clear

mesh/a.py

@@ -1,7 +0,0 @@
-import os 
-
-routes = os.popen('route print').readlines()
-for a in routes:
-    print(a)
-    
-#print([a for a in os.popen('route print').readlines() if ' 0.0.0.0 ' in a])

mesh/api/api.go

@@ -3,9 +3,9 @@ package api
 import (
 	"context"
 	"fmt"
-	"mats/conf"
-	"mats/db"
-	"mats/db/repo"
+	"mesh/conf"
+	"mesh/db"
+	"mesh/db/repo"
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-contrib/sessions"

mesh/api/controller.go

@@ -4,7 +4,7 @@ import (
 	"crypto/md5"
 	"encoding/json"
 	"fmt"
-	"mats/log"
+	"mesh/log"
 	"net/http"
 	"runtime"
 	"strconv"

mesh/api/jwt.go

@@ -3,7 +3,7 @@ package api
 import (
 	"fmt"
 	"log"
-	"mats/conf"
+	"mesh/conf"
 	"time"
 
 	jwt "github.com/appleboy/gin-jwt/v2"
@@ -71,7 +71,7 @@ func NewUitlsJwt(app *conf.AppConf) *UtilsJwt {
 			return &JWTUser{Phone: "empty"}, nil
 		},
 
-		Authorizator: func(data interface{}, c *gin.Context) bool {
+		Authorizator: func(data interface{}, _ *gin.Context) bool {
 			u := data.(*JWTUser)
 			return u.State > 0
 		},
@@ -88,7 +88,7 @@ func NewUitlsJwt(app *conf.AppConf) *UtilsJwt {
 			})
 		},
 
-		LogoutResponse: func(c *gin.Context, status int) {
+		LogoutResponse: func(c *gin.Context, _ int) {
 			ResultSuc(c, true)
 		},
 
@@ -119,7 +119,7 @@ func NewUitlsJwt(app *conf.AppConf) *UtilsJwt {
 			})
 		},
 
-		HTTPStatusMessageFunc: func(e error, c *gin.Context) string {
+		HTTPStatusMessageFunc: func(e error, _ *gin.Context) string {
 
 			// if e == jwt.ErrFailedAuthentication {
 			// 	return "用户名/密码 不正确"

mesh/api/service-database-category.go → mesh/api/mark-service-database-category.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"mats/db/repo"
+	"mesh/db/repo"
 	"time"
 
 	"github.com/gin-gonic/gin"

mesh/api/service-meshes.go → mesh/api/mark-service-meshes.go

@@ -1,9 +1,9 @@
 package api
 
 import (
-	"mats/bus"
-	"mats/db/model"
-	"mats/db/repo"
+	"mesh/bus"
+	"mesh/db/model"
+	"mesh/db/repo"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -46,14 +46,14 @@ func RegQueenMeshes(router *GinRouter) {
 		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
 			return &model.HubMesh{}
 		},
-		SearchFilter: func(c *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
+		SearchFilter: func(_ *gin.Context, apictx *ApiSession, _ map[string]interface{}) map[string]interface{} {
 			userId, _ := primitive.ObjectIDFromHex(apictx.User.Parent)
 			return map[string]interface{}{"userId": userId}
 		},
 		JWT:           true,
 		SearchProject: []string{"name", "thumbnail", "createTime", "host", "dbid", "defineId"},
 		DetailProject: []string{"name", "thumbnail", "createTime", "host", "dbid", "defineId"},
-		Remove: func(c *gin.Context, apictx *ApiSession, id string) (interface{}, error) {
+		Remove: func(_ *gin.Context, apictx *ApiSession, id string) (interface{}, error) {
 
 			hub := &model.HubMesh{}
 			err := repo.RepoSeachDoc2(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: CollectionName, Query: repo.Map{"_id": id}}, hub)

mesh/api/service-queenter-upload.go → mesh/api/mark-service-queenter-upload.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"fmt"
-	"mats/db/model"
-	"mats/db/repo"
+	"mesh/db/model"
+	"mesh/db/repo"
 
 	"github.com/gin-gonic/gin"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -122,7 +122,7 @@ func getUploadCategory(c *gin.Context, apictx *ApiSession) (interface{}, error)
 }
 
 // 上传面料组
-func uploadMatGroup(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+func uploadMatGroup(c *gin.Context, _ *ApiSession) (interface{}, error) {
 
 	body := &struct {
 		Uuid string //设备uuid

mesh/api/service-queenter.go → mesh/api/mark-service-queenter.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"fmt"
-	"mats/bus"
-	"mats/db/model"
-	"mats/db/repo"
+	"mesh/bus"
+	"mesh/db/model"
+	"mesh/db/repo"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -44,7 +44,7 @@ func RegQueenterApi(router *GinRouter) {
 		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
 			return &model.DeviceQueenter{}
 		},
-		SearchFilter: func(c *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
+		SearchFilter: func(_ *gin.Context, apictx *ApiSession, _ map[string]interface{}) map[string]interface{} {
 			userId, _ := primitive.ObjectIDFromHex(apictx.User.Parent)
 			return map[string]interface{}{"userId": userId}
 		},
@@ -88,7 +88,7 @@ func RegQueenterApi(router *GinRouter) {
 		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
 			return &model.DeviceOutput{}
 		},
-		SearchFilter: func(c *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
+		SearchFilter: func(_ *gin.Context, apictx *ApiSession, _ map[string]interface{}) map[string]interface{} {
 			userId, _ := primitive.ObjectIDFromHex(apictx.User.Parent)
 			return map[string]interface{}{"userId": userId}
 		},
@@ -99,7 +99,7 @@ func RegQueenterApi(router *GinRouter) {
 		},
 	})
 
-	router.POSTJWT("/queenter/ouput/sku3dinfo", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	router.POSTJWT("/queenter/ouput/sku3dinfo", func(c *gin.Context, _ *ApiSession) (interface{}, error) {
 		body := &struct {
 			LoginName string
 		}{}

mesh/api/router.go

@@ -10,19 +10,16 @@ import (
 func RegRouters(svc *Service) {
 
 	//登录
-	spud3dGroup := svc.NewGinRouter("/" + svc.Conf.Name)
-	spud3dGroup.group.Use(Logger())
+	queenmesh := svc.NewGinRouter("/" + svc.Conf.Name)
+	queenmesh.group.Use(Logger())
 
-	RegQueenMats(spud3dGroup)
+	RegQueenMeshes(queenmesh)
 
-	// 模型库
-	RegQueenMeshes(spud3dGroup)
+	RegQueenterApi(queenmesh)
 
-	RegQueenterApi(spud3dGroup)
+	RegQueenterUploadApi(queenmesh)
 
-	RegQueenterUploadApi(spud3dGroup)
-
-	CreateDatabaseCategoryRouter(spud3dGroup)
+	CreateDatabaseCategoryRouter(queenmesh)
 
 	//数据存储
 	// spud3dGroup.POST("/save/policy", UploadPolicy)

mesh/api/servcie-test.go

@@ -1,15 +0,0 @@
-package api
-
-import (
-	"fmt"
-
-	"github.com/gin-gonic/gin"
-)
-
-//ServiceTestHttp JWT授权的http处理函数
-func ServiceTestHttp(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-	fmt.Println("test")
-
-	return "hello world " + apictx.Svc.DebugUserPhone, nil
-}

mesh/api/service-array.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"fmt"
-	"mats/db/repo"
+	"mesh/db/repo"
 
 	"github.com/gin-gonic/gin"
 	"go.mongodb.org/mongo-driver/bson"

mesh/api/service-asset.go

@@ -1,190 +0,0 @@
-package api
-
-import (
-	"mats/conf"
-	"mats/db/model"
-	"mats/db/repo"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-const (
-	CategoyScopeGlobal = "global"
-	CategoyScopeQiye   = "qiye"
-)
-
-func AssetProfile(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-	var floatv float32 = 1
-
-	profile := map[string]interface{}{
-		"name":     apictx.Svc.Conf.Name,
-		"version":  apictx.Svc.Conf.Version,
-		"saveType": apictx.Svc.Conf.SaveType,
-		"assets":   apictx.Svc.Conf.Assets,
-		"category": apictx.Svc.Conf.Category,
-		"assetConf": map[string]interface{}{
-			"decorate": &model.AssetDecorateMesh{
-				Components: []*model.MeshMatConf{
-					&model.MeshMatConf{
-						Name:     "xx",
-						Index:    1,
-						Material: &model.MatConfig{},
-					},
-				},
-			},
-			"texture": &model.AssetTexture{},
-			"env3d":   &model.Env3d{},
-			"material": model.AssetMaterial{
-				Config: &model.MatConfig{
-					Uvtransform: &model.MaterailUv{},
-					CullFace:    "",
-					Version:     1,
-					Type:        "default",
-					Albedo:      &model.MatTextureColor{Color: &model.Vect3{}, Texture: &model.OssType{}, UseTexture: BoolValue(true)},
-					Roughness:   &model.MatTextureFactor{Texture: &model.OssType{}, Factor: &floatv},
-					Normal:      &model.MatNormal{Texture: &model.OssType{}, Factor: &floatv},
-					Metalness:   &model.MatTextureFactor{Texture: &model.OssType{}, Factor: &floatv},
-					Opacity:     &model.MatTextureFactorWithEnable{Enable: *BoolValue(false), Factor: &floatv, Texture: &model.OssType{}},
-					Specular:    &model.MatTextureColor{Color: &model.Vect3{}, Texture: &model.OssType{}, UseTexture: BoolValue(true)},
-				},
-			},
-			"boxtpl": &model.Boxtpl{Components: []*model.BoxtplComponent{
-				&model.BoxtplComponent{
-					UV: &model.BoxtplCompUv{},
-				},
-			}},
-		},
-	}
-	return profile, nil
-}
-
-func UploadAsset(c *gin.Context, apictx *ApiSession, asset *conf.AppAsset) (interface{}, error) {
-
-	body := repo.RepoAssetCreateDefaultValue(asset)
-	if body == nil {
-		return nil, NewError("不支持的上传类型")
-	}
-	c.ShouldBindJSON(body.GetEntity())
-
-	return body.Upload(apictx.CreateRepoCtx(), apictx.User.ID)
-}
-
-func UpdateAsset(c *gin.Context, apictx *ApiSession, asset *conf.AppAsset) (interface{}, error) {
-	body := repo.RepoAssetCreateDefaultValue(asset)
-	if body == nil {
-		return nil, NewError("不支持的资产类型")
-	}
-	c.ShouldBindJSON(body.GetEntity())
-
-	return body.Update(apictx.CreateRepoCtx())
-}
-
-func DetailAsset(c *gin.Context, apictx *ApiSession, asset *conf.AppAsset) (interface{}, error) {
-	id := c.Param("id")
-
-	body := repo.RepoAssetCreateDefaultValue(asset)
-	if body == nil {
-		return nil, NewError("不支持的资产类型")
-	}
-	c.ShouldBindJSON(body.GetEntity())
-
-	return body.Detail(apictx.CreateRepoCtx(), id)
-}
-
-func RemoveAsset(c *gin.Context, apictx *ApiSession, asset *conf.AppAsset) (interface{}, error) {
-	body := &struct {
-		Id string
-	}{}
-
-	c.ShouldBindJSON(body)
-	collectionName := "asset-" + asset.Type
-	if len(body.Id) < 1 {
-		return nil, NewError("id不能为空!")
-	}
-	return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), collectionName, body.Id)
-}
-
-func UpdateAssetState(c *gin.Context, apictx *ApiSession, asset *conf.AppAsset) (interface{}, error) {
-	body := &struct {
-		Id    string
-		State int
-	}{}
-
-	c.ShouldBindJSON(body)
-	collectionName := "asset-" + asset.Type
-	if len(body.Id) < 1 {
-		return nil, NewError("id不能为空!")
-	}
-	return repo.RepoUpdateSetDocProps(apictx.CreateRepoCtx(), collectionName, body.Id, bson.M{"$set": bson.M{"state": body.State}})
-}
-
-func UserAssetList(c *gin.Context, apictx *ApiSession, asset *conf.AppAsset) (interface{}, error) {
-
-	page, size, query, fields := UtilQueryPageSize2(c)
-
-	uid, _ := primitive.ObjectIDFromHex(apictx.User.ID)
-	query["userId"] = uid
-
-	collectionName := "asset-" + asset.Type
-
-	// ParseCategories(query, apictx)
-
-	project := []string{"name", "thumbnail", "createTime", "state", "categories", "meshState", "images", "file", "osgjs"}
-	if len(fields) > 0 {
-		project = fields
-	}
-
-	return repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-		CollectName: collectionName,
-		Page:        page,
-		Size:        size,
-		Query:       query,
-		Project:     project,
-		Sort:        bson.M{"createTime": -1},
-	})
-}
-
-func CreateAssetRouter(router *GinRouter) {
-	assets := conf.AppConfig.Assets
-	if len(assets) < 1 {
-		return
-	}
-
-	for _, asset := range assets {
-
-		targetAsset := &conf.AppAsset{Type: asset.Type, Name: asset.Name, IsMesh: asset.IsMesh, IsImage: asset.IsImage, DefaultCategory: asset.DefaultCategory}
-		router.POSTJWT("/upload/"+asset.Type, func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			return UploadAsset(c, apictx, targetAsset)
-		})
-
-		router.POSTJWT("/update/"+asset.Type, func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			return UpdateAsset(c, apictx, targetAsset)
-		})
-
-		router.POSTJWT(asset.Type+"/state", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			return UpdateAssetState(c, apictx, targetAsset)
-		})
-
-		router.GET(asset.Type+"/detail/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-			return DetailAsset(c, apictx, targetAsset)
-		})
-
-		router.POSTJWT("/delete/"+asset.Type, func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			return RemoveAsset(c, apictx, targetAsset)
-		})
-
-		router.GETJWT("/user/"+asset.Type+"/list", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			return UserAssetList(c, apictx, targetAsset)
-		})
-		router.GETJWT("/team/"+asset.Type+"/list", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			return UserAssetList(c, apictx, targetAsset)
-		})
-		router.GET("/platform/"+asset.Type+"/list", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			return UserAssetList(c, apictx, targetAsset)
-		})
-	}
-}

mesh/api/service-clean.go

@@ -1,17 +0,0 @@
-package api
-
-import (
-	"github.com/gin-gonic/gin"
-)
-
-func AssetClean(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-	// ret, err := repo.RepoDeleteDocs(apictx.CreateRepoCtx(), repo.CollectionAssetCategory, bson.M{})
-	// if err != nil {
-	// 	return ret, err
-	// }
-
-	// return repo.RepoDeleteDocs(apictx.CreateRepoCtx(), repo.CollectionCategory, bson.M{})
-
-	return nil, nil
-}

mesh/api/service-database-asset.go

@@ -1,807 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"infish.cn/comm"
-)
-
-func UploadAsset2(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf) (interface{}, error) {
-	switch dbConf.AssetConf.Type {
-	case model.AssetTypeMesh:
-		body := &model.AssetPackage{}
-		c.ShouldBindJSON(body)
-		body.Source.ViewMode = "prod"
-
-		if apictx.User != nil {
-			body.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-
-		}
-		return UploadAssetPackage(apictx, dbConf, body)
-
-	case model.AssetTypePackage:
-		body := &model.AssetPackage{}
-		c.ShouldBindJSON(body)
-		body.Source.ViewMode = "scene"
-
-		if apictx.User != nil {
-			body.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-		}
-		return UploadAssetPackage(apictx, dbConf, body)
-
-	case model.AssetTypeEnv3d:
-		body := &model.AssetEnv3dHdr{}
-		c.ShouldBindJSON(body)
-		if apictx.User != nil {
-			body.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-		}
-		return UploadEnv3d(apictx, dbConf, body)
-	case model.AssetTypeMaterial:
-		body := &comm.AssetMat{}
-		c.ShouldBindJSON(body)
-		if apictx.User != nil {
-			body.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-		}
-		return UploadMaterial(apictx, dbConf, body)
-
-	case model.AssetTypeMaterialGroup:
-		body := &comm.AssetMatGroup{}
-		err := c.ShouldBindJSON(body)
-		if err != nil {
-			return nil, err
-		}
-
-		if apictx.User != nil {
-			body.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-		}
-		return UploadMaterialGroup(apictx, dbConf, body)
-
-	case model.AssetTypeImage:
-		body := &model.AssetImage{}
-		c.ShouldBindJSON(body)
-		if apictx.User != nil {
-			body.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-		}
-		return UploadImage(apictx, dbConf, body)
-	}
-
-	return nil, NewError("不支持的上传类型")
-}
-
-func PublicAssetList(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf) (interface{}, error) {
-
-	page, size, query, fields := UtilQueryPageSize2(c)
-	collectionName := dbConf.AssetConf.Collection
-
-	err := ParseCategories(query, apictx, dbConf)
-	if err != nil {
-		return nil, err
-	}
-
-	project := []string{"name"}
-	if dbConf.AssetConf.Type == model.AssetTypeMesh {
-		project = []string{"name", "assetState", "source"}
-	}
-	if len(fields) > 0 {
-		project = fields
-	}
-
-	out, err := repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-		Db:          dbConf.Db.Name,
-		CollectName: collectionName,
-		Page:        page,
-		Size:        size,
-		Query:       query,
-		Project:     project,
-		Sort:        bson.M{"createTime": -1},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	for _, item := range out.List {
-		item["defineId"] = dbConf.AssetConf.Id
-	}
-	return out, nil
-}
-
-func AssetList(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf) (interface{}, error) {
-
-	page, size, query, fields := UtilQueryPageSize2(c)
-	collectionName := dbConf.AssetConf.Collection
-	if query["userId"] != nil && len(query["userId"].(string)) > 0 {
-		query["userId"], _ = primitive.ObjectIDFromHex(apictx.User.ID)
-	}
-	if query["ownerId"] != nil && len(query["ownerId"].(string)) > 0 {
-		query["ownerId"], _ = primitive.ObjectIDFromHex(query["ownerId"].(string))
-	}
-
-	err := ParseCategories(query, apictx, dbConf)
-	if err != nil {
-		return nil, err
-	}
-
-	project := []string{"name"}
-	if dbConf.AssetConf.Type == model.AssetTypeMesh {
-		project = []string{"name", "assetState", "source"}
-	}
-	if len(fields) > 0 {
-		project = fields
-	}
-
-	out, err := repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-		Db:          dbConf.Db.Name,
-		CollectName: collectionName,
-		Page:        page,
-		Size:        size,
-		Query:       query,
-		Project:     project,
-		Sort:        bson.M{"createTime": -1},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	for _, item := range out.List {
-		item["defineId"] = dbConf.AssetConf.Id
-	}
-	return out, nil
-}
-
-func AssetDelete(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf, id string) (interface{}, error) {
-	return repo.RepoDeleteDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, dbConf.AssetConf.Collection, id)
-}
-
-func AssetCopy(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf, id string, toDbConf *model.AssetDbConf, ownerId string, ownerType string, assetType string) (interface{}, error) {
-	collectionName := dbConf.AssetConf.Collection
-	var body model.IAsset
-	switch dbConf.AssetConf.Type {
-	case model.AssetTypeMesh:
-		body = &model.AssetPackage{}
-	case model.AssetTypeEnv3d:
-		body = &model.AssetEnv3dHdr{}
-	case model.AssetTypeMaterial:
-		body = &comm.AssetMat{}
-	case model.AssetTypeMaterialGroup:
-		body = &comm.AssetMatGroup{}
-
-	case model.AssetTypeImage:
-		body = &model.AssetImage{}
-	case model.AssetTypePackage:
-		body = &model.AssetPackage{}
-	}
-
-	if body == nil {
-		return nil, NewError("不支持的拷贝类型")
-	}
-
-	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(),
-		&repo.DocSearchOptions{
-			Db:          dbConf.Db.Name,
-			CollectName: collectionName,
-			Query:       repo.Map{"_id": id},
-		}, body)
-	if !ok {
-		return nil, NewError("资产已删除!")
-	}
-	if err != nil {
-		return nil, err
-	}
-	body.SetIdEmpty()
-	body.ResetCreateTime()
-	body.SetOwner(ownerId, ownerType)
-	if len(assetType) > 0 {
-		body.SetAssetType(assetType)
-	}
-	return repo.RepoDbAddDoc(apictx.CreateRepoCtx(), toDbConf.Db.Name, toDbConf.AssetConf.Collection, body)
-}
-
-func AssetCopy2My(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf, id string, toDbConf *model.AssetDbConf, ownerId string, ownerType string, assetType string) (interface{}, error) {
-	collectionName := dbConf.AssetConf.Collection
-	var body model.IAsset
-	switch dbConf.AssetConf.Type {
-	case model.AssetTypeMesh:
-		body = &model.AssetPackage{}
-	case model.AssetTypeEnv3d:
-		body = &model.AssetEnv3dHdr{}
-	case model.AssetTypeMaterial:
-		body = &comm.AssetMat{}
-	case model.AssetTypeMaterialGroup:
-		body = &comm.AssetMatGroup{}
-
-	case model.AssetTypeImage:
-		body = &model.AssetImage{}
-	case model.AssetTypePackage:
-		body = &model.AssetPackage{}
-	}
-
-	if body == nil {
-		return nil, NewError("不支持的拷贝类型")
-	}
-
-	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(),
-		&repo.DocSearchOptions{
-			Db:          dbConf.Db.Name,
-			CollectName: collectionName,
-			Query:       repo.Map{"_id": id},
-		}, body)
-	if !ok {
-		return nil, NewError("资产已删除!")
-	}
-	if err != nil {
-		return nil, err
-	}
-	body.SetIdEmpty()
-	body.ResetCreateTime()
-	body.SetOwner(ownerId, ownerType)
-	if len(assetType) > 0 {
-		body.SetAssetType(assetType)
-	}
-
-	//todo fixme 设置用户自己的信息
-	// info, err := bus.NatsCenter.GetUserInfo(apictx.User.ID)
-	// if err != nil {
-	// 	return nil, err
-	// }
-	//body.SetUserInfo(apictx.User.ID, &comm.AssetUserInfo{Name: info.Name, Thumbnail: &comm.OssType{Url: info.Avatar, Size: 0}})
-	body.SetUserInfo(apictx.User.ID, nil)
-
-	return repo.RepoDbAddDoc(apictx.CreateRepoCtx(), toDbConf.Db.Name, toDbConf.AssetConf.Collection, body)
-}
-
-func AssetDetail(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf, id string) (interface{}, error) {
-
-	_, _, _, fields := UtilQueryPageSize2(c)
-	collectionName := dbConf.AssetConf.Collection
-
-	project := []string{"name", "thumbnail", "createTime", "assetType", "cusNum", "state", "categories", "cusCategories", "source", "assetState", "userData"}
-
-	if len(fields) > 0 {
-		project = fields
-	}
-
-	ok, body := repo.RepoSeachDocMap(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-		Db:          dbConf.Db.Name,
-		CollectName: collectionName,
-		Query:       repo.Map{"_id": id},
-		Project:     project,
-	})
-
-	if !ok {
-		return nil, NewError("资产不存在!")
-	}
-
-	return body, nil
-}
-
-func AssetUpdateComm(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf) (interface{}, error) {
-
-	switch dbConf.AssetConf.Type {
-	case model.AssetTypeMesh:
-		body := &model.AssetPackage{}
-		c.ShouldBindJSON(body)
-		body.Source.ViewMode = "prod"
-		return UpdateAssetPackageComm(apictx, dbConf, body)
-
-	case model.AssetTypeEnv3d:
-		body := &model.AssetEnv3dHdr{}
-		c.ShouldBindJSON(body)
-
-		return UpdateHdrComm(apictx, dbConf, body)
-	case model.AssetTypeMaterial:
-		body := &comm.AssetMat{}
-		c.ShouldBindJSON(body)
-		return UpdateMaterialComm(apictx, dbConf, body)
-	case model.AssetTypeMaterialGroup:
-		body := &comm.AssetMatGroup{}
-		c.ShouldBindJSON(body)
-		return UpdateMaterialGroup(apictx, dbConf, body)
-
-	case model.AssetTypeImage:
-		body := &model.AssetImage{}
-		c.ShouldBindJSON(body)
-		return UpdateImageComm(apictx, dbConf, body)
-
-	case model.AssetTypePackage:
-		body := &model.AssetPackage{}
-		c.ShouldBindJSON(body)
-		if body.Source != nil {
-			body.Source.ViewMode = "scene"
-		}
-
-		return UpdateAssetPackageComm(apictx, dbConf, body)
-	}
-
-	return nil, NewError("不支持的类型")
-}
-
-func AssetUpdateSource(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf) (interface{}, error) {
-
-	switch dbConf.AssetConf.Type {
-	case model.AssetTypeMesh:
-		body := &model.AssetPackage{}
-		c.ShouldBindJSON(body)
-
-		return UpdateAssetPackageSource(apictx, dbConf, body)
-	case model.AssetTypePackage:
-		body := &model.AssetPackage{}
-		c.ShouldBindJSON(body)
-
-		return UpdateAssetPackageSource(apictx, dbConf, body)
-
-	case model.AssetTypeEnv3d:
-		body := &model.AssetEnv3dHdr{}
-		c.ShouldBindJSON(body)
-
-		return UpdateHdrSource(apictx, dbConf, body)
-	case model.AssetTypeMaterial:
-		body := &comm.AssetMat{}
-		c.ShouldBindJSON(body)
-		return UpdateMaterialComm(apictx, dbConf, body)
-	case model.AssetTypeMaterialGroup:
-		body := &comm.AssetMatGroup{}
-		c.ShouldBindJSON(body)
-		return UpdateMaterialGroup(apictx, dbConf, body)
-
-	case model.AssetTypeImage:
-		body := &model.AssetImage{}
-		c.ShouldBindJSON(body)
-		return UpdateImageSource(apictx, dbConf, body)
-	}
-
-	return nil, NewError("不支持的类型")
-}
-
-func InsertAsset(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf) (interface{}, error) {
-
-	var asset interface{} = nil
-
-	switch dbConf.AssetConf.Type {
-	case model.AssetTypeMesh:
-	case model.AssetTypePackage:
-		body := &model.AssetPackage{}
-		c.ShouldBindJSON(body)
-		body.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-		body.UpdateTime = time.Now()
-		body.CreateTime = time.Now()
-		body.Id = primitive.NilObjectID
-		asset = body
-	}
-
-	if asset != nil {
-		collectionName := dbConf.AssetConf.Collection
-		return repo.RepoDbAddDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, asset)
-	}
-
-	return nil, NewError("不支持的类型")
-}
-
-func AssetProcess(c *gin.Context, apictx *ApiSession, dbConf *model.AssetDbConf, id string) (interface{}, error) {
-
-	switch dbConf.AssetConf.Type {
-	case model.AssetTypeMesh:
-		return ProcessPackage(apictx, dbConf, id)
-	case model.AssetTypePackage:
-		return ProcessPackage(apictx, dbConf, id)
-		// case model.AssetTypeEnv3d:
-		// 	return ProcessHdr(apictx, dbConf, id)
-	}
-
-	return nil, NewError("不支持的类型")
-}
-
-func CreateDatabaseAssetRouter(router *GinRouter) {
-
-	//dbId的数据上传对应的资产库
-	router.POSTJWT("/upload/:dbId/:assetConfId", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbId")
-		assetConfId := c.Param("assetConfId")
-		if len(dbId) < 1 || len(assetConfId) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return UploadAsset2(c, apictx, &model.AssetDbConf{Db: db, AssetConf: assetConf})
-	})
-
-	router.POSTJWT("/updatecomm/:dbid/:assetConfId", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		if len(dbId) < 1 || len(assetConfId) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-		return AssetUpdateComm(c, apictx, &model.AssetDbConf{Db: db, AssetConf: assetConf})
-	})
-
-	router.POSTJWT("/updatesource/:dbid/:assetConfId", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		if len(dbId) < 1 || len(assetConfId) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return AssetUpdateSource(c, apictx, &model.AssetDbConf{Db: db, AssetConf: assetConf})
-	})
-
-	//删除
-	router.POSTJWT("/delete/:dbid/:assetConfId/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		id := c.Param("id")
-
-		if len(dbId) < 1 || len(assetConfId) < 1 || len(id) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return AssetDelete(c, apictx, &model.AssetDbConf{Db: db, AssetConf: assetConf}, id)
-	})
-
-	//拷贝
-	router.POSTJWT("/copy/:dbid/:assetConfId/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		id := c.Param("id")
-
-		body := &struct {
-			DbId      string
-			AssetType string
-			DefineId  string
-			OwnerId   string
-			OwnerType string
-		}{}
-
-		err := c.ShouldBindJSON(body)
-		if err != nil {
-			return nil, err
-		}
-		if len(body.DbId) < 1 || len(body.DefineId) < 1 {
-			return nil, NewError("目标库Id不合法")
-		}
-
-		if len(dbId) < 1 || len(assetConfId) < 1 || len(id) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-
-		fromDbConf := repo.GetDatabaseCollectionSimple(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if fromDbConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		toDbConf := repo.GetDatabaseCollectionSimple(apictx.CreateRepoCtx(), body.DbId, body.DefineId)
-		if toDbConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return AssetCopy(c, apictx, fromDbConf, id, toDbConf, body.OwnerId, body.OwnerType, body.AssetType)
-	})
-
-	router.POSTJWT("/insertById/:dbid/:assetConfId/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		id := c.Param("id")
-
-		body := &struct {
-			DbId      string
-			DefineId  string
-			OwnerId   string
-			OwnerType string
-			AssetType string
-		}{}
-
-		err := c.ShouldBindJSON(body)
-		if err != nil {
-			return nil, err
-		}
-		if len(body.DbId) < 1 || len(body.DefineId) < 1 {
-			return nil, NewError("目标库Id不合法")
-		}
-
-		if len(dbId) < 1 || len(assetConfId) < 1 || len(id) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-
-		fromDbConf := repo.GetDatabaseCollectionSimple(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if fromDbConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		toDbConf := repo.GetDatabaseCollectionSimple(apictx.CreateRepoCtx(), body.DbId, body.DefineId)
-		if toDbConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return AssetCopy2My(c, apictx, fromDbConf, id, toDbConf, body.OwnerId, body.OwnerType, body.AssetType)
-	})
-
-	//拷贝
-	router.POSTJWT("/insert/:dbid/:assetConfId", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-
-		toDbConf := repo.GetDatabaseCollectionSimple(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if toDbConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return InsertAsset(c, apictx, toDbConf)
-	})
-
-	//列表查询
-	router.GETJWT("/list/:dbid/:assetConfId", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		if len(dbId) < 1 || len(assetConfId) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return AssetList(c, apictx, &model.AssetDbConf{Db: db, AssetConf: assetConf})
-	})
-
-	//公开的列表查询
-	router.GET("/public/:dbid/:assetConfId", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		if len(dbId) < 1 || len(assetConfId) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return PublicAssetList(c, apictx, &model.AssetDbConf{Db: db, AssetConf: assetConf})
-	})
-
-	//列表查询
-	router.GET("/asset/:dbid/:assetConfId", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		if len(dbId) < 1 || len(assetConfId) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return AssetList(c, apictx, &model.AssetDbConf{Db: db, AssetConf: assetConf})
-	})
-
-	//详情
-	router.GET("/detail/:dbid/:assetConfId/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		id := c.Param("id")
-
-		if len(dbId) < 1 || len(assetConfId) < 1 || len(id) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-
-		assetConf := repo.GetDatabaseCollectionSimple(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if assetConf.AssetConf == nil || len(assetConf.Db.Name) < 1 {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return AssetDetail(c, apictx, assetConf, id)
-	})
-
-	//资产处理
-	router.POSTJWT("/process/:dbid/:assetConfId/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		id := c.Param("id")
-
-		if len(dbId) < 1 || len(assetConfId) < 1 || len(id) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		return AssetProcess(c, apictx, &model.AssetDbConf{Db: db, AssetConf: assetConf}, id)
-	})
-
-	//pack生成阴影
-	router.POSTJWT("/processshadow/:dbid/:assetConfId/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		dbId := c.Param("dbid")
-		assetConfId := c.Param("assetConfId")
-		id := c.Param("id")
-
-		body := &struct {
-			Scale int32
-			Width int32
-		}{}
-
-		err := c.ShouldBindJSON(body)
-		if err != nil {
-			body.Scale = 15
-			body.Width = 512
-		}
-
-		if body.Scale < 15 {
-			return nil, NewError("scale需要>=15！")
-		}
-
-		if len(dbId) < 1 || len(assetConfId) < 1 || len(id) < 1 {
-			return nil, NewError("数据Id不合法!")
-		}
-		assetConf := repo.GetDatabaseCollectionSimple(apictx.CreateRepoCtx(), dbId, assetConfId)
-		if assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-
-		if assetConf.AssetConf.Type != model.AssetTypePackage && assetConf.AssetConf.Type != model.AssetTypeMesh {
-			return nil, NewError("该类型不支持生成阴影!")
-		}
-
-		return ProcessPackageShadow(apictx, assetConf, id, body.Scale, body.Width)
-	})
-
-	// router.GETJWT("/team/"+asset.Type+"/list", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	// 	return UserAssetList(c, apictx, targetAsset)
-	// })
-	// router.GET("/platform/"+asset.Type+"/list", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	// 	return UserAssetList(c, apictx, targetAsset)
-	// })
-}
-
-type IteChildren func(n *comm.CategoryNode) []string
-type FindChild func(n *comm.CategoryNode, id string) []string
-
-func FindCategoryIds(c *comm.DbCategory, parents []string) []string {
-	out := []string{}
-	var allChildren IteChildren
-	allChildren = func(n *comm.CategoryNode) []string {
-		ids := []string{}
-		if n == nil {
-			return ids
-		}
-		ids = append(ids, n.Id)
-		if n.Children != nil {
-			for _, c := range n.Children {
-				cids := allChildren(c)
-				if len(cids) > 0 {
-					ids = append(ids, cids...)
-				}
-			}
-		}
-		return ids
-	}
-	var findChildrens FindChild
-	findChildrens = func(n *comm.CategoryNode, id string) []string {
-		ids := []string{}
-		if n == nil {
-			return ids
-		}
-
-		if n.Id == id {
-			ids = allChildren(n)
-			return ids
-		}
-
-		if n.Children == nil {
-			return ids
-		}
-
-		//查找孩子节点
-		for _, c := range n.Children {
-			ids = findChildrens(c, id)
-			if len(ids) > 0 {
-				break
-			}
-		}
-		return ids
-	}
-	for _, v := range parents {
-		for _, catnode := range c.Categories {
-			extends := findChildrens(catnode, v)
-			if len(extends) > 0 {
-				out = append(out, extends...)
-				break
-			}
-		}
-	}
-	return out
-}
-
-func ParseCategories(query map[string]interface{}, apictx *ApiSession, dbConf *model.AssetDbConf) error {
-
-	filters := []bson.M{}
-	keyfilters := []bson.M{}
-	//keyword
-	if query["keyword"] != nil {
-		keyword := query["keyword"].(string)
-		if len(keyword) > 0 {
-			keyfilters = append(keyfilters, bson.M{"name": bson.M{"$regex": keyword, "$options": "$i"}})
-			keyfilters = append(keyfilters, bson.M{"cusNum": bson.M{"$regex": keyword, "$options": "$i"}})
-			filters = append(filters, bson.M{"$or": keyfilters})
-		}
-		query["keyword"] = nil
-	}
-
-	if query["cusCategories"] != nil && query["cateId"] != nil {
-
-		categories := query["categories"].([]interface{})
-
-		cateId := query["cateId"].(string)
-		//查询所有子内容
-		if len(categories) > 0 {
-			cateConf := &comm.DbCategory{}
-			filterCaties := []string{}
-			//查询用户的
-			ok, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionCategories, Query: repo.Map{"_id": cateId}}, cateConf)
-			if !ok {
-				return NewError("cate get error")
-			}
-
-			for _, c := range categories {
-				filterCaties = append(filterCaties, c.(string))
-			}
-			extends := FindCategoryIds(cateConf, filterCaties)
-			if len(extends) > 0 {
-				filter := bson.M{"categories": bson.M{"$elemMatch": bson.M{"$in": extends}}}
-				filters = append(filters, filter)
-			}
-		}
-		query["cusCategories"] = nil
-		query["cateId"] = nil
-	}
-
-	if query["categories"] != nil && dbConf.Db.Categories != nil {
-
-		categories := query["categories"].([]interface{})
-
-		//查询所有子内容
-		if len(categories) > 0 {
-			cateConf := dbConf.Db.Categories
-			filterCaties := []string{}
-
-			for _, c := range categories {
-				filterCaties = append(filterCaties, c.(string))
-			}
-
-			extends := FindCategoryIds(cateConf, filterCaties)
-			if len(extends) > 0 {
-				filter := bson.M{"categories": bson.M{"$elemMatch": bson.M{"$in": extends}}}
-				filters = append(filters, filter)
-			}
-		}
-		query["categories"] = nil
-	}
-
-	if len(filters) > 0 {
-		query["$and"] = filters
-	}
-
-	return nil
-}

mesh/api/service-database-assetconf.go

@@ -1,126 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func CreateDatabaseAssetConfRouter(router *GinRouter) {
-
-	//创建资产定义
-	router.POST("/assetconf/create/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		id := c.Param("id")
-		if len(id) < 1 {
-			return nil, NewError("数据库Id不能为空")
-		}
-		body := &model.DbAsset{}
-		c.ShouldBindJSON(body)
-		body.Id = primitive.NewObjectID().Hex()
-
-		if len(body.Collection) < 1 || len(body.Label) < 1 || body.Type == 0 {
-			return nil, NewError("数据不合法!")
-		}
-		database := &model.Database{}
-		ok, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionDatabase, Query: repo.Map{"assets.collection": body.Collection, "_id": id}, Project: []string{"_id"}}, database)
-		if ok {
-			return nil, NewError("资产库编号不能重复")
-		}
-		return repo.RepoDocArrayAppend(
-			apictx.CreateRepoCtx(),
-			repo.CollectionDatabase,
-			id,
-			"assets",
-			body,
-		)
-	})
-
-	//创建资产定义
-	router.GET("/assetconf/list/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		id := c.Param("id")
-		if len(id) < 1 {
-			return nil, NewError("数据库Id不能为空")
-		}
-
-		database := &model.Database{}
-
-		_, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionDatabase, Query: repo.Map{"_id": id}, Project: []string{"assets"}}, database)
-
-		return database.Assets, err
-	})
-
-	//删除资产定义
-	router.POST("/assetconf/delete/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		id := c.Param("id")
-		if len(id) < 1 {
-			return nil, NewError("数据库Id不能为空")
-		}
-		body := &model.DbAsset{}
-		c.ShouldBindJSON(body)
-		if len(body.Id) < 1 {
-			return nil, NewError("资产Id不能为空!")
-		}
-
-		return repo.RepoDocArrayOneRemove(
-			apictx.CreateRepoCtx(),
-			&repo.ArrayOneRemoveOption{
-				CollectName: repo.CollectionDatabase,
-				Id:          id,
-				ArrayQuery:  repo.Map{"assets": bson.M{"id": body.Id}},
-			},
-		)
-	})
-
-	//更新资产标签
-	router.POST("/assetconf/update/label/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		id := c.Param("id")
-		if len(id) < 1 {
-			return nil, NewError("数据库Id不能为空")
-		}
-		body := &model.DbAsset{}
-		c.ShouldBindJSON(body)
-		if len(body.Id) < 1 || len(body.Label) < 1 {
-			return nil, NewError("参数非法")
-		}
-		optSet := repo.Map{}
-		optSet["assets.$.label"] = body.Label
-		option := &repo.ArrayOneUpdateOption{
-			CollectName: repo.CollectionDatabase,
-			Id:          id,
-			Query:       repo.Map{"assets.id": body.Id},
-			Set:         optSet,
-		}
-		return repo.RepoDocArrayOneUpdate(
-			apictx.CreateRepoCtx(),
-			option,
-		)
-	})
-
-	//更新资产分类
-	router.POST("/assetconf/update/categoryIds/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		id := c.Param("id")
-		if len(id) < 1 {
-			return nil, NewError("数据库Id不能为空")
-		}
-		body := &model.DbAsset{}
-		c.ShouldBindJSON(body)
-		if len(body.Id) < 1 {
-			return nil, NewError("参数非法")
-		}
-		optSet := repo.Map{}
-		optSet["assets.$.categoryIds"] = body.CategoryIds
-		option := &repo.ArrayOneUpdateOption{
-			CollectName: repo.CollectionDatabase,
-			Id:          id,
-			Query:       repo.Map{"assets.id": body.Id},
-			Set:         optSet,
-		}
-		return repo.RepoDocArrayOneUpdate(
-			apictx.CreateRepoCtx(),
-			option,
-		)
-	})
-}

mesh/api/service-database-design-product.go

@@ -1,118 +0,0 @@
-package api
-
-import (
-	"errors"
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-// 注册设计相关接口
-func CreateDatabaseDesignProductRouter(router *GinRouter) {
-
-	//获取项目单品详情
-	router.GETJWT("/design/product/detail", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		id := c.Query("id")
-		ok, ret := repo.RepoSeachDocMap(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionDesignProducts, Query: repo.Map{"_id": id}})
-		if !ok {
-			return nil, NewError("获取单品失败!")
-		}
-		return ret, nil
-	})
-
-	router.POSTJWT("/design/product/add/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		projId := c.Param("id")
-		body := &model.ProductHeader{}
-		c.ShouldBindJSON(body)
-
-		if len(projId) < 1 || len(body.FromDbConfId) < 1 || len(body.FromAssetConfId) < 1 || len(body.FromId) < 1 {
-			return nil, NewError("参数不合法!")
-		}
-
-		db, assetConf := repo.GetDatabaseCollection(apictx.CreateRepoCtx(), body.FromDbConfId, body.FromAssetConfId)
-		if len(db.Name) < 1 || assetConf == nil {
-			return nil, NewError("没有对应的资产定义!")
-		}
-		body.CreateTime = time.Now()
-
-		if assetConf.Type == model.AssetTypeMesh {
-			asset := &model.AssetStaticMesh{}
-			ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{Db: db.Name, CollectName: assetConf.Collection, Query: repo.Map{"_id": body.FromId}}, asset)
-			if err != nil {
-				return nil, err
-			}
-			if !ok {
-				return nil, errors.New("对应的模型不存在!")
-			}
-
-			product := &model.DesignProduct{
-				FromDbConfId:    body.FromDbConfId,
-				FromAssetConfId: body.FromAssetConfId,
-				FromId:          body.FromId,
-				Thumbnail:       asset.Thumbnail,
-				Name:            asset.Name,
-				StaticMesh:      asset.Source,
-			}
-			product.ProjectId, _ = primitive.ObjectIDFromHex(projId)
-
-			id, err := repo.RepoAddDoc(apictx.CreateRepoCtx(), repo.CollectionDesignProducts, product)
-			if err != nil {
-				return nil, err
-			}
-			body.Id = id
-			body.Name = asset.Name
-			body.Thumbnail = asset.Thumbnail
-		} else {
-			return nil, NewError("该资产类型不支持创建单品!")
-		}
-
-		ret, err := repo.RepoDocArrayAppend(apictx.CreateRepoCtx(), repo.CollectionDesigns, projId, "products", body)
-		if err != nil {
-			return nil, err
-		}
-		if ret.ModifiedCount < 1 {
-			return nil, errors.New("添加失败!")
-		}
-		return body, nil
-	})
-
-	router.POSTJWT("/design/product/update", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		// if len(c.Param("id")) < 1 {
-		// 	return nil, NewError("项目Id不能为空！")
-		// }
-
-		body := &model.DesignProduct{}
-		c.ShouldBindJSON(body)
-		if body.Id == primitive.NilObjectID {
-			return nil, NewError("单品Id不能为空！")
-		}
-
-		id := body.Id.Hex()
-		body.Id = primitive.NilObjectID
-		body.ProjectId = primitive.NilObjectID
-		body.UpdateTime = time.Now()
-
-		return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionDesignProducts, id, body)
-	})
-
-	router.POSTJWT("/design/product/delete/:did/:pid", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		desiginId := c.Param("did")
-		prouductId := c.Param("pid")
-
-		if len(desiginId) < 1 || len(prouductId) < 1 {
-			return nil, NewError("参数不合法!")
-		}
-
-		_, err := repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionDesignProducts, prouductId)
-		if err != nil {
-			return nil, err
-		}
-
-		//删除数组内容
-		return repo.RepoDocArrayOneRemove(apictx.CreateRepoCtx(), &repo.ArrayOneRemoveOption{CollectName: repo.CollectionDesigns, Id: desiginId, ArrayQuery: repo.Map{"products": bson.M{"id": prouductId}}})
-	})
-}

mesh/api/service-database-design-scene.go

@@ -1,72 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-// 注册设计相关接口
-func CreateDatabaseDesignSceneRouter(router *GinRouter) {
-
-	//项目场景列表管理
-	CreateArrayCRUD(router, "/design/scene", &ArrayCRUDOption{
-		Collection:  repo.CollectionDesigns,
-		NeedsUpdate: true,
-		NeedsRemove: true,
-		NewModel: func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			prod := model.ProductHeader{}
-			c.ShouldBindJSON(&prod)
-
-			sceneProd := &model.SceneProduct{
-				Id: prod.Id,
-				// Name:    prod.Name,
-				// Type:    "product",
-				Locked:  false,
-				Visible: true,
-				Transform: &model.Transform{
-					Pos:   model.Vect3{0, 0, 0},
-					Scale: model.Vect3{1, 1, 1},
-					Rot:   model.Vect3{0, 0, 0},
-				},
-			}
-
-			scene := &model.DesignScene{
-				Id:         primitive.NewObjectID().Hex(),
-				Name:       prod.Name,
-				Thumbnail:  prod.Thumbnail,
-				CreateTime: time.Now(),
-				Product:    []*model.SceneProduct{sceneProd},
-			}
-			return scene, nil
-		},
-
-		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
-			return &model.DesignScene{}
-		},
-		ArrayFieldPath: "scenes",
-		SearchProject:  []string{"name", "id", "thumbnail", "createTime"},
-	})
-
-	router.POSTJWT("/design/create/scene/:id", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		projId := c.Param("id")
-
-		scene := &model.DesignScene{}
-		c.ShouldBindJSON(scene)
-		if len(scene.Name) < 1 {
-			return nil, NewError("场景名称不能为空!")
-		}
-		scene.Id = primitive.NewObjectID().Hex()
-		scene.CreateTime = time.Now()
-		scene.Product = []*model.SceneProduct{}
-
-		ret, _ := repo.RepoDocArrayAppend(apictx.CreateRepoCtx(), repo.CollectionDesigns, projId, "scenes", scene)
-		if ret.ModifiedCount == 1 {
-			return scene, nil
-		}
-		return nil, NewError("创建失败!")
-	})
-}

mesh/api/service-database-design.go

@@ -1,203 +0,0 @@
-package api
-
-import (
-	"fmt"
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-// 注册设计相关接口
-func CreateDatabaseDesignRouter(router *GinRouter) {
-
-	router.GETJWT("/design/list", DesignList)
-	router.POSTJWT("/design/create", DesignCreate)
-	router.POSTJWT("/design/update", DesignSave)
-	router.POSTJWT("/design/delete/:id", DesignDelete)
-	router.GETJWT("/design/detail/:id", DesignDetail)
-	router.POSTJWT("/design/save", DesignSave)
-}
-
-func DesignList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	page, size, query := UtilQueryPageSize(c)
-
-	if query == nil {
-		query = map[string]interface{}{}
-	}
-
-	query["userId"], _ = primitive.ObjectIDFromHex(apictx.User.ID)
-
-	return repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-		CollectName: repo.CollectionDesigns,
-		Page:        page,
-		Size:        size,
-		Query:       query,
-		Project:     []string{"name", "thumbnail", "createTime"},
-		Sort:        bson.M{"createTime": -1},
-	})
-}
-
-// 创建设计
-func DesignCreate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	body := &struct {
-		Name string
-		From string
-		Id   string
-	}{}
-
-	err := c.ShouldBindJSON(body)
-	if err != nil {
-		return nil, NewError("参数解析错误")
-	}
-	if len(body.Name) < 1 {
-		body.Name = "未定义"
-	}
-
-	//创建空设计
-	d3d := &model.Design3d{
-		Name:       body.Name,
-		CreateTime: time.Now(),
-		Products:   []*model.ProductHeader{},
-		Scenes:     []*model.DesignScene{},
-	}
-	d3d.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-	return repo.RepoAddDoc(apictx.CreateRepoCtx(), repo.CollectionDesigns, d3d)
-
-	// if len(body.From) < 1 || len(body.Id) < 1 {
-	// 	return nil, NewError("单品Id或类型不能为空!")
-	// }
-	// if body.From != "decorate" && body.From != "boxtpl" {
-	// 	return nil, NewError("不支持的模型类型")
-	// }
-
-	// collection := UtilAssetCollectionName(body.From)
-	// updateProjectIdCollection := ""
-	// updateProjectId := ""
-
-	// if body.From == "decorate" {
-	// 	assetHeader := &model.AssetDecorateMesh{}
-	// 	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: collection, Query: repo.Map{"_id": body.Id}}, assetHeader)
-	// 	if err != nil {
-	// 		return nil, err
-	// 	}
-	// 	if !ok {
-	// 		return nil, NewError("对应的装饰不存在!")
-	// 	}
-
-	// 	projectDecorate := &model.ProjectDecorateMesh{}
-	// 	projectDecorate.CopyFromAsset(assetHeader)
-	// 	//projectDecorate.ProjectId, _ = primitive.ObjectIDFromHex(prjId)
-	// 	updateProjectIdCollection = repo.CollectionProjectDecorate
-
-	// 	decorateId, err := repo.RepoAddDoc(apictx.CreateRepoCtx(), repo.CollectionProjectDecorate, projectDecorate)
-
-	// 	if err != nil {
-	// 		return nil, err
-	// 	}
-	// 	updateProjectId = decorateId
-
-	// 	header := &model.ProductHeader{
-	// 		Name:       projectDecorate.Name,
-	// 		From:       body.From,
-	// 		Id:         decorateId,
-	// 		Thumbnail:  *projectDecorate.Thumbnail,
-	// 		CreateTime: time.Now(),
-	// 	}
-	// 	project.Products = []*model.ProductHeader{header}
-	// } else if body.From == "boxtpl" {
-	// 	assetHeader := &model.Boxtpl{}
-	// 	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: collection, Query: repo.Map{"_id": body.Id}}, assetHeader)
-	// 	if err != nil {
-	// 		return nil, err
-	// 	}
-	// 	if !ok {
-	// 		return nil, NewError("对应的装饰不存在!")
-	// 	}
-
-	// 	projectBoxtpl := &model.ProjectBoxtpl{}
-	// 	projectBoxtpl.CopyFromAsset(assetHeader)
-	// 	//projectDecorate.ProjectId, _ = primitive.ObjectIDFromHex(prjId)
-	// 	updateProjectIdCollection = repo.CollectionProjectBoxTpl
-
-	// 	boxId, err := repo.RepoAddDoc(apictx.CreateRepoCtx(), updateProjectIdCollection, projectBoxtpl)
-	// 	if err != nil {
-	// 		return nil, err
-	// 	}
-	// 	updateProjectId = boxId
-
-	// 	header := &model.ProductHeader{
-	// 		Name:       projectBoxtpl.Name,
-	// 		From:       body.From,
-	// 		Id:         boxId,
-	// 		Thumbnail:  *projectBoxtpl.Thumbnail,
-	// 		CreateTime: time.Now(),
-	// 	}
-	// 	project.Products = []*model.ProductHeader{header}
-	// }
-
-	// prjId, err := repo.AddProject(apictx.CreateRepoCtx(), project)
-	// if err != nil {
-	// 	return nil, err
-	// }
-
-	// uid, _ := primitive.ObjectIDFromHex(prjId)
-	// _, err = repo.RepoUpdateSetDocProps(apictx.CreateRepoCtx(), updateProjectIdCollection, updateProjectId, bson.M{"$set": bson.M{"projectId": uid}})
-	// if err != nil {
-	// 	repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionProject, prjId)
-	// 	return nil, err
-	// }
-	// return prjId, nil
-}
-
-func DesignSave(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-	body := &model.Design3d{}
-	err := c.ShouldBindJSON(body)
-	if err != nil {
-		fmt.Println(err)
-		return nil, NewError("参数解析错误" + err.Error())
-	}
-	if len(body.Id) < 1 {
-		return nil, NewError("ID不能为空")
-	}
-
-	id := body.Id.Hex()
-	body.Id = primitive.NilObjectID
-	body.UserId = primitive.NilObjectID
-	body.CreateTime = time.Time{}
-	body.UpdateTime = time.Now()
-
-	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionDesigns, id, body)
-}
-
-func DesignDelete(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	id := c.Param("id")
-	if len(id) < 1 {
-		return nil, NewError("参数不能为空")
-	}
-	return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionDesigns, id)
-}
-
-func DesignDetail(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	id := c.Param("id")
-	if len(id) < 1 {
-		return nil, NewError("参数id不能为空")
-	}
-
-	prj := &model.Design3d{}
-
-	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionDesigns, Query: repo.Map{"_id": id}}, prj)
-
-	if err != nil {
-		return nil, err
-	}
-
-	if !ok {
-		return nil, NewError("没有数据!")
-	}
-	return prj, nil
-}

mesh/api/service-database-package.go

@@ -1,68 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	funcgraph "mats/funcGraph"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func UpdateAssetPackageComm(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetPackage) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}
-
-func UploadAssetPackage(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetPackage) (interface{}, error) {
-	asset := body
-	asset.Enable = BoolValue(false)
-
-	source := asset.Source.Geoms[0]
-	if source == nil || source.Glb.Size < 1 || len(source.Glb.Url) < 1 {
-		asset.AssetState = model.AssetState_Empty
-	} else {
-		asset.AssetState = model.AssetState_Waiting
-	}
-
-	asset.CreateTime = time.Now()
-	asset.UpdateTime = time.Now()
-
-	collectionName := dbConf.AssetConf.Collection
-	assetId, err := repo.RepoDbAddDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, asset)
-	if err != nil {
-		return nil, err
-	}
-
-	if asset.AssetState == model.AssetState_Waiting { //模型转换请求
-		// err = bus.NatsCenter.MeshAssetProcessReq(dbConf.Db.Name, dbConf.AssetConf.Collection, assetId, source.Glb.Url, apictx.User.ID)
-		// if err != nil {
-		// 	update := bson.M{"$set": bson.M{"assetState": model.AssetState_Failed}}
-		// 	repo.RepoUpdateSetDbDocProps(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, assetId, update)
-		// }
-		err = funcgraph.OsgConvRequest(source.Glb.Url, assetId, dbConf.Db.Name, dbConf.AssetConf.Collection)
-		if err != nil {
-			update := bson.M{"$set": bson.M{"assetState": model.AssetState_Failed}}
-			repo.RepoUpdateSetDbDocProps(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, assetId, update)
-		}
-		funcgraph.CreateShadow(source.Glb.Url, assetId, dbConf.Db.Name, dbConf.AssetConf.Collection, 15, 512)
-	}
-
-	return assetId, err
-}
-
-func UpdateAssetPackageSource(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetPackage) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}

mesh/api/service-database-render.go

@@ -1 +0,0 @@
-package api

mesh/api/service-database-upload-env3d.go

@@ -1,70 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	funcgraph "mats/funcGraph"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func UploadEnv3d(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetEnv3dHdr) (interface{}, error) {
-	asset := body
-	source := asset.Source
-	asset.Enable = BoolValue(false)
-	if source == nil || source.File.Size < 1 || len(source.File.Url) < 1 {
-		asset.AssetState = model.AssetState_Empty
-	} else {
-		asset.AssetState = model.AssetState_Waiting
-		// asset.Source.ToneMap = &model.ToneMap{
-		// 	Method:     Int32Value(1),
-		// 	Exposure:   Float64Value(1),
-		// 	Brightness: Float64Value(0.1),
-		// 	Contrast:   Float64Value(0.06),
-		// 	Saturation: Float64Value(1),
-		// }
-		// asset.Source.Options = &model.Env3dOption{
-		// 	Rotation: 0,
-		// 	Exposure: 1,
-		// }
-	}
-	asset.CreateTime = time.Now()
-	asset.UpdateTime = time.Now()
-	collectionName := dbConf.AssetConf.Collection
-	assetId, err := repo.RepoDbAddDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, asset)
-	if err != nil {
-		return nil, err
-	}
-
-	if asset.AssetState == model.AssetState_Waiting { //模型转换请求
-		err = funcgraph.CreateHdr(source.File.Url, assetId, dbConf.Db.Name, dbConf.AssetConf.Collection)
-		if err != nil {
-			update := bson.M{"$set": bson.M{"assetState": model.AssetState_Failed}}
-			repo.RepoUpdateSetDbDocProps(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, assetId, update)
-		}
-	}
-
-	return assetId, err
-}
-
-func UpdateHdrComm(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetEnv3dHdr) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}
-
-func UpdateHdrSource(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetEnv3dHdr) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}

mesh/api/service-database-upload-image.go

@@ -1,41 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func UploadImage(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetImage) (interface{}, error) {
-	asset := body
-	// source := asset.Source
-	asset.Enable = BoolValue(false)
-	asset.AssetState = model.AssetState_Succ
-
-	asset.CreateTime = time.Now()
-	asset.UpdateTime = time.Now()
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoDbAddDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, asset)
-}
-
-func UpdateImageComm(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetImage) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}
-
-func UpdateImageSource(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetImage) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}

mesh/api/service-database-upload-mat.go

@@ -1,92 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"infish.cn/comm"
-)
-
-func UploadMaterial(apictx *ApiSession, dbConf *model.AssetDbConf, body *comm.AssetMat) (interface{}, error) {
-	asset := body
-	// source := asset.Source
-	asset.Enable = BoolValue(false)
-	asset.AssetState = model.AssetState_Succ
-
-	asset.CreateTime = time.Now()
-	asset.UpdateTime = time.Now()
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoDbAddDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, asset)
-}
-
-func UploadMaterialGroup(apictx *ApiSession, dbConf *model.AssetDbConf, body *comm.AssetMatGroup) (interface{}, error) {
-	asset := body
-	// source := asset.Source
-	asset.Enable = BoolValue(false)
-	asset.AssetState = model.AssetState_Succ
-
-	asset.CreateTime = time.Now()
-	asset.UpdateTime = time.Now()
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoDbAddDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, asset)
-}
-
-func UpdateMaterialGroup(apictx *ApiSession, dbConf *model.AssetDbConf, body *comm.AssetMatGroup) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}
-
-func UpdateMaterialComm(apictx *ApiSession, dbConf *model.AssetDbConf, body *comm.AssetMat) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}
-
-func UpdateMaterialSource(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetMat) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}
-
-func ProcessMat(apictx *ApiSession, dbConf *model.AssetDbConf, id string) (interface{}, error) {
-
-	// mesh := &model.AssetMat{}
-
-	// ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-	// 	Db:          dbConf.DbName,
-	// 	CollectName: dbConf.AssetConf.Collection,
-	// 	Query:       repo.Map{"_id": id},
-	// 	Project:     []string{"source.file"},
-	// }, mesh)
-	// if err != nil {
-	// 	return nil, err
-	// }
-	// if !ok {
-	// 	return nil, NewError("hdr已删除!")
-	// }
-
-	// err = bus.NatsCenter.HdrAssetProcessReq(dbConf.DbName, dbConf.AssetConf.Collection, id, mesh.Source.File.Url)
-	// assetState := model.AssetState_Waiting
-	// if err != nil {
-	// 	assetState = model.AssetState_Failed
-	// }
-	// update := bson.M{"$set": bson.M{"assetState": assetState}}
-
-	// return repo.RepoUpdateSetDbDocProps(apictx.CreateRepoCtx(), dbConf.DbName, dbConf.AssetConf.Collection, id, update)
-	return nil, NewError("no impl！")
-}

mesh/api/service-database-upload.go

@@ -1,113 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	funcgraph "mats/funcGraph"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func UpdateStaticMeshComm(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetStaticMesh) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}
-
-func UpdateStaticMeshSource(apictx *ApiSession, dbConf *model.AssetDbConf, body *model.AssetStaticMesh) (interface{}, error) {
-	asset := body
-	asset.UpdateTime = time.Now()
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-
-	collectionName := dbConf.AssetConf.Collection
-	return repo.RepoUpdateSeDbDoc(apictx.CreateRepoCtx(), dbConf.Db.Name, collectionName, id, asset)
-}
-
-func ProcessPackage(apictx *ApiSession, dbConf *model.AssetDbConf, id string) (interface{}, error) {
-
-	mesh := &model.AssetPackage{}
-
-	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-		Db:          dbConf.Db.Name,
-		CollectName: dbConf.AssetConf.Collection,
-		Query:       repo.Map{"_id": id},
-		Project:     []string{"source.geoms"},
-	}, mesh)
-	if err != nil {
-		return nil, err
-	}
-	if !ok {
-		return nil, NewError("模型已删除!")
-	}
-
-	if mesh.Source == nil || len(mesh.Source.Geoms) < 1 {
-		return nil, NewError("数据模型异常！")
-	}
-
-	geom := mesh.Source.Geoms[0]
-	meshUrl := ""
-	if geom.File != nil {
-		meshUrl = geom.File.Url
-	}
-	if geom.Glb != nil && len(geom.Glb.Url) > 0 {
-		meshUrl = geom.Glb.Url
-	}
-	if len(meshUrl) < 1 {
-		return nil, NewError("数据模型异常！")
-	}
-
-	err = funcgraph.OsgConvRequest(meshUrl, id, dbConf.Db.Name, dbConf.AssetConf.Collection)
-
-	assetState := model.AssetState_Waiting
-	if err != nil {
-		assetState = model.AssetState_Failed
-	}
-	update := bson.M{"$set": bson.M{"assetState": assetState}}
-
-	return repo.RepoUpdateSetDbDocProps(apictx.CreateRepoCtx(), dbConf.Db.Name, dbConf.AssetConf.Collection, id, update)
-}
-
-func ProcessPackageShadow(apictx *ApiSession, dbConf *model.AssetDbConf, id string, scale, width int32) (interface{}, error) {
-
-	mesh := &model.AssetPackage{}
-
-	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-		Db:          dbConf.Db.Name,
-		CollectName: dbConf.AssetConf.Collection,
-		Query:       repo.Map{"_id": id},
-		Project:     []string{"source.geoms"},
-	}, mesh)
-	if err != nil {
-		return nil, err
-	}
-	if !ok {
-		return nil, NewError("模型已删除!")
-	}
-
-	if mesh.Source == nil || len(mesh.Source.Geoms) < 1 {
-		return nil, NewError("数据模型异常！")
-	}
-
-	geom := mesh.Source.Geoms[0]
-	meshUrl := ""
-	if geom.File != nil {
-		meshUrl = geom.File.Url
-	}
-	if geom.Glb != nil && len(geom.Glb.Url) > 0 {
-		meshUrl = geom.Glb.Url
-	}
-	if len(meshUrl) < 1 {
-		return nil, NewError("数据模型异常！")
-	}
-
-	err = funcgraph.CreateShadow(meshUrl, id, dbConf.Db.Name, dbConf.AssetConf.Collection, scale, width)
-
-	return true, err
-}

mesh/api/service-database.go

@@ -1,121 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"infish.cn/comm"
-)
-
-func CreateDatabaseRouter(router *GinRouter) {
-
-	router.POSTJWT("/db/import/defaultdb", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-		search := &model.Database{}
-		ok, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionDatabase, Query: repo.Map{"name": "qdb-default"}, Project: []string{"_id"}}, search)
-		if ok {
-			return nil, NewError("默认数据库已存在!")
-		}
-		db := model.CreateDefaultDatabase()
-		return repo.RepoAddDoc(apictx.CreateRepoCtx(), repo.CollectionDatabase, db)
-	})
-
-	router.POSTJWT("/db/category/save", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-		body := &struct {
-			Id         string `json:"_id"`
-			Categories []*comm.CategoryNode
-		}{}
-		err := c.ShouldBindJSON(body)
-		if err != nil {
-			return nil, err
-		}
-
-		search := &model.Database{}
-		ok, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionDatabase, Query: repo.Map{"_id": body.Id}, Project: []string{"_id", "categories"}}, search)
-
-		if ok { //已存在
-			search.Categories.Categories = body.Categories
-			search.Categories.UpdateTime = time.Now()
-
-		} else {
-			search.Categories = &comm.DbCategory{
-				Id:         primitive.NewObjectID(),
-				Scope:      "default",
-				CreateTime: time.Now(),
-				UpdateTime: time.Now(),
-				Categories: body.Categories,
-			}
-		}
-		return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), "database", body.Id, bson.M{"categories": search.Categories})
-	})
-
-	CreateCRUD(router, "/db", &CRUDOption{
-		Collection: repo.CollectionDatabase,
-
-		NewModel: func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			cat := &model.Database{}
-			c.ShouldBindJSON(cat)
-			if len(cat.Name) < 1 || len(cat.Label) < 1 {
-				return nil, NewError("参数不合法!")
-			}
-			cat.CreateTime = time.Now()
-			cat.Assets = model.CreateDefaultDbAssets()
-			cat.Categories = &comm.DbCategory{}
-			cat.UserId = apictx.User.ID
-
-			search := &model.Database{}
-			ok, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionDatabase, Query: repo.Map{"name": cat.Name}, Project: []string{"_id"}}, search)
-			if ok {
-				return nil, NewError("数据库编号已存在!")
-			}
-
-			ok, _ = repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionDatabase, Query: repo.Map{"label": cat.Label}, Project: []string{"_id"}}, search)
-			if ok {
-				return nil, NewError("数据库名字已存在!")
-			}
-
-			cat.Assets = model.CreateDefaultDbAssets()
-			cat.CreateTime = time.Now()
-			return cat, nil
-		},
-
-		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
-			return &model.Database{}
-		},
-		SearchFilter: func(c *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
-			return map[string]interface{}{"userId": apictx.User.ID}
-			// return map[string]interface{}{}
-		},
-		JWT:           true,
-		SearchProject: []string{"name", "label", "createTime"},
-		DetailProject: []string{"name", "label", "createTime", "categories", "assetsCategory", "assets"},
-		Remove: func(c *gin.Context, apictx *ApiSession, id string) (interface{}, error) {
-			// team := &model.ResCategory{}
-			// ok, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: repo.CollectionCategory, Query: repo.Map{"_id": id}, Project: []string{"orderId", "type"}}, team)
-			// if !ok {
-			// 	return nil, NewError("删除失败!")
-			// }
-			// minOrderId := team.OrderId //后面有几个零
-			// if minOrderId > 0 {
-			// 	var maxStep int64 = 1
-			// 	currValue := minOrderId
-			// 	for {
-			// 		if currValue%10 == 0 {
-			// 			currValue = currValue / 10
-			// 			maxStep = maxStep * 10
-			// 		} else {
-			// 			break
-			// 		}
-			// 	}
-			// 	maxOrderId := minOrderId + maxStep - 1
-			// 	return repo.RepoDeleteDocs(apictx.CreateRepoCtx(), repo.CollectionCategory, &bson.M{"orderId": bson.M{"$gte": minOrderId, "$lt": maxOrderId}, "type": team.Type})
-			// }
-			return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionDatabase, id)
-		},
-	})
-}

mesh/api/service-import.go

@@ -1,142 +0,0 @@
-package api
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"math"
-	"mats/conf"
-	"mats/db"
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func AssetImport(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-	valueIdMap, err := ImportCategry(apictx.Svc.Mongo)
-
-	if err != nil {
-		return nil, err
-	}
-
-	err = ImportAssetCategory(apictx, valueIdMap)
-
-	return true, err
-}
-
-func ImportCategry(dbMongo *db.MongoDB) (map[string]string, error) {
-
-	valueIdMap := map[string]string{}
-
-	CategoryConf := conf.AppConfig.Category
-	if CategoryConf == nil {
-		return valueIdMap, nil
-	}
-
-	if len(CategoryConf.DefaultCategory) < 1 {
-		return valueIdMap, errors.New("category.defaultCategory 不能为空!")
-	}
-
-	ctx := &repo.RepoSession{
-		Client: dbMongo,
-		Ctx:    context.Background(),
-	}
-
-	userId := CategoryConf.QiyeUserId
-
-	total, err := repo.RepoCountDoc(ctx, repo.CollectionCategories, repo.Map{})
-	if err != nil {
-		return valueIdMap, err
-	}
-	if total > 0 {
-		return valueIdMap, errors.New("数据已存在，无法导入。请先清除现有数据")
-	}
-
-	var createOrderId = func(deep int32, brotherIndex int32, parentOrder int64) int64 {
-
-		step := math.Pow(100, float64(4-deep))
-
-		orderId := int64(step) * int64(brotherIndex+1)
-
-		return int64(orderId + parentOrder)
-	}
-
-	var IteUpdate func(deep int32, cates []*conf.DefaultCategoryConf, parent string, parentOrder int64) error
-	IteUpdate = func(deep int32, cates []*conf.DefaultCategoryConf, parent string, parentOrder int64) error {
-		if len(cates) < 1 {
-			return nil
-		}
-		for index, item := range cates {
-
-			currOrderId := createOrderId(deep, int32(index), parentOrder)
-
-			insertItem := &model.ResCategory{
-				Type:       "imported",
-				Name:       item.Name,
-				Level:      &deep,
-				Value:      item.Value,
-				Parent:     parent,
-				UserId:     userId,
-				OrderId:    currOrderId,
-				CreateTime: time.Now(),
-			}
-
-			id, err := repo.RepoAddDoc(ctx, repo.CollectionCategories, insertItem)
-			if err != nil {
-				return err
-			}
-			fmt.Println("added", id)
-			valueIdMap[item.Value] = id
-			err = IteUpdate(deep+1, item.Children, id, currOrderId)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-
-	err = IteUpdate(0, CategoryConf.DefaultCategory, "", 0)
-	if err != nil {
-		return valueIdMap, err
-	}
-	return valueIdMap, nil
-}
-
-func ImportAssetCategory(apictx *ApiSession, valueIdMap map[string]string) error {
-
-	AssetsConf := conf.AppConfig.Assets
-	if AssetsConf == nil {
-		return nil
-	}
-
-	if len(AssetsConf) < 1 {
-		return errors.New("AppConfig.Assets 不能为空!")
-	}
-
-	userId := conf.AppConfig.Category.QiyeUserId
-
-	for _, asset := range AssetsConf {
-		if len(asset.DefaultCategory) > 0 {
-			//添加默认分类设置
-
-			ids := []string{}
-			for _, cat := range asset.DefaultCategory {
-				if len(valueIdMap[cat]) > 0 {
-					ids = append(ids, valueIdMap[cat])
-					continue
-				}
-				return errors.New(cat + "没有对应的分类ID")
-			}
-			assetCate := &model.LibCategory{Type: asset.Type, CreateTime: time.Now(), CategoryIds: ids, UserId: userId}
-			id, err := repo.RepoAddDoc(apictx.CreateRepoCtx(), repo.CollectionDbAssetCategory, assetCate)
-			if err != nil {
-				return err
-			}
-			fmt.Sprintln("added "+asset.Type+"=>", id)
-		}
-	}
-	return nil
-}

mesh/api/service-lib.go

@@ -1,79 +0,0 @@
-package api
-
-import (
-	"fmt"
-	"mats/db/model"
-	"mats/db/repo"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson"
-)
-
-/**
-db.designs.find({"editor.users":{$not:{$elemMatch:{$nin: [1,2,3]}}}, 'editor.users.0': {$exists: true}}).explain()
-**/
-
-func ParseCategory(filter []string, src []*model.ResCategory) []string {
-	out := []string{}
-
-	if len(filter) < 1 {
-		for _, v := range src {
-			out = append(out, v.Id.Hex())
-		}
-		return out
-	}
-
-	// rootCate := []string{}
-	// for _, v := range src {
-	// 	if v.Level == 0 {
-	// 		rootCate = append(rootCate, v.Id.Hex())
-	// 	}
-	// }
-	return out
-}
-
-func CreateLibRouter(router *GinRouter) {
-
-	//获取款式列表
-	router.GETJWT("/lib/public/design", func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-		page, size, query := UtilQueryPageSize(c)
-		categories := query["categories"]
-		if categories == nil {
-			return nil, NewError("query.categories不能为空!")
-		}
-		strCategories := []string{}
-
-		cates, ok := categories.([]interface{})
-		if !ok {
-			return nil, NewError("query.categories必须是数组!")
-		}
-		for _, c := range cates {
-			strCategories = append(strCategories, c.(string))
-		}
-
-		designCates := []*model.ResCategory{}
-		err := repo.RepoDocsSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{CollectName: repo.CollectionLibCategory, Query: repo.Map{"type": "design"}}, &designCates)
-		if err != nil {
-			return nil, err
-		}
-
-		//展开当前用户team的资源授权,如果没有则为所有
-		fmt.Sprintln(cates)
-
-		if len(strCategories) > 0 {
-			query["categories"] = bson.M{"$not": bson.M{"$elemMatch": bson.M{"$nin": strCategories}}}
-			query["categories.0"] = bson.M{"$exists": true}
-		}
-		//展开待查询的cates
-		//{$not:{$elemMatch:{$nin: [1,2,3]}}}, 'editor.users.0': {$exists: true}}
-
-		return repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-			CollectName: repo.CollectionDesigns,
-			Page:        page,
-			Size:        size,
-			Query:       query,
-			Project:     []string{"name", "thumbnail", "createTime", "isPublic"},
-		})
-	})
-
-}

mesh/api/service-mats.go

@@ -1,71 +0,0 @@
-package api
-
-import (
-	"mats/bus"
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func RegQueenMats(router *GinRouter) {
-
-	CollectionName := "hubmats"
-	CreateCRUD(router, "/hubmat", &CRUDOption{
-		Collection: CollectionName,
-		NewModel: func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			hub := &model.HubMat{}
-			c.ShouldBindJSON(hub)
-			if len(hub.Name) < 1 {
-				return nil, NewError("参数不合法!")
-			}
-			hub.CreateTime = time.Now()
-			hub.UserId, _ = primitive.ObjectIDFromHex(apictx.User.Parent)
-			if hub.UserId == primitive.NilObjectID {
-				return nil, NewError("参数不合法!")
-			}
-
-			hub.DbName = "queenmats"
-			if len(hub.Thumbnail) < 1 {
-				hub.Thumbnail = "https://gd1.alicdn.com/imgextra/i2/0/O1CN01BXPA5l1H9VvVhEQQ7_!!0-item_pic.jpg_400x400.jpg"
-			}
-			ret, err := bus.TreeAddDefineMatgroup("queenmats", apictx.User.Parent, hub.Name)
-			if err != nil {
-				return nil, err
-			}
-			hub.Host = ret.Host
-			hub.DefineId = ret.DefineId
-			hub.Collection = ret.Collection
-			hub.DbId = ret.DbId
-
-			return hub, nil
-		},
-
-		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
-			return &model.HubMat{}
-		},
-		SearchFilter: func(c *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
-			userId, _ := primitive.ObjectIDFromHex(apictx.User.Parent)
-			return map[string]interface{}{"userId": userId}
-		},
-		JWT:           true,
-		SearchProject: []string{"name", "thumbnail", "createTime", "host", "dbid", "defineId"},
-		DetailProject: []string{"name", "thumbnail", "createTime", "host", "dbid", "defineId"},
-		Remove: func(c *gin.Context, apictx *ApiSession, id string) (interface{}, error) {
-
-			hub := &model.HubMat{}
-			err := repo.RepoSeachDoc2(apictx.CreateRepoCtx(), &repo.DocSearchOptions{CollectName: CollectionName, Query: repo.Map{"_id": id}}, hub)
-			if err != nil {
-				return nil, err
-			}
-			err = bus.TreeRemoveDefineMatgroup(hub.DbId, hub.DefineId)
-			if err != nil {
-				return nil, err
-			}
-			//todo queentree 添加删除状态
-			return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), CollectionName, id)
-		},
-	})
-}

mesh/api/service-minio.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"mats/conf"
+	"mesh/conf"
 	"path"
 	"strings"
 	"time"

mesh/api/service-obs.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"fmt"
-	"mats/conf"
-	"mats/db/model"
-	"mats/log"
+	"mesh/conf"
+	"mesh/db/model"
+	"mesh/log"
 	"os"
 	"path"
 	"strings"

mesh/api/service-project.go

@@ -1,59 +0,0 @@
-package api
-
-import (
-	"mats/db/model"
-	"mats/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func ServiceProjectCreate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	body := &struct {
-		Name string
-	}{}
-	err := c.ShouldBindJSON(body)
-	if err != nil {
-		return nil, NewError("参数解析错误")
-	}
-	if len(body.Name) < 1 {
-		return nil, NewError("名称不能为空")
-	}
-
-	project := &model.Project{
-		Name:       body.Name,
-		CreateTime: time.Now(),
-		Products:   []*model.Product{},
-		Scenes:     []*model.Scene{},
-	}
-	project.UserId, _ = primitive.ObjectIDFromHex(apictx.User.ID)
-
-	return repo.AddProject(apictx.CreateRepoCtx(), project)
-}
-
-func ServiceProjectList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	page, size, query := UtilQueryPageSize(c)
-
-	if query == nil {
-		query = map[string]interface{}{}
-	}
-
-	query["userId"], _ = primitive.ObjectIDFromHex(apictx.User.ID)
-
-	return repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-		CollectName: repo.CollectionProject,
-		Page:        page,
-		Size:        size,
-		Query:       query,
-		Project:     []string{"name", "thumbnail", "createTime"},
-	})
-}
-
-func ServiceProjectDelete(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	id := c.Param("id")
-	if len(id) < 1 {
-		return nil, NewError("参数不能为空")
-	}
-	return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionProject, id)
-}

mesh/api/service-save.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"mats/conf"
+	"mesh/conf"
 
 	"github.com/gin-gonic/gin"
 )

mesh/api/service.go

@@ -3,7 +3,7 @@ package api
 import (
 	"encoding/hex"
 	"fmt"
-	"mats/db/repo"
+	"mesh/db/repo"
 	"reflect"
 
 	"github.com/gin-gonic/gin"

mesh/app.yaml

@@ -1,6 +1,5 @@
-# http
 port: 8908
-name: queenmat
+name: queenmesh
 version: 1.0.0
 saveType: obs
 jwt: 
@@ -8,21 +7,17 @@ jwt:
   realm: spu3d
   key: spu3d secret
   
-taskCenter: http://192.168.110.207:9502/taskcenter
-
 redis:
   addr: 124.70.148.113:6379
   password: ""
   db: 0
 
 log:
-  fileName: assettest.log
+  fileName: queenmesh.log
   level: 1
-  serviceName: assettest
+  serviceName: queenmesh
+
 
-mongo: 
-  dsn: mongodb://root:root@124.71.139.24:27033/queentree?authSource=admin
-  Database: queentree
 
 debug: 
   userId: test
@@ -47,8 +42,3 @@ nats:
   url: nats://124.71.139.24:14219
   maxReconnect: 1000
   reconnDelaySecond: 5
-
-  hdrProcStreamTopic: hdrproc-req-stream#hdrproc.request#hdrproc-queue
-  osgConvStreamTopic: sku3d-convglb-result-stream#convglb.result#convglb-result-queue
-  osgShadowStreamTopic: sku3d-convshadow-result-stream#convshadow.result#convshadow-result-queue
-  hdrConvStreamTopic: sku3d-convhdr-result-stream#convhdr.result#convhdr-result-queue

mesh/build.bat

@@ -1,7 +0,0 @@
-set GOARCH=amd64
-set GOOS=linux
-go build
-
-docker rmi registry.cn-chengdu.aliyuncs.com/infish/queentreetest:0.0.1
-docker build -t registry.cn-chengdu.aliyuncs.com/infish/queentreetest:0.0.1 .
-docker push registry.cn-chengdu.aliyuncs.com/infish/queentreetest:0.0.1

mesh/bus/main.go

@@ -1,7 +1,7 @@
 package bus
 
 import (
-	"mats/conf"
+	"mesh/conf"
 
 	"infish.cn/comm"
 )

mesh/bus/mongo.go

@@ -2,8 +2,8 @@ package bus
 
 import (
 	"context"
-	"mats/db"
-	"mats/db/repo"
+	"mesh/db"
+	"mesh/db/repo"
 )
 
 const (

mesh/conf/app.go

@@ -3,10 +3,8 @@ package conf
 import (
 	"fmt"
 	"os"
-	"strconv"
-	"strings"
 
-	"mats/log"
+	"mesh/log"
 
 	"github.com/spf13/viper"
 )
@@ -17,33 +15,6 @@ const (
 	SaveType_Minio = "minio"
 )
 
-type TaskConfig struct {
-	Name              string
-	Broker            string
-	DefaultQueue      string
-	ResultBackend     string
-	ResultsExpireIn   int32
-	AmqpExchange      string
-	AmqpExchangeType  string
-	AmqpBindingKey    string
-	AmqpPrefetchCount int32
-}
-
-type AppAsset struct {
-	Name            string //鞋楦
-	Type            string //"last"
-	IsMesh          bool   //是否转换模型true
-	IsImage         bool
-	DefaultCategory []string //默认的目录设定
-}
-
-type AppCatogry struct {
-	Scope           string //global全局设定 qiye 企业级设定
-	StartUpdate     bool   //程序启动的时候是否更新category 表数据 和 AssetCategry表的数据
-	QiyeUserId      string //scope为qiye的时候默认企业主账号ID
-	DefaultCategory []*DefaultCategoryConf
-}
-
 type DefaultCategoryConf struct {
 	Children []*DefaultCategoryConf
 	Name     string //分类名字
@@ -54,21 +25,13 @@ type AppConf struct {
 	Name     string
 	Version  string
 	SaveType string //obs, oss, minio
-	Assets   []*AppAsset
 
-	Category *AppCatogry
-	Jwt      struct {
+	Jwt struct {
 		Realm       string
 		Key         string
 		TimeoutHour int
 	}
 
-	Etcd struct {
-		Endpoints   []string
-		UserName    string
-		Password    string
-		DialTimeout int64
-	}
 	Mysql struct {
 		DSN string
 	}
@@ -82,11 +45,7 @@ type AppConf struct {
 		Level       int32
 		ServiceName string
 	}
-	Port  int32
-	Mongo struct {
-		DSN      string
-		Database string
-	}
+	Port int32
 
 	Debug struct {
 		UserId    string
@@ -109,20 +68,11 @@ type AppConf struct {
 		AccessKey string
 		AccessSec string
 	}
-
 	Nats struct {
 		Url               string
-		MaxReconnect      int
-		ReconnDelaySecond int
-
-		MeshProcStreamTopic  string
-		HdrProcStreamTopic   string
-		OsgConvStreamTopic   string
-		OsgShadowStreamTopic string
-		HdrConvStreamTopic   string
+		MaxReconnect      string
+		ReconnDelaySecond string
 	}
-
-	TaskCenter string
 }
 
 func LoadConfFile(filepath string) (*AppConf, error) {
@@ -152,38 +102,6 @@ func NewAppConf(filePath string) (*AppConf, error) {
 	//初始化log
 	_ = log.NewLoggerSugar(c.Log.ServiceName, c.Log.FileName, c.Log.Level)
 
-	//环境变量
-	mongo := os.Getenv("MONGO")
-	fmt.Println("env MONGO=>", mongo)
-
-	if len(mongo) > 0 {
-		c.Mongo.DSN = mongo
-		//解析出database mongodb://admin:123456@124.70.148.113:27018/sku3d_dadong?authSource=admin
-		start := strings.LastIndex(mongo, "/")
-		end := strings.LastIndex(mongo, "?")
-		database := mongo[start+1 : end]
-		if len(database) > 0 {
-			c.Mongo.Database = database
-		}
-		fmt.Println(c.Mongo.DSN, c.Mongo.Database)
-	}
-	//redis
-	redis := os.Getenv("REDIS")
-	fmt.Println("Env REDIS=>", redis)
-
-	if len(redis) > 0 {
-		c.Redis.Addr = redis
-		start := strings.LastIndex(redis, "/")
-		if start > 0 {
-			db := redis[start:]
-			dbint, _ := strconv.Atoi(db)
-			c.Redis.Db = dbint
-			c.Redis.Addr = string(redis[0:start])
-		}
-
-		fmt.Println(c.Redis.Addr, c.Redis.Db)
-	}
-	//taskCenter
 	natsHost := os.Getenv("NATS")
 	if len(natsHost) > 0 {
 		c.Nats.Url = natsHost

mesh/db/model/application.go

@@ -1,51 +0,0 @@
-package model
-
-import "go.mongodb.org/mongo-driver/bson/primitive"
-
-type AppAssetDef struct {
-	Name         string //资产名字
-	Desc         string //资产使用简介
-	Type         int    //资产类型
-	DbId         string //数据库Id
-	CollectionId string //数据表Id
-}
-
-type Database3dApp struct {
-	Id                       primitive.ObjectID `bson:"_id,omitempty" json:"_id"`                                     //
-	Name                     string             `bson:"name,omitempty" json:"name"`                                   //应用名字
-	AppIcon                  string             `bson:"appIcon,omitempty" json:"appIcon"`                             //应用图标
-	Desc                     string             `bson:"desc,omitempty" json:"desc"`                                   //应用描述
-	HomePageUrl              string             `bson:"homepageUrl,omitempty" json:"homepageUrl"`                     //应用网页地址
-	AuthorizationCallbackUrl string             `bson:"authorizedCallbackUrl,omitempty" json:"authorizedCallbackUrl"` //授权后回调地址
-
-	AppKey     string `bson:"appKey,omitempty" json:"appKey"`
-	AppSecrete string `bson:"appSecrete,omitempty" json:"appSecrete"`
-
-	//输入资产定义
-	InputAssetConfs []*AppAssetDef `bson:"inputAssetConfs,omitempty" json:"inputAssetConfs"`
-
-	//输出资产定义
-	OutputAssetConfs []*AppAssetDef `bson:"outputAssetConfs,omitempty" json:"outputAssetConfs"`
-}
-
-var Spu3dApp = &Database3dApp{
-	InputAssetConfs: []*AppAssetDef{
-		&AppAssetDef{
-			Name:         "盒型",
-			DbId:         "001",
-			CollectionId: "1111",
-		}, &AppAssetDef{
-			Name:         "场景",
-			DbId:         "001",
-			CollectionId: "1111",
-		},
-	},
-}
-
-type UserAssetOAuths struct {
-	Id               primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId           primitive.ObjectID `bson:"userId,omitempty" json:"userId"`
-	AppId            primitive.ObjectID `bson:"appId,omitempty" json:"appId"`
-	InputAssetConfs  []*AppAssetDef     `bson:"inputAssetConfs,omitempty" json:"inputAssetConfs"`
-	OutputAssetConfs []*AppAssetDef     `bson:"outputAssetConfs,omitempty" json:"outputAssetConfs"`
-}

mesh/db/model/asset.go

@@ -1,167 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-const (
-	AssetState_Created      = 1
-	AssetState_Complated    = 2
-	AssetState_Publish2Qiye = 3
-)
-
-const (
-	MeshState_SetFile   = 0 //create
-	MeshState_SetOsgjs  = 1 //模型转换到osgjs了，可以用于webgl显示了
-	MeshState_SetShadow = 2 //阴影已生成
-)
-
-type Asset struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-
-	Categories []string `bson:"categories,omitempty" json:"categories,omitempty"` //所属分类Id
-
-	State int32 `bson:"state,omitempty" json:"state"` //是否公开
-
-	Thumbnail *OssType `bson:"thumbnail,omitempty" json:"thumbnail"`
-
-	//图片相关
-	Image *OssType `bson:"image,omitempty" json:"image"`
-
-	//模型相关
-	Materials *[]struct {
-		Name string     `bson:"name" json:"name"`
-		Data *MatConfig `bson:"data" json:"data"`
-	} `bson:"materials,omitempty" json:"materials"`
-	Geometries []string `bson:"geometries,omitempty" json:"geometries"`
-	Osgjs      *OssType `bson:"osgjs,omitempty" json:"osgjs"`
-	File       *OssType `bson:"file,omitempty" json:"file"` //hdr or fbx
-	Shadow     *OssType `bson:"shadow,omitempty" json:"shadow,omitempty"`
-	MeshState  *int32   `bson:"meshState,omitempty" json:"meshState,omitempty"`
-}
-type UvSize struct {
-	Width  int `bson:"width,omitempty" json:"width,omitempty"`
-	Height int `bson:"height,omitempty" json:"height,omitempty"`
-}
-
-type MeshMatConf struct {
-	UvMap        *OssType       `bson:"uvmap" json:"uvmap"`
-	UvSize       *UvSize        `bson:"uvsize" json:"uvsize"`
-	Name         string         `bson:"name" json:"name"`
-	Material     *MatConfig     `bson:"material" json:"material"`
-	TechMaterial *TechMatConfig `bson:"techMaterial" json:"techMaterial"`
-
-	Index   int               `bson:"index" json:"index"`
-	Images  []*ComponentImage `bson:"images" json:"images"`
-	Visible *bool             `bson:"visible" json:"visible"`
-}
-
-type AssetDecorateMesh struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-	State      int                `bson:"state,omitempty" json:"state"` //created completed published
-	Thumbnail  *OssType           `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories []string           `bson:"categories,omitempty" json:"categories,omitempty"` //所属分类Id
-
-	Components []*MeshMatConf `bson:"components,omitempty" json:"components"`
-	Osgjs      *OssType       `bson:"osgjs,omitempty" json:"osgjs"`
-	File       *OssType       `bson:"file,omitempty" json:"file"` //hdr or fbx
-	Shadow     *OssType       `bson:"shadow,omitempty" json:"shadow,omitempty"`
-}
-
-type AssetTexture struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-	Categories []string           `bson:"categories,omitempty" json:"categories,omitempty"` //所属分类Id
-	State      int32              `bson:"state,omitempty" json:"state"`                     //是否公开
-	Image      *OssType           `bson:"image,omitempty" json:"image"`
-}
-
-/*盒型*/
-type Boxtpl struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-	State      int                `bson:"state,omitempty" json:"state"` //created completed published
-	Thumbnail  *OssType           `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories []string           `bson:"categories,omitempty" json:"categories,omitempty"` //所属分类Id
-
-	Osgjs  *OssType `bson:"osgjs,omitempty" json:"osgjs"`
-	File   *OssType `bson:"file,omitempty" json:"file"` //模型文件
-	Shadow *OssType `bson:"shadow,omitempty" json:"shadow,omitempty"`
-
-	Type int `bson:"type,omitempty" json:"type,omitempty"` //动态生成或模型文件 默认模型
-
-	Components []*BoxtplComponent `bson:"components,omitempty" json:"components"` //模板部件
-}
-
-type BoxtplComponent struct {
-	Name  string        `bson:"name,omitempty" json:"name"`
-	Index int           `bson:"index,omitempty" json:"index"`
-	UV    *BoxtplCompUv `bson:"uv,omitempty" json:"uv"`
-}
-
-type BoxtplCompUv struct {
-	Width  uint    `bson:"width,omitempty" json:"width"`
-	Height uint    `bson:"height,omitempty" json:"height"`
-	Image  OssType `bson:"image,omitempty" json:"image"`
-}
-
-/*项目的盒型*/
-type ProjectBoxtpl struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	ProjectId  primitive.ObjectID `bson:"projectId,omitempty" json:"projectId,omitempty"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-	Thumbnail  *OssType           `bson:"thumbnail,omitempty" json:"thumbnail"`
-
-	Osgjs  *OssType `bson:"osgjs,omitempty" json:"osgjs"`
-	File   *OssType `bson:"file,omitempty" json:"file"` //模型文件
-	Shadow *OssType `bson:"shadow,omitempty" json:"shadow,omitempty"`
-	Type   int      `bson:"type,omitempty" json:"type,omitempty"` //动态生成或模型文件 默认模型
-
-	Components []*BoxtplComponent `bson:"components,omitempty" json:"components"` //模板部件
-}
-
-type ProjectDecorateMesh struct {
-	Id        primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	ProjectId primitive.ObjectID `bson:"projectId,omitempty" json:"projectId,omitempty"`
-
-	Name       string    `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time `bson:"updateTime,omitempty" json:"updateTime"`
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail"`
-
-	Osgjs  *OssType `bson:"osgjs,omitempty" json:"osgjs"`
-	File   *OssType `bson:"file,omitempty" json:"file"` //hdr or fbx
-	Shadow *OssType `bson:"shadow,omitempty" json:"shadow,omitempty"`
-
-	Materials []*MeshMatConf `bson:"materials,omitempty" json:"materials"`
-}
-
-type AssetMaterial struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId"` //用户ID
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Thumbnail  *OssType           `bson:"thumbnail,omitempty" json:"thumbnail"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-	Config     *MatConfig         `bson:"config,omitempty" json:"config"`
-	State      int                `bson:"state,omitempty" json:"state"`                     //created completed published
-	Categories []string           `bson:"categories,omitempty" json:"categories,omitempty"` //所属分类Id
-}

mesh/db/model/database.go

@@ -1,381 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"infish.cn/comm"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-const (
-	AssetTypeMesh          = 10 //"mesh"     //模型
-	AssetTypeImage         = 20 //"image"    //图片
-	AssetTypeMaterial      = 30 //"material" //材质球
-	AssetTypeMaterialGroup = 31 //"material" //材质球组
-	AssetTypeEnv3d         = 40 //"hdr "      //环境球
-	AssetTypePackage       = 50 //"package "  //3d资产包
-
-	AssetState_Empty    = 0
-	AssetState_Waiting  = 100 //等待处理
-	AssetState_Proccing = 101 //正在处理
-	AssetState_Failed   = 102 //处理失败！
-	AssetState_Succ     = 200 //处理成功
-)
-
-type DbAsset struct {
-	Id    string `bson:"id,omitempty" json:"id"` //资产id
-	Label string `bson:"label,omitempty" json:"label"`
-	Type  int    `bson:"type,omitempty" json:"type"` //AssetTypeMesh  AssetTypeImage ...
-
-	Collection  string    `bson:"collection,omitempty" json:"collection"` //数据库存储集合
-	CreateTime  time.Time `bson:"createTime,omitempty" json:"createTime"`
-	CategoryIds []string  `bson:"categoryIds,omitempty" json:"categoryIds"`
-}
-
-type AssetDbConf struct {
-	Db        *Database
-	AssetConf *DbAsset
-}
-
-type Database struct {
-	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id"`       //数据库Id
-	UserId string             `bson:"userId,omitempty" json:"userId"` //数据库Id
-
-	Name       string    `bson:"name,omitempty" json:"name"`   //数据库名字
-	Label      string    `bson:"label,omitempty" json:"label"` //前端展示标签
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
-
-	Categories *comm.DbCategory `bson:"categories,omitempty" json:"categories"` //数据的分类
-	Assets     []*DbAsset       `bson:"assets,omitempty" json:"assets"`         //资产定义
-}
-
-func CreateDefaultDbAssets() []*DbAsset {
-	return []*DbAsset{
-		&DbAsset{
-			Id:         "1",
-			Label:      "模型",
-			Type:       AssetTypeMesh,
-			Collection: "mesh",
-			CreateTime: time.Now(),
-		},
-		&DbAsset{
-			Id:         "2",
-			Label:      "图片",
-			Type:       AssetTypeImage,
-			Collection: "image",
-			CreateTime: time.Now(),
-		},
-		&DbAsset{
-			Id:         "3",
-			Label:      "材质球",
-			Type:       AssetTypeMaterial,
-			Collection: "material",
-			CreateTime: time.Now(),
-		}, &DbAsset{
-			Id:         "4",
-			Label:      "环境球",
-			Type:       AssetTypeEnv3d,
-			Collection: "env3d",
-			CreateTime: time.Now(),
-		},
-	}
-}
-
-func CreateDefaultDatabase() *Database {
-	return &Database{
-		Name:       "qdb-default",
-		Label:      "默认资产库",
-		CreateTime: time.Now(),
-
-		Assets:     CreateDefaultDbAssets(),
-		Categories: &comm.DbCategory{},
-	}
-}
-
-type Obb struct {
-	Min Vec3Obj `bson:"min,omitempty" json:"min"`
-	Max Vec3Obj `bson:"max,omitempty" json:"max"`
-}
-
-type StaticMesh struct {
-	Id      primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	OwnerId primitive.ObjectID `bson:"ownerId,omitempty" json:"ownerId,omitempty"`
-
-	Name       string    `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time `bson:"updateTime,omitempty" json:"updateTime"`
-	State      int       `bson:"state,omitempty" json:"state"` //created completed published
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories []string  `bson:"categories,omitempty" json:"categories,omitempty"` //所属分类Id
-
-	Components []*MeshMatConf `bson:"components,omitempty" json:"components"`
-	Osgjs      *OssType       `bson:"osgjs,omitempty" json:"osgjs"`
-	File       *OssType       `bson:"file,omitempty" json:"file"` //hdr or fbx
-	Shadow     *OssType       `bson:"shadow,omitempty" json:"shadow,omitempty"`
-	Obb        *Obb           `bson:"obb,omitempty" json:"obb,omitempty"`
-}
-
-type AssetBase struct {
-	OwnerId    primitive.ObjectID `bson:"ownerId,omitempty" json:"ownerId,omitempty"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-	Thumbnail  *OssType           `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories []string           `bson:"categories,omitempty" json:"categories"` //所属分类Id
-	TaskId     string             `bson:"taskId,omitempty" json:"taskId"`         //资产处理id
-	AssetState int                `bson:"assetState,omitempty" json:"assetState"`
-	Enable     *bool              `bson:"enable,omitempty" json:"enable"` //是否有效！
-}
-
-type StaticMeshSource struct {
-	Components  []*MeshMatConf `bson:"components,omitempty" json:"components"`
-	Osgjs       *OssType       `bson:"osgjs,omitempty" json:"osgjs"`
-	File        *OssType       `bson:"file,omitempty" json:"file"` //hdr or fbx
-	Glb         *OssType       `bson:"glb,omitempty" json:"glb"`   //hdr or fbx
-	Shadow      *OssType       `bson:"shadow,omitempty" json:"shadow,omitempty"`
-	BoundingBox *Obb           `bson:"boundingBox,omitempty" json:"boundingBox,omitempty"`
-}
-
-type HdrSource struct {
-	Config  *Evn3dHdrConf `bson:"config,omitempty" json:"config"`
-	File    *OssType      `bson:"file,omitempty" json:"file"` //hdr or fbx
-	Options *Env3dOption  `bson:"options,omitempty" json:"options"`
-	ToneMap *ToneMap      `bson:"toneMap,omitempty" json:"toneMap"`
-}
-
-type ImageSource struct {
-	File *OssType `bson:"file,omitempty" json:"file"` //hdr or fbx
-}
-
-type AssetUserInfo struct {
-	Name      string   `bson:"name,omitempty" json:"name"`
-	Thumbnail *OssType `bson:"thumbnail,omitempty" json:"thumbnail"`
-}
-
-type IAsset interface {
-	SetIdEmpty()
-	ResetCreateTime()
-	SetOwner(id string, otype string)
-	SetAssetType(atype string)
-	SetUserInfo(id string, info *comm.AssetUserInfo)
-}
-
-type AssetStaticMesh struct {
-	Id        primitive.ObjectID  `bson:"_id,omitempty" json:"_id"`
-	UserId    primitive.ObjectID  `bson:"userId,omitempty" json:"userId,omitempty"`       //用户Id
-	UserInfo  *comm.AssetUserInfo `bson:"userInfo,omitempty" json:"userInfo,omitempty"`   //用户Id
-	OwnerId   primitive.ObjectID  `bson:"ownerId,omitempty" json:"ownerId,omitempty"`     //userId teamId companyId
-	OwnerType string              `bson:"ownerType,omitempty" json:"ownerType,omitempty"` //user team company
-	AssetType string              `bson:"assetType,omitempty" json:"assetType,omitempty"` //user team company
-
-	Name   string `bson:"name,omitempty" json:"name"`
-	CusNum string `bson:"cusNum,omitempty" json:"cusNum,omitempty"` //型号
-
-	CreateTime    time.Time `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime    time.Time `bson:"updateTime,omitempty" json:"updateTime"`
-	Thumbnail     *OssType  `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories    []string  `bson:"categories,omitempty" json:"categories"`       //所属分类Id
-	CusCategories []string  `bson:"cusCategories,omitempty" json:"cusCategories"` //用户自定义分类
-	TaskId        string    `bson:"taskId,omitempty" json:"taskId"`               //资产处理id
-	AssetState    int       `bson:"assetState,omitempty" json:"assetState"`
-	Enable        *bool     `bson:"enable,omitempty" json:"enable"` //是否有效！
-
-	Source *StaticMeshSource `bson:"source,omitempty" json:"source,omitempty"`
-
-	UserData interface{} `bson:"userData,omitempty" json:"userData,omitempty"` //用户数据
-}
-
-func (s *AssetStaticMesh) SetIdEmpty() {
-	s.Id = primitive.NilObjectID
-}
-
-func (s *AssetStaticMesh) ResetCreateTime() {
-	s.CreateTime = time.Now()
-	s.UpdateTime = time.Now()
-}
-
-func (s *AssetStaticMesh) SetOwner(id string, otype string) {
-	s.OwnerId, _ = primitive.ObjectIDFromHex(id)
-	s.OwnerType = otype
-}
-
-func (s *AssetStaticMesh) SetUserInfo(id string, info *comm.AssetUserInfo) {
-	s.UserId, _ = primitive.ObjectIDFromHex(id)
-	s.UserInfo = info
-}
-
-func (s *AssetStaticMesh) SetAssetType(otype string) {
-	s.AssetType = otype
-}
-
-type AssetEnv3dHdr struct {
-	Id         primitive.ObjectID  `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID  `bson:"userId,omitempty" json:"userId,omitempty"`     //用户Id
-	UserInfo   *comm.AssetUserInfo `bson:"userInfo,omitempty" json:"userInfo,omitempty"` //用户Id
-	OwnerId    primitive.ObjectID  `bson:"ownerId,omitempty" json:"ownerId,omitempty"`
-	OwnerType  string              `bson:"ownerType,omitempty" json:"ownerType,omitempty"`
-	AssetType  string              `bson:"assetType,omitempty" json:"assetType,omitempty"`
-	Name       string              `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time           `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time           `bson:"updateTime,omitempty" json:"updateTime"`
-	Thumbnail  *OssType            `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories []string            `bson:"categories,omitempty" json:"categories"` //所属分类Id
-	TaskId     string              `bson:"taskId,omitempty" json:"taskId"`         //资产处理id
-	AssetState int                 `bson:"assetState,omitempty" json:"assetState"`
-	Enable     *bool               `bson:"enable,omitempty" json:"enable"` //是否有效！
-
-	Source   *HdrSource  `bson:"source,omitempty" json:"source,omitempty"`
-	UserData interface{} `bson:"userData,omitempty" json:"userData,omitempty"` //用户数据
-}
-
-func (s *AssetEnv3dHdr) SetIdEmpty() {
-	s.Id = primitive.NilObjectID
-}
-
-func (s *AssetEnv3dHdr) ResetCreateTime() {
-	s.CreateTime = time.Now()
-	s.UpdateTime = time.Now()
-}
-func (s *AssetEnv3dHdr) SetOwner(id string, otype string) {
-	s.OwnerId, _ = primitive.ObjectIDFromHex(id)
-	s.OwnerType = otype
-}
-func (s *AssetEnv3dHdr) SetAssetType(otype string) {
-	s.AssetType = otype
-}
-
-func (s *AssetEnv3dHdr) SetUserInfo(id string, info *comm.AssetUserInfo) {
-	s.UserId, _ = primitive.ObjectIDFromHex(id)
-	s.UserInfo = info
-}
-
-type AssetMat struct {
-	Id        primitive.ObjectID  `bson:"_id,omitempty" json:"_id"`
-	UserId    primitive.ObjectID  `bson:"userId,omitempty" json:"userId,omitempty"`     //用户Id
-	UserInfo  *comm.AssetUserInfo `bson:"userInfo,omitempty" json:"userInfo,omitempty"` //用户Id
-	OwnerId   primitive.ObjectID  `bson:"ownerId,omitempty" json:"ownerId,omitempty"`
-	OwnerType string              `bson:"ownerType,omitempty" json:"ownerType,omitempty"` //user team company
-	AssetType string              `bson:"assetType,omitempty" json:"assetType,omitempty"` //user team company
-
-	CusNum string `bson:"cusNum,omitempty" json:"cusNum,omitempty"` //型号
-	Name   string `bson:"name,omitempty" json:"name"`
-
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time `bson:"updateTime,omitempty" json:"updateTime"`
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories []string  `bson:"categories,omitempty" json:"categories"` //所属分类Id
-	TaskId     string    `bson:"taskId,omitempty" json:"taskId"`         //资产处理id
-	AssetState int       `bson:"assetState,omitempty" json:"assetState"`
-	Enable     *bool     `bson:"enable,omitempty" json:"enable"` //是否有效！
-
-	Source *MatConfig `bson:"source,omitempty" json:"source,omitempty"`
-
-	UserData interface{} `bson:"userData,omitempty" json:"userData,omitempty"` //用户数据
-}
-
-func (s *AssetMat) SetIdEmpty() {
-	s.Id = primitive.NilObjectID
-}
-func (s *AssetMat) ResetCreateTime() {
-	s.CreateTime = time.Now()
-	s.UpdateTime = time.Now()
-}
-func (s *AssetMat) SetOwner(id string, otype string) {
-	s.OwnerId, _ = primitive.ObjectIDFromHex(id)
-	s.OwnerType = otype
-}
-func (s *AssetMat) SetAssetType(otype string) {
-	s.AssetType = otype
-}
-func (s *AssetMat) SetUserInfo(id string, info *comm.AssetUserInfo) {
-	s.UserId, _ = primitive.ObjectIDFromHex(id)
-	s.UserInfo = info
-}
-
-type AssetImage struct {
-	Id        primitive.ObjectID  `bson:"_id,omitempty" json:"_id"`
-	UserId    primitive.ObjectID  `bson:"userId,omitempty" json:"userId,omitempty"`     //用户Id
-	UserInfo  *comm.AssetUserInfo `bson:"userInfo,omitempty" json:"userInfo,omitempty"` //用户Id
-	OwnerId   primitive.ObjectID  `bson:"ownerId,omitempty" json:"ownerId,omitempty"`
-	OwnerType string              `bson:"ownerType,omitempty" json:"ownerType,omitempty"` //user team company
-	AssetType string              `bson:"assetType,omitempty" json:"assetType,omitempty"` //user team company
-
-	Name       string    `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time `bson:"updateTime,omitempty" json:"updateTime"`
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories []string  `bson:"categories,omitempty" json:"categories"` //所属分类Id
-	TaskId     string    `bson:"taskId,omitempty" json:"taskId"`         //资产处理id
-	AssetState int       `bson:"assetState,omitempty" json:"assetState"`
-	Enable     *bool     `bson:"enable,omitempty" json:"enable"` //是否有效！
-
-	Source *ImageSource `bson:"source,omitempty" json:"source,omitempty"`
-}
-
-func (s *AssetImage) SetIdEmpty() {
-	s.Id = primitive.NilObjectID
-}
-func (s *AssetImage) ResetCreateTime() {
-	s.CreateTime = time.Now()
-	s.UpdateTime = time.Now()
-}
-func (s *AssetImage) SetOwner(id string, otype string) {
-	s.OwnerId, _ = primitive.ObjectIDFromHex(id)
-	s.OwnerType = otype
-}
-
-func (s *AssetImage) SetAssetType(otype string) {
-	s.AssetType = otype
-}
-func (s *AssetImage) SetUserInfo(id string, info *comm.AssetUserInfo) {
-	s.UserId, _ = primitive.ObjectIDFromHex(id)
-	s.UserInfo = info
-}
-
-type AssetPackage struct {
-	Id        primitive.ObjectID  `bson:"_id,omitempty" json:"_id"`
-	OwnerId   primitive.ObjectID  `bson:"ownerId,omitempty" json:"ownerId,omitempty"`     //userId teamId companyId
-	OwnerType string              `bson:"ownerType,omitempty" json:"ownerType,omitempty"` //user team company
-	UserId    primitive.ObjectID  `bson:"userId,omitempty" json:"userId,omitempty"`       //用户Id
-	UserInfo  *comm.AssetUserInfo `bson:"userInfo,omitempty" json:"userInfo,omitempty"`   //用户Id
-
-	AssetType string `bson:"assetType,omitempty" json:"assetType,omitempty"` //业务类型 shoe sole heel decorate
-	Name      string `bson:"name,omitempty" json:"name"`
-	CusNum    string `bson:"cusNum,omitempty" json:"cusNum,omitempty"` //型号
-
-	CreateTime    time.Time `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime    time.Time `bson:"updateTime,omitempty" json:"updateTime"`
-	Thumbnail     *OssType  `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Categories    []string  `bson:"categories,omitempty" json:"categories"`       //所属分类Id
-	CusCategories []string  `bson:"cusCategories,omitempty" json:"cusCategories"` //所属分类Id
-
-	TaskId string `bson:"taskId,omitempty" json:"taskId"` //资产处理id
-
-	AssetState int   `bson:"assetState,omitempty" json:"assetState"`
-	Enable     *bool `bson:"enable,omitempty" json:"enable"` //是否有效！
-
-	Source   *comm.Queen3dPackageSource `bson:"source,omitempty" json:"source,omitempty"`
-	UserData interface{}                `bson:"userData,omitempty" json:"userData,omitempty"` //用户数据
-}
-
-func (s *AssetPackage) SetIdEmpty() {
-	s.Id = primitive.NilObjectID
-}
-func (s *AssetPackage) ResetCreateTime() {
-	s.CreateTime = time.Now()
-	s.UpdateTime = time.Now()
-}
-func (s *AssetPackage) SetOwner(id string, otype string) {
-	s.OwnerId, _ = primitive.ObjectIDFromHex(id)
-	s.OwnerType = otype
-}
-
-func (s *AssetPackage) SetAssetType(otype string) {
-	s.AssetType = otype
-}
-
-func (s *AssetPackage) SetUserInfo(id string, info *comm.AssetUserInfo) {
-	s.UserId, _ = primitive.ObjectIDFromHex(id)
-	s.UserInfo = info
-}

mesh/db/model/decorate.go

@@ -1,37 +0,0 @@
-package model
-
-// CREATE TABLE `execute_snapshot_his` (
-//  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-//  `snapshot_id` varchar(32) NOT NULL,
-//  `job_name` varchar(32) NOT NULL,
-//  `group` varchar(32) NOT NULL,
-//  `cron` varchar(255) DEFAULT NULL,
-//  `target` varchar(255) DEFAULT NULL,
-//  `ip` varchar(32) DEFAULT NULL,
-//  `param` varchar(255) DEFAULT NULL,
-//  `state` tinyint(4) DEFAULT NULL,
-//  `before_time` datetime NOT NULL,
-//  `schedule_time` datetime NOT NULL,
-//  `end_time` datetime DEFAULT NULL,
-//  `times` bigint(20) NOT NULL,
-//  `mobile` varchar(32) DEFAULT NULL,
-//  `remark` varchar(32) DEFAULT NULL,
-//  PRIMARY KEY (`id`)
-//) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-type OssType struct {
-	Url  string `bson:"url" json:"url"`
-	Size int64  `bson:"size" json:"size"`
-}
-
-func NewOssTypeWithMap(data map[string]interface{}) *OssType {
-	url := data["url"].(string)
-	size := data["size"].(int64)
-
-	return &OssType{Url: url, Size: size}
-}
-
-type MaterialConfig struct {
-	Id   string
-	Data interface{}
-}

mesh/db/model/design.go

@@ -1,63 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type Matrix [16]float64
-
-type SceneLight struct {
-	Id        string  `bson:"id,omitempty" json:"id"`
-	Type      string  `bson:"type,omitempty" json:"type"`
-	Enable    bool    `bson:"enable,omitempty" json:"enable"`
-	Matrix    Matrix  `bson:"matrix,omitempty" json:"matrix"`
-	Color     Vect3   `bson:"color,omitempty" json:"color"`
-	Intensity float64 `bson:"intensity,omitempty" json:"intensity"`
-}
-
-type DesignScene struct {
-	Id         string    `bson:"id,omitempty"  json:"id"`
-	Name       string    `bson:"name,omitempty"  json:"name"` //名字唯一
-	CreateTime time.Time `bson:"createTime,omitempty"  json:"createTime"`
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty"  json:"thumbnail"`
-
-	Product []*SceneProduct `bson:"products"  json:"products"`
-	Env3d   *Env3dConfig    `bson:"env3d,omitempty"  json:"env3d"`
-	Lights  []*SceneLight   `bson:"lights,omitempty"  json:"lights"`
-}
-
-type DesignProduct struct { //设计单品信息
-	Id              primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	ProjectId       primitive.ObjectID `bson:"projectId,omitempty" json:"projectId"`
-	FromDbConfId    string             `bson:"fromDbConfId,omitempty" json:"fromDbConfId"` //数据库定义Id
-	FromAssetConfId string             `bson:"fromAssetConfId,omitempty" json:"fromAssetConfId"`
-	FromId          string             `bson:"fromId,omitempty" json:"fromId"`
-	Name            string             `bson:"name,omitempty"  json:"name"`
-	Thumbnail       *OssType           `bson:"thumbnail,omitempty"  json:"thumbnail"`
-
-	StaticMesh *StaticMeshSource `bson:"staticMesh,omitempty" json:"staticMesh"` //静态模型资产
-	UpdateTime time.Time         `bson:"updateTime,omitempty"  json:"updateTime"`
-}
-
-type ProductHeader struct {
-	Id              string    `bson:"id,omitempty"  json:"id"`
-	FromDbConfId    string    `bson:"fromDbConfId,omitempty" json:"fromDbConfId"` //数据库定义Id
-	FromAssetConfId string    `bson:"fromAssetConfId,omitempty" json:"fromAssetConfId"`
-	FromId          string    `bson:"fromId,omitempty" json:"fromId"`
-	Name            string    `bson:"name,omitempty"  json:"name"`
-	Thumbnail       *OssType  `bson:"thumbnail,omitempty"  json:"thumbnail"`
-	CreateTime      time.Time `bson:"createTime,omitempty"  json:"createTime"`
-}
-
-type Design3d struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Thumbnail  *OssType           `bson:"thumbnail" json:"thumbnail"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId"`
-	Products   []*ProductHeader   `bson:"products,omitempty" json:"products"`
-	Scenes     []*DesignScene     `bson:"scenes,omitempty" json:"scenes"`
-}

mesh/db/model/env3d.go

@@ -1,45 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type Env3d struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Thumbnail  *OssType           `bson:"thumbnail,omitempty" json:"thumbnail"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-	State      int                `bson:"state,omitempty" json:"state"` //created completed published
-
-	HDR    *OssType      `bson:"hdr,omitempty" json:"hdr"`
-	Config *Evn3dHdrConf `bson:"config,omitempty" json:"config"`
-
-	Options *Env3dOption `bson:"options,omitempty" json:"options"`
-
-	ToneMap *ToneMap `bson:"toneMap,omitempty" json:"toneMap"`
-
-	Background *Evn3dBackground `bson:"background,omitempty" json:"background"`
-}
-
-type Env3dConfig struct {
-	Id primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-
-	Name       string    `bson:"name,omitempty" json:"name"`
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time `bson:"updateTime,omitempty" json:"updateTime"`
-
-	HDR     *OssType      `bson:"hdr,omitempty" json:"hdr"`
-	Config  *Evn3dHdrConf `bson:"config,omitempty" json:"config"`
-	Options *Env3dOption  `bson:"options,omitempty" json:"options"`
-}
-
-type Evn3dBackground struct {
-	Color *Vect3   `bson:"color,omitempty" json:"color"`
-	Image *OssType `bson:"image,omitempty" json:"image"`
-	Type  int32    `bson:"type,omitempty" json:"type"`
-}

mesh/db/model/obs.go

@@ -0,0 +1,17 @@
+package model
+
+import "time"
+
+type ObsItem struct {
+	Name         string    `json:"name"`
+	LastModified time.Time `json:"lastModified"`
+	Size         uint64    `json:"size"`
+	IsImage      bool      `json:"isImage"`
+	Url          string    `json:"url"`
+	IsDir        bool      `json:"isDir"`
+}
+
+type OssType struct {
+	Url  string `bson:"url" json:"url"`
+	Size int64  `bson:"size" json:"size"`
+}

mesh/db/model/perms.go

@@ -1,44 +0,0 @@
-package model
-
-import "go.mongodb.org/mongo-driver/bson/primitive"
-
-const (
-	Perm_Root        = "超级管理员"       //超级管理员
-	Perm_SubAccount  = "SubAccount"  //子账号管理
-	Perm_AccountRole = "AccountRole" //角色管理
-
-	Perm_Shoe_Public_list   = "ShoePublicList"   //款式查看企业公开列表
-	Perm_Shoe_Public_edit   = "ShoePublicEdit"   //款式编辑企业公开列表
-	Perm_Shoe_Public_Remove = "ShoePublicRemove" //款式删除权限
-	Perm_Shoe_Upload        = "ShoeUpload"       //款式上传
-	Perm_Shoe_Remove        = "ShoeRemove"       //款式删除
-)
-
-type PermItem struct {
-	Value string `bson:"value,omitempty" json:"value"`
-	Name  string `bson:"name,omitempty" json:"name"`
-}
-
-type Perms struct {
-	Id       primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Group    string             `bson:"group,omitempty" json:"group"`
-	Children []*PermItem        `bson:"children,omitempty" json:"children"`
-}
-
-// func (r *Role) IsPermOk(perm string) bool {
-// 	if r.Name == Perm_Root {
-// 		return true
-// 	}
-
-// 	if r.Perms == nil {
-// 		return false
-// 	}
-// 	for _, p := range r.Perms {
-// 		for _, item := range p.Children {
-// 			if item.Value == perm {
-// 				return true
-// 			}
-// 		}
-// 	}
-// 	return false
-// }

mesh/db/model/productTpl.go

@@ -1,29 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type ProductTplComponent struct {
-	Name       string `bson:"name,omitempty" json:"name"`
-	CreateType uint8  `bson:"createType,omitempty" json:"createType"` //0-模型创建 1-dynamic 动态生成
-	Label      string `bson:"label,omitempty" json:"label"`           //ui 显示的名字
-	UV         *struct {
-		Width  uint    `bson:"width,omitempty" json:"width"`
-		Height uint    `bson:"height,omitempty" json:"height"`
-		Image  OssType `bson:"image,omitempty" json:"image"`
-	} `bson:"uv,omitempty" json:"uv"`
-}
-
-type ProductTpl struct {
-	Id         primitive.ObjectID     `bson:"_id,omitempty" json:"_id"`
-	CreateTime time.Time              `bson:"createTime,omitempty" json:"createTime"`
-	MeshId     primitive.ObjectID     `bson:"meshId,omitempty" json:"meshId"`
-	Name       string                 `bson:"name,omitempty" json:"name"`
-	Thumbnail  *OssType               `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Components []*ProductTplComponent `bson:"components,omitempty" json:"components"` //模板部件
-
-	IsPublic *bool `bson:"isPublic,omitempty" json:"isPublic"` //是否公开
-}

mesh/db/model/project.go

@@ -1,129 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type Transform struct {
-	Pos   Vect3 `bson:"pos" json:"pos"`
-	Scale Vect3 `bson:"scale" json:"scale"`
-	Rot   Vect3 `bson:"rot" json:"rot"`
-}
-
-type Vect2 [2]float64
-type Vect3 [3]float64
-type Vect4 [4]float64
-
-type VectXYWH struct {
-	Y float64 `bson:"y" json:"y"`
-	X float64 `bson:"x" json:"x"`
-	W float64 `bson:"w" json:"w"`
-	H float64 `bson:"h" json:"h"`
-}
-
-type DynamicProp struct {
-	Label string  `bson:"label"`
-	Name  string  `bson:"name"`
-	Value float32 `bson:"value"`
-	Type  string  `bson:"type"`
-}
-
-type ComponentTransform struct {
-	Translate []float32 `bson:"translate"`
-	Rotate    []float32 `bson:"rotate"`
-}
-
-type ComponentMaterial struct {
-	Thumbnail *OssType       `bson:"thumbnail,omitempty"`
-	Name      string         `bson:"name,omitempty"`
-	Id        string         `bson:"id"`
-	Offset    *Vect2         `bson:"offset"`
-	Repeat    *Vect2         `bson:"repeat"`
-	Props     []*DynamicProp `bson:"props"`
-}
-
-type ComponentImage struct {
-	Id     string   `bson:"id" json:"id"`
-	Image  *OssType `bson:"image" json:"image"`
-	Width  int      `bson:"width" json:"width"`
-	Height int      `bson:"height" json:"height"`
-
-	Position         Vect2   `bson:"position" json:"position"`
-	Scale            Vect2   `bson:"scale" json:"scale"`
-	Rotation         float64 `bson:"rotation" json:"rotation"`
-	FillType         string  `bson:"fillType" json:"fillType"`
-	Technology       string  `bson:"technology" json:"technology"`
-	BasicColor       Vect3   `bson:"basicColor" json:"basicColor"`
-	AotuFactor       float32 `bson:"aotuFactor" json:"aotuFactor"`
-	RoughFactor      float32 `bson:"roughFactor" json:"roughFactor"`
-	ReflectionFactor float32 `bson:"reflectionFactor" json:"reflectionFactor"`
-	MetalFactor      float32 `bson:"metalFactor" json:"metalFactor"`
-}
-
-type ProductComponentUv struct {
-	Img       *OssType           `bson:"img"`
-	Transform ComponentTransform `bson:"transform"`
-}
-type ProductComponent struct {
-	Id           string              `bson:"id"`
-	Uv           *ProductComponentUv `bson:"uv"`
-	BaseMaterial *ComponentMaterial  `bson:"baseMaterial"`
-	Images       []*ComponentImage   `bson:"images"`
-}
-
-type SceneProduct struct {
-	FromId    string     `bson:"fromId,omitempty" json:"fromId"` //多模型的支持
-	Id        string     `bson:"id,omitempty" json:"id"`
-	Name      string     `bson:"name,omitempty" json:"name"`
-	Type      string     `bson:"type,omitempty" json:"type"`
-	Locked    bool       `bson:"locked,omitempty" json:"locked"`
-	Visible   bool       `bson:"visible,omitempty" json:"visible"`
-	Transform *Transform `bson:"transform,omitempty" json:"transform"`
-}
-
-type Product struct {
-	Id         string              `bson:"id,omitempty"`
-	Name       string              `bson:"name,omitempty"` //名字唯一
-	Thumbnail  OssType             `bson:"thumbnail,omitempty"`
-	CreateTime time.Time           `bson:"createTime,omitempty"`
-	Components []*ProductComponent `bson:"components,omitempty"`
-}
-
-type SceneOfflineRender struct {
-	TaskId string  `bson:"taskId,omitempty"`
-	Image  OssType `bson:"image,omitempty"`
-}
-
-type Scene struct {
-	Id         string                `bson:"id,omitempty"`
-	Name       string                `bson:"name,omitempty"` //名字唯一
-	CreateTime time.Time             `bson:"createTime,omitempty"`
-	Thumbnail  *OssType              `bson:"thumbnail,omitempty"`
-	Renders    []*SceneOfflineRender `bson:"renders"`
-	Product    []*SceneProduct       `bson:"renders"`
-}
-
-type Project struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty"`
-	Name       string             `bson:"name,omitempty"`
-	Thumbnail  OssType            `bson:"thumbnail"`
-	CreateTime time.Time          `bson:"createTime,omitempty"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty"`
-
-	UserId   primitive.ObjectID `bson:"userId,omitempty"`
-	Products []*Product         `bson:"products"`
-	Scenes   []*Scene           `bson:"scenes"`
-}
-
-//declare interface DesignConfig {
-
-// 	scenes: {
-// 	  lights: {
-// 		id: string;
-// 		name: string;
-// 		type: string;
-// 	  }[];
-// 	}[];
-//}

mesh/db/model/mat.go → mesh/db/model/queenter.go

@@ -6,21 +6,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
-// 面料库
-type HubMat struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Thumbnail  string             `bson:"thumbnail,omitempty" json:"thumbnail"`
-	Host       string             `bson:"host,omitempty" json:"host"`
-	DbId       string             `bson:"dbid,omitempty" json:"dbid"`
-	DbName     string             `bson:"dbName,omitempty" json:"dbName"`
-	DefineId   string             `bson:"defineId,omitempty" json:"defineId"`
-	Collection string             `bson:"collection,omitempty" json:"collection"`
-
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
-}
-
 // Queneter设备
 type DeviceQueenter struct {
 	Id        primitive.ObjectID `bson:"_id,omitempty" json:"_id"`

mesh/db/model/res.go

@@ -1,338 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-const (
-	LibState_Created      = 1
-	LibState_Complated    = 2
-	LibState_Publish2Qiye = 3
-)
-
-type Texture struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Image      OssType            `bson:"image,omitempty" json:"image"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-}
-
-type ObsItem struct {
-	Name         string    `json:"name"`
-	LastModified time.Time `json:"lastModified"`
-	Size         uint64    `json:"size"`
-	IsImage      bool      `json:"isImage"`
-	Url          string    `json:"url"`
-	IsDir        bool      `json:"isDir"`
-}
-
-type MaterailUv struct {
-	Scale   float64 `bson:"scale" json:"scale"`
-	Rotate  float64 `bson:"rotate" json:"rotate"`
-	OffsetX float64 `bson:"offsetX" json:"offsetX"`
-	OffsetY float64 `bson:"offsetY" json:"offsetY"`
-}
-
-type MatAlbedo struct {
-	Color      *Vect3   `bson:"color" json:"color"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-}
-
-type MatRoughness struct {
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	Factor     *float32 `bson:"factor" json:"factor"`
-}
-
-type MatMetalness struct {
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	Factor     *float32 `bson:"factor" json:"factor"`
-}
-type MatNormal struct {
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	Factor     *float32 `bson:"factor" json:"factor"`
-	FlipY      *bool    `bson:"flipY" json:"flipY"`
-}
-
-type MatDisplace struct {
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	Factor     *float32 `bson:"factor" json:"factor"`
-}
-
-type MatDiffuse struct {
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	Factor     *float32 `bson:"factor" json:"factor"`
-}
-
-type MatTextureFactorWithEnable struct {
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	Factor     *float32 `bson:"factor" json:"factor"`
-	Enable     bool     `bson:"enable" json:"enable"`
-}
-
-type MatTextureFactor struct {
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	Factor     *float32 `bson:"factor" json:"factor"`
-}
-
-type MatTextureColor struct {
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	Color      *Vect3   `bson:"color" json:"color"`
-}
-
-type MatOpacity struct {
-	Enable     bool     `bson:"enable" json:"enable"`
-	Factor     *float32 `bson:"factor" json:"factor"`
-	Texture    *OssType `bson:"texture" json:"texture"`
-	UseTexture *bool    `bson:"useTexture" json:"useTexture"`
-}
-
-type MatConfig struct {
-	Version     int         `bson:"version,omitempty" json:"version"`
-	Type        string      `bson:"type,omitempty" json:"type"` //高光流 金属流(默认) meta spec
-	Uvtransform *MaterailUv `bson:"uv,omitempty" json:"uv"`
-	CullFace    string      `bson:"cullFace" json:"cullFace"`
-
-	Albedo    *MatTextureColor            `bson:"albedo" json:"albedo"`
-	Roughness *MatTextureFactor           `bson:"roughness" json:"roughness"`
-	Metalness *MatTextureFactor           `bson:"metalness" json:"metalness"`
-	Normal    *MatNormal                  `bson:"normal" json:"normal"`
-	Opacity   *MatTextureFactorWithEnable `bson:"opacity" json:"opacity"`
-
-	Displace *MatTextureFactorWithEnable `bson:"displace,omitempty" json:"displace"` //置换
-	Diffuse  *MatTextureColor            `bson:"diffuse,omitempty" json:"diffuse"`
-	Specular *MatTextureColor            `bson:"specular" json:"specular"`
-	Gloss    *MatTextureFactor           `bson:"gloss,omitempty" json:"gloss"` //光泽贴图
-
-	UvMap string `bson:"uvMap,omitempty" json:"uvMap"` //uv包裹 box、uv
-}
-
-type TechMatConfig struct {
-	Version     int           `bson:"version,omitempty" json:"version"`
-	Type        string        `bson:"type,omitempty" json:"type"`
-	Uvtransform *MaterailUv   `bson:"uvtransform,omitempty" json:"uvtransform"`
-	CullFace    string        `bson:"cullFace" json:"cullFace"`
-	Albedo      *MatAlbedo    `bson:"albedo" json:"albedo"`
-	Roughness   *MatRoughness `bson:"roughness" json:"roughness"`
-	Metalness   *MatMetalness `bson:"metalness" json:"metalness"`
-	Specular    *MatAlbedo    `bson:"specular" json:"specular"`
-	Normal      *MatNormal    `bson:"normal" json:"normal"`
-	Opacity     *MatOpacity   `bson:"opacity" json:"opacity"`
-}
-
-type MaterialChannels struct {
-	Albedo       *MaterailFeature  `bson:"Albedo" json:"Albedo"`
-	Roughness    *MaterailFeature  `bson:"Roughness" json:"Roughness"`
-	NormalMap    *MaterailFeature  `bson:"NormalMap" json:"NormalMap"`
-	BumpMap      *MaterailFeature  `bson:"BumpMap" json:"BumpMap"`
-	Opacity      *OpacityFeature   `bson:"Opacity" json:"Opacity"`
-	AO           *AOFeature        `bson:"AO" json:"AO"`
-	MetalnessPBR *MaterailFeature  `bson:"MetalnessPBR" json:"MetalnessPBR"`
-	SpecularF0   float32           `bson:"SpecularF0" json:"SpecularF0"`
-	ClearCoat    *ClearCoatFeature `bson:"ClearCoat" json:"ClearCoat"`
-	Displacement *MaterailFeature  `bson:"Displacement" json:"Displacement"`
-	CavityMap    *MaterailFeature  `bson:"CavityMap" json:"CavityMap"`
-	Emissive     *Emissive         `bson:"Emissive" json:"Emissive"`
-}
-type Emissive struct {
-	Color  Vect3   `bson:"color" json:"color"`
-	Enable bool    `bson:"enable" json:"enable"`
-	Factor float32 `bson:"factor" json:"factor"`
-}
-
-type MaterailFeature struct {
-	Color   *Vect3   `bson:"color" json:"color"`
-	Texture *OssType `bson:"texture" json:"texture"`
-	Factor  *float32 `bson:"factor" json:"factor"`
-	Invert  *bool    `bson:"invert" json:"invert"`
-	Enable  *bool    `bson:"enable" json:"enable"`
-	FlipY   *bool    `bson:"flipY" json:"flipY"`
-}
-
-type OpacityFeature struct {
-	Enable                 bool    `bson:"enable" json:"enable"`
-	Type                   string  `bson:"type" json:"type"`
-	Factor                 float32 `bson:"factor" json:"factor"`
-	Invert                 bool    `bson:"invert" json:"invert"`
-	SampleChannel          string  `bson:"sampleChannel" json:"sampleChannel"`
-	RefractionTint         Vect3   `bson:"refractionTint" json:"refractionTint"`
-	RefractUseDiffuse      bool    `bson:"refractUseDiffuse" json:"refractUseDiffuse"`
-	RefractUseShininessMap bool    `bson:"refractUseShininessMap" json:"refractUseShininessMap"`
-	IOR                    float32 `bson:"IOR" json:"IOR"`
-	RoughnessFactor        float32 `bson:"roughnessFactor" json:"roughnessFactor"`
-	Texture                OssType `bson:"texture" json:"texture"`
-}
-
-type AOFeature struct {
-	Enable          bool    `bson:"enable" json:"enable"`
-	OccludeSpecular bool    `bson:"occludeSpecular" json:"occludeSpecular"`
-	Factor          float32 `bson:"factor" json:"factor"`
-	Texture         OssType `bson:"texture" json:"texture"`
-}
-
-type ClearCoatFeature struct {
-	Enable       bool    `bson:"enable" json:"enable"`
-	Thickness    float32 `bson:"thickness" json:"thickness"`
-	Intensity    float32 `bson:"intensity" json:"intensity"`
-	Color        Vect3   `bson:"color" json:"color"`
-	Reflectivity float32 `bson:"reflectivity" json:"reflectivity"`
-	Roughness    struct {
-		Factor float32 `bson:"factor" json:"factor"`
-	} `bson:"roughness" json:"roughness"`
-	Normalmap struct {
-		Factor float32 `bson:"factor" json:"factor"`
-		FlipY  bool    `bson:"flipY" json:"flipY"`
-	} `bson:"normalmap" json:"normalmap"`
-}
-
-//材质球
-type Material struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId"` //用户ID
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Data       *MatConfig         `bson:"data,omitempty" json:"data"`
-	Thumbnail  *OssType           `bson:"thumbnail,omitempty" json:"thumbnail"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	Category   string             `bson:"category,omitempty" json:"category"`
-
-	IsPublic *bool `bson:"isPublic,omitempty" json:"isPublic"` //是否公开
-
-	IsEffect   *bool `bson:"effect,omitempty" json:"effect"`     //是否属于效果材质球
-	IsPlatform *bool `bson:"platform,omitempty" json:"platform"` //是否属于平台
-}
-
-type Env3dOption struct {
-	Rotation float64 `bson:"rotation" json:"rotation"`
-	Exposure float64 `bson:"exposure" json:"exposure"`
-}
-
-func NewEnv3dOptionWithMap(options map[string]interface{}) *Env3dOption {
-
-	Rotation := float64(0.0)
-	if v, ok := options["rotation"].(float64); ok {
-		Rotation = v
-	} else if v, ok := options["rotation"].(float64); ok {
-		Rotation = float64(v)
-	}
-	Exposure := float64(1.0)
-	if v, ok := options["exposure"].(float64); ok {
-		Exposure = v
-	} else if v, ok := options["exposure"].(float64); ok {
-		Exposure = float64(v)
-	}
-
-	return &Env3dOption{Rotation: Rotation, Exposure: Exposure}
-}
-
-func NewEnv3dToneMapWithMap(tone map[string]interface{}) *ToneMap {
-
-	method := int32(0)
-	Exposure := float64(1)
-	Saturation := float64(1)
-	Brightness := float64(0)
-	Contrast := float64(0)
-
-	if tone == nil {
-		return &ToneMap{
-			Method:     &method,
-			Exposure:   &Exposure,
-			Saturation: &Saturation,
-			Brightness: &Brightness,
-			Contrast:   &Contrast,
-		}
-	}
-
-	if v, ok := tone["method"].(int32); ok {
-		method = v
-	}
-
-	if v, ok := tone["exposure"].(float64); ok {
-		Exposure = v
-	}
-
-	if v, ok := tone["saturation"].(float64); ok {
-		Saturation = v
-	}
-
-	if v, ok := tone["brightness"].(float64); ok {
-		Brightness = v
-	}
-
-	if v, ok := tone["contrast"].(float64); ok {
-		Contrast = v
-	}
-
-	return &ToneMap{Method: &method, Exposure: &Exposure, Saturation: &Saturation, Brightness: &Brightness, Contrast: &Contrast}
-}
-
-func NewEnv3dBackgroundWithMap(options map[string]interface{}) *Evn3dBackground {
-	Color := options["color"].(primitive.A)
-	Image := &OssType{}
-	if options["image"] != nil {
-		Image = NewOssTypeWithMap(options["image"].(map[string]interface{}))
-	}
-	Type := options["type"].(int32)
-	return &Evn3dBackground{Color: &Vect3{Color[0].(float64), Color[1].(float64), Color[2].(float64)}, Image: Image, Type: Type}
-}
-
-type ToneMap struct {
-	Method     *int32   `bson:"method,omitempty" json:"method"`         //0 "linear" 值0 "reinhard" 值 1 "filmic”:值2
-	Exposure   *float64 `bson:"exposure,omitempty" json:"exposure"`     //默认值1 范围0到2
-	Brightness *float64 `bson:"brightness,omitempty" json:"brightness"` //默认值0 范围-1到 1
-	Contrast   *float64 `bson:"contrast,omitempty" json:"contrast"`     //默认值0 范围-1到1
-	Saturation *float64 `bson:"saturation,omitempty" json:"saturation"` //默认值1 范围0-2
-}
-
-type Evn3dTextureImage struct {
-	File             string  `bson:"file,omitempty" json:"file"`
-	SizeUncompressed int32   `bson:"sizeUncompressed,omitempty" json:"sizeUncompressed"`
-	Samples          uint32  `bson:"samples,omitempty" json:"samples"`
-	Height           float32 `bson:"height,omitempty" json:"height"`
-	Width            float32 `bson:"width,omitempty" json:"width"`
-	SizeCompressed   int32   `bson:"sizeCompressed,omitempty" json:"sizeCompressed"`
-	Blur             float32 `bson:"blur,omitempty,truncate" json:"blur"`
-}
-
-type Evn3dTexture struct {
-	Images    []*Evn3dTextureImage `bson:"images,omitempty" json:"images"`
-	LimitSize int32                `bson:"limitSize,omitempty" json:"limitSize"`
-	Encoding  string               `bson:"encoding,omitempty" json:"encoding"`
-	Type      string               `bson:"type,omitempty" json:"type"`
-	Format    string               `bson:"format,omitempty" json:"format"`
-}
-
-type Evn3dLight struct {
-	Direction  Vect3    `bson:"direction,omitempty" json:"direction"`
-	Lum_ratio  float64  `bson:"lum_ratio,omitempty" json:"lum_ratio"`
-	Color      Vect3    `bson:"color,omitempty" json:"color"`
-	Luminosity float64  `bson:"luminosity,omitempty" json:"luminosity"`
-	Sum        float64  `bson:"sum,omitempty" json:"sum"`
-	Area       VectXYWH `bson:"area,omitempty" json:"area"`
-	Error      int32    `bson:"error,omitempty" json:"error"`
-	Variance   float64  `bson:"variance,omitempty" json:"variance"`
-}
-
-type Evn3dHdrConf struct {
-	Textures       []*Evn3dTexture `bson:"textures,omitempty" json:"textures"`
-	WriteByChannel bool            `bson:"writeByChannel,omitempty" json:"writeByChannel"`
-	Lights         []*Evn3dLight   `bson:"lights,omitempty" json:"lights"`
-	DiffuseSPH     []float64       `bson:"diffuseSPH,omitempty" json:"diffuseSPH"`
-}
-
-type CanvasBackground struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Color      *Vect3             `bson:"color,omitempty" json:"color"`
-	Image      *OssType           `bson:"image,omitempty" json:"image"`
-	Type       int32              `bson:"type,omitempty" json:"type"`
-	Order      int32              `bson:"order,omitempty" json:"order"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-}

mesh/db/model/task.go

@@ -1,210 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type RenderComponent struct {
-	Name     string              `bson:"name,omitempty" json:"name"`
-	FabricId *primitive.ObjectID `bson:"fabricId,omitempty" json:"fabricId,omitempty"`
-	CardId   *primitive.ObjectID `bson:"cardId,omitempty" json:"cardId,omitempty"`
-	MatType  uint8               `bson:"matType,omitempty" json:"matType"`
-	// Imagemat    *ImageMatConf       `bson:"imageMat,omitempty" json:"imageMat,omitempty"`
-	// Uvtransform *Uvtransform        `bson:"transform,omitempty" json:"transform"`
-	Color   *Vect3     `bson:"color,omitempty" json:"color"`
-	GroupId uint64     `bson:"groupId,omitempty" json:"groupId"`
-	Visible *bool      `bson:"visible,omitempty" json:"visible"`
-	Card    *MatConfig `bson:"card,omitempty" json:"card"`
-}
-
-type RenderShoeComp struct {
-	Name   string
-	Config *RenderComponent
-}
-
-type RenderModelComp struct {
-	Id      string              `bson:"id,omitempty" json:"id"`
-	MeshId  *primitive.ObjectID `bson:"meshId,omitempty" json:"meshId,omitempty"`
-	MeshUrl string              `bson:"meshUrl,omitempty" json:"meshUrl,omitempty"`
-	Type    string              `bson:"type,omitempty" json:"type"`
-	TypeId  *primitive.ObjectID `bson:"typeId,omitempty" json:"typeId,omitempty"`
-	// Transform  ModelTransform      `bson:"transform,omitempty" json:"transform,omitempty"`
-	Components []*RenderShoeComp `bson:"components,omitempty" json:"components,omitempty"`
-}
-
-const (
-	TaskRunState_Created      = 0
-	TaskRunState_Quened       = 1
-	TaskRunState_WorkRuning   = 2
-	TaskRunState_ReWorkRuning = 3
-	TaskRunState_Succ         = 4
-	TaskRunState_Fail         = 5
-)
-
-type TaskRunResult struct {
-	Images []*OssType
-}
-
-type ConvMeshRunResult struct {
-	Osgjs     *OssType
-	Thumbnail *OssType
-	File      *OssType
-}
-
-type RenderTask struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId"`
-	DesignId   primitive.ObjectID `bson:"designId" json:"designId"`
-
-
-	RunState   int32              `bson:"runState" json:"runState"`
-	RunPercent int32              `bson:"runPercent" json:"runPercent"`
-
-	RunResult  *TaskRunResult     `bson:"runResult" json:"runResult"`
-
-	Width      int32              `bson:"width" json:"width"`
-	Height     int32              `bson:"height" json:"height"`
-	CreateTime time.Time          `bson:"createTime" json:"createTime"`
-
-	Scene      *DesignScene       `bson:"scene" json:"scene"`
-	MeshId     string             `bson:"meshId" json:"meshId"`
-	MeshUrl    string             `bson:"meshUrl" json:"meshUrl"`
-	MeshShadow string             `bson:"meshShadow" json:"meshShadow"`
-
-	Cameras    []*RenderCamera    `bson:"cameras" json:"cameras"`
-
-	ShoeComps  []*RenderShoeComp  `bson:"shoeComps" json:"shoeComps"`
-	
-	ModelComps []*RenderModelComp `bson:"modelComps" json:"modelComps"`
-
-	MaxSamples int32   `bson:"maxSamples" json:"maxSamples"`
-	Exposure   float32 `bson:"exposure" json:"exposure"`
-}
-
-type RenderSetting struct {
-	MaxSamples int32   `bson:"maxSamples" json:"maxSamples"` //32
-	Exposure   float32 `bson:"exposure" json:"exposure"`     //1.2
-}
-
-type RenderCamera struct {
-	Thumbnail *OssType       `bson:"thumbnail" json:"thumbnail"` //
-	Position  Vec3Obj        `bson:"position" json:"position"`   //
-	Fov       float32        `bson:"fov" json:"fov"`             //45
-	Direction Vec3Obj        `bson:"direction" json:"direction"`
-	Viewport  CameraViewPort `bson:"viewport" json:"viewport"`
-}
-
-type CameraViewPort struct {
-	Width  int32 `bson:"width" json:"width"`
-	Height int32 `bson:"height" json:"height"`
-}
-
-type SunLight struct {
-	Type            string  `bson:"type" json:"type"`
-	Intensity       float32 `bson:"intensity" json:"intensity"`
-	Direction       Vec3Obj `bson:"direction" json:"direction"`
-	AngularDiameter float32 `bson:"angularDiameter" json:"angularDiameter"`
-	Color           Vect3   `bson:"color" json:"color"`
-}
-
-type RenderEnv struct {
-	Color     Vect3   `bson:"color" json:"color"`
-	Rotation  float32 `bson:"rotation" json:"rotation"`
-	Intensity float32 `bson:"intensity" json:"intensity"`
-	FilePath  string  `bson:"filePath" json:"filePath"`
-	Visiable  bool    `bson:"visiable" json:"visiable"`
-}
-
-type Vec3Obj struct {
-	X float64 `bson:"x" json:"x"`
-	Y float64 `bson:"y" json:"y"`
-	Z float64 `bson:"z" json:"z"`
-}
-type Vec4Obj struct {
-	X float64 `bson:"x" json:"x"`
-	Y float64 `bson:"y" json:"y"`
-	Z float64 `bson:"z" json:"z"`
-	W float64 `bson:"w" json:"w"`
-}
-
-type RenderMatParam struct {
-	Name  string      `bson:"name" json:"name"`
-	Type  string      `bson:"type" json:"type"`
-	Value interface{} `bson:"value" json:"value"`
-}
-
-type RenderMat struct {
-	Name       string            `bson:"name" json:"name"`
-	Type       string            `bson:"type" json:"type"`
-	Parameters []*RenderMatParam `bson:"parameters" json:"parameters"`
-}
-
-type RenderGroup struct {
-	Name      string       `bson:"name" json:"name"`
-	Position  Vec3Obj      `bson:"position" json:"position"`
-	Rotation  Vec4Obj      `bson:"rotation" json:"rotation"`
-	Scale     Vec3Obj      `bson:"scale" json:"scale"`
-	Materials []*RenderMat `bson:"materials" json:"materials"`
-	FilePath  string       `bson:"filePath" json:"filePath"`
-}
-
-type RenderConf struct {
-	Setting    *RenderSetting `bson:"setting" json:"setting"`
-	Camera     *RenderCamera  `bson:"camera" json:"camera"`
-	Lights     []interface{}  `bson:"lights" json:"lights"`
-	Enviroment *RenderEnv     `bson:"enviroment" json:"enviroment"`
-	Groups     []*RenderGroup `bson:"groups" json:"groups"`
-}
-
-type TaskConvMesh2Osgjs struct {
-	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId string             `bson:"userId,omitempty" json:"userId"`
-	MeshId string             `bson:"meshId,omitempty" json:"meshId"` //模型meshId
-
-	Collecton      string    `bson:"collection,omitempty" json:"collection"`         //数据库表的名字
-	FbxFile        *OssType  `bson:"fbxFile,omitempty" json:"fbxFile"`               //模型文件字段名字
-	OsgjsFieldName string    `bson:"osgjsFieldName,omitempty" json:"osgjsFieldName"` //模型文件字段名字
-	CreateTime     time.Time `bson:"createTime,omitempty" json:"createTime"`         //创建时间
-
-	WorkerId string `bson:"workerId,omitempty" json:"workerId"` //分配的工作ID，可根据此Id取消worker的执行
-}
-
-type TaskConvHdr struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     string             `bson:"userId,omitempty" json:"userId"`
-	Env3dId    string             `bson:"env3dId,omitempty" json:"env3dId"`       //模型meshId
-	Collecton  string             `bson:"collection,omitempty" json:"collection"` //数据库表的名字
-	HdrFile    *OssType           `bson:"hdrFile,omitempty" json:"hdrFile"`       //模型文件字段名字
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"` //创建时间
-	WorkerId   string             `bson:"workerId,omitempty" json:"workerId"`     //分配的工作ID，可根据此Id取消worker的执行
-}
-
-type TaskCreateShadow struct {
-	Id              primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	CreateTime      time.Time          `bson:"createTime,omitempty" json:"createTime"` //创建时间
-	UserId          string             `bson:"userId,omitempty" json:"userId"`
-	MeshId          string             `bson:"meshId,omitempty" json:"meshId"`                   //模型meshId
-	Collecton       string             `bson:"collection,omitempty" json:"collection"`           //数据库表的名字
-	FbxFile         *OssType           `bson:"fbxFile,omitempty" json:"fbxFile"`                 //模型文件字段名字
-	ShadowFieldName string             `bson:"shadowFieldName,omitempty" json:"shodowFieldName"` //模型文件字段名字
-}
-
-type WorkerRequest struct {
-	Name           string    `json:"name"`
-	UserId         string    `json:"userId"`
-	TaskId         string    `json:"taskId"`
-	MainId         string    `json:"mainId"`
-	TaskCollection string    `json:"taskCollection"`
-	WorkerType     string    `json:"workerType"`
-	CreateTime     time.Time `json:"createTime"`
-}
-
-type WorkerResponse struct {
-	ErrorNo   int    `json:"errorNo"`
-	ErrorDesc string `json:"errorDesc"`
-	Result    struct {
-		WorkingId string `json:"workingId"`
-	} `json:"result"`
-}

mesh/db/model/user-qiye.go

@@ -1,26 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type UserPost struct { //人员职位
-	Id        primitive.ObjectID `bson:"_id,omitempty" json:"_id"`                       //职位ID
-	Name      string             `bson:"name,omitempty" json:"name,omitempty"`           //职位名称唯一、不能重复
-	TreeLevel int32              `bson:"treeLevel,omitempty" json:"treeLevel,omitempty"` //职位等级
-
-	Parent primitive.ObjectID `bson:"parent,omitempty" json:"parent"` //父级职
-}
-
-//联系我们
-type ContentInfo struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Phone      string             `bson:"phone,omitempty" json:"phone"`
-	Company    string             `bson:"company,omitempty" json:"company"`
-	POST       string             `bson:"post,omitempty" json:"post"`
-	City       string             `bson:"city,omitempty" json:"city"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-}

mesh/db/model/user-role.go

@@ -1,85 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-//企业账户的角色列表
-type FilterTime struct {
-	Year    int32
-	Seasons []int32
-}
-
-//企业账户的角色列表
-type FilterCategory struct {
-	Category1 string
-	Category2 []string
-}
-
-type LibFilter struct {
-	Values []string `bson:"values,omitempty" json:"values"` //企业类型["设计中心(企业平台)-运动鞋设计部(运动鞋设计部)-小组（设计1小组）-个人"]
-	CateId string   `bson:"cateId,omitempty" json:"cateId"` //年限
-	IsAll  *bool    `bson:"isAll,omitempty" json:"isAll"`   //性别
-}
-
-type MatFilter struct {
-	QiyeFrom   []string          //企业类型["设计中心(企业平台)-运动鞋设计部(运动鞋设计部)-小组（设计1小组）-个人"]
-	YearSeason []*FilterTime     //年限
-	Category   []*FilterCategory //分类
-}
-
-type TeamResFilter struct {
-	ShoeCategoryIds     []*LibFilter `bson:"shoeCategoryIds,omitempty" json:"shoeCategoryIds"`         //分配的分类列表
-	MatCategoryIds      []*LibFilter `bson:"matCategoryIds,omitempty" json:"matCategoryIds"`           //分配的分类列表
-	SoleCategoryIds     []*LibFilter `bson:"soleCategoryIds,omitempty" json:"soleCategoryIds"`         //分配的分类列表
-	HeelCategoryIds     []*LibFilter `bson:"heelCategoryIds,omitempty" json:"heelCategoryIds"`         //分配的分类列表
-	DecorateCategoryIds []*LibFilter `bson:"decorateCategoryIds,omitempty" json:"decorateCategoryIds"` //分配的分类列表
-}
-
-type QiyeRole struct {
-	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId string             `bson:"userId,omitempty" json:"userId"`         //企业主账户id
-	Name   string             `bson:"name, omitempty" json:"name,omitempty"`  //角色名字
-	Perms  []string           `bson:"perms,omitempty" json:"perms,omitempty"` //权限名字列表
-}
-
-type Team struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-	UserId     string             `bson:"userId,omitempty" json:"userId,omitempty"` //企业主账户id
-	Name       string             `bson:"name" json:"name"`                         //角色名字
-	UserCount  int32              `bson:"userCount" json:"userCount"`               //用户个数
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime,omitempty"`
-	Filter     *TeamResFilter     `bson:"filters" json:"filters"`                       //资源名字列表
-	LeaderId   string             `bson:"leaderId,omitempty" json:"leaderId,omitempty"` //leaderId
-}
-
-type ResCategory struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Type       string             `bson:"type,omitempty" json:"type"`
-	UserId     string             `bson:"userId,omitempty" json:"userId"`
-	Parent     string             `bson:"parent,omitempty" json:"parent"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Value      string             `bson:"value,omitempty" json:"value"`
-	Level      *int32             `bson:"level,omitempty" json:"level"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	OrderId    int64              `bson:"orderId,omitempty" json:"orderId"`
-}
-
-type LibCategory struct {
-	Id          primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Type        string             `bson:"type,omitempty" json:"type"`
-	UserId      string             `bson:"userId,omitempty" json:"userId"`
-	CategoryIds []string           `bson:"categoryIds,omitempty" json:"categoryIds"`
-	CreateTime  time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime  time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
-}
-
-type Role struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     string             `bson:"userId,omitempty" json:"userId"` //主账号Id
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Perms      []string           `bson:"perms,omitempty" json:"perms"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-}

mesh/db/model/user.go

@@ -1,91 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type Sass struct {
-	Title  string
-	Level  int32
-	Status string //使用中
-
-	Exp time.Time
-}
-
-type EnvTheme struct {
-	Id string `bson:"id,omitempty" json:"id"`
-	// Options    *Evn3dOption     `bson:"options,omitempty" json:"options"`
-	ToneMap *ToneMap `bson:"toneMap,omitempty" json:"toneMap"`
-	// Background *SceneBackground `bson:"background,omitempty" json:"background"`
-}
-
-type EditorSetting struct {
-	Themes         []*EnvTheme `bson:"themes,omitempty" json:"themes"`
-	ModelBaseColor *Vect3      `bson:"modelBaseColor,omitempty" json:"modelBaseColor"`
-	DefaultEnv3dId string      `bson:"defaultEnv3dId,omitempty" json:"defaultEnv3dId"`
-}
-
-type User struct {
-	Id       primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Phone    string             `bson:"phone,omitempty" json:"phone"`
-	Password string             `bson:"password,omitempty" json:"password"`
-	Name     string             `bson:"name,omitempty" json:"name"`
-	Company  string             `bson:"company,omitempty" json:"company"`
-	Wechat   string             `bson:"wechat,omitempty" json:"wechat"`
-	City     string             `bson:"city,omitempty" json:"city"`
-	Alipay   string             `bson:"alipay,omitempty" json:"alipay,omitempty"`
-	Avatar   string             `bson:"avatar,omitempty" json:"avatar,omitempty"`
-
-	Desc string `bson:"desc,omitempty" json:"desc"`
-
-	CreateTime      time.Time      `bson:"createTime,omitempty" json:"createTime,omitempty"`
-	Email           string         `bson:"email" json:"email,omitempty"`
-	LastLogin       time.Time      `bson:"lastLogin,omitempty" json:"lastLogin,omitempty"`
-	Saas            *Sass          `bson:"saas,omitempty" json:"saas,omitempty"`
-	EditorSet       *EditorSetting `bson:"editorSet,omitempty" json:"editorSet,omitempty"`
-	CanDeployDesign *bool          `bson:"canDeployDesign,omitempty" json:"canDeployDesign,omitempty"`
-
-	Parent     string    `bson:"parent,omitempty" json:"parent,omitempty"` //主账号ID
-	State      int32     `bson:"state,omitempty" json:"state,omitempty"`   //-1 用户已禁用
-	Roles      []string  `bson:"roles,omitempty" json:"roles,omitempty"`   //-1 用户已禁用
-	Qiye       *QiyeInfo `bson:"qiye,omitempty" json:"qiye,omitempty"`     //企业信息
-	IsPlatform *bool     `bson:"isPlatform" json:"isPlatform,omitempty"`
-	TeamId     string    `bson:"teamId,omitempty" json:"teamId,omitempty"` //用户团队Id
-	// Cameras    []*SceneCamera `bson:"cameras,omitempty" json:"cameras"`         //用户的相机设置
-}
-
-type QiyeInfo struct {
-	Name    string `bson:"name,omitempty" json:"name,omitempty"`       //名字
-	Logo    string `bson:"logo,omitempty" json:"logo,omitempty"`       //logo
-	Address string `bson:"address,omitempty" json:"address,omitempty"` //地址
-}
-
-func (u *User) GetID() string {
-	return u.Id.Hex()
-}
-
-type SubAccount struct {
-	Name       string    `bson:"name,omitempty" json:"name,omitempty"`
-	Phone      string    `bson:"phone,omitempty" json:"phone,omitempty"`
-	Password   string    `bson:"password,omitempty" json:"password,omitempty"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime,omitempty"`
-	LastLogin  time.Time `bson:"lastLogin,omitempty" json:"lastLogin,omitempty"`
-	UserId     string    `bson:"userId,omitempty" json:"userId,omitempty"`
-	RoleIds    []string  `bson:"roles,omitempty" json:"roles,omitempty"`   //用户角色
-	TeamId     string    `bson:"teamId,omitempty" json:"teamId,omitempty"` //用户团队Id
-}
-
-type UserParent struct {
-}
-
-type Material1 struct {
-	A    int
-	Type int
-}
-
-type Material2 struct {
-	B    int32
-	Type int
-}

mesh/db/repo/asset-boxtpl.go

@@ -1,76 +0,0 @@
-package repo
-
-import (
-	"errors"
-	"mats/conf"
-	"mats/db/model"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type BoxtplRepo struct {
-	Conf  *conf.AppAsset
-	Model *model.Boxtpl
-}
-
-func (repo *BoxtplRepo) GetEntity() interface{} {
-	return repo.Model
-}
-
-func (repo *BoxtplRepo) Upload(ctx *RepoSession, userId string) (interface{}, error) {
-	asset := repo.Model
-	if asset.File == nil || asset.File.Size < 1 || len(asset.File.Url) < 1 {
-		return nil, errors.New("模型文件不能为空")
-	}
-
-	asset.CreateTime = time.Now()
-	asset.UserId, _ = primitive.ObjectIDFromHex(userId)
-	asset.UpdateTime = time.Now()
-	asset.State = model.AssetState_Created
-
-	collectionName := "asset-" + repo.Conf.Type
-
-	assetId, err := RepoAddDoc(ctx, collectionName, asset)
-	if err != nil {
-		return nil, err
-	}
-	_, err = CreateMeshConvTask(ctx, asset.File, assetId, collectionName, userId)
-	if err != nil { //模型转换失败，删除对应的模型
-		RepoDeleteDoc(ctx, collectionName, assetId)
-		return nil, err
-	}
-
-	// _, err = CreateShadowTask(ctx, asset.File, assetId, collectionName, userId)
-	// if err != nil {
-	// 	log.Error("CreateShadowTask err ", err)
-	// 	fmt.Println("CreateShadowTask err ", err)
-	// }
-	return assetId, err
-}
-
-func (repo *BoxtplRepo) Update(ctx *RepoSession) (interface{}, error) {
-	asset := repo.Model
-	if len(asset.Id) < 1 {
-		return nil, errors.New("id不能为空!")
-	}
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-	asset.UpdateTime = time.Now()
-	collectionName := "asset-" + repo.Conf.Type
-
-	return RepoUpdateSetDoc(ctx, collectionName, id, asset)
-}
-
-func (repo *BoxtplRepo) Detail(ctx *RepoSession, id string) (interface{}, error) {
-	collectionName := "asset-" + repo.Conf.Type
-	ok, ret := RepoSeachDocMap(ctx, &DocSearchOptions{
-		CollectName: collectionName,
-		Query:       Map{"_id": id},
-		Project:     []string{"name", "createTime", "updateTime", "state", "thumbnail", "categories", "osgjs", "file", "shadow", "type", "components"},
-	})
-	if !ok {
-		return nil, errors.New("数据为空!")
-	}
-	return ret, nil
-}

mesh/db/repo/asset-decorate.go

@@ -1,76 +0,0 @@
-package repo
-
-import (
-	"errors"
-	"mats/conf"
-	"mats/db/model"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type AssetDecorateMeshRepo struct {
-	Conf  *conf.AppAsset
-	Model *model.AssetDecorateMesh
-}
-
-func (repo *AssetDecorateMeshRepo) GetEntity() interface{} {
-	return repo.Model
-}
-
-func (repo *AssetDecorateMeshRepo) Upload(ctx *RepoSession, userId string) (interface{}, error) {
-	asset := repo.Model
-	if asset.File == nil || asset.File.Size < 1 || len(asset.File.Url) < 1 {
-		return nil, errors.New("模型文件不能为空")
-	}
-
-	asset.CreateTime = time.Now()
-	asset.UserId, _ = primitive.ObjectIDFromHex(userId)
-	asset.UpdateTime = time.Now()
-	asset.State = model.AssetState_Created
-
-	collectionName := "asset-" + repo.Conf.Type
-
-	assetId, err := RepoAddDoc(ctx, collectionName, asset)
-	if err != nil {
-		return nil, err
-	}
-	_, err = CreateMeshConvTask(ctx, asset.File, assetId, collectionName, userId)
-	if err != nil { //模型转换失败，删除对应的模型
-		RepoDeleteDoc(ctx, collectionName, assetId)
-		return nil, err
-	}
-
-	// _, err = CreateShadowTask(ctx, asset.File, assetId, collectionName, userId)
-	// if err != nil {
-	// 	log.Error("CreateShadowTask err ", err)
-	// 	fmt.Println("CreateShadowTask err ", err)
-	// }
-	return assetId, err
-}
-
-func (repo *AssetDecorateMeshRepo) Update(ctx *RepoSession) (interface{}, error) {
-	asset := repo.Model
-	if len(asset.Id) < 1 {
-		return nil, errors.New("id不能为空!")
-	}
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-	asset.UpdateTime = time.Now()
-	collectionName := "asset-" + repo.Conf.Type
-
-	return RepoUpdateSetDoc(ctx, collectionName, id, asset)
-}
-
-func (repo *AssetDecorateMeshRepo) Detail(ctx *RepoSession, id string) (interface{}, error) {
-	collectionName := "asset-" + repo.Conf.Type
-	ok, ret := RepoSeachDocMap(ctx, &DocSearchOptions{
-		CollectName: collectionName,
-		Query:       Map{"_id": id},
-		Project:     []string{"name", "createTime", "updateTime", "state", "thumbnail", "categories", "osgjs", "file", "shadow", "components"},
-	})
-	if !ok {
-		return nil, errors.New("数据为空!")
-	}
-	return ret, nil
-}

mesh/db/repo/asset-env3d.go

@@ -1,74 +0,0 @@
-package repo
-
-import (
-	"errors"
-	"mats/conf"
-	"mats/db/model"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type AssetEnv3dRepo struct {
-	Conf  *conf.AppAsset
-	Model *model.Env3d
-}
-
-func (repo *AssetEnv3dRepo) GetEntity() interface{} {
-	return repo.Model
-}
-
-func (repo *AssetEnv3dRepo) Upload(ctx *RepoSession, userId string) (interface{}, error) {
-	asset := repo.Model
-	if asset.HDR == nil || asset.HDR.Size < 1 || len(asset.HDR.Url) < 1 {
-		return nil, errors.New("模型文件不能为空")
-	}
-
-	asset.CreateTime = time.Now()
-	asset.UserId, _ = primitive.ObjectIDFromHex(userId)
-	asset.UpdateTime = time.Now()
-	asset.State = model.AssetState_Created
-
-	collectionName := "asset-" + repo.Conf.Type
-
-	assetId, err := RepoAddDoc(ctx, collectionName, asset)
-	if err != nil {
-		return nil, err
-	}
-
-	_, err = CreateHdrConverterTask(ctx, asset.HDR, assetId, collectionName, userId)
-	if err != nil { //模型转换失败，删除对应的模型
-		RepoDeleteDoc(ctx, collectionName, assetId)
-		return nil, err
-	}
-
-	return assetId, err
-}
-
-func (repo *AssetEnv3dRepo) Update(ctx *RepoSession) (interface{}, error) {
-	asset := repo.Model
-	if len(asset.Id) < 1 {
-		return nil, errors.New("id不能为空!")
-	}
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-	asset.UpdateTime = time.Now()
-	collectionName := "asset-" + repo.Conf.Type
-
-	return RepoUpdateSetDoc(ctx, collectionName, id, asset)
-}
-
-func (repo *AssetEnv3dRepo) Detail(ctx *RepoSession, id string) (interface{}, error) {
-
-	collectionName := "asset-" + repo.Conf.Type
-	ok, ret := RepoSeachDocMap(ctx, &DocSearchOptions{
-		CollectName: collectionName,
-		Query:       Map{"_id": id},
-		Project:     []string{"name", "createTime", "updateTime", "state", "thumbnail", "config"},
-	})
-	if !ok {
-		return nil, errors.New("数据为空!")
-	}
-
-	return ret, nil
-}

mesh/db/repo/asset-material.go

@@ -1,61 +0,0 @@
-package repo
-
-import (
-	"errors"
-	"mats/conf"
-	"mats/db/model"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type MaterialRepo struct {
-	Conf  *conf.AppAsset
-	Model *model.AssetMaterial
-}
-
-func (repo *MaterialRepo) GetEntity() interface{} {
-	return repo.Model
-}
-
-func (repo *MaterialRepo) Upload(ctx *RepoSession, userId string) (interface{}, error) {
-	asset := repo.Model
-
-	asset.CreateTime = time.Now()
-	asset.UserId, _ = primitive.ObjectIDFromHex(userId)
-	asset.UpdateTime = time.Now()
-	asset.State = model.AssetState_Created
-
-	collectionName := "asset-" + repo.Conf.Type
-
-	assetId, err := RepoAddDoc(ctx, collectionName, asset)
-	if err != nil {
-		return nil, err
-	}
-	return assetId, err
-}
-
-func (repo *MaterialRepo) Update(ctx *RepoSession) (interface{}, error) {
-	asset := repo.Model
-	if len(asset.Id) < 1 {
-		return nil, errors.New("id不能为空!")
-	}
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-	asset.UpdateTime = time.Now()
-	collectionName := "asset-" + repo.Conf.Type
-
-	return RepoUpdateSetDoc(ctx, collectionName, id, asset)
-}
-
-func (repo *MaterialRepo) Detail(ctx *RepoSession, id string) (interface{}, error) {
-	collectionName := "asset-" + repo.Conf.Type
-	ok, ret := RepoSeachDocMap(ctx, &DocSearchOptions{
-		CollectName: collectionName,
-		Query:       Map{"_id": id},
-	})
-	if !ok {
-		return nil, errors.New("数据不存在!")
-	}
-	return ret, nil
-}

mesh/db/repo/asset-projectDecorate.go

@@ -1,67 +0,0 @@
-package repo
-
-import (
-	"errors"
-	"mats/conf"
-	"mats/db/model"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type ProjectDecorateRepo struct {
-	Conf  *conf.AppAsset
-	Model *model.AssetDecorateMesh
-}
-
-func (repo *ProjectDecorateRepo) GetEntity() interface{} {
-	return repo.Model
-}
-
-func (repo *ProjectDecorateRepo) Upload(ctx *RepoSession, userId string) (interface{}, error) {
-	asset := repo.Model
-	if asset.File == nil || asset.File.Size < 1 || len(asset.File.Url) < 1 {
-		return nil, errors.New("模型文件不能为空")
-	}
-
-	asset.CreateTime = time.Now()
-	asset.UserId, _ = primitive.ObjectIDFromHex(userId)
-	asset.UpdateTime = time.Now()
-	asset.State = model.AssetState_Created
-
-	collectionName := "asset-" + repo.Conf.Type
-
-	assetId, err := RepoAddDoc(ctx, collectionName, asset)
-	if err != nil {
-		return nil, err
-	}
-	_, err = CreateMeshConvTask(ctx, asset.File, assetId, collectionName, userId)
-	if err != nil { //模型转换失败，删除对应的模型
-		RepoDeleteDoc(ctx, collectionName, assetId)
-		return nil, err
-	}
-
-	// _, err = CreateShadowTask(ctx, asset.File, assetId, collectionName, userId)
-	// if err != nil {
-	// 	log.Error("CreateShadowTask err ", err)
-	// 	fmt.Println("CreateShadowTask err ", err)
-	// }
-	return assetId, err
-}
-
-func (repo *ProjectDecorateRepo) Update(ctx *RepoSession) (interface{}, error) {
-	asset := repo.Model
-	if len(asset.Id) < 1 {
-		return nil, errors.New("id不能为空!")
-	}
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-	asset.UpdateTime = time.Now()
-	collectionName := "asset-" + repo.Conf.Type
-
-	return RepoUpdateSetDoc(ctx, collectionName, id, asset)
-}
-
-func (repo *ProjectDecorateRepo) Detail(ctx *RepoSession, id string) (interface{}, error) {
-	return nil, errors.New("no impl")
-}

mesh/db/repo/asset-texture.go

@@ -1,51 +0,0 @@
-package repo
-
-import (
-	"errors"
-	"mats/conf"
-	"mats/db/model"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type AssetTextureRepo struct {
-	Conf  *conf.AppAsset
-	Model *model.AssetTexture
-}
-
-func (repo *AssetTextureRepo) GetEntity() interface{} {
-	return repo.Model
-}
-
-func (repo *AssetTextureRepo) Upload(ctx *RepoSession, userId string) (interface{}, error) {
-	asset := repo.Model
-	if asset.Image == nil || len(asset.Image.Url) < 0 || len(asset.Name) < 0 {
-		return nil, errors.New("图片或名称不能为空!")
-	}
-	asset.CreateTime = time.Now()
-	asset.UserId, _ = primitive.ObjectIDFromHex(userId)
-	asset.UpdateTime = time.Now()
-	asset.State = model.AssetState_Created
-
-	collectionName := "asset-" + repo.Conf.Type
-
-	return RepoAddDoc(ctx, collectionName, asset)
-}
-
-func (repo *AssetTextureRepo) Update(ctx *RepoSession) (interface{}, error) {
-	asset := repo.Model
-	if len(asset.Id) < 1 {
-		return nil, errors.New("id不能为空!")
-	}
-	id := asset.Id.Hex()
-	asset.Id = primitive.NilObjectID
-	asset.UpdateTime = time.Now()
-	collectionName := "asset-" + repo.Conf.Type
-
-	return RepoUpdateSetDoc(ctx, collectionName, id, asset)
-}
-
-func (repo *AssetTextureRepo) Detail(ctx *RepoSession, id string) (interface{}, error) {
-	return nil, errors.New("no impl")
-}

mesh/db/repo/asset.go

@@ -1,135 +0,0 @@
-package repo
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"mats/conf"
-	"mats/db/model"
-	"net/http"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson"
-)
-
-type IRepoAsset interface {
-	Upload(ctx *RepoSession, userId string) (interface{}, error)
-	Update(ctx *RepoSession) (interface{}, error)
-	Detail(ctx *RepoSession, id string) (interface{}, error)
-	GetEntity() interface{}
-}
-
-func RepoAssetCreateDefaultValue(asset *conf.AppAsset) IRepoAsset {
-	switch asset.Type {
-	case "decorate":
-		return &AssetDecorateMeshRepo{Conf: asset, Model: &model.AssetDecorateMesh{}}
-	case "texture":
-		return &AssetTextureRepo{Conf: asset, Model: &model.AssetTexture{}}
-	case "env3d":
-		return &AssetEnv3dRepo{Conf: asset, Model: &model.Env3d{}}
-	case "boxtpl":
-		return &BoxtplRepo{Conf: asset, Model: &model.Boxtpl{}}
-	case "material":
-		return &MaterialRepo{Conf: asset, Model: &model.AssetMaterial{}}
-	}
-	return nil
-}
-
-func CreateMeshConvTask(ctx *RepoSession, file *model.OssType, meshId string, collecton string, userId string) (interface{}, error) {
-	taskConfig := &model.TaskConvMesh2Osgjs{
-		CreateTime:     time.Now(),
-		FbxFile:        file,
-		OsgjsFieldName: "osgjs",
-		MeshId:         meshId,
-		Collecton:      collecton,
-		UserId:         userId,
-	}
-	taskId, err := RepoAddDoc(ctx, CollectionTaskMeshConv, taskConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	//生成worker请求
-	req := &model.WorkerRequest{WorkerType: "osgconverter", MainId: meshId, TaskCollection: CollectionTaskMeshConv, UserId: userId, Name: "模型转换", TaskId: taskId, CreateTime: time.Now()}
-
-	return true, ReqestTaskWorker(ctx, req, CollectionTaskMeshConv)
-}
-
-func CreateShadowTask(ctx *RepoSession, file *model.OssType, meshId string, collecton string, userId string) (interface{}, error) {
-	taskConfig := &model.TaskCreateShadow{
-		CreateTime:      time.Now(),
-		FbxFile:         file,
-		ShadowFieldName: "shadow",
-		MeshId:          meshId,
-		Collecton:       collecton,
-		UserId:          userId,
-	}
-	taskId, err := RepoAddDoc(ctx, CollectionTaskShadowCreator, taskConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	//生成worker请求
-	req := &model.WorkerRequest{WorkerType: "shadowCreator", MainId: meshId, TaskCollection: CollectionTaskShadowCreator, UserId: userId, Name: "阴影生成", TaskId: taskId, CreateTime: time.Now()}
-
-	return true, ReqestTaskWorker(ctx, req, CollectionTaskShadowCreator)
-}
-
-func CreateHdrConverterTask(ctx *RepoSession, hdr *model.OssType, env3dId string, collecton string, userId string) (interface{}, error) {
-	taskConfig := &model.TaskConvHdr{
-		CreateTime: time.Now(),
-		HdrFile:    hdr,
-		Env3dId:    env3dId,
-		Collecton:  collecton,
-		UserId:     userId,
-	}
-	taskId, err := RepoAddDoc(ctx, CollectionTaskHdrConv, taskConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	//生成worker请求
-	req := &model.WorkerRequest{WorkerType: "hdrconverter", TaskCollection: CollectionTaskHdrConv, UserId: userId, Name: "环境球转换", TaskId: taskId, CreateTime: time.Now()}
-
-	return true, ReqestTaskWorker(ctx, req, CollectionTaskHdrConv)
-}
-
-func ReqestTaskWorker(ctx *RepoSession, task *model.WorkerRequest, taskCollection string) error {
-	taskCenterHost := conf.AppConfig.TaskCenter
-	if len(taskCenterHost) < 1 {
-		return errors.New("任务中心没有配置，没法执行耗时任务")
-	}
-
-	client := &http.Client{}
-	bytesData, _ := json.Marshal(task)
-	req, err := http.NewRequest("POST", taskCenterHost+"/execTask", bytes.NewReader(bytesData))
-	if err != nil {
-		return err
-	}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != 200 {
-		return errors.New("taskCenter 请求出错")
-	}
-
-	body, _ := ioutil.ReadAll(resp.Body)
-
-	taskRep := &model.WorkerResponse{}
-
-	err = json.Unmarshal(body, taskRep)
-	if err != nil {
-		return errors.New("解析WorkerResponse错误!")
-	}
-
-	if taskRep.ErrorNo != 200 {
-		return errors.New(taskRep.ErrorDesc)
-	}
-
-	_, err = RepoUpdateSetDocProps(ctx, taskCollection, task.TaskId, bson.M{"$set": bson.M{"workingId": taskRep.Result.WorkingId}})
-
-	return err
-}

mesh/db/repo/category.go

@@ -1,76 +0,0 @@
-package repo
-
-import (
-	"fmt"
-	"mats/utils"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func CategoryExtend(categories []string, ctx *RepoSession) []string {
-	out := []string{}
-
-	cateIds := []primitive.ObjectID{}
-
-	for _, cate := range categories {
-		id, _ := primitive.ObjectIDFromHex(cate)
-
-		cateIds = append(cateIds, id)
-	}
-	ok, cateItems := RepoSeachDocsMap(ctx, &DocsSearchOptions{CollectName: CollectionLibCategory, Query: Map{"_id": bson.M{"$in": cateIds}}, Project: []string{"orderId", "type"}})
-	if !ok {
-		return out
-	}
-
-	filters := []bson.M{}
-	for _, item := range cateItems {
-		orderId := item["orderId"].(int64)
-		//ok, cateItems := RepoSeachDocsMap(ctx, &DocsSearchOptions{CollectName: CollectionLibCategory, Query: Map{"_id": bson.M{"$in": cateIds}}, Project: []string{"orderId", "type"}})
-		fmt.Println(orderId)
-
-		minId, maxId := utils.OrderIdRange(orderId)
-		f := bson.M{"orderId": bson.M{"$gte": minId, "$lt": maxId}, "type": item["type"].(string)}
-		filters = append(filters, f)
-	}
-
-	ok, extendsItems := RepoSeachDocsMap(ctx, &DocsSearchOptions{CollectName: CollectionLibCategory, Query: Map{"$or": filters}, Project: []string{"_id"}})
-	if !ok {
-		return out
-	}
-	for _, item := range extendsItems {
-		out = append(out, item["_id"].(primitive.ObjectID).Hex())
-	}
-	fmt.Println(filters)
-
-	return out
-}
-
-func CategoryExtendList(categories []string, ctx *RepoSession) []map[string]interface{} {
-
-	out := []map[string]interface{}{}
-	cateIds := []primitive.ObjectID{}
-	for _, cate := range categories {
-		id, _ := primitive.ObjectIDFromHex(cate)
-
-		cateIds = append(cateIds, id)
-	}
-	ok, cateItems := RepoSeachDocsMap(ctx, &DocsSearchOptions{CollectName: CollectionLibCategory, Query: Map{"_id": bson.M{"$in": cateIds}}, Project: []string{"orderId", "type"}})
-	if !ok {
-		return out
-	}
-
-	filters := []bson.M{}
-	for _, item := range cateItems {
-		orderId := item["orderId"].(int64)
-		//ok, cateItems := RepoSeachDocsMap(ctx, &DocsSearchOptions{CollectName: CollectionLibCategory, Query: Map{"_id": bson.M{"$in": cateIds}}, Project: []string{"orderId", "type"}})
-		fmt.Println(orderId)
-
-		minId, maxId := utils.OrderIdRange(orderId)
-		f := bson.M{"orderId": bson.M{"$gte": minId, "$lt": maxId}, "type": item["type"].(string)}
-		filters = append(filters, f)
-	}
-
-	_, extendsItems := RepoSeachDocsMap(ctx, &DocsSearchOptions{CollectName: CollectionLibCategory, Query: Map{"$or": filters}, Project: []string{"name", "type", "parent", "createTime", "type", "value", "level", "orderId"}})
-	return extendsItems
-}

mesh/db/repo/database.go

@@ -1,50 +0,0 @@
-package repo
-
-import "mats/db/model"
-
-func GetDatabaseCollection(ctx *RepoSession, dbId string, assetId string) (db *model.Database, assetConf *model.DbAsset) {
-	database := &model.Database{}
-	ok, _ := RepoSeachDoc(ctx, &DocSearchOptions{CollectName: CollectionDatabase, Query: Map{"_id": dbId}, Project: []string{"assets", "name", "categories"}}, database)
-	if !ok {
-		return
-	}
-	db = database
-	for _, v := range database.Assets {
-		if v.Id == assetId {
-			assetConf = v
-			break
-		}
-	}
-	return
-}
-
-func GetDatabaseCollectionSimple(ctx *RepoSession, dbId string, assetId string) *model.AssetDbConf {
-	out := &model.AssetDbConf{}
-	database := &model.Database{}
-	ok, _ := RepoSeachDoc(ctx, &DocSearchOptions{CollectName: CollectionDatabase, Query: Map{"_id": dbId}, Project: []string{"assets", "name"}}, database)
-	if !ok {
-		return nil
-	}
-	out.Db = database
-	find := false
-	for _, v := range database.Assets {
-		if v.Id == assetId {
-			out.AssetConf = v
-			find = true
-			break
-		}
-	}
-	if find {
-		return out
-	}
-	return nil
-}
-
-func RepoCreateDefaultAssetValue(asset *model.DbAsset) interface{} {
-	switch asset.Type {
-	case model.AssetTypeMesh:
-		return &model.AssetStaticMesh{}
-	}
-
-	return nil
-}

mesh/db/repo/env3d.go

@@ -1,22 +0,0 @@
-package repo
-
-import (
-	"mats/db/model"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func Env3dGetById(ctx *RepoSession, id string, project []string) *model.Env3d {
-	eid, _ := primitive.ObjectIDFromHex(id)
-	option := DocSearchOptions{
-		CollectName: CollectionEvn3d,
-		Query:       Map{"_id": eid},
-		Project:     project,
-	}
-	env3d := &model.Env3d{}
-	ok, err := RepoSeachDoc(ctx, &option, env3d)
-	if err != nil || !ok {
-		return nil
-	}
-	return env3d
-}

mesh/db/repo/material.go

@@ -1,22 +0,0 @@
-package repo
-
-import (
-	"mats/db/model"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func MaterialGetById(ctx *RepoSession, id string, project []string) *model.Material {
-	eid, _ := primitive.ObjectIDFromHex(id)
-	option := DocSearchOptions{
-		CollectName: CollectionMaterials,
-		Query:       Map{"_id": eid},
-		Project:     project,
-	}
-	entity := &model.Material{}
-	ok, err := RepoSeachDoc(ctx, &option, entity)
-	if err != nil || !ok {
-		return nil
-	}
-	return entity
-}

mesh/db/repo/project.go

@@ -1,18 +0,0 @@
-package repo
-
-import (
-	"mats/db/model"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func AddProject(ctx *RepoSession, d *model.Project) (string, error) {
-
-	coll := ctx.Client.GetCollection(CollectionProject)
-	result, err := coll.InsertOne(ctx.Ctx, d)
-	if err != nil {
-		return "", err
-	}
-
-	return result.InsertedID.(primitive.ObjectID).Hex(), nil
-}

mesh/db/repo/repo.go

@@ -3,8 +3,8 @@ package repo
 import (
 	"context"
 	"fmt"
-	"mats/db"
-	"mats/log"
+	"mesh/db"
+	"mesh/log"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -18,54 +18,12 @@ type RepoSession struct {
 }
 
 const (
-	CollectionUser    = "users"
-	CollectionProject = "projects"
-	CollectionAdmin   = "admins"
-	CollectionTexture = "textures"
-
 	CollectionCategories      = "categories"
 	CollectionDbAssetCategory = "categories-asset"
 
-	CollectionLibCategory  = "libCategory"
-	CollectionLib2Category = "lib2Category"
-	CollectionTeam         = "team"
-	CollectionStickers     = "sticker"
-
-	CollectionMesh              = "meshes"
-	CollectionEvn3d             = "Env3ds"
-	CollectionTask              = "tasks"
-	CollectionTaskMeshConv      = "task-meshconv"
-	CollectionTaskHdrConv       = "task-hdrconv"
-	CollectionTaskShadowCreator = "task-shadowCreator"
-
-	CollectionTaskShadow = "task-shadow"
-
-	CollectionProductTpls = "productTpls"
-	CollectionMaterials   = "materials"
-	CollectionBaseMats    = "basemats"
-	CollectionDecorates   = "decorate-mesh"
-
-	CollectionInfoDesigns = "infoDesigns"
-	CollectionInfoTrends  = "infoTrends"
-
-	CollectionDesignProducts = "designProducts"
-
-	CollectionShoes      = "shoes"
-	CollectionImageMat   = "imgmats"
-	CollectionFabric     = "fabrics"
-	CollectionDesigns    = "designs"
-	CollectionBackground = "backgrounds"
-	CollectionLasts      = "last-mesh"
-	CollectionHeels      = "heel-mesh"
-	CollectionSoles      = "sole-mesh"
-
-	CollectionPerms = "perms"
-	CollectionRoles = "roles"
-
-	CollectionDatabase        = "database"
 	CollectionQueenters       = "queenters"
 	CollectionQueenterOutputs = "queenter-outputs"
-	CollectionHubMats         = "hubmats"
+	CollectionHubMeshes       = "hubmeshes"
 )
 
 type Map map[string]interface{}
@@ -511,18 +469,18 @@ func RepoDocArraySearch(ctx *RepoSession, options *ArrayOneSearchOption) (ok boo
 	docId, _ := primitive.ObjectIDFromHex(options.Id)
 
 	match := []bson.E{}
-	match = append(match, bson.E{"_id", docId})
+	match = append(match, bson.E{Key: "_id", Value: docId})
 	if len(options.ArrayQuery) > 0 {
 		for k, v := range options.ArrayQuery {
-			match = append(match, bson.E{k, v})
+			match = append(match, bson.E{Key: k, Value: v})
 		}
 	}
 	matchStage := bson.D{
-		{"$match", match},
+		{Key: "$match", Value: match},
 	}
 
 	unwindStage := bson.D{
-		{"$unwind", fmt.Sprintf("%s%s", "$", options.Field)},
+		{Key: "$unwind", Value: fmt.Sprintf("%s%s", "$", options.Field)},
 	}
 
 	curr, err := colls.Aggregate(ctx.Ctx, mongo.Pipeline{matchStage, unwindStage})

mesh/db/repo/team.go

@@ -1,35 +0,0 @@
-package repo
-
-import (
-	"mats/db/model"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-// 获取用户的团队成员
-func TeamGetUserTeamers(ctx *RepoSession, userId string, includeSelf bool) []primitive.ObjectID {
-	out := []primitive.ObjectID{}
-
-	user := &model.User{}
-	RepoSeachDoc(ctx, &DocSearchOptions{CollectName: CollectionUser, Query: Map{"_id": userId}, Project: []string{"teamId"}}, user)
-
-	//没有团队
-	if len(user.TeamId) < 1 {
-		return out
-	}
-
-	uid, _ := primitive.ObjectIDFromHex(userId)
-	if includeSelf {
-		out = append(out, uid)
-	}
-
-	//团队人员
-	ok, list := RepoSeachDocsMap(ctx, &DocsSearchOptions{CollectName: CollectionUser, Query: Map{"teamId": user.TeamId}, Project: []string{"_id"}})
-	if !ok {
-		return out
-	}
-	for _, item := range list {
-		out = append(out, item["_id"].(primitive.ObjectID))
-	}
-	return out
-}

mesh/db/repo/user.go

@@ -1,117 +0,0 @@
-package repo
-
-import (
-	"fmt"
-	"mats/db/model"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-func UserSearchByPhoneAndPwd(ctx *RepoSession, phone string, pwdMd5 string) (*model.User, error) {
-
-	users := ctx.Client.GetCollection(CollectionUser)
-
-	filter := bson.M{"phone": phone, "password": pwdMd5}
-
-	opt := &options.FindOneOptions{Projection: bson.M{"_id": 1, "phone": 1, "lastLogin": 1, "createTime": 1, "avatar": 1, "name": 1, "company": 1, "city": 1, "desc": 1, "email": 1}}
-
-	out := &model.User{}
-
-	err := users.FindOne(ctx.Ctx, filter, opt).Decode(out)
-
-	if err == mongo.ErrNoDocuments {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
-
-func UserSearchByPhone(ctx *RepoSession, phone string) (*model.User, error) {
-
-	users := ctx.Client.GetCollection(CollectionUser)
-
-	filter := bson.M{"phone": phone}
-
-	opt := &options.FindOneOptions{Projection: bson.M{"_id": 1, "phone": 1, "lastLogin": 1, "createTime": 1, "avatar": 1, "name": 1, "company": 1, "city": 1, "desc": 1, "email": 1}}
-
-	out := &model.User{}
-
-	err := users.FindOne(ctx.Ctx, filter, opt).Decode(out)
-
-	if err == mongo.ErrNoDocuments {
-		return nil, nil
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
-
-func UserSearchById(ctx *RepoSession, id string) (*model.User, error) {
-
-	users := ctx.Client.GetCollection(CollectionUser)
-	objId, _ := primitive.ObjectIDFromHex(id)
-	filter := bson.M{"_id": objId}
-	opt := &options.FindOneOptions{Projection: bson.M{"phone": 1, "teamId": 1, "isPlatform": 1, "roles": 1, "lastLogin": 1, "canDeployDesign": 1, "createTime": 1, "avatar": 1, "name": 1, "company": 1, "city": 1, "desc": 1, "email": 1, "editorSet": 1}}
-	out := &model.User{}
-	err := users.FindOne(ctx.Ctx, filter, opt).Decode(out)
-	if err == mongo.ErrNoDocuments {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func UserLoginSucc(ctx *RepoSession, uid primitive.ObjectID, phone string) error {
-
-	filter := bson.M{"_id": uid}
-	users := ctx.Client.GetCollection(CollectionUser)
-	update := bson.M{"$set": bson.M{"lastLogin": time.Now()}}
-
-	result := users.FindOneAndUpdate(ctx.Ctx, filter, update)
-
-	fmt.Println(result)
-
-	update2 := bson.M{"$set": bson.M{"children.$.lastLogin": time.Now(), "children.$.uid": uid}}
-
-	filter2 := bson.M{"children.phone": phone}
-
-	result2, err := users.UpdateMany(ctx.Ctx, filter2, update2)
-
-	if err != nil {
-		return err
-	}
-	fmt.Println(result2)
-	return nil
-}
-
-func GetUserParents(ctx *RepoSession, phone string) []map[string]interface{} {
-	_, list := RepoSeachDocsMap(ctx, &DocsSearchOptions{
-		CollectName: CollectionUser,
-		Query:       map[string]interface{}{"children.phone": phone},
-		Project:     []string{"_id", "name", "phone", "children.phone", "children.password"},
-	})
-	return list
-}
-
-func AddUser(ctx *RepoSession, u *model.User) string {
-
-	users := ctx.Client.GetCollection(CollectionUser)
-	result, err := users.InsertOne(ctx.Ctx, u)
-	if err != nil {
-		return ""
-	}
-	return result.InsertedID.(primitive.ObjectID).Hex()
-}

mesh/funcGraph/hdr.go

@@ -1,36 +0,0 @@
-package funcgraph
-
-import (
-	"fmt"
-	"mats/conf"
-	"strings"
-
-	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/functiongraph/v2/model"
-)
-
-func CreateHdr(fileUrl string, assetId string, dbId string, table string) error {
-
-	client := createFuncGraphClient()
-	streamTopic := conf.AppConfig.Nats.HdrConvStreamTopic
-	streamTopics := strings.Split(streamTopic, "#")
-
-	request := &model.AsyncInvokeFunctionRequest{Body: map[string]interface{}{
-		"meshUrl":       fileUrl,
-		"assetId":       assetId,
-		"dbId":          dbId,
-		"table":         table,
-		"notifyNatsUrl": conf.AppConfig.Nats.Url,
-		"notifyStream":  streamTopics[0],
-		"notifySubject": streamTopics[1],
-	}}
-
-	request.FunctionUrn = "urn:fss:cn-east-3:0956c65fd600f29f2ff6c00dbb3d1e2e:function:default:hdrconv:latest"
-	response, err := client.AsyncInvokeFunction(request)
-	if err == nil {
-		fmt.Printf("%+v\n", response)
-		return nil
-	}
-	fmt.Println("CreateHrc Function Graph call failed=>", err.Error())
-
-	return err
-}

mesh/funcGraph/osgconv.go

@@ -1,65 +0,0 @@
-package funcgraph
-
-import (
-	"fmt"
-	"mats/bus"
-	"mats/conf"
-	"strings"
-
-	"github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/basic"
-	functiongraph "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/functiongraph/v2"
-	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/functiongraph/v2/model"
-	region "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/functiongraph/v2/region"
-)
-
-const (
-	ak = "RA1D7CFVCVKUFX1FHHPB"
-	sk = "cDrR2NgAF2KaA4MRkcK19r93P3P6hLKOPhHvPu9p"
-)
-
-func createFuncGraphClient() *functiongraph.FunctionGraphClient {
-	auth := basic.NewCredentialsBuilder().
-		WithAk(ak).
-		WithSk(sk).
-		Build()
-	return functiongraph.NewFunctionGraphClient(
-		functiongraph.FunctionGraphClientBuilder().
-			WithRegion(region.ValueOf("cn-east-3")).
-			WithCredential(auth).
-			Build())
-
-}
-
-func OsgConvRequest(meshUrl string, assetId string, dbId string, table string) error {
-
-	OsgConvStreamTopic := conf.AppConfig.Nats.OsgConvStreamTopic
-	streamTopics := strings.Split(OsgConvStreamTopic, "#")
-
-	client := createFuncGraphClient()
-
-	url, err := bus.NatsCenter.RequestConfig("bus-network")
-	if err != nil {
-		return err
-	}
-
-	request := &model.AsyncInvokeFunctionRequest{Body: map[string]interface{}{
-		"meshUrl":       meshUrl,
-		"assetId":       assetId,
-		"dbId":          dbId,
-		"table":         table,
-		"notifyNatsUrl": url,
-		"notifyStream":  streamTopics[0],
-		"notifySubject": streamTopics[1],
-	}}
-
-	request.FunctionUrn = "urn:fss:cn-east-3:0956c65fd600f29f2ff6c00dbb3d1e2e:function:default:osgconv:v1"
-	response, err := client.AsyncInvokeFunction(request)
-
-	if err == nil {
-		fmt.Printf("%+v\n", response)
-		return nil
-	}
-	fmt.Println(err)
-
-	return err
-}

mesh/funcGraph/shadow.go

@@ -1,40 +0,0 @@
-package funcgraph
-
-import (
-	"fmt"
-	"mats/conf"
-	"strings"
-
-	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/functiongraph/v2/model"
-)
-
-func CreateShadow(meshUrl string, assetId string, dbId string, table string, scale, width int32) error {
-	//
-	client := createFuncGraphClient()
-
-	OsgConvStreamTopic := conf.AppConfig.Nats.OsgShadowStreamTopic
-	streamTopics := strings.Split(OsgConvStreamTopic, "#")
-
-	request := &model.AsyncInvokeFunctionRequest{Body: map[string]interface{}{
-		"meshUrl":       meshUrl,
-		"assetId":       assetId,
-		"dbId":          dbId,
-		"table":         table,
-		"scalex10":      scale,
-		"width":         width,
-		"notifyNatsUrl": conf.AppConfig.Nats.Url,
-		"notifyStream":  streamTopics[0],
-		"notifySubject": streamTopics[1],
-	}}
-
-	request.FunctionUrn = "urn:fss:cn-east-3:0956c65fd600f29f2ff6c00dbb3d1e2e:function:default:shadowconv:v3"
-	response, err := client.AsyncInvokeFunction(request)
-
-	if err == nil {
-		fmt.Printf("%+v\n", response)
-		return nil
-	}
-	fmt.Println("CreateShadow request failed=>", err.Error())
-
-	return err
-}

mesh/go.mod

@@ -1,9 +1,8 @@
-module mats
+module mesh
 
 go 1.19
 
 require (
-	github.com/RichardKnop/machinery/v2 v2.0.11
 	github.com/appleboy/gin-jwt/v2 v2.7.0
 	github.com/gin-contrib/cors v1.3.1
 	github.com/gin-contrib/sessions v0.0.3
@@ -21,13 +20,6 @@ require (
 )
 
 require (
-	cloud.google.com/go v0.100.2 // indirect
-	cloud.google.com/go/compute v1.3.0 // indirect
-	cloud.google.com/go/iam v0.1.0 // indirect
-	cloud.google.com/go/kms v1.4.0 // indirect
-	cloud.google.com/go/pubsub v1.10.0 // indirect
-	github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae // indirect
-	github.com/aws/aws-sdk-go v1.37.16 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
@@ -36,25 +28,17 @@ require (
 	github.com/go-playground/locales v0.13.0 // indirect
 	github.com/go-playground/universal-translator v0.17.0 // indirect
 	github.com/go-playground/validator/v10 v10.4.1 // indirect
-	github.com/go-redsync/redsync/v4 v4.0.4 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/golang-jwt/jwt/v4 v4.1.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.3 // indirect
-	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/google/uuid v1.2.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
 	github.com/gorilla/sessions v1.1.3 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kelseyhightower/envconfig v1.4.0 // indirect
 	github.com/klauspost/compress v1.14.4 // indirect
 	github.com/klauspost/cpuid v1.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -73,36 +57,28 @@ require (
 	github.com/nats-io/nkeys v0.3.0 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/rs/xid v1.2.1 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/streadway/amqp v1.0.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/ugorji/go/codec v1.1.7 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.0.2 // indirect
 	github.com/xdg-go/stringprep v1.0.2 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	go.opencensus.io v0.23.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/api v0.70.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf // indirect
-	google.golang.org/grpc v1.44.0 // indirect
+	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/ini.v1 v1.66.6 // indirect

mesh/go.sum

@@ -15,7 +15,6 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
 cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
 cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
 cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
@@ -24,34 +23,19 @@ cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSU
 cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
 cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
 cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U=
-cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y=
-cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
-cloud.google.com/go/compute v1.3.0 h1:mPL/MzDDYHsh5tHRS9mhmhWlcgClCrCa6ApQCU6wnHI=
-cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU=
-cloud.google.com/go/iam v0.1.0 h1:W2vbGCrE3Z7J/x3WXLxxGl9LMSB2uhsAA7Ss/6u/qRY=
-cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c=
-cloud.google.com/go/kms v1.4.0 h1:iElbfoE61VeLhnZcGOltqL8HIly8Nhbe5t6JlH9GXjo=
-cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/pubsub v1.10.0 h1:JK22g5uNpscGPthjJE/D0siWtA6UlU4Cb6pLcyJkzyQ=
-cloud.google.com/go/pubsub v1.10.0/go.mod h1:eNpTrkOy7dCpkNyaSNetMa6udbgecJMd0ZsTJS/cuNo=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
@@ -62,10 +46,6 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae h1:DcFpTQBYQ9Ct2d6sC7ol0/ynxc2pO1cpGUM+f4t5adg=
-github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae/go.mod h1:rJJ84PyA/Wlmw1hO+xTzV2wsSUon6J5ktg0g8BF2PuU=
-github.com/RichardKnop/machinery/v2 v2.0.11 h1:BTfLGOmOju3W/OtlZmLX26OjYNZsU4PJo04pQReycdc=
-github.com/RichardKnop/machinery/v2 v2.0.11/go.mod h1:b5Q6cT/w7YLlIl4Vi+jpdEoyYiqhTgx+0USoKb1wzqU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/appleboy/gin-jwt/v2 v2.7.0 h1:MjbX0OVC1hmb+cYNSW7yrlG8KfIN/X0qn5kqhAsHinY=
 github.com/appleboy/gin-jwt/v2 v2.7.0/go.mod h1:AP2pmslwuqdHcjua9m8APdgqX9Ksx0ZM34d5RGvUYBU=
@@ -75,17 +55,12 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
-github.com/aws/aws-sdk-go v1.37.16 h1:Q4YOP2s00NpB9wfmTDZArdcLRuG9ijbnoAwTW3ivleI=
-github.com/aws/aws-sdk-go v1.37.16/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw=
 github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -95,14 +70,9 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -118,12 +88,9 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -150,43 +117,10 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
-github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-redis/redis/v7 v7.4.0 h1:7obg6wUoj05T0EpY0o8B59S9w5yeMWql7sw2kwNW1x4=
-github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
-github.com/go-redis/redis/v8 v8.1.1/go.mod h1:ysgGY09J/QeDYbu3HikWEIPCwaeOkuNoTgKayTEaEOw=
-github.com/go-redis/redis/v8 v8.6.0/go.mod h1:DQ9q4Rk2HtwkrwVrdgmphoOQDMfpvcd/nHEwRsicg8s=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
-github.com/go-redsync/redsync/v4 v4.0.4 h1:ru0qG+VCefaZSx3a5ADmlKZXkNdgeeYWIuymDu/tzV8=
-github.com/go-redsync/redsync/v4 v4.0.4/go.mod h1:QBOJAs1k8O6Eyrre4a++pxQgHe5eQ+HF56KuTVv+8Bs=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
-github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
-github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
-github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
-github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
-github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
-github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
-github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
-github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
-github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
-github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
-github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
-github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
-github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
@@ -195,8 +129,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -227,8 +159,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
-github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -260,7 +190,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -274,8 +203,6 @@ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1 h1:dp3bWCh+PPO1zjRRiCSczJav13sBvG4UhNyVTa1KqdU=
-github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
@@ -288,14 +215,11 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb
 github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
@@ -310,19 +234,12 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
 github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
 github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible h1:3kDd8PIWAdU+qGs/+0QUgsMI2ZSiJPt45Xn0su+x/Q0=
 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible/go.mod h1:l7VUhRbTKCzdOacdT4oWCwATKyvZqUOlOqr0Ous3k4s=
 github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.0.102 h1:dq22kaGkkTN60p8yPk0hFlmQKsrDH4CLkY5lmF2h+Cg=
 github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.0.102/go.mod h1:i26wWZgTXy1S6CByqx7SX4lpNPECzAFF940ver/Zi9k=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -332,14 +249,9 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
-github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
-github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/kidstuff/mongostore v0.0.0-20181113001930-e650cd85ee4b/go.mod h1:g2nVr8KZVXJSS97Jo8pJ0jgq29P6H7dG0oplUA86MQw=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.14.4 h1:eijASRJcobkVtSt81Olfh7JX43osYLwy5krOJo6YEu4=
@@ -347,8 +259,6 @@ github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47e
 github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s=
 github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -361,8 +271,6 @@ github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -413,27 +321,12 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
-github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
-github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -444,22 +337,13 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/quasoft/memstore v0.0.0-20180925164028-84a050167438/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -469,18 +353,13 @@ github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk=
 github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4=
-github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo=
-github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -488,8 +367,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM=
-github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tidwall/gjson v1.9.4 h1:oNis7dk9Rs3dKJNNigXZT1MTOiJeBtpurn+IpCB75MY=
@@ -502,15 +379,12 @@ github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhso
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
 github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -521,7 +395,6 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
-go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc=
 go.mongodb.org/mongo-driver v1.9.1 h1:m078y9v7sBItkt1aaoe2YlvWEXcD263e1a4E1fBrJ1c=
 go.mongodb.org/mongo-driver v1.9.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -530,13 +403,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0=
-go.opentelemetry.io/otel v0.17.0/go.mod h1:Oqtdxmf7UtEvL037ohlgnaYa1h7GtMh0NcSd9eqkC9s=
-go.opentelemetry.io/otel/metric v0.17.0/go.mod h1:hUz9lH1rNXyEwWAhIWCMFWKhYtpASgSnObJFnU26dJ0=
-go.opentelemetry.io/otel/oteltest v0.17.0/go.mod h1:JT/LGFxPwpN+nlsTiinSYjdIx3hZIGqHCpChcIZmdoE=
-go.opentelemetry.io/otel/trace v0.17.0/go.mod h1:bIujpqg6ZL6xUTubIUgziI1jSaUPthmabA/ygf/6Cfg=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -546,12 +413,9 @@ go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
@@ -600,7 +464,6 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -623,7 +486,6 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
@@ -631,9 +493,7 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
@@ -650,7 +510,6 @@ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210113205817-d3ed898aa8a3/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
@@ -658,13 +517,10 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -675,33 +531,23 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cO
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -717,9 +563,7 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -727,9 +571,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -745,16 +587,10 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -777,9 +613,6 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -822,10 +655,8 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -856,7 +687,6 @@ google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSr
 google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.39.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
 google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
@@ -865,21 +695,13 @@ google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtuk
 google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
 google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
 google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
 google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
-google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
-google.golang.org/api v0.70.0 h1:67zQnAE0T2rB0A3CwLSas0K+SbVzSxP+zTLkQLexeiw=
-google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -916,8 +738,6 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -935,19 +755,6 @@ google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKr
 google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
 google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
 google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf h1:SVYXkUz2yZS9FWb2Gm8ivSlbNQzL2Z/NpPKE3RG2jWk=
-google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -973,9 +780,6 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ
 google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
 google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg=
-google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -998,7 +802,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
@@ -1008,13 +811,9 @@ gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

mesh/main.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"flag"
-	"mats/api"
-	"mats/bus"
-	"mats/conf"
-	"mats/db"
-	"mats/log"
+	"mesh/api"
+	"mesh/bus"
+	"mesh/conf"
+	"mesh/db"
+	"mesh/log"
 
 	"go.uber.org/dig"
 	"infish.cn/comm"
@@ -44,7 +44,7 @@ func main() {
 	flag.Parse()
 	app := BuildApp()
 
-	err := app.Invoke(func(svc *api.Service, config *conf.AppConf, bus *comm.NatsBus) error {
+	err := app.Invoke(func(svc *api.Service, bus *comm.NatsBus) error {
 		go bus.Run()
 
 		svc.Run()

mesh/readme.rd

@@ -1,25 +0,0 @@
-# 转换服务器
-docker run -itd --restart=always --name osg -e OSG_OPTIMIZER=DEFAULT~SHARE_DUPLICATE_STATE -v /root/services/service-dadong/uploads:/data harbor.infish.cn/services/osgconv:20171
-
-docker run -itd --restart=always --name osg -e OSG_OPTIMIZER=DEFAULT~SHARE_DUPLICATE_STATE -v I:\2021\dadong\dadong-server\uploads:/data harbor.infish.cn/services/osgconv:20171
-
-
-
-
-docker exec osg osgconv --use-world-frame -O "useExternalBinaryArray mergeAllBinaryFiles", -o "0,1,0-0,0,1", /data/1636516102042757800/44444.fbx , /data/1636516102042757800/4.osg.gles
-
-docker exec osg osgconv -O "useExternalBinaryArray mergeAllBinaryFiles"  /data/1636516102042757800/4.osg.gles, /data/1636516102042757800/4.osgjs
-
-
-set GOARCH=amd64 && set GOOS=linux && go build
-
-
-docker run  --name hdr -v I:\2021\dadong\service-all\uploads:/data  -it -d --restart=always dongjianran/envtools
-
-
-#rabbitmq
-
-docker run -d --hostname rabbitmqalone --name rabbitmq -p 15672:15672 -p 5672:5672 -e RABBITMQ_DEFAULT_USER=infish -e RABBITMQ_DEFAULT_PASS=infish2022 rabbitmq:3-management
-
-
-docker run -d --restart=always --name spu3dassetcenter -p 8902:8902 -e TASKCENTER=http://192.168.110.207:9502/taskcenter harbor.infish.cn/services/spu3dassetcenter:1.0.0

mesh/renderTest.bat

@@ -1,2 +0,0 @@
-"./bin-offline/swiftViewer.exe" --input-paths ./bin-offline/task/demo1/render.json --background --output ./bin-offline/task/demo1/out.png
-rem "./bin-offline/swiftViewer.exe" --input-paths ./bin-offline/task/demo1/render.json

mesh/task/task.go

@@ -1,312 +0,0 @@
-package task
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"mats/conf"
-	"mats/db"
-	"mats/log"
-	"runtime"
-	"sync"
-	"time"
-
-	"github.com/RichardKnop/machinery/v2"
-
-	"github.com/RichardKnop/machinery/v2/config"
-	"github.com/RichardKnop/machinery/v2/tasks"
-
-	redisbackend "github.com/RichardKnop/machinery/v2/backends/redis"
-	amqpbroker "github.com/RichardKnop/machinery/v2/brokers/amqp"
-	eagerlock "github.com/RichardKnop/machinery/v2/locks/eager"
-)
-
-func StartServer(AppConfig *conf.TaskConfig) (*machinery.Server, error) {
-	cnf := &config.Config{
-		Broker:       AppConfig.Broker,
-		DefaultQueue: AppConfig.DefaultQueue,
-		// ResultBackend:   AppConfig.ResultBackend,
-		ResultsExpireIn: int(AppConfig.ResultsExpireIn),
-		AMQP: &config.AMQPConfig{
-			Exchange:      AppConfig.AmqpExchange,
-			ExchangeType:  AppConfig.AmqpExchangeType,
-			BindingKey:    AppConfig.AmqpBindingKey,
-			PrefetchCount: int(AppConfig.AmqpPrefetchCount),
-		},
-		Redis: &config.RedisConfig{
-			MaxIdle:                3,
-			IdleTimeout:            240,
-			ReadTimeout:            15,
-			WriteTimeout:           15,
-			ConnectTimeout:         15,
-			NormalTasksPollPeriod:  1000,
-			DelayedTasksPollPeriod: 500,
-		},
-	}
-	// Create server instance
-	broker := amqpbroker.New(cnf)
-	backend := redisbackend.NewGR(cnf, []string{conf.AppConfig.Redis.Addr}, conf.AppConfig.Redis.Db)
-	lock := eagerlock.New()
-	server := machinery.NewServer(cnf, broker, backend, lock)
-
-	return server, nil
-}
-
-func RunRenderTask(taskId string, db *db.MongoDB) error {
-
-	defer func() {
-		if r := recover(); r != nil {
-			fmt.Println("RunRenderTask success.")
-			fmt.Println(r)
-			buf := make([]byte, 1<<16)
-			runtime.Stack(buf, true)
-			fmt.Println("buf", string(buf))
-			log.Error(string(buf))
-		}
-	}()
-	return nil
-	// renderServer := GetOrCreateServer(&conf.AppConfig.TaskRender)
-	// if renderServer == nil {
-	// 	return errors.New("GetOrCreateServer null")
-	// }
-	// renderTask := &tasks.Signature{
-	// 	Name: "render",
-	// 	Args: []tasks.Arg{
-	// 		{
-	// 			Name:  "taskId",
-	// 			Type:  "string",
-	// 			Value: taskId,
-	// 		},
-	// 	},
-	// }
-
-	// asyncResult, err := renderServer.SendTaskWithContext(context.Background(), renderTask)
-	// go func() {
-	// 	results, err := asyncResult.Get(time.Duration(time.Microsecond * 200))
-	// 	update := bson.M{}
-	// 	if err != nil {
-	// 		log.Errorf("Getting task result failed with error: %s", err.Error())
-	// 		update["runState"] = model.TaskRunState_Fail
-	// 		update["runPercent"] = 0
-	// 	} else {
-
-	// 		result := tasks.HumanReadableResults(results)
-	// 		log.Infof("render result = %v\n", result)
-	// 		update["runState"] = model.TaskRunState_Succ
-	// 		update["runPercent"] = 100
-	// 		contentLen := len("result:")
-	// 		renderRet := result[contentLen:]
-
-	// 		runResult := &model.TaskRunResult{}
-	// 		err = json.Unmarshal([]byte(renderRet), runResult)
-	// 		if err == nil {
-	// 			update["runResult"] = runResult
-	// 		}
-	// 	}
-	// 	_, err = repo.RepoUpdateSetDocProps(&repo.RepoSession{Ctx: context.Background(), Client: db}, repo.CollectionTask, taskId, bson.M{"$set": update})
-	// 	if err != nil {
-	// 		log.Errorf("render task update error")
-	// 	}
-	// }()
-	// return err
-}
-
-// func RunConvmeshTask(meshUrl string, createThumbnail bool) (*model.ConvMeshRunResult, error) {
-
-// 	//先转换fbx
-// 	file, err := RunFbxConverterTask(meshUrl)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-
-// 	taskConf := &tasks.Signature{
-// 		Name: "convmesh",
-// 		Args: []tasks.Arg{
-// 			{
-// 				Name:  "meshUrl",
-// 				Type:  "string",
-// 				Value: meshUrl,
-// 			},
-// 			{
-// 				Name:  "thumbnail",
-// 				Type:  "bool",
-// 				Value: createThumbnail,
-// 			},
-// 		},
-// 	}
-// 	runResult := &model.ConvMeshRunResult{}
-// 	err = RunTask(&conf.AppConfig.TaskConvMesh, taskConf, runResult)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	runResult.File = file
-
-// 	return runResult, nil
-// }
-
-// func RunFbxConverterTask(meshUrl string) (*model.OssType, error) {
-
-// 	renderTask := &tasks.Signature{
-// 		Name: "fbxConverter",
-// 		Args: []tasks.Arg{
-// 			{
-// 				Name:  "meshUrl",
-// 				Type:  "string",
-// 				Value: meshUrl,
-// 			},
-// 		},
-// 	}
-// 	runResult := &model.OssType{}
-
-// 	err := RunTask(&conf.AppConfig.TaskFbxConverter, renderTask, runResult)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	return runResult, nil
-// }
-
-var taskServers map[string]*machinery.Server = map[string]*machinery.Server{}
-
-var lock sync.Mutex
-
-func GetOrCreateServer(config *conf.TaskConfig) *machinery.Server {
-	lock.Lock()
-	defer lock.Unlock()
-
-	server := taskServers[config.Name]
-	if server == nil {
-		taskServer, err := StartServer(config)
-		if err != nil {
-			fmt.Sprintln("GetOrCreateServer failed")
-			return nil
-		}
-		server = taskServer
-		taskServers[config.Name] = server
-	}
-	return server
-}
-
-func RunTask(config *conf.TaskConfig, task *tasks.Signature, runResult interface{}) error {
-
-	server := GetOrCreateServer(config)
-	if server == nil {
-		return errors.New("GetOrCreateServer null")
-	}
-
-	defer func() {
-		if r := recover(); r != nil {
-			fmt.Println(r)
-			buf := make([]byte, 1<<16)
-			runtime.Stack(buf, true)
-			fmt.Println("buf", string(buf))
-			log.Error(string(buf))
-		}
-	}()
-
-	asyncResult, err := server.SendTask(task)
-	if err != nil {
-		return err
-	}
-	if runResult == nil {
-		return nil
-	}
-
-	results, err := asyncResult.Get(time.Duration(time.Microsecond * 200))
-	if err != nil {
-		log.Errorf("Getting task result failed with error: %s", err.Error())
-		fmt.Println(err)
-		return err
-	}
-
-	msg := tasks.HumanReadableResults(results)
-	log.Infof("task result = %v\n", msg)
-	contentLen := len("result:")
-	renderRet := msg[contentLen:]
-	err = json.Unmarshal([]byte(renderRet), runResult)
-	if err != nil {
-		return errors.New("转换结果解析失败!")
-	}
-
-	return nil
-}
-
-// func RunShadowTask(meshId string) (*model.OssType, error) {
-// 	taskReq := &tasks.Signature{
-// 		Name: "shadow",
-// 		Args: []tasks.Arg{
-// 			{
-// 				Name:  "from",
-// 				Type:  "string",
-// 				Value: "db",
-// 			},
-// 			{
-// 				Name:  "meshId",
-// 				Type:  "string",
-// 				Value: meshId,
-// 			},
-// 		},
-// 	}
-// 	runResult := &model.OssType{}
-// 	err := RunTask(&conf.AppConfig.TaskShadow, taskReq, runResult)
-
-// 	return runResult, err
-// }
-
-func RunMeshPostProcessTask(meshId string, collection string, itemId string, itemCollection string) error {
-
-	go func() {
-		RunMeshShadowTask(meshId, collection)
-	}()
-
-	taskReq := &tasks.Signature{
-		Name: "uploadmesh",
-		Args: []tasks.Arg{
-			{
-				Name:  "meshId",
-				Type:  "string",
-				Value: meshId,
-			},
-			{
-				Name:  "collection",
-				Type:  "string",
-				Value: collection,
-			},
-			{
-				Name:  "itemId",
-				Type:  "string",
-				Value: itemId,
-			},
-			{
-				Name:  "itemCollection",
-				Type:  "string",
-				Value: itemCollection,
-			},
-		},
-	}
-	fmt.Sprintln(taskReq)
-	// runResult := ""
-	// return RunTask(&conf.AppConfig.TaskUploadProcess, taskReq, runResult)
-	return nil
-}
-
-func RunMeshShadowTask(meshId string, collection string) error {
-	taskReq := &tasks.Signature{
-		Name: "shadow",
-		Args: []tasks.Arg{
-			{
-				Name:  "meshId",
-				Type:  "string",
-				Value: meshId,
-			},
-			{
-				Name:  "collection",
-				Type:  "string",
-				Value: collection,
-			},
-		},
-	}
-	// runResult := &model.OssType{}
-	// return RunTask(&conf.AppConfig.TaskShadow, taskReq, runResult)
-	fmt.Sprintln(taskReq)
-	return nil
-}

mesh/utils/uitls.go

@@ -1,17 +1 @@
 package utils
-
-func OrderIdRange(OrderId int64) (int64, int64) {
-	minOrderId := OrderId //后面有几个零
-	var maxStep int64 = 1
-	currValue := minOrderId
-	for {
-		if currValue%10 == 0 {
-			currValue = currValue / 10
-			maxStep = maxStep * 10
-		} else {
-			break
-		}
-	}
-	maxOrderId := minOrderId + maxStep - 1
-	return minOrderId, maxOrderId
-}