update

mesh/Dockerfile

@@ -10,13 +10,13 @@ RUN echo -e https://mirrors.ustc.edu.cn/alpine/v3.15/main > /etc/apk/repositorie
 # 由于alpine镜像使用的是musl libc而不是gnu libc，/lib64/ 是不存在的。但他们是兼容的，可以创建个软连接
   && mkdir /lib64 \
   && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 \
-  && mkdir -p /root/queenmat
+  && mkdir -p /root/queenmesh
 
-WORKDIR /root/queenmat
+WORKDIR /root/queenmesh
 
-ADD ./mat-service ./mat-service
+ADD ./mesh-service ./mesh-service
 ADD ./app.yaml ./app.yaml
 
 EXPOSE 8908
 
-ENTRYPOINT ["./mat-service"]
+ENTRYPOINT ["./mesh-service"]

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

@@ -1,134 +0,0 @@
-package api
-
-import (
-	"fmt"
-	"mesh/db/model"
-	"mesh/db/repo"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"infish.cn/comm"
-)
-
-func RegQueenterUploadApi(router *GinRouter) {
-	router.GETJWT("/queenter/upload/category", getUploadCategory)
-	router.POSTJWT("/queenter/upload/matgroup", uploadMatGroup)
-}
-
-func getUploadCategory(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-	body := &struct {
-		Uuid string //设备uuid
-	}{}
-	c.ShouldBindJSON(body)
-	if len(body.Uuid) < 1 {
-		return nil, fmt.Errorf("uuid不能为空")
-	}
-
-	//获取设备绑定的数据库
-	userId, _ := primitive.ObjectIDFromHex(apictx.User.Parent)
-	list := []*model.DeviceQueenter{}
-	err := repo.RepoSeachDocs(apictx.CreateRepoCtx(), &repo.DocsSearchOptions{
-		CollectName: repo.CollectionQueenters,
-		Query:       map[string]interface{}{"userId": userId},
-	}, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(list) < 1 {
-		return nil, fmt.Errorf("后台没有创建设备无法获取分类")
-	}
-
-	var queenter *model.DeviceQueenter = nil
-	var defaultQueenter *model.DeviceQueenter = nil
-	for _, v := range list {
-		if v.IsDefaut != nil && *v.IsDefaut && defaultQueenter == nil {
-			defaultQueenter = v
-		}
-		if body.Uuid == v.Uuid {
-			queenter = v
-			break
-		}
-	}
-	if queenter == nil && defaultQueenter == nil {
-		return nil, fmt.Errorf("没有设置默认设备")
-	}
-	if queenter == nil {
-		queenter = defaultQueenter
-	}
-	if len(queenter.BindOutId) < 1 {
-		return nil, fmt.Errorf("当前设备没有绑定输出内容")
-	}
-
-	//获取输出配置
-	output := &model.DeviceOutput{}
-	err = repo.RepoSeachDoc2(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-		CollectName: repo.CollectionQueenterOutputs,
-		Query:       repo.Map{"_id": queenter.BindOutId},
-	}, output)
-	if err != nil {
-		return nil, err
-	}
-
-	if output.Type == "queenmat" { //面料库
-		hub := &model.HubMat{}
-		err = repo.RepoSeachDoc2(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-			CollectName: repo.CollectionHubMats,
-			Query:       repo.Map{"_id": output.QueenMatId},
-		}, hub)
-		if err != nil {
-			return nil, fmt.Errorf("获取面料库失败")
-		}
-
-		scope := "queenmat"
-		userCaties := &comm.DbCategory{}
-		_, err = repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-			CollectName: repo.CollectionCategories,
-			Query:       repo.Map{"userId": userId, "scope": scope},
-		}, userCaties)
-
-		if err != nil {
-			return nil, err
-		}
-
-		userAssetCaties := &comm.DbAssetUserCategory{}
-		_, err = repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-			CollectName: repo.CollectionDbAssetCategory,
-			Query:       repo.Map{"userId": userId, "scope": scope},
-		}, userAssetCaties)
-
-		if err != nil {
-			return nil, err
-		}
-
-		cates := &comm.DbCategory{}
-		for _, v := range userAssetCaties.CategoryConfs {
-			if v.DbAssetId.Hex() == hub.DefineId {
-				for _, id := range v.CategoryIds {
-					for _, c := range userCaties.Categories {
-						if c.Id == id {
-							cates.Categories = append(cates.Categories, c)
-							break
-						}
-					}
-				}
-			}
-		}
-		return cates, nil
-	}
-
-	return nil, nil
-}
-
-// 上传面料组
-func uploadMatGroup(c *gin.Context, _ *ApiSession) (interface{}, error) {
-
-	body := &struct {
-		Uuid string //设备uuid
-	}{}
-	c.ShouldBindJSON(body)
-	//获取设备绑定的数据库
-
-	return nil, nil
-}

mesh/api/mark-service-queenter.go

@@ -1,118 +0,0 @@
-package api
-
-import (
-	"fmt"
-	"mesh/bus"
-	"mesh/db/model"
-	"mesh/db/repo"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func RegQueenterApi(router *GinRouter) {
-
-	//设备列表管理
-	CollectionName := "queenters"
-	CreateCRUD(router, "/queenter/device", &CRUDOption{
-		Collection: CollectionName,
-		NewModel: func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			hub := &model.DeviceQueenter{}
-			c.ShouldBindJSON(hub)
-			hub.CreateTime = time.Now()
-			hub.UserId, _ = primitive.ObjectIDFromHex(apictx.User.Parent)
-			if hub.UserId == primitive.NilObjectID {
-				return nil, NewError("参数不合法!")
-			}
-
-			hub.Thumbnail = "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/avatar/queenter2.png"
-			hub.Name = "Queenter4.0"
-
-			count, err := repo.RepoCountDoc(apictx.CreateRepoCtx(), repo.CollectionQueenters, repo.Map{"userId": hub.UserId})
-			if err != nil {
-				return nil, err
-			}
-			if count < 1 {
-				isDefault := true
-				hub.IsDefaut = &isDefault
-			}
-
-			return hub, nil
-		},
-
-		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
-			return &model.DeviceQueenter{}
-		},
-		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", "bindOutId", "isDefault", "uuid", "lastRunTime", "lastUploadTime"},
-		Remove: func(c *gin.Context, apictx *ApiSession, id string) (interface{}, error) {
-			return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), CollectionName, id)
-		},
-	})
-
-	//设备输出管理
-	CollectionOutput := "queenter-outputs"
-
-	CreateCRUD(router, "/queenter/output", &CRUDOption{
-		Collection: CollectionOutput,
-		NewModel: func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-			hub := &model.DeviceOutput{}
-			c.ShouldBindJSON(hub)
-			hub.CreateTime = time.Now()
-			hub.UserId, _ = primitive.ObjectIDFromHex(apictx.User.Parent)
-			if hub.UserId == primitive.NilObjectID {
-				return nil, NewError("参数不合法!")
-			}
-			if hub.Type != "sku3d" && hub.Type != "queenmat" {
-				return nil, NewError("type 只支持 sku3d, queenmat")
-			}
-			if hub.Type == "sku3d" {
-				hub.Name = "sku3d账号"
-				if len(hub.Thumbnail) < 1 {
-					hub.Thumbnail = "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/usercenter/png/1660096358418mwS8hW_256.png"
-				}
-			} else if hub.Type == "queenmat" {
-				hub.Name = "材质库"
-				if len(hub.Thumbnail) < 1 {
-					hub.Thumbnail = "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/avatar/queenter2.png"
-				}
-			}
-			return hub, nil
-		},
-
-		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
-			return &model.DeviceOutput{}
-		},
-		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", "type", "createTime", "queenMatId", "sku3dUserId"},
-		Remove: func(c *gin.Context, apictx *ApiSession, id string) (interface{}, error) {
-			return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), CollectionOutput, id)
-		},
-	})
-
-	router.POSTJWT("/queenter/ouput/sku3dinfo", func(c *gin.Context, _ *ApiSession) (interface{}, error) {
-		body := &struct {
-			LoginName string
-		}{}
-		c.ShouldBindJSON(body)
-		if len(body.LoginName) < 1 {
-			return nil, fmt.Errorf("sku3d账号不能为空")
-		}
-		user := &model.User{}
-
-		err := bus.NatsCenter.RequestApi("user.op.info", &map[string]string{"loginName": body.LoginName}, 5*time.Second, user)
-		if err != nil {
-			return nil, err
-		}
-		return map[string]string{"name": user.Name, "avatar": user.Avatar, "id": user.Id.Hex()}, nil
-	})
-}

mesh/api/router.go

@@ -6,28 +6,23 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-// RegRouters 注册路由
+// 注册路由
 func RegRouters(svc *Service) {
-
-	//登录
 	queenmesh := svc.NewGinRouter("/" + svc.Conf.Name)
 	queenmesh.group.Use(Logger())
 
+	// 模型库
 	RegQueenMeshes(queenmesh)
 
-	RegQueenterApi(queenmesh)
-
-	RegQueenterUploadApi(queenmesh)
-
 	CreateDatabaseCategoryRouter(queenmesh)
 
 	//数据存储
-	// spud3dGroup.POST("/save/policy", UploadPolicy)
+	// queenmesh.POST("/save/policy", UploadPolicy)
 
-	// spud3dGroup.GETJWT("/obs/list", ServiceObsList)
-	// spud3dGroup.POSTJWT("/obs/upload", ServiceObsUploadPolicy)
-	// spud3dGroup.POSTJWT("/obs/delete", ServiceObsRemove)
-	// spud3dGroup.POSTJWT("/obs/folder", ServiceObsCreateFolder)
+	// queenmesh.GETJWT("/obs/list", ServiceObsList)
+	// queenmesh.POSTJWT("/obs/upload", ServiceObsUploadPolicy)
+	// queenmesh.POSTJWT("/obs/delete", ServiceObsRemove)
+	// queenmesh.POSTJWT("/obs/folder", ServiceObsCreateFolder)
 }
 
 func Logger() gin.HandlerFunc {

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

@@ -9,6 +9,7 @@ import (
 	"infish.cn/comm"
 )
 
+// 创建数据库分类api
 func CreateDatabaseCategoryRouter(router *GinRouter) {
 
 	//创建分类定义

mesh/build.sh

@@ -3,11 +3,11 @@
 # 编译应用
 echo "building..."
 
-go build -o mat-service
+go build -o mesh-service
 
 # 命名镜像
-local_imge="pack-cloud-mat:v1.0.0"
-repository_image="registry.cn-chengdu.aliyuncs.com/infish/pack-cloud-mat:v1.0.0"
+local_imge="pack-cloud-mesh:v1.0.0"
+repository_image="registry.cn-chengdu.aliyuncs.com/infish/pack-cloud-mesh:v1.0.0"
 
 # 删除本地已存在的镜像
 docker rmi $repository_image

mesh/bus/tree.go

@@ -22,26 +22,11 @@ type TreeAddDefineResp struct {
 	Collection string
 }
 
-func TreeAddDefineMatgroup(DbName, UserId, Name string) (resp *TreeAddDefineResp, err error) {
-	req := &TreeAddDefMatgroupReq{DbName: DbName, UserId: UserId, Name: Name}
-	out := &TreeAddDefineResp{}
-	err = NatsCenter.RequestPackApi("tree.define.add.matgroup", req, out, &comm.RequestOptions{
-		DeployPack: "queentree",
-	})
-	return out, err
-}
-
-func TreeRemoveDefineMatgroup(DbId, defineId string) error {
-	req := &TreeRemoveDefMatgroupReq{DbId: DbId, DefineId: defineId}
-	return NatsCenter.RequestPackApi("tree.define.remove.matgroup", req, nil, &comm.RequestOptions{
-		DeployPack: "queentree",
-	})
-}
-
-// 模型
+// 对queentree数据操作
 func TreeAddDefineMeshpack(DbName, UserId, Name string) (resp *TreeAddDefineResp, err error) {
 	req := &TreeAddDefMatgroupReq{DbName: DbName, UserId: UserId, Name: Name}
 	out := &TreeAddDefineResp{}
+	// 调用queentree包中的接口
 	err = NatsCenter.RequestPackApi("tree.define.add.meshpack", req, out, &comm.RequestOptions{
 		DeployPack: "queentree",
 	})

mesh/conf/app.go

@@ -70,8 +70,8 @@ type AppConf struct {
 	}
 	Nats struct {
 		Url               string
-		MaxReconnect      string
-		ReconnDelaySecond string
+		MaxReconnect      int
+		ReconnDelaySecond int
 	}
 }
 

mesh/db/db.go

@@ -35,7 +35,7 @@ func (db *MongoDB) GetOrCreateDatabase(name string) *mongo.Database {
 }
 
 func NewMongoDB(bus *comm.NatsBus) *MongoDB {
-	inst, err := bus.NewMongoDBFromConfigDev("mat-mongo")
+	inst, err := bus.NewMongoDBFromConfigDev("mesh-mongo")
 	if err != nil {
 		panic(err)
 	}

mesh/db/model/mesh.go

@@ -20,137 +20,3 @@ type HubMesh struct {
 
 	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
 }
-
-type Mesh struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Category   string             `bson:"category,omitempty" json:"category"`
-	Thumbnail  *OssType           `bson:"thumbnail,omitempty" json:"thumbnail"`
-
-	Osgjsbin  *OssType `bson:"osgjsbin,omitempty" json:"osgjsbin"`
-	Osgjs     *OssType `bson:"osgjs,omitempty" json:"osgjs"`
-	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"`
-	File       *OssType `bson:"file,omitempty" json:"file"`
-	Shadow     *OssType `bson:"shadow,omitempty" json:"shadow,omitempty"`
-	MeshState  *int32   `bson:"meshState,omitempty" json:"meshState,omitempty"`
-}
-
-type ShoeCompDef struct {
-	Node   string `bson:"node,omitempty" json:"node"`
-	MatId  int32  `bson:"matId,omitempty" json:"matId"`
-	Name   string `bson:"name,omitempty" json:"name"`
-	Enable bool   `bson:"enable,omitempty" json:"enable"`
-}
-
-type ShoeMesh struct {
-	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-	UserId primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	MeshId primitive.ObjectID `bson:"meshId,omitempty" json:"meshId,omitempty"`
-
-	Thumbnail      *OssType       `bson:"thumbnail,omitempty" json:"thumbnail,omitempty"`
-	Name           string         `bson:"name,omitempty" json:"name,omitempty"`
-	CreateTime     time.Time      `bson:"createTime,omitempty" json:"createTime,omitempty"`
-	LeftComponents []*ShoeCompDef `bson:"leftComponents,omitempty" json:"leftComponents,omitempty"`
-
-	Sex    uint8  `bson:"sex,omitempty" json:"sex,omitempty"`
-	Season uint8  `bson:"season,omitempty" json:"season,omitempty"`
-	Type   string `bson:"type,omitempty" json:"type,omitempty"`
-
-	IsPublic *bool `bson:"isPublic,omitempty" json:"isPublic,omitempty"`
-	Platform *bool `bson:"platform,omitempty" json:"platform,omitempty"` //是否属于平台
-}
-
-type LastMesh struct {
-	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-	UserId primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	MeshId primitive.ObjectID `bson:"meshId,omitempty" json:"meshId,omitempty"`
-
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail,omitempty"`
-	Name       string    `bson:"name,omitempty" json:"name,omitempty"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime,omitempty"`
-
-	Sex    uint8  `bson:"sex,omitempty" json:"sex,omitempty"`
-	Season uint8  `bson:"season,omitempty" json:"season,omitempty"`
-	Type   string `bson:"type,omitempty" json:"type,omitempty"`
-
-	IsPublic   *bool    `bson:"isPublic,omitempty" json:"isPublic,omitempty"`
-	Platform   *bool    `bson:"platform,omitempty" json:"platform,omitempty"` //是否属于平台
-	State      int32    `bson:"state,omitempty" json:"state"`
-	Categories []string `bson:"categories,omitempty" json:"categories,omitempty"` //所有一级分类的id数组 contain filter里面的值
-	MeshState  *int32   `bson:"meshState,omitempty" json:"meshState,omitempty"`
-}
-
-type HeelMesh struct {
-	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-	UserId primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	MeshId primitive.ObjectID `bson:"meshId,omitempty" json:"meshId,omitempty"`
-
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail,omitempty"`
-	Name       string    `bson:"name,omitempty" json:"name,omitempty"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime,omitempty"`
-
-	Sex    uint8  `bson:"sex,omitempty" json:"sex,omitempty"`
-	Season uint8  `bson:"season,omitempty" json:"season,omitempty"`
-	Type   string `bson:"type,omitempty" json:"type,omitempty"`
-
-	IsPublic   *bool    `bson:"isPublic,omitempty" json:"isPublic,omitempty"`
-	Platform   *bool    `bson:"platform,omitempty" json:"platform,omitempty"` //是否属于平台
-	State      int32    `bson:"state,omitempty" json:"state"`
-	Categories []string `bson:"categories,omitempty" json:"categories,omitempty"` //所有一级分类的id数组 contain filter里面的值
-	MeshState  *int32   `bson:"meshState,omitempty" json:"meshState,omitempty"`
-}
-
-type DecorateMesh struct {
-	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-	UserId primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	MeshId primitive.ObjectID `bson:"meshId,omitempty" json:"meshId,omitempty"`
-
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail,omitempty"`
-	Name       string    `bson:"name,omitempty" json:"name,omitempty"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime,omitempty"`
-
-	Sex    uint8  `bson:"sex,omitempty" json:"sex,omitempty"`
-	Season uint8  `bson:"season,omitempty" json:"season,omitempty"`
-	Type   string `bson:"type,omitempty" json:"type,omitempty"`
-
-	IsPublic   *bool    `bson:"isPublic,omitempty" json:"isPublic,omitempty"`
-	Platform   *bool    `bson:"platform,omitempty" json:"platform,omitempty"` //是否属于平台
-	State      int32    `bson:"state,omitempty" json:"state"`
-	Categories []string `bson:"categories,omitempty" json:"categories,omitempty"` //所有一级分类的id数组 contain filter里面的值
-	MeshState  *int32   `bson:"meshState,omitempty" json:"meshState,omitempty"`
-}
-
-type SoleMesh struct {
-	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-	UserId primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	MeshId primitive.ObjectID `bson:"meshId,omitempty" json:"meshId,omitempty"`
-
-	Thumbnail  *OssType  `bson:"thumbnail,omitempty" json:"thumbnail,omitempty"`
-	Name       string    `bson:"name,omitempty" json:"name,omitempty"`
-	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime,omitempty"`
-
-	Sex    uint8  `bson:"sex,omitempty" json:"sex,omitempty"`
-	Season uint8  `bson:"season,omitempty" json:"season,omitempty"`
-	Type   string `bson:"type,omitempty" json:"type,omitempty"`
-
-	IsPublic   *bool    `bson:"isPublic,omitempty" json:"isPublic,omitempty"`
-	Platform   *bool    `bson:"platform,omitempty" json:"platform,omitempty"` //是否属于平台
-	State      int32    `bson:"state,omitempty" json:"state"`
-	Categories []string `bson:"categories,omitempty" json:"categories,omitempty"` //所有一级分类的id数组 contain filter里面的值
-	MeshState  *int32   `bson:"meshState,omitempty" json:"meshState,omitempty"`
-}
-
-type StickerImage struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId,omitempty"`
-	Image      *OssType           `bson:"image,omitempty" json:"image,omitempty"`
-	Name       string             `bson:"name,omitempty" json:"name,omitempty"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime,omitempty"`
-	State      int32              `bson:"state,omitempty" json:"state"`
-	Categories []string           `bson:"categories,omitempty" json:"categories,omitempty"` //所有一级分类的id数组 contain filter里面的值
-}

mesh/db/model/queenter.go

@@ -1,34 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-// Queneter设备
-type DeviceQueenter struct {
-	Id        primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Uuid      string             `bson:"uuid,omitempty" json:"uuid"`
-	Name      string             `bson:"name,omitempty" json:"name"` //quen
-	Thumbnail string             `bson:"thumbnail,omitempty" json:"thumbnail"`
-
-	UserId         primitive.ObjectID `bson:"userId,omitempty" json:"userId"`
-	CreateTime     time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	BindOutId      string             `bson:"bindOutId,omitempty" json:"bindOutId"`
-	IsDefaut       *bool              `bson:"isDefault,omitempty" json:"isDefault"`           //是否默认设备
-	LastRunTime    time.Time          `bson:"lastRunTime,omitempty" json:"lastRunTime"`       //最近运行时间
-	LastUploadTime time.Time          `bson:"lastUploadTime,omitempty" json:"lastUploadTime"` //最近上传时间
-}
-
-type DeviceOutput struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId"`
-	Type       string             `bson:"type,omitempty" json:"type"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Thumbnail  string             `bson:"thumbnail,omitempty" json:"thumbnail"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-
-	QueenMatId  string `bson:"queenMatId,omitempty" json:"queenMatId"`
-	Sku3dUserId string `bson:"sku3dUserId,omitempty" json:"sku3dUserId"`
-}

mesh/db/model/user.go

@@ -0,0 +1,12 @@
+package model
+
+import (
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+// 用户简单信息
+type User struct {
+	Id     primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
+	Name   string             `bson:"name,omitempty" json:"name"`
+	Avatar string             `bson:"avatar,omitempty" json:"avatar,omitempty"`
+}

mesh/utils/uitls.go

@@ -1 +0,0 @@
-package utils