diff --git a/server/upload/internal/logic/uploadlogologic.go b/server/upload/internal/logic/uploadlogologic.go index 8120d330..6b6abea0 100644 --- a/server/upload/internal/logic/uploadlogologic.go +++ b/server/upload/internal/logic/uploadlogologic.go @@ -133,12 +133,11 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us Height: "0", Proportion: "100", }) - logoUrl = resLogoStandard.ResourceUrl - if err != nil { logx.Error(err) return resp.SetStatus(basic.CodeServiceErr) } + logoUrl = resLogoStandard.ResourceUrl } else { logoUrl = uploadRes.ResourceUrl } diff --git a/service/repositories/image_handle.go b/service/repositories/image_handle.go index 43a68c54..4a89f61c 100644 --- a/service/repositories/image_handle.go +++ b/service/repositories/image_handle.go @@ -59,7 +59,7 @@ func (l *defaultImageHandle) LogoInfoSet(ctx context.Context, in *LogoInfoSetReq err := curl.NewClient(ctx, &curl.Config{ BaseUrl: *l.BLMServiceUrl, - Url: constants.BLMServiceUrlLogoCombine, + Url: constants.BLMServiceUrlLogoFeatureExtraction, }).PostJson(postMap, &resultBLM) if err != nil { logx.Error(err) @@ -70,7 +70,9 @@ func (l *defaultImageHandle) LogoInfoSet(ctx context.Context, in *LogoInfoSetReq logx.Error(err) return nil, err } - return nil, nil + return &LogoInfoSetRes{ + Res: resultBLM.Data.(string), + }, nil } /* logo信息 */ diff --git a/utils/file/upload.go b/utils/file/upload.go index 4539ef2f..0279422b 100644 --- a/utils/file/upload.go +++ b/utils/file/upload.go @@ -81,7 +81,10 @@ func (upload *Upload) UploadFileByBase64(req *UploadBaseReq) (*UploadBaseRes, er uploadBaseRes.ResourceId = resourceId uploadBaseRes.ResourceUrl = *resourceInfo.ResourceUrl } else { - resourceId = req.ResourceId + if req.ResourceId != "" { + resourceId = req.ResourceId + } + dist, contentType, err := FileBase64ToByte(req.FileData) if err != nil {