fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
laodaming 2023-10-08 10:22:00 +08:00
parent 3f78cfd824
commit 414a3f8507
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/product-template-tag/internal/logic/gettemplatetagcolorlogic.go
View File

@ -1,15 +1,14 @@
package logic package logic
import ( import (
"context"
"encoding/json" "encoding/json"
"errors" "errors"
"fusenapi/model/gmodel" "fusenapi/model/gmodel"
"fusenapi/utils/auth" "fusenapi/utils/auth"
"fusenapi/utils/basic" "fusenapi/utils/basic"
"fusenapi/utils/s3url_to_s3id"
"gorm.io/gorm" "gorm.io/gorm"
"strings"
"context"
"fusenapi/server/product-template-tag/internal/svc" "fusenapi/server/product-template-tag/internal/svc"
"fusenapi/server/product-template-tag/internal/types" "fusenapi/server/product-template-tag/internal/types"
@ -40,11 +39,10 @@ func (l *GetTemplateTagColorLogic) GetTemplateTagColor(req *types.GetTemplateTag
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param selected_color_index is invalid") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param selected_color_index is invalid")
} }
//根据logo查询素材资源 //根据logo查询素材资源
s := strings.Split(req.Logo, "/") resourceId := s3url_to_s3id.GetS3ResourceIdFormUrl(req.Logo)
if len(s) <= 1 { if resourceId == "" {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid logo") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "param logo is invalid")
} }
resourceId := s[len(s)-1]
var ( var (
userMaterial *gmodel.FsUserMaterial userMaterial *gmodel.FsUserMaterial
templateTagInfo *gmodel.FsProductTemplateTags templateTagInfo *gmodel.FsProductTemplateTags

9
service/repositories/image_handle.go
View File

@ -9,7 +9,7 @@ import (
"fusenapi/utils/curl" "fusenapi/utils/curl"
"fusenapi/utils/file" "fusenapi/utils/file"
"fusenapi/utils/hash" "fusenapi/utils/hash"
"strings" "fusenapi/utils/s3url_to_s3id"
"time" "time"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
@ -225,11 +225,10 @@ type TemplateTagColor struct {
} }
func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq) (*LogoCombineRes, error) { func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq) (*LogoCombineRes, error) {
s := strings.Split(in.LogoUrl, "/") logoResourceId := s3url_to_s3id.GetS3ResourceIdFormUrl(in.LogoUrl)
if len(s) <= 1 { if logoResourceId == "" {
return nil, errors.New("无效的logo") return nil, errors.New("invalid logo url")
} }
logoResourceId := s[len(s)-1]
userMaterialModel := gmodel.NewFsUserMaterialModel(l.MysqlConn) userMaterialModel := gmodel.NewFsUserMaterialModel(l.MysqlConn)
resLogoInfo, err := userMaterialModel.FindOneByLogoResourceId(ctx, logoResourceId) resLogoInfo, err := userMaterialModel.FindOneByLogoResourceId(ctx, logoResourceId)
if err != nil { if err != nil {