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

server/websocket/internal/logic/datatransferlogic.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fusenapi/constants"
 	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/id_generator"
 	"fusenapi/utils/websocket_data"
@@ -66,7 +67,9 @@ var (
 // 每个连接的连接基本属性
 type wsConnectItem struct {
 	conn           *websocket.Conn //websocket的连接
+	ctx            context.Context
 	rabbitMq       *initalize.RabbitMqHandle
+	allModels      *gmodel.AllModelsGen
 	closeChan      chan struct{}  //ws连接关闭chan
 	isClose        bool           //是否已经关闭
 	uniqueId       uint64         //ws连接唯一标识
@@ -87,7 +90,7 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 	}
 	defer conn.Close()
 	//鉴权不成功10秒后断开
-	var (
+	/*var (
 		userInfo *auth.UserInfo
 		isAuth   bool
 	)
@@ -104,15 +107,17 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 		//发送关闭信息
 		_ = conn.WriteMessage(websocket.CloseMessage, nil)
 		return
-	}
+	}*/
 	//测试的目前写死 39
-	/*var userInfo auth.UserInfo
-	userInfo.UserId = 39*/
+	var userInfo auth.UserInfo
+	userInfo.UserId = 39
 	//生成连接唯一标识
 	uniqueId := websocketIdGenerator.Get()
 	ws := wsConnectItem{
 		conn:      conn,
+		ctx:       l.ctx,
 		rabbitMq:  l.svcCtx.RabbitMq,
+		allModels: l.svcCtx.AllModels,
 		uniqueId:  uniqueId,
 		closeChan: make(chan struct{}, 1),
 		inChan:    make(chan []byte, 1000),

server/websocket/internal/logic/ws_render_image_logic.go

@@ -2,11 +2,13 @@ package logic
 
 import (
 	"encoding/json"
+	"errors"
 	"fusenapi/constants"
 	"fusenapi/utils/hash"
 	"fusenapi/utils/websocket_data"
 
 	"github.com/zeromicro/go-zero/core/logx"
+	"gorm.io/gorm"
 )
 
 // 云渲染属性
@@ -24,18 +26,66 @@ type renderImageControlChanItem struct {
 
 // 渲染发送到组装数据组装数据
 func (w *wsConnectItem) renderImage(data []byte) {
-	var renderImageData websocket_data.AssembleRenderData
+	var renderImageData websocket_data.RenderImageReqMsg
 	if err := json.Unmarshal(data, &renderImageData); err != nil {
 		w.outChan <- w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, "invalid format of websocket render image message:"+string(data))
 		logx.Error("invalid format of websocket render image message", err)
 		return
 	}
 	logx.Info("收到请求云渲染图片数据：", renderImageData)
+	if renderImageData.RenderId == "" {
+		w.outChan <- w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, "invalid format of websocket render image message:render_id is empty")
+		logx.Error("invalid format of websocket render image message:render_id is empty")
+		return
+	}
+	if renderImageData.RenderData.ProductId <= 0 {
+		w.outChan <- w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, "invalid format of websocket render image message:product_id ")
+		logx.Error("invalid format of websocket render image message:product_id")
+		return
+	}
+	if renderImageData.RenderData.TemplateTagId <= 0 {
+		w.outChan <- w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, "invalid format of websocket render image message:template_tag_id ")
+		logx.Error("invalid format of websocket render image message:template_tag_id")
+		return
+	}
+	//获取上传最近的logo
+	userMaterial, err := w.allModels.FsUserMaterial.FindLatestOne(w.ctx, w.userId, w.guestId)
+	if err != nil {
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
+			w.outChan <- w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, "failed to get user logo")
+			logx.Error("failed to get user logo")
+			return
+		}
+		//使用默认logo(写死一个默认)
+		renderImageData.RenderData.Logo = "https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/f5ccd11365099fa47a6316b1cd639f6dd6064dcd2d37c8d2fcd0a322160b33cc"
+	} else {
+		renderImageData.RenderData.Logo = *userMaterial.ResourceUrl
+	}
 	//用户id赋值
 	renderImageData.RenderData.UserId = w.userId
 	renderImageData.RenderData.GuestId = w.guestId
-	//把需要渲染的图片任务加进去
+
+	//生成任务id
 	taskId := hash.JsonHashKey(renderImageData.RenderData)
+	//查询有没有缓存的资源,有就返回######################
+	resource, err := w.allModels.FsResource.FindOneById(w.ctx, taskId)
+	if err != nil {
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
+			logx.Error("failed to find render resource:", err)
+			return
+		}
+	} else {
+		//返回给客户端
+		b := w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{
+			RenderId: renderImageData.RenderId,
+			Image:    *resource.ResourceUrl,
+		})
+		//发送数据到out chan
+		w.sendToOutChan(b)
+		return
+	}
+	//###########################################
+	//把需要渲染的图片任务加进去
 	w.renderProperty.renderImageTaskCtlChan <- renderImageControlChanItem{
 		Option:   1, //0删除 1添加
 		TaskId:   taskId,

server/websocket/internal/svc/servicecontext.go

@@ -36,6 +36,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		RabbitMq:    initalize.InitRabbitMq(c.SourceRabbitMq, nil),
 	}
 }
+
 func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, error) {
 	AuthKey := r.Header.Get("Authorization")
 	if AuthKey == "" {