From d775e408eb05f83567b14a16f162b2f32bd83cf3 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Thu, 27 Apr 2023 11:12:24 +0800
Subject: [PATCH] im3

---
 controllers/im.go       | 60 ++++++++++++++++++++---------------------
 controllers/im_model.go |  1 -
 2 files changed, 30 insertions(+), 31 deletions(-)
 delete mode 100644 controllers/im_model.go

diff --git a/controllers/im.go b/controllers/im.go
index 3409197a7..81180e512 100644
--- a/controllers/im.go
+++ b/controllers/im.go
@@ -2,9 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"net/http"
-
-	"git.rosy.net.cn/jx-callback/globals"
 
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/im"
 	"github.com/astaxie/beego/server/web"
@@ -22,34 +19,37 @@ var maxMessageSize = int64(8192) // 最大的消息大小
 // @Failure 200 {object} controllers.CallResult
 // @router /StartWebSocket [get]
 func (c *IMController) StartWebSocket() {
-	upgrader.CheckOrigin = func(r *http.Request) bool {
-		return true
-	}
-	conn, err := upgrader.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil)
-	if err != nil {
-		globals.SugarLogger.Errorf("upgrade error: %v", err)
-		return
-	}
-	defer conn.Close()
 
-	clientID := c.GetString("clientID")
-	globals.SugarLogger.Debugf("clientID=%s", clientID)
-
-	//设置读取消息大小上线
-	conn.SetReadLimit(maxMessageSize)
-
-	clientSocket := im.NewClient(clientID, conn)
-
-	//读取客户端消息
-	clientSocket.Read()
-
-	if err = im.ConnRender(conn, im.RetData{Data: clientID}); err != nil {
-		_ = conn.Close()
-		return
-	}
-
-	// 用户连接事件
-	im.Manager.Connect <- clientSocket
+	im.Run(c.Ctx.ResponseWriter, c.Ctx.Request)
+	//
+	//upgrader.CheckOrigin = func(r *http.Request) bool {
+	//	return true
+	//}
+	//conn, err := upgrader.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil)
+	//if err != nil {
+	//	globals.SugarLogger.Errorf("upgrade error: %v", err)
+	//	return
+	//}
+	//defer conn.Close()
+	//
+	//clientID := c.GetString("clientID")
+	//globals.SugarLogger.Debugf("clientID=%s", clientID)
+	//
+	////设置读取消息大小上线
+	//conn.SetReadLimit(maxMessageSize)
+	//
+	//clientSocket := im.NewClient(clientID, conn)
+	//
+	////读取客户端消息
+	//clientSocket.Read()
+	//
+	//if err = im.ConnRender(conn, im.RetData{Data: clientID}); err != nil {
+	//	_ = conn.Close()
+	//	return
+	//}
+	//
+	//// 用户连接事件
+	//im.Manager.Connect <- clientSocket
 
 }
 
diff --git a/controllers/im_model.go b/controllers/im_model.go
deleted file mode 100644
index 2d3293679..000000000
--- a/controllers/im_model.go
+++ /dev/null
@@ -1 +0,0 @@
-package controllers