diff --git a/.vscode/launch.json b/.vscode/launch.json index 87e66b85..f4adc576 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -19,7 +19,7 @@ "request": "launch", "mode": "auto", "cwd": "${workspaceFolder}", - "args": ["-port=30000"], + "args": ["-port=27777"], "program": "${workspaceFolder}/logic" } diff --git a/common/socket/ServerEvent.go b/common/socket/ServerEvent.go index f771ff25..9c20e078 100644 --- a/common/socket/ServerEvent.go +++ b/common/socket/ServerEvent.go @@ -28,6 +28,12 @@ func (s *Server) Stop() error { return nil } +func (s *Server) OnClose(c gnet.Conn, _ error) (action gnet.Action) { + //fmt.Println(glog.GetStack(), c.Context().(*entity.ClientData).Player.UserID, "断开连接") + + //关闭连接 + return +} func (s *Server) OnBoot(eng gnet.Engine) gnet.Action { s.eng = eng @@ -111,7 +117,7 @@ func handle(c gnet.Conn) { c.Write([]byte(CROSS_DOMAIN)) c.Discard(len(TEXT)) - clientdata.IsCrossDomain = true + clientdata.IsCrossDomain = true //TODO 待修复未成功切换bug return } diff --git a/logic/main.go b/logic/main.go index 5531c82b..9a25b5f3 100644 --- a/logic/main.go +++ b/logic/main.go @@ -25,5 +25,5 @@ func Start(port string) { head := handler.NewTomeeHandler() head.Callback = controller.Recv - socket.NewServer(socket.WithPort(port), socket.WithSocketHandler(head)).Start() + socket.NewServer(socket.WithPort(port), socket.WithCORS(), socket.WithSocketHandler(head)).Start() } diff --git a/modules/base/middleware/middleware.go b/modules/base/middleware/middleware.go index a97896e7..27caff8f 100644 --- a/modules/base/middleware/middleware.go +++ b/modules/base/middleware/middleware.go @@ -75,6 +75,7 @@ func init() { // ants.Submit(func() { // socket.ReadLoop() // }) + // ants.Submit(func() { socket.ReadLoop() }) go socket.ReadLoop() })