合并主支

xiyoo0812 · Oct 7, 2023 · f6b830e · f6b830e
2 parents dc73da0 + 41dd4d6
commit f6b830e
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 384 deletions.
diff --git a/bin/accord.conf b/bin/accord.conf
@@ -28,3 +28,6 @@ set_env("QUANTA_MODE", "3")
 
 --协议测试
 set_env("QUANTA_ACCORD_HTTP", "127.0.0.1:10401")
+
+--服务器列表API
+set_env("QUANTA_SRVLIST_API", "http://10.98.8.100:18080/server_mgr/query")
diff --git a/server/robot/accord/src/bundle.lua b/server/robot/accord/src/bundle.lua
diff --git a/server/robot/accord/src/index.html b/server/robot/accord/src/index.html
diff --git a/server/robot/accord/src/net_utils.js b/server/robot/accord/src/net_utils.js
@@ -4,7 +4,7 @@ var NetUtils = {
         this.http = http
     },
     post: function (name, args, callback) {
-        this.http.post('/'+name, args).then(function (response) {
+        this.http.post(name, args).then(function (response) {
             var data = response.data || {}
             if(response.status == 200){
                 if(callback){
@@ -15,12 +15,12 @@ var NetUtils = {
                 console.error("[Request][post] fail name(%s) args(%s) status(%s)", name, args, response.status)
             }
         }, function (response) {
-            callback(false, data)
+            callback(false, null)
             console.error("[Request][post] fail name(%s) args(%s) status(%s)", name, args, response.status)
         });
     },
     get: function(name, args, callback){
-        this.http.get('/'+name, args).then(function(response){
+        this.http.get(name, args).then(function(response){
             var data = response.data || {}
             if(response.status == 200){
                 if(callback){
@@ -31,7 +31,7 @@ var NetUtils = {
                 console.error("[Request][get] fail name(%s) args(%s) status(%s)", name, args, response.status)
             }
         }, function (response) {
-            callback(false, data)
+            callback(false, null)
             console.error("[Request][get] fail name(%s) args(%s) status(%s)", name, args, response.status)
         });
     }

diff --git a/server/robot/module/login.lua b/server/robot/module/login.lua
@@ -170,7 +170,7 @@ function LoginModule:choose_role_req()
     }
     local ok, res = self:call("NID_LOGIN_ROLE_CHOOSE_REQ", req_data)
     if self:check_callback(ok, res) then
-        log_warn("[LoginModule][choose_role_req] robot:{}, ok={}, res={}", self:get_title(), ok, res)
+        log_warn("[LoginModule][choose_role_req] robot:{}, ok={}, res={} req_data={}", self:get_title(), ok, res, req_data)
         return false
     end
     self.lobby = res.lobby

diff --git a/server/robot/module/session.lua b/server/robot/module/session.lua
@@ -88,6 +88,7 @@ function SessionModule:call(cmdid, data)
     if self.client then
         local srv_type = self:conv_type(cmdid)
         local ok, resp = self.client:call(cmdid, data, srv_type)
+        log_debug("call cmdid:{} data:{} srv_type:{} ok:{} resp:{}",cmdid, data, srv_type, ok, resp)
         if srv_type == 0 and cmdid ~= 1001 then
             if resp then
                 resp.req_cmd_id = cmdid

diff --git a/server/robot/msg_mgr.lua b/server/robot/msg_mgr.lua
@@ -5,6 +5,7 @@ local log_debug    = logger.debug
 local pb_enum_id   = protobuf.enum
 local supper       = string.upper
 local tunpack      = table.unpack
+local tcopy        = qtable.copy
 
 local protobuf_mgr = quanta.get("protobuf_mgr")
 
@@ -99,12 +100,14 @@ function MsgMgr:args_convert(cmd_id, data)
     if cmd_id == 1001 then
         return
     end
+    local c_data = tcopy(data)
     -- 获取协议结构
     local struct = self:msg_struct(cmd_id)
     -- 转换参数字段
     if struct then
-        self:convert_fields(struct, data)
+        self:convert_fields(struct, c_data)
     end
+    return c_data
 end
 
 quanta.msg_mgr = MsgMgr()

diff --git a/server/robot/robot.lua b/server/robot/robot.lua
@@ -48,8 +48,8 @@ end
 function Robot:push_message(cmd_id, msg)
     log_debug("recv server msg:{} {}",cmd_id, msg)
     msg.cmd_id = cmd_id
-    msg_mgr:args_convert(cmd_id, msg)
-    self.messages:push(msg)
+    local c_msg = msg_mgr:args_convert(cmd_id, msg)
+    self.messages:push(c_msg)
 end
 
 function Robot:get_messages()