From 50da55d7bb9d60b78c67856f1466ef665b8cb009 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Mon, 14 Aug 2023 15:46:28 +0800
Subject: [PATCH] fix

---
 server/render/consumer/assemble_render_data.go | 9 +++++----
 server/render/etc/render.yaml                  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/render/consumer/assemble_render_data.go b/server/render/consumer/assemble_render_data.go
index 2eaf2831..a37a131c 100644
--- a/server/render/consumer/assemble_render_data.go
+++ b/server/render/consumer/assemble_render_data.go
@@ -17,6 +17,7 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"gorm.io/gorm"
 	"io/ioutil"
+	"os"
 	"strconv"
 	"time"
 )
@@ -233,9 +234,9 @@ func getCombineImage(ctx context.Context, svcCtx *svc.ServiceContext, parseInfo
 	url := svcCtx.Config.PythonApi.CombineImageUrl
 	header := make(map[string]string)
 	header["content-type"] = "application/json"
-	/*f, _ := os.Create("a.txt")
-	defer f.Close()
-	f.Write(postData)*/
+	/*	f, _ := os.Create("a.txt")
+		defer f.Close()
+		f.Write(postData)*/
 	httpRsp, err := curl.ApiCall(url, "POST", header, bytes.NewReader(postData), time.Second*20)
 	if err != nil {
 		logx.Error("failed to combine logo:", err)
@@ -252,7 +253,6 @@ func getCombineImage(ctx context.Context, svcCtx *svc.ServiceContext, parseInfo
 		logx.Error("failed to parse python api rsp:", err)
 		return "", err
 	}
-	//fmt.Println("××××××××××××××××××××：", pythonApiInfo)
 	//上传刀版图
 	var upload = file.Upload{
 		Ctx:        ctx,
@@ -271,5 +271,6 @@ func getCombineImage(ctx context.Context, svcCtx *svc.ServiceContext, parseInfo
 		logx.Error("上传刀版图到s3失败:", err)
 		return "", err
 	}
+	logx.Info("发送渲染组装数据到unity成功")
 	return uploadRes.ResourceUrl, nil
 }
diff --git a/server/render/etc/render.yaml b/server/render/etc/render.yaml
index 7081d46b..2be7fc7d 100644
--- a/server/render/etc/render.yaml
+++ b/server/render/etc/render.yaml
@@ -14,4 +14,4 @@ AWS:
             Secret: sjCEv0JxATnPCxno2KNLm0X8oDc7srUR+4vkYhvm
             Token:
 PythonApi: #python接口
-    CombineImageUrl: http://192.168.1.7:45678/LogoCombine #合成刀版图接口
\ No newline at end of file
+    CombineImageUrl: http://18.119.109.254:8999/LogoCombine #合成刀版图接口
\ No newline at end of file