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

server/render/consumer/assemble_render_data.go

@@ -218,7 +218,8 @@ func getCombineImage(ctx context.Context, svcCtx *svc.ServiceContext, parseInfo
 	}
 	combineInfo["param_data"] = replaceData
 	postData, _ := json.Marshal(combineInfo)
-	url := "http://192.168.1.7:45678/LogoCombine"
+	//请求合成图片
+	url := svcCtx.Config.PythonApi.CombineImageUrl
 	header := make(map[string]string)
 	header["content-type"] = "application/json"
 	httpRsp, err := curl.ApiCall(url, "POST", header, bytes.NewReader(postData), 20)

server/render/etc/render.yaml

@@ -12,4 +12,6 @@ AWS:
         Credentials:
             AccessKeyID: AKIAZB2JKUXDPNRP4YT2
             Secret: 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
-            Token:
+            Token:
+PythonApi: #python接口
+    CombineImageUrl: http://192.168.1.7:45678/LogoCombine #合成刀版图接口

server/render/internal/config/config.go

@@ -19,4 +19,7 @@ type Config struct {
 			}
 		}
 	}
+	PythonApi struct {
+		CombineImageUrl string //合图url
+	}
 }