fix:修复上传

server/upload/internal/handler/uploadlogohandler.go

@@ -21,7 +21,7 @@ func UploadLogoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		}
 
 		// 创建一个业务逻辑层实例
-		l := logic.NewUploadLogoLogic(r.Context(), svcCtx)
+		l := logic.NewUploadLogoLogic(r, svcCtx)
 
 		rl := reflect.ValueOf(l)
 		basic.BeforeLogic(w, r, rl)

server/upload/internal/logic/uploadcallbacklogic.go

@@ -66,8 +66,10 @@ func (l *UploadCallbackLogic) UploadCallback(req *types.UploadCallbackReq, useri
 
 	ctx := l.ctx
 	err := l.svcCtx.MysqlConn.Transaction(func(connGorm *gorm.DB) error {
-		resourceModelTS := gmodel.NewFsResourceModel(l.svcCtx.MysqlConn)
-		resourceInfo, err := resourceModelTS.FindOneById(ctx, req.ResourceId)
+		resourceModelTS := gmodel.NewFsResourceModel(connGorm)
+		transBuilder := resourceModelTS.BuilderTrans(nil)
+		transBuilderFind := transBuilder.Where("resource_id =?", req.ResourceId)
+		resourceInfo, err := resourceModelTS.FindOneByQuery(ctx, transBuilderFind, nil)
 		if err != nil {
 			return err
 		}
@@ -84,9 +86,9 @@ func (l *UploadCallbackLogic) UploadCallback(req *types.UploadCallbackReq, useri
 		fsResource.BucketName = bucketName
 		fsResource.Version = &version
 		if resourceInfo.ResourceId == "" {
-			_, err = resourceModelTS.Create(ctx, fsResource)
+			_, err = resourceModelTS.BuilderCreate(ctx, transBuilder, fsResource)
 		} else {
-			_, err = resourceModelTS.Update(ctx, fsResource)
+			_, err = resourceModelTS.BuilderUpdate(ctx, transBuilder, fsResource)
 		}
 		return err
 	})

server/upload/internal/logic/uploadlogologic.go

@@ -6,7 +6,10 @@ import (
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 	"fusenapi/utils/curl"
+	"fusenapi/utils/file"
+	"fusenapi/utils/hash"
 	"io"
+	"net/http"
 	"strings"
 	"time"
 
@@ -22,13 +25,15 @@ type UploadLogoLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
+	r      *http.Request
 }
 
-func NewUploadLogoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UploadLogoLogic {
+func NewUploadLogoLogic(r *http.Request, svcCtx *svc.ServiceContext) *UploadLogoLogic {
 	return &UploadLogoLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
+		Logger: logx.WithContext(r.Context()),
+		ctx:    r.Context(),
 		svcCtx: svcCtx,
+		r:      r,
 	}
 }
 
@@ -61,6 +66,43 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 		userId = userinfo.UserId
 	}
 
+	//设置内存大小
+	l.r.ParseMultipartForm(32 << 20)
+
+	fileObject, _, err := l.r.FormFile("file")
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatus(basic.CodeFileUploadErr, "file upload err,no files")
+	}
+
+	// 读取数据流
+	ioData, err := io.ReadAll(fileObject)
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatus(basic.CodeFileUploadErr, "file upload err,no files")
+	}
+
+	// 上传文件
+	var upload = file.Upload{
+		Ctx:        l.ctx,
+		MysqlConn:  l.svcCtx.MysqlConn,
+		AwsSession: l.svcCtx.AwsSession,
+	}
+	var resourceId string = hash.JsonHashKey(req.FileKey)
+	uploadRes, err := upload.UploadFileByByte(&file.UploadBaseReq{
+		FileHash:     resourceId,
+		FileByte:     ioData,
+		UploadBucket: 1,
+		ApiType:      2,
+		UserId:       userId,
+		GuestId:      guestId,
+	})
+
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatus(basic.CodeFileUploadErr, "upload file failed")
+	}
+
 	var logoWidth int64
 	var logoHeight int64
 	// 查看sku是否存在
@@ -82,17 +124,14 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 		logoHeight = 200
 	}
 	var resultStr string
-	var err error
 
 	var postMap = make(map[string]interface{}, 1)
-	postMap["logo_url"] = req.ResourceUrl
+	postMap["logo_url"] = uploadRes.ResourceUrl
 	postMapB, _ := json.Marshal(postMap)
 
-	//result, err := http.Post(l.svcCtx.Config.BLMService.ImageProcess.Url, "application/json", strings.NewReader(string(postMapB)))
-
 	var headerData = make(map[string]string, 1)
 	headerData["Content-Type"] = "application/json"
-	result, err := curl.ApiCall(l.svcCtx.Config.BLMService.ImageProcess.Url, "POST", headerData, strings.NewReader(string(postMapB)), 20)
+	result, err := curl.ApiCall(l.svcCtx.Config.BLMService.ImageProcess.Url, "POST", headerData, strings.NewReader(string(postMapB)), time.Second*20)
 
 	if err != nil {
 		logx.Error(err)
@@ -118,8 +157,8 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 		Module:      &module,
 		UserId:      &userId,
 		GuestId:     &guestId,
-		ResourceId:  &req.ResourceId,
-		ResourceUrl: &req.ResourceUrl,
+		ResourceId:  &uploadRes.ResourceId,
+		ResourceUrl: &uploadRes.ResourceUrl,
 		Metadata:    &resultStr,
 		CreateAt:    &nowTime,
 	})

server/upload/internal/types/types.go

@@ -16,11 +16,10 @@ type UploadFileBaseReq struct {
 }
 
 type UploadLogoReq struct {
-	ResourceId  string `form:"resource_id"`           // 资源ID
-	ResourceUrl string `form:"resource_url"`          // 资源URL
-	IsRemoveBg  int64  `form:"is_remove_bg,optional"` // 是否要去掉背景
-	Proportion  int64  `form:"proportion,default=60"` // 贴图在模型面板上的比例
-	SkuId       int64  `form:"sku_id,default=0"`      // 模板ID
+	FileKey    string `form:"file_key"`              // 上传logo唯一标识信息
+	IsRemoveBg int64  `form:"is_remove_bg,optional"` // 是否要去掉背景
+	Proportion int64  `form:"proportion,default=60"` // 贴图在模型面板上的比例
+	SkuId      int64  `form:"sku_id,default=0"`      // 模板ID
 }
 
 type UploadFileBackendReq struct {