后台配置更新

nodes/web/controllers/gm.lua

@@ -1,28 +1,16 @@
 local code = require "code"
-local machine = require "machine"
-local noticeUtil = require "utils.noticeUtil"
 local timeUtil = require "utils.timeUtil"
-local nodeMgr = require "nodeMgr"
-local loginPlatformModule = require "modules.loginPlatformModule"
-local chatUtil = require "utils.chatUtil"
 local util_user = require("utils.util_user")
 local util_mail = require("utils.util_mail")
-local lib_game_mysql = require("lib_game_mysql")
 local gameConst = require("const.gameConst")
 
 local baseAdapt = require("base.baseAdapt")
-local resAdapt = require "adapt.resAdapt"
-local shopAdapt = require "adapt.shopAdapt"
-local chatAdapt = require "adapt.chatAdapt"
+local resAdapt = require("adapt.resAdapt")
 
 local moduleData = require("data.module")
-local sessionData = require("data.session")
 local payData = require("data.pay")
 local userData = require("data.user")
-local arenaData = require("data.arena")
-local battleData = require("data.battle")
-local resData = require("data.res")
-local playerData = require("data.player")
+local bagData = require("data.bag")
 
 local root = {}
 
@@ -35,10 +23,9 @@ function root.gm_get_player_info(msg)
     --.战斗局数	.广告次数	。金币	。钻石	.充值金额	-充值次数	.当前城市	.UUID	.UDID
     local _, items = root.getBagInfo({uid = uid})
     local userInfo = userData:user_get_info(uid)
-    userInfo.lv = playerData:get_level(uid)
     userInfo.status = ""
-    userInfo.gold = resData:get_item_count(uid, gameConst.ITEM_ID.GOLD) -- 金币
-    userInfo.diamond = resData:get_item_count(uid, gameConst.ITEM_ID.DIAMOND) -- 钻石
+    userInfo.gold = bagData:get_item_count(uid, gameConst.ITEM_ID.GOLD) -- 金币
+    userInfo.diamond = bagData:get_item_count(uid, gameConst.ITEM_ID.DIAMOND) -- 钻石
     userInfo.RechargeAmount = payData:user_get_total_pay_count(uid) -- 充值总额 integer
     userInfo.RechargeCount = 0 -- 充值次数 integer
 
@@ -74,9 +61,10 @@ function root.gm_get_conf_items(msg)
     local items = {}
     local conf = resAdapt:get_item_conf_list()
     for _, v in ipairs(conf) do
-        table.insert(items, {id = v.id, name = v.name, price = v.price})
+        table.insert(items, {id = v.id, ty = v.type, name = v.name, price = v.price})
     end
-    return code.OK, {list = items}
+    log.info("gm_get_conf_items items[%s]", tostring(items))
+    return code.OK, {items = items}
 end
 
 -- 获取商品配置
@@ -86,7 +74,7 @@ function root.gm_get_conf_goods(msg)
     for k, v in ipairs(shConf) do
         table.insert(list, {id = v.id, name = v.name, rmb = v.rmb})
     end
-    return code.OK, {goods = list}
+    return code.OK, {goodsList = list}
 end
 
 -- 对某个玩家发送邮件

nodes/web/lib/webapp.lua

@@ -191,28 +191,27 @@ local function POST(path, body, response)
 		return errCode, sbody, l_get_req_headers(true)
 	end
 
-	local isGmJson, pathData = l_is_match_gm_json(path)
-	if isGmJson then
-		path = pathData
-		body = cjson_decode(body)
-	end
+	local data = cjson_decode(body)
+	local name = data.name
+	log.info("POST body[%s] name[%s]", tostring(body), tostring(name))
 
 	local res = {code = 200, body = nil, headers = l_get_req_headers()}
 
-	local controllerName, method = l_get_math_controller_and_func(path)
+	local controllerName = _get_cotroller(name)
 	local controller = controllerList[controllerName]
 	if not controller then
 		log.error("controller[%s] not exist", controllerName)
 		return l_get_unmatch_controller(res)
 	end
 
-	local func = controller[method]
+	local func = controller[name]
 	if not func then
 		log.error("controller[%s] has no method[%s] ", controllerName, method)
 		return l_get_unmatch_process(res)
 	end
+	local isGmJson = controllerName == "gm"
 
-	local param = controllerName == "sgm" and body or l_get_gm_param(body)
+	local param = isGmJson and data.data or l_get_gm_param(body)
 	local errCode, ret = func(param)
 	if isGmJson then
 		res.body = l_pack_gm_rsp(errCode, ret)
@@ -303,7 +302,7 @@ end
 
 -- 初始化
 function root:init()
-	local files = lfsUtil:get_path_lua_files("nodes/login/controllers")
+	local files = lfsUtil:get_path_lua_files("nodes/web/controllers")
 	for _, v in ipairs(files) do
 		controllerList[v] = require("controllers." .. v)
 	end

nodes/web/main.lua

@@ -24,6 +24,8 @@ skynet.start(
         init_nodes:init_redis()
 
         -- TODO:节点下服务
+        -- 配置
+        skynet.uniqueservice("srvConfig")
         -- 协议
         skynet.uniqueservice("srvProtoLoad", "http")