Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/upload/internal/logic/uploadcallbacklogic.go

@@ -41,6 +41,29 @@ func (l *UploadCallbackLogic) UploadCallback(req *types.UploadCallbackReq, useri
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
 
+	var userId int64
+	var guestId int64
+
+	// 检查用户是否是游客
+	if userinfo.IsGuest() {
+		// 如果是，使用游客ID和游客键名格式
+		guestId = userinfo.GuestId
+	} else {
+		// 否则，使用用户ID和用户键名格式
+		userId = userinfo.UserId
+	}
+
+	// 定义存储桶名称
+	var bucketName *string
+
+	// 根据类别选择存储桶
+	switch req.UploadBucket {
+	case 2:
+		bucketName = basic.TempfileBucketName
+	default:
+		bucketName = basic.StorageBucketName
+	}
+
 	resourceModel := gmodel.NewFsResourceModel(l.svcCtx.MysqlConn)
 	err := resourceModel.Trans(l.ctx, func(ctx context.Context, connGorm *gorm.DB) (err error) {
 		resourceModelTS := gmodel.NewFsResourceModel(l.svcCtx.MysqlConn)
@@ -49,12 +72,17 @@ func (l *UploadCallbackLogic) UploadCallback(req *types.UploadCallbackReq, useri
 			return err
 		}
 
+		var version string = "0.0.1"
 		var fsResource = &gmodel.FsResource{}
+		fsResource.UserId = &userId
+		fsResource.GuestId = &guestId
 		fsResource.ResourceId = req.ResourceId
 		fsResource.ResourceType = &req.ResourceType
 		fsResource.ResourceUrl = &req.ResourceUrl
 		fsResource.Metadata = &req.Metadata
 		fsResource.ApiType = &req.ApiType
+		fsResource.BucketName = bucketName
+		fsResource.Version = &version
 		if resourceInfo.ResourceId == "" {
 			_, err = resourceModelTS.Create(ctx, fsResource)
 		} else {

server/upload/internal/logic/uploadfilebaselogic.go

@@ -140,6 +140,7 @@ func (l *UploadFileBaseLogic) UploadFileBase(req *types.UploadFileBaseReq, useri
 				UploadedAt:   &nowTime,
 				Metadata:     &req.Metadata,
 				ApiType:      &apiType,
+				BucketName:   bucketName,
 			})
 			if err != nil {
 				logx.Error(err)

server/upload/internal/logic/uploadfilesbackendlogic.go

@@ -195,6 +195,7 @@ func (l *UploadFilesBackendLogic) UploadFilesBackend(req *types.UploadFilesReq,
 					UploadedAt:   &nowTime,
 					Metadata:     &uploadDataInfo.Metadata,
 					ApiType:      &uploadDataInfo.ApiType,
+					BucketName:   bucketName,
 				})
 				if err != nil {
 					logx.Error(err)
@@ -228,7 +229,7 @@ func (l *UploadFilesBackendLogic) UploadFilesBackend(req *types.UploadFilesReq,
 
 	// 返回成功的响应和上传URL
 	return resp.SetStatus(basic.CodeOK, map[string]interface{}{
-		"upload_urls": result,
+		"upload_data": result,
 	})
 }
 

server/upload/internal/logic/uploadlogologic.go

@@ -78,6 +78,7 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 		logoHeight = 200
 	}
 	var resultStr string
+	var err error
 
 	// apiUrl := l.svcCtx.Config.BLMService.ImageProcess.Url
 	// var onlyScale = true
@@ -113,7 +114,7 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 	var nowTime = time.Now().Unix()
 	// 新增记录
 	userMaterialModel := gmodel.NewFsUserMaterialModel(l.svcCtx.MysqlConn)
-	_, err := userMaterialModel.CreateOrUpdate(l.ctx, &gmodel.FsUserMaterial{
+	_, err = userMaterialModel.CreateOrUpdate(l.ctx, &gmodel.FsUserMaterial{
 		Module:      &module,
 		UserId:      &userId,
 		GuestId:     &guestId,

server/upload/internal/types/types.go

@@ -36,11 +36,12 @@ type UploadFilesReq struct {
 }
 
 type UploadCallbackReq struct {
-	ResourceId   string `form:"resource_id"`                      // 资源ID
-	ResourceType string `form:"resource_type"`                    // 资源类型
-	ResourceUrl  string `form:"resource_url"`                     // 资源URL
-	Metadata     string `form:"metadata,optional"`                // 元数据,json格式,存储图像分率
-	ApiType      int64  `form:"api_type,options=[1,2],default=1"` // 调用类型：1=对外，2=对内
+	UploadBucket int64  `form:"upload_bucket,options=[1,2],default=1"` // 上传桶名:1=缓存,2=持久
+	ResourceId   string `form:"resource_id"`                           // 资源ID
+	ResourceType string `form:"resource_type"`                         // 资源类型
+	ResourceUrl  string `form:"resource_url"`                          // 资源URL
+	Metadata     string `form:"metadata,optional"`                     // 元数据,json格式,存储图像分率
+	ApiType      int64  `form:"api_type,options=[1,2],default=1"`      // 调用类型：1=对外，2=对内
 }
 
 type RequestUpFile struct {