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

server/resource/etc/resource.yaml

@@ -17,6 +17,7 @@ AWS:
             Token:
 BLMService:
     Url: "http://18.119.109.254:8999"
+    # Url: "http://192.168.1.7:8999"
     LogoCombine:
         #Url: "http://192.168.1.7:8999/LogoCombine"
         Url: "http://18.119.109.254:8999/LogoCombine"

server/resource/internal/logic/logocombinelogic.go

@@ -57,11 +57,15 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
 		userId = userinfo.UserId
 	}
 	res, err := l.svcCtx.Repositories.ImageHandle.LogoCombine(l.ctx, &repositories.LogoCombineReq{
-		ResourceKey:  req.ResourceKey,
-		TemplateId:   req.TemplateId,
-		CombineParam: req.CombineParam,
-		UserId:       userId,
-		GuestId:      guestId,
+		UserId:      userId,
+		GuestId:     guestId,
+		TemplateId:  req.TemplateId,
+		TemplateTag: req.TemplateTag,
+		Website:     req.Website,
+		Slogan:      req.Slogan,
+		Phone:       req.Phone,
+		Address:     req.Address,
+		Qrcode:      req.Qrcode,
 	})
 
 	if err != nil {

server/resource/internal/types/types.go

@@ -11,9 +11,13 @@ type ResourceInfoReq struct {
 }
 
 type LogoCombineReq struct {
-	ResourceKey  string `form:"resource_key"`  // 资源唯一标识
-	CombineParam string `form:"combine_param"` // 合图参数
-	TemplateId   int64  `form:"template_id"`   // 合图参数
+	TemplateId  int64  `form:"template_id"`      // 合图参数
+	TemplateTag string `form:"template_tag"`     // 合图参数
+	Website     string `form:"website,optional"` // 合图参数
+	Slogan      string `form:"slogan,optional"`  // 合图参数
+	Address     string `form:"address,optional"` // 合图参数
+	Phone       string `form:"phone,optional"`   // 合图参数
+	Qrcode      string `form:"qrcode,optional"`  // 合图参数
 }
 
 type Request struct {

server/resource/resource.go

@@ -4,7 +4,6 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
-	"time"
 
 	"fusenapi/utils/auth"
 
@@ -23,7 +22,6 @@ func main() {
 
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
-	c.Timeout = int64(time.Second * 15)
 	server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) {
 	}))
 	defer server.Stop()