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

server/render/consumer/assemble_render_data.go

@@ -1,6 +1,8 @@
 package consumer
 
 import (
+	"encoding/json"
+	"fusenapi/utils/websocket_data"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -10,5 +12,11 @@ type MqConsumerRenderAssemble struct {
 
 func (m *MqConsumerRenderAssemble) Run(data []byte) error {
 	logx.Info("收到需要组装的消息:", string(data))
+	var parseInfo websocket_data.AssembleRenderData
+	if err := json.Unmarshal(data, &parseInfo); err != nil {
+		logx.Error("MqConsumerRenderAssemble数据格式错误:", err)
+		return nil //不返回错误就删除消息
+	}
+
 	return nil
 }

server/render/internal/handler/getfaceslicehandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/render/internal/logic"
+	"fusenapi/server/render/internal/svc"
+	"fusenapi/server/render/internal/types"
+)
+
+func GetFaceSliceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.Request
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewGetFaceSliceLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.GetFaceSlice(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/render/internal/handler/routes.go

@@ -17,6 +17,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/render/render_notify",
 				Handler: RenderNotifyHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/render/get_face_slice",
+				Handler: GetFaceSliceHandler(serverCtx),
+			},
 		},
 	)
 }

server/render/internal/logic/getfaceslicelogic.go

@@ -0,0 +1,69 @@
+package logic
+
+import (
+	"encoding/json"
+	"errors"
+	"fusenapi/constants"
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+	"gorm.io/gorm"
+	"strings"
+
+	"context"
+
+	"fusenapi/server/render/internal/svc"
+	"fusenapi/server/render/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetFaceSliceLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetFaceSliceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetFaceSliceLogic {
+	return &GetFaceSliceLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// 处理进入前逻辑w,r
+// func (l *GetFaceSliceLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
+// }
+
+// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
+// func (l *GetFaceSliceLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
+// // httpx.OkJsonCtx(r.Context(), w, resp)
+// }
+
+func (l *GetFaceSliceLogic) GetFaceSlice(req *types.Request, userinfo *auth.UserInfo) (resp *basic.Response) {
+	if !userinfo.IsUser() && !userinfo.IsGuest() {
+		return resp.SetStatusWithMessage(basic.CodeUnAuth, "please login or access cookie")
+	}
+	//获取用户素材信息
+	materialInfo, err := l.svcCtx.AllModels.FsUserMaterial.FindLatestOne(l.ctx, userinfo.UserId, userinfo.GuestId)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return resp.SetStatusWithMessage(basic.CodeDbRecordNotFoundErr, "user material info is not exists")
+		}
+		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get user material info")
+	}
+	if materialInfo.Metadata == nil || *materialInfo.Metadata == "" {
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "user material info`Metadata is empty")
+	}
+	var info map[string]interface{}
+	if err = json.Unmarshal([]byte(*materialInfo.Metadata), &info); err != nil {
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeJsonErr, "invalid json format of metadata")
+	}
+	str := strings.ReplaceAll(constants.RENDER_FACE_SLICE_TEMPLATE_JSON, "{{MainColorFill}}", info["main_color_fill"].(string))
+	str = strings.ReplaceAll(str, "{{SecondaryColorFill}}", info["secondary_color_fill"].(string))
+	str = strings.ReplaceAll(str, "{{LogoMaterial}}", info["logo_material"].(string))
+	var rspInfo interface{}
+	_ = json.Unmarshal([]byte(str), &rspInfo)
+	return resp.SetStatusWithMessage(basic.CodeOK, "success", rspInfo)
+}

server/websocket/internal/logic/datatransferlogic.go

@@ -65,12 +65,13 @@ var (
 type wsConnectItem struct {
 	conn           *websocket.Conn //websocket的连接
 	rabbitMq       *initalize.RabbitMqHandle
-	closeChan      chan struct{}  //ws连接关闭chan
-	isClose        bool           //是否已经关闭
-	uniqueId       uint64         //ws连接唯一标识
-	inChan         chan []byte    //接受消息缓冲通道
-	outChan        chan []byte    //发送回客户端的消息
-	mutex          sync.Mutex     //互斥锁
+	closeChan      chan struct{} //ws连接关闭chan
+	isClose        bool          //是否已经关闭
+	uniqueId       uint64        //ws连接唯一标识
+	inChan         chan []byte   //接受消息缓冲通道
+	outChan        chan []byte   //发送回客户端的消息
+	mutex          sync.Mutex    //互斥锁
+	userId         int64
 	renderProperty renderProperty //扩展云渲染属性
 }
 
@@ -83,10 +84,14 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 	}
 	defer conn.Close()
 	//鉴权不成功10秒后断开
-	/*isAuth, _ := l.checkAuth(svcCtx, r)
+	var (
+		userInfo *auth.UserInfo
+		isAuth   bool
+	)
+	isAuth, userInfo = l.checkAuth(svcCtx, r)
 	if !isAuth {
 		time.Sleep(time.Second) //兼容下火狐
-		rsp := types.DataTransferData{
+		rsp := websocket_data.DataTransferData{
 			T: constants.WEBSOCKET_UNAUTH,
 			D: nil,
 		}
@@ -96,7 +101,7 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 		//发送关闭信息
 		_ = conn.WriteMessage(websocket.CloseMessage, nil)
 		return
-	}*/
+	}
 	//生成连接唯一标识
 	uniqueId := websocketIdGenerator.Get()
 	ws := wsConnectItem{
@@ -111,6 +116,11 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 			renderImageTaskCtlChan: make(chan renderImageControlChanItem, 100),
 		},
 	}
+	if userInfo.UserId > 0 {
+		ws.userId = userInfo.UserId
+	} else {
+		ws.userId = userInfo.GuestId
+	}
 	//保存连接
 	mapConnPool.Store(uniqueId, ws)
 	defer ws.close()

server/websocket/internal/logic/ws_render_image_logic.go

@@ -39,6 +39,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
 	}
 	tmpData := websocket_data.AssembleRenderData{
 		TaskId:     taskId,
+		UserId:     w.userId,
 		RenderData: renderImageData.RenderData,
 	}
 	d, _ := json.Marshal(tmpData)