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

server/upload/internal/logic/uploadlogodebuglogic.go

@@ -13,12 +13,14 @@ import (
 	"fusenapi/utils/s3url_to_s3id"
 	"io"
 	"net/http"
+	"time"
 
 	"context"
 
 	"fusenapi/server/upload/internal/svc"
 	"fusenapi/server/upload/internal/types"
 
+	"github.com/zeromicro/go-zero/core/logc"
 	"github.com/zeromicro/go-zero/core/logx"
 	"gorm.io/gorm"
 )
@@ -149,6 +151,50 @@ func (l *UploadLogoDebugLogic) UploadLogoDebug(req *types.UploadLogoDebugReq, us
 		return resp.SetStatus(basic.CodeServiceErr, fmt.Sprintf("算法请求--LOGO信息--错误：%+v", err))
 	}
 	resultStr = resLogoStandard.Res
+	resultStrB := []byte(resultStr)
+
+	var module = "logo"
+	var nowTime = time.Now().UTC()
+	// 新增素材记录
+	materialInfo := gmodel.FsUserMaterial{
+		Module:      &module,
+		UserId:      &userId,
+		GuestId:     &guestId,
+		ResourceId:  &uploadRes.ResourceId,
+		ResourceUrl: &uploadRes.ResourceUrl,
+		Metadata:    &resultStrB,
+		Ctime:       &nowTime,
+	}
+	err = l.svcCtx.MysqlConn.WithContext(l.ctx).Transaction(func(tx *gorm.DB) error {
+		var userDebug gmodel.FsUserDebug
+		res01 := tx.Model(&gmodel.FsUserDebug{}).Where("guest_id = ?", guestId).Take(&userDebug)
+		if res01.Error != nil {
+			if !errors.Is(res01.Error, gorm.ErrRecordNotFound) {
+				logc.Errorf(l.ctx, "FsUserDebug Take err：%+v", res01.Error)
+				return res01.Error
+			} else {
+				res02 := tx.Model(&gmodel.FsUserDebug{}).Create(&gmodel.FsUserDebug{
+					GuestId: &guestId,
+					Ctime:   &nowTime,
+				})
+				if res02.Error != nil {
+					logc.Errorf(l.ctx, "FsUserDebug Create err：%+v", res02.Error)
+					return res02.Error
+				}
+			}
+		}
+		resCreate := tx.Create(&materialInfo)
+		err = resCreate.Error
+		if err != nil {
+			logc.Errorf(l.ctx, "FsUserMaterial Create err：%+v", err)
+			return err
+		}
+		return nil
+	})
+
+	if err != nil {
+		return resp.SetStatusWithMessage(basic.CodeApiErr, "")
+	}
 
 	//解析用户素材元数据
 	var metaData map[string]interface{}