animeic 2 anos atrás
pai
commit
c55bbbcd22

+ 1 - 1
3dshow-supplier/api/asset.go

@@ -50,7 +50,7 @@ func regAssetApi(r *GinRouter) {
 			return query
 		},
 		JWT:           true,
-		SearchProject: []string{"name", "createTime", "type", "unit", "price", "cover", "status"},
+		SearchProject: []string{"name", "createTime", "thumbnail", "groups"},
 		OnUpdate: func(c *gin.Context, apictx *ApiSession, entity interface{}, id primitive.ObjectID) {
 			asset := entity.(*model.Asset360Fake3d)
 			if asset == nil {

+ 1 - 1
3dshow-supplier/api/router.go

@@ -22,7 +22,7 @@ func RegRouters(svc *Service) {
 	regAssetApi(_3dshow)
 
 	// test
-	Test(_3dshow)
+	// Test(_3dshow)
 }
 
 func Logger() gin.HandlerFunc {

+ 8 - 10
3dshow-supplier/api/test_print.go

@@ -1,15 +1,13 @@
 package api
 
-import "github.com/gin-gonic/gin"
+// func Test(r *GinRouter) {
+// 	r.POST("/test/upload", ImageUpload)
 
-func Test(r *GinRouter) {
-	r.POST("/test/upload", ImageUpload)
+// }
 
-}
+// func ImageUpload(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
-func ImageUpload(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-	orginPath := "images"
-	obsPath := "test/spin_360_orgin"
-	return uploadImage(orginPath, obsPath)
-}
+// 	orginPath := "images"
+// 	obsPath := "test/spin_360_orgin"
+// 	return uploadImage(orginPath, obsPath)
+// }

+ 2 - 2
3dshow-supplier/bus/tileResult.go

@@ -73,8 +73,8 @@ func RepoTileConvResult(data *TileConvertorResult) error {
 	if asset.Groups != nil {
 		for _, g := range asset.Groups {
 			if g.Id == data.GroupId {
-				host := "https://www.3dqueen.cloud/asset360/index.html?apath="
-				g.Url = fmt.Sprintf("%s%s", host, data.TilePath)
+
+				g.Url = data.TilePath
 				g.State = model.GROUPSTATE_SUCC
 			}
 		}

+ 1 - 1
3dshow-supplier/db/model/asset.go

@@ -16,7 +16,7 @@ const (
 
 // 一套360度图片
 type Asset360Group struct {
-	Id        string `bson:"_id,omitempty" json:"_id"`
+	Id        string `bson:"id,omitempty" json:"id"`
 	GroupName string `bson:"groupName,omitempty" json:"groupName"` //白色
 	Name      string `bson:"name,omitempty" json:"name"`           //正视
 

+ 1 - 1
3dshow-supplier/funcgraph/tile360.go

@@ -46,7 +46,7 @@ func Tile360onvRequest(assetId string, groupId string, sourcePath string, natsUr
 		"notifySubject": streamTopics[1],
 	}}
 
-	request.FunctionUrn = "urn:fss:cn-east-3:0956c65fd600f29f2ff6c00dbb3d1e2e:function:default:osgconv:v1"
+	request.FunctionUrn = "urn:fss:cn-east-3:0956c65fd600f29f2ff6c00dbb3d1e2e:function:default:tileconv:latest"
 	response, err := client.AsyncInvokeFunction(request)
 
 	if err == nil {