修改http服务器架构

common/service/paySrv.lua

@@ -0,0 +1,94 @@
+--[[
+Descripttion:支付服务
+version:
+Author: Neo,Huang
+Date: 2021-08-24 19:40:15
+LastEditors: Neo,Huang
+LastEditTime: 2021-09-24 10:26:38
+--]]
+local nodeMgr = require "nodeMgr"
+local baseService = require "baseService"
+local util_order = require("utils.util_order")
+
+local sessionData = require("data.session")
+
+local CMD = {}
+
+local INTERVAL = 180 -- 每3分钟轮询一次
+local orderReissue = {} -- {uid --> {order1, order2}}
+
+-- 加载未处理的订单
+local function loadUnprocessedOrder()
+    local ret = util_order:get_unhandle_order_list()
+    if ret and not table.empty(ret) then
+        for _, v in ipairs(ret) do
+            local uid = tonumber(v.uid)
+            orderReissue[uid] = orderReissue[uid] or {}
+            if not table.key_find(orderReissue[uid], "id", v.id) then
+                table.insert(orderReissue[uid], v)
+            end
+        end
+    end
+
+    collectgarbage "collect"
+    create_timeout(
+        INTERVAL * 100,
+        function()
+            loadUnprocessedOrder()
+        end
+    )
+end
+
+-- 玩家登录处理订单
+function CMD.loginOrder(uid)
+    -- log.print("玩家登录处理订单 uid:%s, %s", uid, tostring(orderReissue[uid]))
+    local orderList = orderReissue[uid]
+    if not orderList then
+        return
+    end
+
+    local nodeInfo = sessionData:user_get_cluster_info(uid, "game")
+    if nodeMgr.is_node_info_valid(nodeInfo) then
+        -- 回调到逻辑服处理
+        for _, orderAction in pairs(orderList) do
+            local msg = {
+                orderAction = orderAction,
+                goodsId = tonumber(orderAction.itemId)
+            }
+            nodeMgr.send_with_node_info(nodeInfo, "doCmd", uid, "shop", "on_pay", msg)
+        end
+    end
+end
+
+-- 完成订单处理
+function CMD.finishOrder(uid, id)
+    if not uid or not id then
+        return
+    end
+
+    util_order:update_order_status(id, 1)
+    local orderList = orderReissue[uid]
+    if not orderList then
+        return
+    end
+
+    log.print("完成订单处理 uid:%s, id:%s", uid, id)
+    table.key_delete(orderList, "id", id)
+    if table.empty(orderList) then
+        orderReissue[uid] = nil
+    end
+end
+
+-- 同步订单
+function CMD.syncOrder(uid, orderAction)
+    log.print("同步订单 uid:%s, orderAction:%s", uid, tostring(orderAction))
+
+    orderReissue[uid] = orderReissue[uid] or {}
+    table.insert(orderReissue[uid], orderAction)
+end
+
+function CMD.onStart()
+    loadUnprocessedOrder()
+end
+
+baseService.start(CMD, ".paySrv", true)

common/utils/serverLogUtil.lua

@@ -156,18 +156,14 @@ function root.logPay(playerInfo, orderInfo)
         date,
         dateStr,
         playerInfo.uid or "",
-        playerInfo.uuid or "",
-        playerInfo.channel or "",
+        playerInfo.bandShareCode or "",
         playerInfo.version or "",
-        playerInfo.gold or "",
-        playerInfo.diamond or "",
         orderInfo.orderNo or "",
         orderInfo.pay or "",
         orderInfo.itemId or "",
         orderInfo.amount or "",
         orderInfo.status or "",
-        orderInfo.retmsg or "",
-        playerInfo.nickname or ""
+        orderInfo.retmsg or ""
     }
     local dataStr = root.formatData(data)
 

dev/data/user.lua

@@ -89,4 +89,24 @@ function root:band_share_code(uid, sharecode)
     return true
 end
 
+-- 获取属性
+function root:get_key_int(uid, key)
+    if uid == nil or is_empty(key) then
+        return 0
+    end
+    return moduleData:hget_int(uid, MODULE_NAME, key)
+end
+function root:get_key_info(uid, key)
+    if uid == nil or is_empty(key) then
+        return 0
+    end
+    return moduleData:hget(uid, MODULE_NAME, key)
+end
+function root:get_key_json(uid, key)
+    if uid == nil or is_empty(key) then
+        return 0
+    end
+    return moduleData:hget_json(uid, MODULE_NAME, key)
+end
+
 return root

nodes/web/controllers/gm.lua

@@ -0,0 +1,138 @@
+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 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 root = {}
+
+-- 获取玩家信息
+function root.gm_get_player_info(msg)
+    local uid = tonumber(msg.uid)
+
+    log.info("gm_get_player_info msg[%s]", tostring(msg))
+    --.玩家id	.玩家昵称	.国王等级	.竞技场等级	.玩家密码	-是否在线	.渠道号	.版本号	-账号状态	.注册时间	.最近登录时间	-状态
+    --.战斗局数	.广告次数	。金币	。钻石	.充值金额	-充值次数	.当前城市	.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.RechargeAmount = payData:user_get_total_pay_count(uid) -- 充值总额 integer
+    userInfo.RechargeCount = 0 -- 充值次数 integer
+
+    return code.OK, {user = userInfo, bag = {items = items}}
+end
+
+-- 背包信息
+function root.gm_get_player_bag_info(msg)
+    local uid = tonumber(msg.uid)
+
+    local itemList = {}
+    local itemInfo = moduleData:hget_json(uid, "bag", "itemInfo")
+    for k, v in ipairs(itemInfo) do
+        if v.count > 0 then
+            table.insert(itemList, {id = v.id, count = v.count, endTime = v.endTime})
+        end
+    end
+    for i, v in pairs(itemList) do
+        v.name = resAdapt:get_item_name(v.id)
+        if v.sceneLv then
+            v.name = string.format("%s-%s", v.name, v.sceneLv)
+            v.sceneLv = nil
+        elseif v.endTime then
+            v.name = string.format("%s(%s)", v.name, timeUtil.toString(v.endTime))
+            v.endTime = nil
+        end
+    end
+    return code.OK, itemList
+end
+
+-- 获取道具配置
+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})
+    end
+    return code.OK, {list = items}
+end
+
+-- 获取商品配置
+function root.gm_get_conf_goods(msg)
+    local list = {}
+    local shConf = baseAdapt:getConfig("GoodsConfig")
+    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}
+end
+
+-- 对某个玩家发送邮件
+function root.send_mail(msg)
+    local uid = tonumber(msg.uid)
+
+    for i, v in pairs(msg.items) do
+        if not resAdapt:get_item_conf(v.id) then
+            return code.RES.ID_ERROR
+        end
+    end
+
+    local ok = util_mail:add_mail(uid, 0, msg.title, msg.message, msg.items, msg.type, nil, nil, "GM后台")
+
+    do
+        -- 埋点
+        local keyEvent = "message"
+        for _, value in ipairs(msg.items or {}) do
+            local text = string.format("%s,%s,%s", tostring(1), tostring(value.id), tostring(value.count))
+            util_user:log_event(uid, keyEvent, text)
+        end
+    end
+
+    if not ok then
+        return code.UNKNOWN
+    end
+    return code.OK, {}
+end
+
+-- 玩家状态
+function root.update_player_status(msg)
+    log.info("update_player_status msg[%s]", tostring(msg))
+    if msg == nil then
+        return code.PARAMTER_ERROR
+    end
+    local uid = tonumber(msg.uid)
+    local status = msg.status
+    if uid == nil or status == nil then
+        return code.PARAMTER_ERROR
+    end
+    if util_user:user_is_online_game(uid) then
+        util_user:user_call_game_agent(uid, "user.updateStatus", msg)
+    else
+        moduleData:hset(uid, "user", "status", status)
+    end
+    return code.OK
+end
+
+return root

nodes/web/controllers/pay.lua

@@ -0,0 +1,103 @@
+-- 支付
+local code = require "code"
+local skynet = require "skynet"
+local nodeMgr = require "nodeMgr"
+local timeUtil = require "utils.timeUtil"
+local serverLogUtil = require "utils.serverLogUtil"
+local util_order = require("utils.util_order")
+
+local sessionData = require("data.session")
+local userData = require("data.user")
+
+local root = {}
+
+-- 支付埋点日志
+local function logPay(uid, orderAction)
+    skynet.fork(
+        function()
+            local playerInfo = {
+                uid = uid,
+                bandShareCode = userData:get_key_info(uid, "bandShareCode"),
+                version = userData:get_key_info(uid, "version")
+            }
+            -- 生成支付日志
+            serverLogUtil.logPay(playerInfo, orderAction)
+        end
+    )
+end
+
+-- 充值到账
+function root.recharge(msg)
+    -- 检查回调参数
+    local payCode, orderAction = msg.code, msg.orderAction
+    if not orderAction then
+        log.error("[支付回调]订单无效")
+        return false
+    end
+
+    local uid, orderId = tonumber(orderAction.uid), orderAction.orderNo
+    -- 检查订单有效性
+    local orderStatus = tonumber(orderAction.status or 0)
+    if orderStatus == 0 then
+        return util_order:handle_invalid_order(orderAction)
+    end
+    -- 检查订单物品是否存在
+    local itemId = tonumber(orderAction.itemId or 0)
+    if itemId <= 0 then
+        orderAction.status = 0
+        orderAction.resMsg = "订单参数错误"
+        log.error("订单参数错误1, itemId:%d, uid:%d", itemId, uid)
+        return util_order:handle_invalid_order(orderAction)
+    end
+
+    -- 检查玩家的在线情况
+    local nodeInfo = sessionData:user_get_cluster_info(uid, "game")
+    -- 玩家在线的处理
+    if nodeMgr.is_node_info_valid(nodeInfo) then
+        -- 回调到逻辑服处理
+        local pack = {
+            orderAction = orderAction,
+            goodsId = tonumber(orderAction.itemId)
+        }
+        nodeMgr.send_with_node_info(nodeInfo, "doCmd", uid, "shop", "on_pay", pack)
+    else
+        nodeMgr.send("global", ".paySrv", "syncOrder", uid, orderAction)
+    end
+
+    pcall(logPay, uid, orderAction)
+
+    return true
+end
+
+-- 支付服订单回调
+function root.pay_notify(msg)
+    if (not msg) or (not msg.orderAction) or (not msg.orderAction.orderNo) or (not msg.orderAction.uid) then
+        log.error("[支付回调]订单错误, data:%s", tostring(msg or ""))
+        return code.OK
+    end
+
+    local orderAction = msg.orderAction
+    local orderType = string.find(orderAction.pay, "baidu")
+    if not orderType then
+        local isExist = util_order:is_order_exist(orderAction.orderNo)
+        if isExist then
+            log.error("[支付回调]订单重复:Order:%s", tostring(msg or ""))
+            return code.OK
+        end
+    end
+
+    if orderAction.createtime and #(orderAction.createtime) <= 0 then
+        orderAction.createtime = timeUtil.toString(timeUtil.currentTime())
+    end
+    -- 订单入库
+    util_order:add_order(orderAction)
+    util_order:on_shop_order(orderAction)
+    orderAction.id = util_order:get_order_id(orderAction.orderNo, orderAction.uid)
+    log.info("payOrder orderAction[%s]", tostring(orderAction))
+    -- 支付到账
+    root.recharge(msg)
+
+    return code.OK
+end
+
+return root

run/common/login.conf

@@ -1,7 +1,7 @@
 include "public.conf"
 
 -- 节点集群名
-clusterName = "login"
+clusterName = "web"
 -- 节点名
 nodeName = "login"
 
@@ -14,5 +14,5 @@ start = "main"
 
 -- daemon
 if system == "linux" then
-    daemon = "./skynet_"..nodeName..".pid"
+daemon = "./skynet_"..nodeName..".pid"
 end

run/common/web.conf

@@ -0,0 +1,18 @@
+include "public.conf"
+
+-- 节点集群名
+clusterName = "web"
+-- 节点名
+nodeName = "web"
+
+lroot = root.."nodes/"..clusterName.."/"
+luaservice = luaservice..lroot.."service/?.lua;"..lroot.."?.lua;"
+lua_path = lua_path..lroot.."?.lua;"..lroot.."service/?.lua;"..lroot.."lib/?.lua;"
+snax = luaservice
+
+start = "main"
+
+-- daemon
+if system == "linux" then
+daemon = "./skynet_"..nodeName..".pid"
+end

run/neo-test1/clustername.lua

@@ -5,3 +5,4 @@ login_1_1 = "127.0.0.1:3003"
 gate_1_1 = "127.0.0.1:3004"
 game_1_1 = "127.0.0.1:3005"
 match = "127.0.0.1:3006"
+web = "127.0.0.1:3007"

run/neo-test1/machine.conf

@@ -5,4 +5,4 @@ statistic_path = ./log/statistic/
 zip_statistic_path = ./log/zip_path/
 
 #启动进程配置
-nodeList = master resource global match game_1_1 gate_1_1 login_1_1
+nodeList = master resource global match web game_1_1 gate_1_1 login_1_1

run/neo-test1/nodes.lua

@@ -52,4 +52,12 @@ root["game_1_1"] = {
     weight = 50 -- 权重
 }
 
+root["web"] = {
+    ip = "0.0.0.0",
+    debugPort = 8207,
+    port = 8303,
+    agentCount = 5,
+    bodyLimit = 8192
+}
+
 return root