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

server/websocket/etc/websocket.yaml

@@ -5,4 +5,5 @@ SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
     AccessSecret: fusen2023
     AccessExpire: 2592000
-    RefreshAfter: 1592000
+    RefreshAfter: 1592000
+SourceRabbitMq: amqp://rabbit001:rabbit001129@110.41.19.98:5672

server/websocket/internal/config/config.go

@@ -8,6 +8,7 @@ import (
 
 type Config struct {
 	rest.RestConf
-	SourceMysql string
-	Auth        types.Auth
+	SourceMysql    string
+	Auth           types.Auth
+	SourceRabbitMq string
 }

server/websocket/internal/logic/datatransferlogic.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"fusenapi/constants"
+	"fusenapi/initalize"
 	"fusenapi/server/websocket/internal/types"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/id_generator"
@@ -64,13 +65,14 @@ var (
 // 每个连接的连接基本属性
 type wsConnectItem struct {
 	conn           *websocket.Conn //websocket的连接
-	closeChan      chan struct{}   //ws连接关闭chan
-	isClose        bool            //是否已经关闭
-	uniqueId       uint64          //ws连接唯一标识
-	inChan         chan []byte     //接受消息缓冲通道
-	outChan        chan []byte     //发送回客户端的消息
-	mutex          sync.Mutex      //互斥锁
-	renderProperty renderProperty  //扩展云渲染属性
+	rabbitMq       *initalize.RabbitMqHandle
+	closeChan      chan struct{}  //ws连接关闭chan
+	isClose        bool           //是否已经关闭
+	uniqueId       uint64         //ws连接唯一标识
+	inChan         chan []byte    //接受消息缓冲通道
+	outChan        chan []byte    //发送回客户端的消息
+	mutex          sync.Mutex     //互斥锁
+	renderProperty renderProperty //扩展云渲染属性
 }
 
 func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.ResponseWriter, r *http.Request) {
@@ -100,6 +102,7 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 	uniqueId := websocketIdGenerator.Get()
 	ws := wsConnectItem{
 		conn:      conn,
+		rabbitMq:  l.svcCtx.RabbitMq,
 		uniqueId:  uniqueId,
 		closeChan: make(chan struct{}, 1),
 		inChan:    make(chan []byte, 1000),
@@ -272,7 +275,7 @@ func (w *wsConnectItem) dealwithReciveData(data []byte) {
 	switch parseInfo.T {
 	//图片渲染
 	case constants.WEBSOCKET_RENDER_IMAGE:
-		go w.SendToCloudRender(d)
+		w.SendToCloudRender(d)
 	default:
 
 	}

server/websocket/internal/logic/ws_render_image_logic.go

@@ -59,7 +59,12 @@ func (w *wsConnectItem) SendToCloudRender(data []byte) {
 				Option: 1, //0删除 1添加
 				Key:    key,
 			}
-			// TODO 数据发送给云渲染服务器
+			//发送给对应的流水线组装数据
+			if err := w.rabbitMq.SendMsg(constants.RABBIT_MQ_ASSEMBLE_RENDER_DATA, data); err != nil {
+				logx.Error("发送渲染任务数据到MQ失败:", string(data))
+				continue
+			}
+			logx.Info("发送渲染数据到rabbitmq成功:", string(data))
 		}
 	}
 }

server/websocket/internal/svc/servicecontext.go

@@ -21,6 +21,7 @@ type ServiceContext struct {
 
 	MysqlConn *gorm.DB
 	AllModels *gmodel.AllModelsGen
+	RabbitMq  *initalize.RabbitMqHandle
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -29,9 +30,10 @@ func NewServiceContext(c config.Config) *ServiceContext {
 
 	return &ServiceContext{
 		Config:      c,
-		MysqlConn:   conn,
 		SharedState: StateServer,
+		MysqlConn:   initalize.InitMysql(c.SourceMysql),
 		AllModels:   gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
+		RabbitMq:    initalize.InitRabbitMq(c.SourceRabbitMq, nil),
 	}
 }
 func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, error) {