From affa1e0380ff13d68926a75ae6c618e5d361f8bb Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Tue, 25 Apr 2023 15:50:41 +0800
Subject: [PATCH] ws

---
 controllers/im.go                     | 27 +++++++++++++++------------
 main.go                               |  2 +-
 routers/commentsRouter_controllers.go | 16 ++++++++--------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/controllers/im.go b/controllers/im.go
index 7c851a0f5..c02af7fd7 100644
--- a/controllers/im.go
+++ b/controllers/im.go
@@ -3,6 +3,8 @@ package controllers
 import (
 	"encoding/json"
 
+	"git.rosy.net.cn/jx-callback/globals"
+
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/im"
 	"github.com/astaxie/beego/server/web"
 )
@@ -16,18 +18,19 @@ type IMController struct {
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /StartWebSocket [get]
-//func (c *IMController) StartWebSocket() {
-//	ws, err := upgrader.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil)
-//	if err != nil {
-//		globals.SugarLogger.Errorf("upgrade error: %v", err)
-//		return
-//	}
-//	defer ws.Close()
-//
-//	clientID := c.GetString("clientID")
-//	globals.SugarLogger.Debugf("clientID=%s", clientID)
-//	im.StartWebSocket(ws, clientID, err)
-//}
+func (c *IMController) StartWebSocket() {
+	ws, err := upgrader.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil)
+	if err != nil {
+		globals.SugarLogger.Errorf("upgrade error: %v", err)
+		return
+	}
+	defer ws.Close()
+
+	clientID := c.GetString("clientID")
+	globals.SugarLogger.Debugf("clientID=%s", clientID)
+
+	im.StartWebSocket(ws, clientID, err)
+}
 
 // @Title IM获取门店用户聊天列表
 // @Description IM获取门店用户聊天列表
diff --git a/main.go b/main.go
index 1bd4ddf57..d66ba444c 100644
--- a/main.go
+++ b/main.go
@@ -97,7 +97,7 @@ func Init() {
 	auto_delivery.Init() // 初始化骑手列表
 
 	go im.Init() //初始化ws连接
-	go http.HandleFunc("/v2/im/StartWebSocket", im.Run)
+	//go http.HandleFunc("/v2/im/StartWebSocket", im.Run)
 
 	//test
 	//mux := http.NewServeMux()
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 2c80a6074..6e2ea4650 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -4356,14 +4356,14 @@ func init() {
 			MethodParams:     param.Make(),
 			Filters:          nil,
 			Params:           nil})
-	//web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"],
-	//	web.ControllerComments{
-	//		Method:           "StartWebSocket",
-	//		Router:           `/StartWebSocket`,
-	//		AllowHTTPMethods: []string{"get"},
-	//		MethodParams:     param.Make(),
-	//		Filters:          nil,
-	//		Params:           nil})
+	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"],
+		web.ControllerComments{
+			Method:           "StartWebSocket",
+			Router:           `/StartWebSocket`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
 
 	//web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:FnController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:FnController"],
 	//	web.ControllerComments{