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

service/repositories/image_handle.go

@@ -9,7 +9,7 @@ import (
 	"fusenapi/utils/curl"
 	"fusenapi/utils/file"
 	"fusenapi/utils/hash"
-	"strings"
+	"fusenapi/utils/s3url_to_s3id"
 	"time"
 
 	"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) {
-	s := strings.Split(in.LogoUrl, "/")
-	if len(s) <= 1 {
-		return nil, errors.New("无效的logo")
+	logoResourceId := s3url_to_s3id.GetS3ResourceIdFormUrl(in.LogoUrl)
+	if logoResourceId == "" {
+		return nil, errors.New("invalid logo url")
 	}
-	logoResourceId := s[len(s)-1]
 	userMaterialModel := gmodel.NewFsUserMaterialModel(l.MysqlConn)
 	resLogoInfo, err := userMaterialModel.FindOneByLogoResourceId(ctx, logoResourceId)
 	if err != nil {