From 54dc7ba173df00a0124130b0a84a58f964c49aa1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-V763RJ7\\Administrator" <835606593@qq.com>
Date: Fri, 27 Jun 2025 21:03:23 +0800
Subject: [PATCH] tt
---
Client/a.html | 175 ++++++++++++++++++
Server/Gateway/handler/ws_handler/manager.go | 8 +-
Server/common/net/socket/server.go | 4 +-
.../common/net/socket/websocket/websocket.go | 2 +-
Server/common/net/socket/websocket/wsconn.go | 10 +-
5 files changed, 188 insertions(+), 11 deletions(-)
create mode 100644 Client/a.html
diff --git a/Client/a.html b/Client/a.html
new file mode 100644
index 0000000..a2f6d24
--- /dev/null
+++ b/Client/a.html
@@ -0,0 +1,175 @@
+
+
+
+
+
+ 游戏方块容器
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Server/Gateway/handler/ws_handler/manager.go b/Server/Gateway/handler/ws_handler/manager.go
index 3976db7..e186d2d 100644
--- a/Server/Gateway/handler/ws_handler/manager.go
+++ b/Server/Gateway/handler/ws_handler/manager.go
@@ -17,16 +17,16 @@ func init() {
}
}
-func (m *userManager) Add(cid int32, client *Client) {
+func (m *userManager) Add(uid int32, client *Client) {
m.Lock()
defer m.Unlock()
- m.userMap[cid] = client
+ m.userMap[uid] = client
}
-func (m *userManager) Delete(cid int32) {
+func (m *userManager) Delete(uid int32) {
m.Lock()
defer m.Unlock()
- delete(m.userMap, cid)
+ delete(m.userMap, uid)
}
func (m *userManager) GetAll() map[int32]*Client {
diff --git a/Server/common/net/socket/server.go b/Server/common/net/socket/server.go
index 88f5a49..1d8e830 100644
--- a/Server/common/net/socket/server.go
+++ b/Server/common/net/socket/server.go
@@ -26,8 +26,8 @@ type ISocketServer interface {
// ISocketConn 由网络层实现
type ISocketConn interface {
- GetParam(key string) interface{}
- SetParam(key string, values interface{})
+ GetParam(key string) string
+ SetParam(key string, values string)
Write(data []byte) error
Close() error
}
diff --git a/Server/common/net/socket/websocket/websocket.go b/Server/common/net/socket/websocket/websocket.go
index 5bc47f6..fae657e 100644
--- a/Server/common/net/socket/websocket/websocket.go
+++ b/Server/common/net/socket/websocket/websocket.go
@@ -66,7 +66,7 @@ func (s *WSServer) OnOpen(c gnet.Conn) ([]byte, gnet.Action) {
curHeader: nil,
cachedBuf: bytes.Buffer{},
},
- param: make(map[string]interface{}),
+ param: make(map[string]string),
}
c.SetContext(ws)
s.unUpgradeConn.Store(c.RemoteAddr().String(), ws)
diff --git a/Server/common/net/socket/websocket/wsconn.go b/Server/common/net/socket/websocket/wsconn.go
index 6516d38..f54c265 100644
--- a/Server/common/net/socket/websocket/wsconn.go
+++ b/Server/common/net/socket/websocket/wsconn.go
@@ -19,7 +19,7 @@ type WSConn struct {
logger logging.Logger
isUpgrade bool
isClose bool
- param map[string]interface{}
+ param map[string]string
openTime int64
wsMessageBuf
}
@@ -163,15 +163,17 @@ func (w *WSConn) OnRequest(u []byte) error {
if err != nil {
return err
}
- w.SetParam("query", parsedURL.Query())
+ for key, value := range parsedURL.Query() {
+ w.SetParam(key, value[0])
+ }
return nil
}
-func (w *WSConn) GetParam(key string) interface{} {
+func (w *WSConn) GetParam(key string) string {
return w.param[key]
}
-func (w *WSConn) SetParam(key string, values interface{}) {
+func (w *WSConn) SetParam(key string, values string) {
w.param[key] = values
}