fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/auth

Browse Source
This commit is contained in:
eson 2023-08-11 11:31:34 +08:00
commit c40cd1e180
4 changed files with 76 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
proxyserver/main.go
View File

@ -15,6 +15,7 @@ import (
"sync"
"time"
"github.com/gorilla/websocket"
"gopkg.in/yaml.v2"
)
@ -115,6 +116,7 @@ type Backend struct {
HttpAddress string
Client *http.Client
Handler http.HandlerFunc
Dialer *websocket.Dialer
}
func NewBackend(mux *http.ServeMux, httpAddress string, muxPaths ...string) *Backend {
@ -150,6 +152,60 @@ func NewBackend(mux *http.ServeMux, httpAddress string, muxPaths ...string) *Bac
// 创建处理请求的函数
handleRequest := func(w http.ResponseWriter, r *http.Request) {
if websocket.IsWebSocketUpgrade(r) {
//todo: 建立websocket的代理
target := url.URL{Scheme: "ws", Host: strings.Split(backend.HttpAddress, "//")[1], Path: r.URL.Path}
var transfer = func(src, dest *websocket.Conn) {
for {
mType, msg, err := src.ReadMessage()
if err != nil {
log.Println(err)
break
}
err = dest.WriteMessage(mType, msg)
if err != nil {
log.Println(err)
break
}
}
src.Close()
dest.Close()
}
header := r.Header.Clone()
// log.Println(target.String())
header.Del("Sec-Websocket-Extensions")
header.Del("Upgrade")
header.Del("Sec-Websocket-Key")
header.Del("Sec-Websocket-Version")
header.Del("Connection")
// header.Del("Origin")
proxyConn, _, err := backend.Dialer.Dial(target.String(), header)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
// defer proxyConn.Close()
upgrader := websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { return true },
}
conn, err := upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
// defer conn.Close()
go transfer(proxyConn, conn)
// go transfer(conn, proxyConn)
return
}
// 解析目标URL，包含了查询参数
targetURL, err := url.Parse(httpAddress + r.URL.String())
if err != nil {

2
run_all_server.sh
View File

@ -22,6 +22,8 @@ run_server() {
cd - > /dev/null
}
find /tmp/go-build* -mmin +5 -delete
# 列出所有服务器目录
server_dirs=() # 初始化一个空数组

27
server/render/consumer/assemble_render_data.go
View File

@ -40,11 +40,13 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
}
val := ctx.Value("svcctx")
if val == nil {
return errors.New("svcctx is nil")
logx.Error("svcctx is nil")
return nil //不返回错误就删除消息
}
svcCtx, ok := val.(*svc.ServiceContext)
if !ok {
return errors.New("svcctx is nil!!")
logx.Error("svcctx is nil!!")
return nil //不返回错误就删除消息
}
rabbitmq := initalize.RabbitMqHandle{}
//获取模板（产品第一个sku的模板）
@ -52,10 +54,10 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
logx.Error("template info is not found")
return nil
return nil //不返回错误就删除消息
}
logx.Error("failed to get template info:", err)
return err
return nil //不返回错误就删除消息
}
combineImage := "" //刀版图
combineHash := hash.JsonHashKey(parseInfo) //区别于云渲染的taskid,这个用获取刀版图缓存
@ -63,13 +65,13 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
resource, err := svcCtx.AllModels.FsResource.FindOneById(ctx, combineHash)
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
logx.Error("failed to get resource :", err)
return err
return nil //不返回错误就删除消息
}
//如果不存在,则请求生成刀版图
if errors.Is(err, gorm.ErrRecordNotFound) {
combineImage, err = getCombineImage(ctx, svcCtx, parseInfo, productTemplate, combineHash)
if err != nil {
return err
return nil //不返回错误就删除消息
}
} else {
combineImage = *resource.ResourceUrl
@ -79,10 +81,10 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
logx.Error("element info is not found,model_id = ?", *productTemplate.ModelId)
return nil
return nil //不返回错误就删除消息
}
logx.Error("failed to get element list,", err)
return err
return nil //不返回错误就删除消息
}
//组装数据
refletion := -1
@ -94,7 +96,7 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
if element.Mode != nil && *element.Mode != "" {
if err = json.Unmarshal([]byte(*element.Mode), &mode); err != nil {
logx.Error("faile to parse element mode json:", err)
return err
return nil //不返回错误就删除消息
}
}
tempData := make([]map[string]interface{}, 0, 3)
@ -154,7 +156,7 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error {
b, _ := json.Marshal(sendData)
if err = rabbitmq.SendMsg(constants.RABBIT_MQ_TO_UNITY, b); err != nil {
logx.Error("发送渲染组装数据到rabbitmq失败：", err)
return err
return nil //不返回错误就删除消息
}
logx.Info("发送渲染组装数据到unity成功")
return nil
@ -180,7 +182,7 @@ func getCombineImage(ctx context.Context, svcCtx *svc.ServiceContext, parseInfo
"address": "",
"phone": "",
"colors": []string{},
"template_tagid": []string{},
"template_tagid": []string{"b1a"},
"is_crop": false,
"shape": "",
"ratio": 0,
@ -222,6 +224,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)*/
httpRsp, err := curl.ApiCall(url, "POST", header, bytes.NewReader(postData), 20)
if err != nil {
logx.Error("failed to combine logo:", err)

4
server/websocket/internal/logic/ws_render_image_logic.go
View File

@ -100,10 +100,10 @@ func (w *wsConnectItem) renderImage(data []byte) {
d, _ := json.Marshal(tmpData)
//发送给对应的流水线组装数据
if err := w.rabbitMq.SendMsg(constants.RABBIT_MQ_ASSEMBLE_RENDER_DATA, d); err != nil {
logx.Error("发送渲染任务数据到MQ失败:", string(data), "err:", err)
logx.Error("发送渲染任务数据到MQ失败:", string(d), "err:", err)
return
}
logx.Info("发送渲染数据到rabbitmq成功:", string(data))
logx.Info("发送渲染数据到rabbitmq成功:", string(d))
}
// 操作连接中渲染任务的增加/删除