fix

server/websocket/internal/logic/allocation_processing_factory.go

@@ -6,23 +6,23 @@ import (
 
 // 消息分发工厂
 type allocationProcessorFactory interface {
-	allocationMessage(data []byte)
+	allocationMessage(w *wsConnectItem, data []byte)
 }
 
 var mapAllocationProcessor = make(map[constants.Websocket]allocationProcessorFactory)
 
 func (w *wsConnectItem) newAllocationProcessor(msgType constants.Websocket) allocationProcessorFactory {
-	if obj, ok := mapAllocationProcessor[msgType]; ok {
-		return obj
+	if val, ok := mapAllocationProcessor[msgType]; ok {
+		return val
 	}
 	var obj allocationProcessorFactory
 	switch msgType {
 	//图片渲染
 	case constants.WEBSOCKET_RENDER_IMAGE:
-		obj = &renderProcessor{*w}
+		obj = &renderProcessor{}
 	//刷新重连请求恢复上次连接的标识
 	case constants.WEBSOCKET_REQUEST_REUSE_LAST_CONNECT:
-		obj = &reuseConnProcessor{*w}
+		obj = &reuseConnProcessor{}
 	default:
 
 	}

server/websocket/internal/logic/datatransferlogic.go

@@ -393,6 +393,10 @@ func (w *wsConnectItem) allocationProcessing(data []byte) {
 	d, _ := json.Marshal(parseInfo.D)
 	//获取工厂实例
 	processor := w.newAllocationProcessor(parseInfo.T)
+	if processor == nil {
+		logx.Error("未知消息类型:", string(data))
+		return
+	}
 	//执行工厂方法
-	processor.allocationMessage(d)
+	processor.allocationMessage(w, d)
 }

server/websocket/internal/logic/ws_render_image.go

@@ -20,7 +20,6 @@ import (
 
 // 渲染处理器
 type renderProcessor struct {
-	w wsConnectItem
 }
 
 // 云渲染属性
@@ -49,12 +48,12 @@ type renderTask struct {
 	uploadUnityRenderImageTakesTime int64  //上传unity渲染结果图时间
 }
 
-func (r *renderProcessor) allocationMessage(data []byte) {
+func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) {
 	logx.Info("收到渲染任务消息:", string(data))
 	select {
-	case <-r.w.closeChan: //已经关闭
+	case <-w.closeChan: //已经关闭
 		return
-	case r.w.extendRenderProperty.renderChan <- data: //发入到缓冲队列
+	case w.extendRenderProperty.renderChan <- data: //发入到缓冲队列
 		return
 	case <-time.After(time.Second * 3): //三秒没进入缓冲队列就丢弃
 		return

server/websocket/internal/logic/ws_reuse_last_connect.go

@@ -11,58 +11,60 @@ import (
 
 // 复用连接处理器
 type reuseConnProcessor struct {
-	w wsConnectItem
 }
 
-func (r *reuseConnProcessor) allocationMessage(data []byte) {
+func (r *reuseConnProcessor) allocationMessage(w *wsConnectItem, data []byte) {
 	logx.Info("收到请求恢复上次连接标识数据:", string(data))
 	var wid string
 	if err := json.Unmarshal(data, &wid); err != nil {
 		logx.Error(" invalid format of wid :", wid)
-		r.w.incomeDataFormatErrResponse("invalid format of wid")
+		w.incomeDataFormatErrResponse("invalid format of wid")
 		return
 	}
 	//解密
 	decryptionWid, err := encryption_decryption.CBCDecrypt(wid)
 	if err != nil {
-		r.w.reuseLastConnErrResponse("invalid wid")
+		w.reuseLastConnErrResponse("invalid wid")
 		return
 	}
 	lendecryptionWid := len(decryptionWid)
 	//合成client后缀,不是同个后缀的不能复用
-	userPart := getUserJoinPart(r.w.userId, r.w.guestId, r.w.userAgent)
+	userPart := getUserJoinPart(w.userId, w.guestId, w.userAgent)
 	lenUserPart := len(userPart)
 	if lendecryptionWid <= lenUserPart {
-		r.w.reuseLastConnErrResponse("length of client id is to short")
+		w.reuseLastConnErrResponse("length of client id is to short")
 		return
 	}
 	//尾部不同不能复用
 	if decryptionWid[lendecryptionWid-lenUserPart:] != userPart {
-		r.w.reuseLastConnErrResponse("the client id is not belong to you before")
+		w.reuseLastConnErrResponse("the client id is not belong to you before")
 		return
 	}
 	//存在是不能给他申请重新绑定
 	if v, ok := mapConnPool.Load(wid); ok {
 		obj, ok := v.(wsConnectItem)
 		if !ok {
+			w.reuseLastConnErrResponse("连接断言失败")
 			logx.Error("连接断言失败")
+			return
 		}
 		//是当前自己占用(无需处理)
-		if obj.uniqueId == r.w.uniqueId {
-			rsp := r.w.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, wid)
-			r.w.sendToOutChan(rsp)
+		if obj.uniqueId == w.uniqueId {
+			rsp := w.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, wid)
+			w.sendToOutChan(rsp)
 			return
 		} else {
-			r.w.reuseLastConnErrResponse("the wid is used by other people")
+			w.reuseLastConnErrResponse("the wid is used by other people")
 			return
 		}
 	}
 	//重新绑定
-	r.w.uniqueId = wid
-	mapConnPool.Store(wid, r.w)
-	rsp := r.w.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, wid)
-	r.w.sendToOutChan(rsp)
-	return
+	logx.Info("开始重新绑定>>>>>")
+	w.uniqueId = wid
+	mapConnPool.Store(wid, *w)
+	rsp := w.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, wid)
+	w.sendToOutChan(rsp)
+	logx.Info("重新绑定成功")
 }
 
 // 获取用户拼接部分(复用标识用到)