修改埋点

common/utils/serverLogUtil.lua

@@ -33,22 +33,25 @@ local function l_add_active_user(uid)
 end
 
 -- 服务端事件埋点
-function root.logEvent(uid, version, channel, eventId, extraParams)
+function root.logEvent(uid, bandShareCode, version, channel, eventId, extraParams)
     local now = timeUtil.currentTime()
     local date = timeUtil.toDate(now)
     local dateStr = timeUtil.toString(now)
-    local data = {
-        date,
-        dateStr,
-        uid or "",
-        version or "",
-        channel or "",
-        eventId or "",
-        extraParams or ""
-    }
-    local dataStr = root.formatData(data)
 
-    writeServerLog("event", date, dataStr)
+    local cnt =
+        string.format(
+        "%s;%s;%s;%s;%s;%s;%s;%s",
+        tostring(date),
+        tostring(dateStr),
+        tostring(uid or ""),
+        tostring(bandShareCode or ""),
+        tostring(channel or 0),
+        tostring(version or ""),
+        tostring(eventId or ""),
+        tostring(extraParams or "")
+    )
+
+    writeServerLog("event", date, cnt)
 end
 
 -- 服务端资源埋点
@@ -75,21 +78,21 @@ function root.logResource(uid, eventId, itemId, resChgs, resResult, channel, ban
 end
 
 -- 服务端注册埋点
-function root.logRegister(uid, channel, version, machineType, uuid, udid, ip, userType)
+function root.logRegister(uid, bandShareCode, channel, version, machineType, uuid, udid, ip)
     local now = timeUtil.currentTime()
     local date = timeUtil.toDate(now)
     local dateStr = timeUtil.toString(now)
     local data = {
         date,
-        uid or "",
         dateStr,
+        uid or "",
+        bandShareCode or "",
         channel or "",
         version or "",
         machineType or "",
         uuid or "",
         udid or "",
-        ip or "",
-        userType or ""
+        ip or ""
     }
     local dataStr = root.formatData(data)
     -- 添加到每日活跃信息中
@@ -99,23 +102,23 @@ function root.logRegister(uid, channel, version, machineType, uuid, udid, ip, us
 end
 
 -- 服务端登录埋点
-function root.logLogin(uid, channel, version, machineType, operator, network, uuid, udid, ip, userType)
+function root.logLogin(uid, bandShareCode, channel, version, machineType, operator, network, uuid, udid, ip)
     local now = timeUtil.currentTime()
     local date = timeUtil.toDate(now)
     local dateStr = timeUtil.toString(now)
     local data = {
         date,
+        dateStr,
         uid or 0,
+        bandShareCode or "",
         channel or "",
         version or "",
-        dateStr,
         machineType or "",
         operator or "",
         network or "",
         uuid or "",
         udid or "",
-        ip or "",
-        userType or ""
+        ip or ""
     }
     local dataStr = root.formatData(data)
     -- 添加到每日活跃信息中
@@ -125,7 +128,7 @@ function root.logLogin(uid, channel, version, machineType, operator, network, uu
 end
 
 -- 服务端登出埋点
-function root.logLogout(uid, channel, runTimes, version, battleCount, items, isFinishGuide, guideStep)
+function root.logLogout(uid, bandShareCode, channel, version, runTimes)
     local now = timeUtil.currentTime()
     local date = timeUtil.toDate(now)
     local dateStr = timeUtil.toString(now)
@@ -134,9 +137,10 @@ function root.logLogout(uid, channel, runTimes, version, battleCount, items, isF
         date,
         dateStr,
         uid or "",
+        bandShareCode or "",
         channel or "",
-        runTimes or "",
-        version or ""
+        version or "",
+        runTimes or ""
     }
     local dataStr = root.formatData(data)
     -- 添加到每日活跃信息中
@@ -159,6 +163,7 @@ function root.logPay(playerInfo, orderInfo)
         dateStr,
         playerInfo.uid or "",
         playerInfo.bandShareCode or "",
+        playerInfo.channel or "",
         playerInfo.version or "",
         orderInfo.orderNo or "",
         orderInfo.pay or "",
@@ -172,4 +177,23 @@ function root.logPay(playerInfo, orderInfo)
     writeServerLog("pay", date, dataStr)
 end
 
+-- 绑定推广码
+function root.logBandShareCode(uid, bandShareCode, channel, version)
+    local now = timeUtil.currentTime()
+    local date = timeUtil.toDate(now)
+    local dateStr = timeUtil.toString(now)
+
+    local data = {
+        date,
+        dateStr,
+        uid or "",
+        bandShareCode or "",
+        channel or "",
+        version or ""
+    }
+    local dataStr = root.formatData(data)
+
+    writeServerLog("banding", date, dataStr)
+end
+
 return root

dev/data/user.lua

@@ -29,6 +29,7 @@ function root:user_init_register_info(uid, info)
     moduleData:hset(uid, MODULE_NAME, "sysVer", info.sysVer or "")
     moduleData:hset(uid, MODULE_NAME, "deviceId", info.deviceId or "")
     moduleData:hset(uid, MODULE_NAME, "channel", info.channel)
+    moduleData:hset(uid, MODULE_NAME, "ip", info.ip)
 
     moduleData:hset(uid, MODULE_NAME, "phone", info.phone)
     moduleData:hset(uid, MODULE_NAME, "shareCode", info.shareCode)
@@ -87,6 +88,12 @@ function root:band_share_code(uid, sharecode)
         return false
     end
     moduleData:hset(uid, MODULE_NAME, "bandShareCode", sharecode)
+
+    local serverLogUtil = require("utils.serverLogUtil")
+    local channel = self:get_key_info(uid, "channel")
+    local version = self:get_key_info(uid, "version")
+    serverLogUtil.logBandShareCode(uid, sharecode, channel, version)
+
     return true
 end
 

dev/modules/user.lua

@@ -2,8 +2,10 @@ local code = require("code")
 local util_player = require("utils.util_player")
 local util_global = require("utils.util_global")
 local util_3rd = require("utils.util_3rd")
+local serverLogUtil = require("utils.serverLogUtil")
 
 local playerData = require("data.player")
+local userData = require("data.user")
 
 local root = class("user", require("base.baseModule"))
 
@@ -73,7 +75,21 @@ function root:itf_update_band_share_code(role, msg)
         -- 邀请码不存在
         return code.SHARE_CODE.NOT_FOUND
     end
-    self:redis_update_key_info("bandShareCode", shareCode)
+    userData:band_share_code(self.uid, shareCode)
+    -- 再次输出玩家登录埋点，方便后台捕捉数据
+    serverLogUtil.logLogin(
+        self.uid,
+        shareCode,
+        self:redis_get_key_info("channel") or "",
+        self:redis_get_key_info("version") or "",
+        self:redis_get_key_info("sysVer") or "",
+        "",
+        "",
+        self:redis_get_key_info("uuid") or "",
+        self:redis_get_key_info("udid") or "",
+        self:redis_get_key_info("ip") or ""
+    )
+
     return code.OK
 end
 

dev/utils/util_user.lua

@@ -23,8 +23,9 @@ function root:log_event(uid, keyEvent, cnt)
 
     local version = moduleData:get_version(uid)
     local channel = moduleData:get_channel(uid)
+    local bandShareCode = userData:get_key_info(uid, "bandShareCode")
 
-    serverLogUtil.logEvent(uid, version, channel, keyEvent, cnt)
+    serverLogUtil.logEvent(uid, bandShareCode, version, channel, keyEvent, cnt)
 end
 -- 埋点 - 资源变化
 function root:log_resource(uid, keyEvent, itemId, delta, total)

nodes/game/lib/role.lua

@@ -1,6 +1,9 @@
 local dataMode = require "dataMode"
+local timeUtil = require("utils.timeUtil")
+local serverLogUtil = require("utils.serverLogUtil")
 
 local sessionData = require("data.session")
+local moduleData = require("data.module")
 
 local root = class("role")
 
@@ -59,6 +62,15 @@ function root:logout_modules()
         self[cname]:do_logout()
         self[cname]:backup_to_db()
     end
+    -- 埋点
+    local currTime = timeUtil.now(self.uid)
+    local loginTime = moduleData:hget_int(self.uid, "player", "loginTime")
+    loginTime = (not loginTime or loginTime == 0) and currTime or loginTime
+    local mins = currTime - loginTime
+    local bandShareCode = moduleData:hget(self.uid, "user", "bandShareCode")
+    local channel = moduleData:get_channel(self.uid)
+    local version = moduleData:get_version(self.uid)
+    serverLogUtil.logLogout(self.uid, bandShareCode or "", channel, version, mins)
     -- 删除玩家session信息
     sessionData:user_update_cluster_info(self.uid, "gate")
     sessionData:user_update_cluster_info(self.uid, "game")

nodes/web/controllers/pay.lua

@@ -18,7 +18,8 @@ local function logPay(uid, orderAction)
             local playerInfo = {
                 uid = uid,
                 bandShareCode = userData:get_key_info(uid, "bandShareCode"),
-                version = userData:get_key_info(uid, "version")
+                version = userData:get_key_info(uid, "version"),
+                channel = userData:get_key_info(uid, "channel")
             }
             -- 生成支付日志
             serverLogUtil.logPay(playerInfo, orderAction)

nodes/web/controllers/usr.lua

@@ -65,7 +65,7 @@ function root.usr_register(msg)
 
     userData:user_init_register_info(uid, msg)
     -- 注册埋点
-    serverLogUtil.logRegister(uid, msg.channel, msg.version, msg.sysVer or "", msg.uuid, msg.udid, msg.ip)
+    serverLogUtil.logRegister(uid, "", msg.channel, msg.version, msg.sysVer or "", msg.uuid, msg.udid, msg.ip)
 
     msg.uid = uid
     msg.password = moduleData:hget_int(uid, "user", "password")
@@ -178,7 +178,16 @@ function root.usr_register_by_phone(msg)
         userData:band_share_code(uid, msg.sharecode)
     end
     -- 注册埋点
-    serverLogUtil.logRegister(uid, msg.channel, msg.version, msg.sysVer or "", msg.uuid, msg.udid, msg.ip)
+    serverLogUtil.logRegister(
+        uid,
+        msg.sharecode,
+        msg.channel,
+        msg.version,
+        msg.sysVer or "",
+        msg.uuid,
+        msg.udid,
+        msg.ip
+    )
 
     return root.usr_login_by_phone(msg)
 end
@@ -211,12 +220,12 @@ function root.usr_login_by_phone(msg)
     if is_empty(nodeInfo) or is_empty(nodeInfo.ip) or is_empty(nodeInfo.wsPort) then
         return code.NOT_FOUND_SERVER
     end
-
-    -- 暂存登陆数据
+    local bandShareCode = moduleData:hget(uid, "user", "bandShareCode")
 
     -- 登陆埋点
     serverLogUtil.logLogin(
         uid,
+        bandShareCode or "",
         msg.channel or "",
         msg.version or "",
         msg.sysVer or "",