修改模块

common/utils/timeUtil.lua

@@ -0,0 +1,518 @@
+local skynet = require "skynet"
+local moduleData = require("data.module")
+
+local root = {
+	SEC_PER_HOUR = 3600,
+	SEC_PER_DAY = 86400,
+	SEC_PER_WEEK = 7 * 86400,
+	REFRESH_HOUR = 5
+}
+
+-- 获取当前时间 单位秒
+function root.currentTime()
+	return math.floor(skynet.time())
+end
+-- 获取玩家当前时间
+function root.now(uid)
+	local currTime = skynet_time()
+	if not IS_TEST then
+		return currTime
+	end
+	local deltaTime = moduleData:hget_int(uid, "user", "time:sys")
+	if not is_empty(deltaTime) then
+		return currTime + deltaTime
+	end
+	return currTime
+end
+
+function root.toString(t)
+	return os.date("%Y-%m-%d %H:%M:%S", t)
+end
+
+function root.toDate(t)
+	return os.date("%Y-%m-%d", t or root.currentTime())
+end
+
+function root.toTab(t)
+	return os.date("*t", t)
+end
+
+function root.toInt(tab)
+	return os.time(tab)
+end
+
+function root.getYday(t)
+	return os.date("%j", t)
+end
+
+-- 获取时间的0点时间戳
+function root.getCday(ctime)
+	local a = root.toTab(ctime)
+	a.hour, a.min, a.sec = 0, 0, 0
+	return root.toInt(a)
+end
+
+-- 将时间格式化秒 %Y-%m-%d %H:%M:%S
+function root.getSecond(t)
+	local function split(str, pat)
+		local t = {}
+		local fpat = "(.-)" .. pat
+		local last_end = 1
+		local s, e, cap = str:find(fpat, 1)
+		while s do
+			if s ~= 1 or cap ~= "" then
+				table.insert(t, cap)
+			end
+			last_end = e + 1
+			s, e, cap = str:find(fpat, last_end)
+		end
+
+		if last_end <= #str then
+			cap = str:sub(last_end)
+			table.insert(t, cap)
+		end
+
+		return t
+	end
+
+	local a = split(t, " ")
+	local b = split(a[1], "-")
+	local c = split(a[2], ":")
+
+	return root.toInt({year = b[1], month = b[2], day = b[3], hour = c[1], min = c[2], sec = c[3]})
+end
+
+function root.getDayCount(year, month)
+	local year = tonumber(year)
+	local month = tonumber(month)
+	if not year or not month then
+		return 0
+	end
+
+	if month == 1 or month == 3 or month == 5 or month == 7 or month == 8 or month == 10 or month == 12 then
+		return 31
+	end
+
+	if month == 2 then
+		if (year % 4 == 0 and year % 100 ~= 0) or (year % 400 == 0) then
+			return 29
+		else
+			return 28
+		end
+	end
+
+	return 30
+end
+
+function root.getTime(year, month, day, hour, min, sec)
+	local timeStruct = {}
+	timeStruct.sec = tonumber(sec) or 0
+	timeStruct.min = tonumber(min) or 0
+	timeStruct.hour = tonumber(hour) or 0
+	timeStruct.day = tonumber(day) or 0
+	timeStruct.month = tonumber(month) or 0
+	timeStruct.year = tonumber(year) or 0
+
+	return root.toInt(timeStruct)
+end
+
+-- 能否日刷新
+function root.dailyRefresh(atime, btime, hour, min, sec)
+	local atime = tonumber(atime) or 0
+	local btime = tonumber(btime) or root.currentTime()
+	local hour, min, sec = tonumber(hour) or 0, tonumber(min) or 0, tonumber(sec) or 0
+
+	local aTimeTab, bTimeTab = root.toTab(atime), root.toTab(btime)
+	bTimeTab.hour, bTimeTab.min, bTimeTab.sec = hour, min, sec
+	aTimeTab.hour, aTimeTab.min, aTimeTab.sec = hour, min, sec
+	-- 超过1天
+	if btime - atime >= 24 * 60 * 60 then
+		return true
+	end
+	-- 1天之内
+	if btime >= root.toInt(aTimeTab) and root.toInt(aTimeTab) >= atime then
+		return true
+	end
+	if btime >= root.toInt(bTimeTab) and root.toInt(bTimeTab) >= atime then
+		return true
+	end
+
+	return false
+end
+
+-- 能否周刷新 [wday=2 是周一]
+function root.WeekRefresh(atime, btime, wday, hour, min, sec)
+	atime = tonumber(atime) or 0
+	btime = tonumber(btime) or root.currentTime()
+	wday, hour, min, sec = tonumber(wday) or 2, tonumber(hour) or 0, tonumber(min) or 0, tonumber(sec) or 0
+
+	local aTimeTab, bTimeTab = root.toTab(atime), root.toTab(btime)
+	bTimeTab.day = bTimeTab.day + (wday - bTimeTab.wday)
+	aTimeTab.day = aTimeTab.day + (wday - aTimeTab.wday)
+	bTimeTab.hour, bTimeTab.min, bTimeTab.sec = hour, min, sec
+	aTimeTab.hour, aTimeTab.min, aTimeTab.sec = hour, min, sec
+	-- 超过七天
+	if btime - atime >= 7 * 24 * 60 * 60 then
+		return true
+	end
+	-- 七天之内
+	if btime >= root.toInt(aTimeTab) and root.toInt(aTimeTab) >= atime then
+		return true
+	end
+	if btime >= root.toInt(bTimeTab) and root.toInt(bTimeTab) >= atime then
+		return true
+	end
+
+	return false
+end
+
+-- 能否月刷新
+function root.can_month_refresh(atime, btime, in_day, hour, min, sec)
+	local atime = tonumber(atime) or 0
+	local btime = tonumber(btime) or root.currentTime()
+	local bTimeTab, aTimeTab = root.toTab(btime), root.toTab(atime)
+	local day, hour, min, sec = tonumber(in_day) or 1, tonumber(hour) or 0, tonumber(min) or 0, tonumber(sec) or 0
+	aTimeTab.day, aTimeTab.hour, aTimeTab.min, aTimeTab.sec = day, hour, min, sec
+	bTimeTab.day, bTimeTab.hour, bTimeTab.min, bTimeTab.sec = day, hour, min, sec
+	-- 超过一月
+	local month = (bTimeTab.year - aTimeTab.year) * 12
+	if bTimeTab.month + month > aTimeTab.month + 1 then
+		return true
+	end
+	-- 一月之内
+	if btime >= root.toInt(aTimeTab) and root.toInt(aTimeTab) >= atime then
+		return true
+	end
+	if btime >= root.toInt(bTimeTab) and root.toInt(bTimeTab) >= atime then
+		return true
+	end
+
+	return false
+end
+
+-- 两个时间相距天数
+function root.getDisDays(t1, t2)
+	if t1 == nil or t2 == nil then
+		return 0
+	end
+
+	local d1 = root.getYday(t1)
+	local d2 = root.getYday(t2)
+	return math.abs(d1 - d2)
+end
+
+function root.isSameDay(t1, t2)
+	if t1 == nil or t2 == nil then
+		return false
+	end
+	local d1 = root.getYday(t1)
+	local d2 = root.getYday(t2)
+	if d1 == d2 then
+		return true
+	end
+	return false
+end
+-- 是否同一天（凌晨5点）
+function root.is_same_c5_day(t1, t2)
+	if t1 == nil or t2 == nil then
+		return false
+	end
+	local d1 = root.getYday(t1 - 5 * 3600)
+	local d2 = root.getYday(t2 - 5 * 3600)
+	if d1 == d2 then
+		return true
+	end
+	return false
+end
+
+-- 获取当前天数（自1970年）
+function root.getDaysOfTimestampExt(timestamp, diffTime)
+	timestamp = (timestamp or root.currentTime()) - (diffTime or 0)
+	return math.floor((timestamp + (8 * 3600)) / (3600 * 24))
+end
+
+-- 获取获取相差的天数
+function root.getDisDaysC5(t1, t2)
+	if t1 == nil or t2 == nil then
+		return 0
+	end
+
+	local d1 = root.getDaysOfTimestampExt(t1, 5 * 3600)
+	local d2 = root.getDaysOfTimestampExt(t2, 5 * 3600)
+	return math.abs(d1 - d2)
+end
+
+-- 获取获取相差的天数
+function root.getDisDaysExt(t1, t2)
+	if t1 == nil or t2 == nil then
+		return 0
+	end
+
+	local d1 = root.getDaysOfTimestampExt(t1)
+	local d2 = root.getDaysOfTimestampExt(t2)
+	return math.abs(d1 - d2)
+end
+
+-- 获取下一个凌晨5点时间戳
+function root.get_next_c5_time(currTime)
+	currTime = currTime or skynet_time()
+	local startTime = root.getDayStartTime(currTime) + 5 * 3600
+	if currTime >= startTime then
+		return startTime + 24 * 3600
+	end
+	return startTime
+end
+
+-- 获取下周一开始时间 5点
+function root.c5_get_next_week_start_time(currTime)
+	local date = os.date("*t", currTime)
+	-- log.info("获取下周一5点时间 date[%s]", tostring(date))
+	if date.wday == 1 and date.hour < 5 then
+		return root.getTime(date.year, date.month, date.day, 5, 0, 0)
+	end
+	local diffDays
+	local wday = date.wday - 1
+	if wday == 0 then
+		wday = 7
+	end
+	diffDays = 8 - wday
+	-- log.info("diffDays = %s", diffDays)
+	return root.getDayStartTime(currTime, diffDays) + 5 * 3600
+end
+
+-- 获取下个月1号开始时间 5点
+function root.c5_get_next_month_start_time(currTime)
+	local date = os.date("*t", currTime)
+	-- log.info("获取下周一5点时间 date[%s]", tostring(date))
+	if date.day == 1 and date.hour < 5 then
+		return root.getTime(date.year, date.month, date.day, 5, 0, 0)
+	end
+
+	date.month = date.month + 1
+	return root.getTime(date.year, date.month, date.day, 5, 0, 0)
+end
+
+-- 两个时间间隔（凌晨5点）
+function root.get_c5_dis_days(t1, t2)
+	if t1 == nil or t2 == nil then
+		return 0
+	end
+
+	local d1 = root.getYday(t1 - 5 * 3600)
+	local d2 = root.getYday(t2 - 5 * 3600)
+	return math.abs(d1 - d2)
+end
+
+function root.isSameWeek(t1, t2)
+	local dateA = os.date("*t", t1)
+	local dateB = os.date("*t", t2)
+	local diff = math.abs(dateA.yday - dateB.yday)
+	if diff == 0 then
+		return true
+	end
+
+	local beforeDt = 0
+	if dateA.yday < dateB.yday then
+		beforeDt = dateA
+	else
+		beforeDt = dateB
+	end
+	if diff > 7 then
+		return false
+	end
+
+	local wday = beforeDt.wday - 1
+	if wday == 0 then
+		wday = 7
+	end
+
+	if wday + diff > 7 then
+		return false
+	end
+
+	return true
+end
+
+function root.isSameMonth(t1, t2)
+	if t1 == nil or t2 == nil then
+		return false
+	end
+	local n1 = os.date("*t", t1)
+	local n2 = os.date("*t", t2)
+	if n1.year == n2.year and n1.month == n2.month then
+		return true
+	end
+	return false
+end
+
+-- 获取当天结束时间
+function root.getDayEndTime(currTime, days)
+	local daySec = 24 * 3600
+	local addDay = days or 1
+	local timeout = math.floor((currTime + 8 * 3600) / daySec) * daySec + daySec * addDay - 8 * 3600 - 1
+
+	return timeout
+end
+
+-- 获取当天开始时间
+function root.getDayStartTime(currTime, days)
+	local daySec = 24 * 3600
+	local addDay = days or 0
+	local timeout = math.floor((currTime + 8 * 3600) / daySec) * daySec + daySec * addDay - 8 * 3600
+
+	return timeout
+end
+
+-- 获取当前周开始时间[周日开始]
+function root.getWeekStartTime(currTime)
+	local t = root.toTab(currTime)
+	local startTime = root.getDayStartTime(currTime)
+	return startTime - (t.wday - 1) * root.SEC_PER_DAY
+end
+
+-- 获取当天周结束时间[周六结束]
+function root.getWeekEndTime(currTime)
+	local startTime = root.getWeekStartTime(currTime)
+	return startTime + root.SEC_PER_WEEK - 1
+end
+
+-- 获取当前周的指定时间的时间戳[从周日起]
+-- day周日为0，周六为6
+function root.getTimeByWeek(currTime, day, h, m, s)
+	day = day or 0
+	h = h or 0
+	m = m or 0
+	s = s or 0
+	local startTime = root.getWeekStartTime(currTime)
+	local addTime = day * root.SEC_PER_DAY + h * root.SEC_PER_HOUR + m * 60 + s
+	return startTime + addTime
+end
+
+-- 获取现在时间是几星期几.day周日为0，周六为6
+function root.getWeekDay(currTime)
+	local tab = os.date("*t", currTime or os.time())
+	return tab.wday - 1
+end
+
+-- 获取当天0点时间戳
+function root.getUnixtimeToday(t1)
+	local nt = os.date("*t", t1)
+	return os.time({year = nt.year, month = nt.month, day = nt.day, hour = 0, min = 0, sec = 0})
+end
+
+-- 获取明天0点时间戳
+function root.getUnixtimeTomorrow(t1)
+	return root.getUnixtimeToday(t1) + 86400
+end
+
+-- 明天零点倒计时
+function root.countdownToTomorrow(t1)
+	return root.getUnixtimeTomorrow(t1) - (t1 or os.time())
+end
+
+-- 跨分钟数
+function root.get_across_minutes(startTime, endTime)
+	if startTime == nil or endTime == nil then
+		return 0
+	end
+	local s = math.floor(startTime / 60)
+	local e = math.floor(endTime / 60)
+	if endTime > e * 60 then
+		e = e + 1
+	end
+	log.info(
+		"get_across_minutes startTime[%s] s[%s] endTime[%s] e[%s]",
+		tostring(startTime),
+		tostring(s),
+		tostring(endTime),
+		tostring(e)
+	)
+	return math.abs(e - s)
+end
+-- 跨小时数(rate每多少整小时，可以是每整1小时，也可以是每整2小时)
+function root.get_across_hours(startTime, endTime, rate)
+	if startTime == nil or endTime == nil then
+		return 0
+	end
+
+	if not rate then
+		rate = 3600
+	end
+
+	local s = math.floor(startTime / rate)
+	local e = math.floor(endTime / rate)
+	log.info(
+		"get_across_hours startTime[%s] s[%s] endTime[%s] e[%s]",
+		tostring(startTime),
+		tostring(s),
+		tostring(endTime),
+		tostring(e)
+	)
+	return math.abs(e - s)
+end
+-- 跨天数
+function root.c5_get_cross_days(startTime, endTime)
+	if startTime == nil or endTime == nil then
+		return 0
+	end
+	local days = 0
+	local nextTime = root.get_next_c5_time(startTime)
+	while nextTime < endTime do
+		days = days + 1
+		nextTime = nextTime + 24 * 3600
+	end
+	return days
+end
+
+--#region ----------------------------------------- 时间的扩展:功能代码块
+-- 为什么重新实现?
+-- 部分功能实现得过于复杂,没必要过于遇合,需要考虑到lua的性能消耗.
+
+-- 获取当天0点时间戳
+function root.getTodayHourTimestamp(hour)
+	local t_date = os.date("*t")
+	return os.time(
+		{
+			year = t_date.year,
+			month = t_date.month,
+			day = t_date.day,
+			hour = hour or root.REFRESH_HOUR,
+			min = 0,
+			sec = 0
+		}
+	)
+end
+
+-- 跨天数
+-- 获取某个时间戳跨越了多少天(5点为分界线)
+function root.getDaysOfTimestamp(timestamp)
+	-- 错误的时间参数返回1天
+	if not timestamp or timestamp == 0 then
+		return 1
+	end
+
+	local dt = root.getTodayHourTimestamp()
+	if timestamp > dt then
+		-- 以一天来计算,可能
+		-- return 888
+		return math.ceil((timestamp - dt) / root.SEC_PER_DAY)
+	else
+		-- 逻辑刷新前面要加1.
+		return math.ceil((dt - timestamp) / root.SEC_PER_DAY) + 1
+	end
+end
+
+-- 是否已经跨天了
+function root.isOtherDay(uid, actData)
+	-- 刷新时间
+	local currTime = root.now(uid or 0)
+	if actData.nextUT == nil or currTime >= actData.nextUT then
+		actData.nextUT = root.get_next_c5_time(currTime)
+		return true
+	end
+	return false
+end
+
+--#endregion
+
+return root

dev/base/baseModule.lua

@@ -11,10 +11,11 @@ local lib_game_mysql = require("lib_game_mysql")
 
 local root = class("base")
 
-function root:ctor(uid, mdlName, keyName)
+function root:ctor(uid, mdlName, keyName, isSaveDB)
     self.uid = uid
     self.mdlName = mdlName
     self.keyName = keyName
+    self.isSaveDB = isSaveDB
 end
 
 -- 模块sql属性
@@ -27,10 +28,44 @@ function root:mysql_get_table_info()
     return {
         mdlName = self.mdlName,
         keyName = self.keyName,
+        isSaveDB = self.isSaveDB,
         columnNameOptions = self:mysql_get_init_columns()
     }
 end
 
+function root:getKeyValue()
+    return self[self.keyName]
+end
+-- 获取模块key
+function root:get_module_redis_key()
+    local moduleKey = string.format("%s:%s", self.mdlName, tostring(self:getKeyValue()))
+    return moduleKey
+end
+
+-- 获取玩家模块数据
+function root:get_data_from_db()
+    local moduleKey = self:get_module_redis_key()
+    local res = redisUtil.hgetall(moduleKey)
+    if not is_empty(res) then
+        return res
+    end
+
+    if self.isSaveDB then
+        local sql = sqlUtil.select_table_by_key(self.mdlName, self.keyName, self:getKeyValue())
+        res = lib_game_mysql:query(sql)
+        if res and res[1] then
+            -- add to redis
+            redisUtil.hmset(moduleKey, res[1])
+            -- get again
+            res = redisUtil.hgetall(moduleKey)
+            if not is_empty(res) then
+                return res
+            end
+        end
+        return res
+    end
+end
+
 -- 字段类型 - json
 function root:is_json(column)
     return string.match(string.upper(column), "JSON")
@@ -76,4 +111,63 @@ function root:backup_to_db()
     lib_game_mysql:query(sql)
 end
 
+----------------------------------------
+-- 实时数据
+----------------------------------------
+local moduleData = require("data.module")
+-- 获取数据类型
+function root:get_sub_key_type(subKey)
+    if subKey == nil then
+        return
+    end
+
+    local mpOptions = self:mysql_get_init_columns()
+    for k, v in pairs(mpOptions) do
+        if tostring(k) == tostring(subKey) then
+            if self:is_number(v) then
+                return "int"
+            end
+            if self:is_json(v) then
+                return "json"
+            end
+            return "string"
+        end
+    end
+end
+-- 获取数据
+function root:redis_get_key_info(subKey, uid)
+    if subKey == nil then
+        return
+    end
+    uid = uid or self.uid
+    local info = moduleData:hget(uid, self.mdlName, subKey)
+    local tyKey = self:get_sub_key_type(subKey)
+    if tyKey then
+        if tyKey == "json" then
+            if info then
+                info = cjson_decode(info)
+            end
+            -- 主要针对C++中的NULL
+            if is_empty(info) then
+                info = {}
+            end
+        end
+        if tyKey == "int" then
+            info = tonumber(info or 0)
+        end
+    end
+    return info
+end
+-- 设置数据
+function root:redis_update_key_info(subKey, info, uid)
+    uid = uid or self.uid
+    return moduleData:hset(uid, self.mdlName, subKey, info)
+end
+
+-- +1
+function root:redis_hincrby(subKey, uid)
+    uid = uid or self.uid
+    return moduleData:hincrby(uid, self.mdlName, subKey)
+end
+
 return root

dev/data/module.lua

@@ -107,6 +107,13 @@ function root:hget_json(uid, mdl, key)
     return info
 end
 
+function root:hincrby(uid, mdl, key, val)
+    if is_nil(uid) or is_nil(mdl) or is_nil(key) then
+        return
+    end
+    return lib_game_redis:hincrby(get_player_key(uid, mdl), key, val or 1)
+end
+
 function root:model_func(func, mdl, key, defaultValue)
     local resFunc = function(root, uid)
         if func then

dev/data/session.lua

@@ -0,0 +1,35 @@
+--[[
+Descripttion:节点信息
+version:
+Author: Neo,Huang
+Date: 2021-09-17 10:03:39
+LastEditors: Neo,Huang
+LastEditTime: 2021-09-17 10:06:57
+--]]
+local moduleData = require("data.module")
+
+local MODULE_NAME = "tb_session"
+
+local root = {}
+
+-- 更新玩家节点信息
+function root:user_update_cluster_info(uid, clusterName, nodeInfo)
+    if uid == nil or is_empty(clusterName) then
+        return false
+    end
+    moduleData:hset(uid, MODULE_NAME, clusterName, nodeInfo)
+    return true
+end
+-- 获取节点信息
+function root:user_get_cluster_info(uid, clusterName)
+    if uid == nil or is_empty(clusterName) then
+        return
+    end
+    local nodeInfo = moduleData:hget_json(uid, MODULE_NAME, clusterName)
+    if is_empty(nodeInfo) then
+        nodeInfo = nil
+    end
+    return nodeInfo
+end
+
+return root

dev/data/user.lua

@@ -19,8 +19,6 @@ function root:user_init_register_info(uid, info)
     end
     moduleData:hset(uid, MODULE_NAME, "uid", uid)
     moduleData:hset(uid, MODULE_NAME, "registerTime", skynet_time())
-    moduleData:hset(uid, MODULE_NAME, "registerRegion", info.region or "")
-    moduleData:hset(uid, MODULE_NAME, "city", info.city or "")
     moduleData:hset(uid, MODULE_NAME, "version", info.version or "")
     moduleData:hset(uid, MODULE_NAME, "registerVersion", info.version or "")
     moduleData:hset(uid, MODULE_NAME, "appVerison", info.version or "")
@@ -52,4 +50,12 @@ function root:user_is_match_password(uid, password)
     return password == moduleData:hget(uid, MODULE_NAME, "password")
 end
 
+-- 账号状态
+function root:get_status(uid)
+    if uid == nil then
+        return 1
+    end
+    return moduleData:hget(uid, MODULE_NAME, "status")
+end
+
 return root

dev/modules/bag.lua

@@ -0,0 +1,26 @@
+local root = class("moduleBag", require("base.baseModule"))
+
+function root:ctor(uid)
+    root.super.ctor(self, uid, "bag", "uid", true)
+    self.uid = uid
+end
+
+function root:mysql_get_init_columns()
+    return {
+        uid = "int(11) unsigned NOT NULL",
+        itemList = "JSON COMMENT '道具信息'",
+        lastBid = "int(11) DEFAULT 0 COMMENT '最后使用的bid'",
+        lastInitTime = "int(11) DEFAULT 0 COMMENT '最后初始化背包的时间戳'"
+    }
+end
+
+----------------------------------------
+-- 接口
+----------------------------------------
+-- 请求获取背包信息
+function root:itf_get_info(role, msg)
+    local items = self:redis_get_key_info("itemList")
+    return code.OK, {items = items}
+end
+
+return root

dev/modules/user.lua

@@ -1,7 +1,8 @@
 local root = class("moduleUser", require("base.baseModule"))
 
 function root:ctor(uid)
-    root.super.ctor(self, uid, "user", "uid")
+    root.super.ctor(self, uid, "user", "uid", true)
+    self.uid = uid
 end
 
 function root:mysql_get_init_columns()
@@ -17,8 +18,6 @@ function root:mysql_get_init_columns()
         sysVer = "varchar(1024) DEFAULT NULL",
         version = "varchar(45) DEFAULT NULL",
         appVersion = "varchar(45) DEFAULT NULL",
-        city = "varchar(45) DEFAULT NULL",
-        region = "varchar(45) DEFAULT NULL",
         deviceId = "varchar(200) DEFAULT NULL",
         headUrl = "varchar(500) DEFAULT NULL",
         sex = "int(11) DEFAULT NULL",
@@ -26,13 +25,19 @@ function root:mysql_get_init_columns()
         lastLoginTime = "int(11) DEFAULT 0",
         logoutTime = "int(11) DEFAULT 0",
         registerTime = "int(11) DEFAULT 0 COMMENT '注册时间'",
-        registerRegion = "varchar(45) DEFAULT 0 COMMENT '注册区域'",
-        registerCity = "varchar(45) DEFAULT 0 COMMENT '注册城市'",
         registerVersion = "varchar(45) DEFAULT NULL COMMENT '注册版本'",
         ip = "varchar(45) DEFAULT NULL COMMENT 'IP'",
-        status = "int(11) DEFAULT 0 COMMENT '账号状态 0:正常 1:封号 2:注销'",
-        openId = "varchar(45) DEFAULT NULL COMMENT '用户唯一标识符'"
+        status = "int(11) DEFAULT 0 COMMENT '账号状态 0:正常 1:封号 2:注销'"
     }
 end
 
+----------------------------------------
+-- 接口
+----------------------------------------
+-- 获取自己的信息
+function root:itf_get_info(role, msg)
+    local items = self:redis_get_key_info("itemList")
+    return code.OK, {items = items}
+end
+
 return root

nodes/game/interface/bag.lua

@@ -0,0 +1,18 @@
+--[[
+Descripttion:接口 - 背包
+version:
+Author: Neo,Huang
+Date: 2022-07-05 17:32:01
+LastEditors: Neo,Huang
+LastEditTime: 2022-07-05 20:29:29
+--]]
+local code = require "code"
+
+local root = {}
+
+-- 获取背包信息
+function root:bag_get_info(role, msg)
+    return role.bag:itf_get_info(role, msg)
+end
+
+return root

nodes/game/interface/user.lua

@@ -7,20 +7,19 @@ LastEditors: Neo,Huang
 LastEditTime: 2022-07-05 20:29:29
 --]]
 local code = require "code"
+local timeUtil = require("utils.timeUtil")
 
-local root = {}
+local moduleUser = require("modules.user")
 
-function root:self_info(uid, msg)
-    return code.OK
-end
+local root = {}
 
-function root:after_self_info(uid)
+function root:user_keepalive(role)
+    return code.OK, {systemTime = timeUtil.now(role.uid)}
 end
 
-function root:keep_alive(uid)
-    return code.OK
+-- 请求个人信息
+function root:user_self_info(role, msg)
+    return moduleUser:itf_get_info(role, msg)
 end
 
 return root

nodes/game/lib/role.lua

@@ -0,0 +1,96 @@
+local dataMode = require "dataMode"
+
+local sessionData = require("data.session")
+
+local root = class("role")
+
+-- 角色构造
+function root:ctor(uid, gSession)
+    local mapClass = dataMode.get_module_class_map()
+
+    self.uid = uid
+    self.gateNode = nil
+    self.gateAgent = nil
+
+    self.moduleList = {}
+    -- self.createTime = timeUtil.currentTime()
+    for _, moduleClass in pairs(mapClass) do
+        local cname = moduleClass.__cname
+        assert(self[cname] == nil)
+
+        local moduleObj = moduleClass.new(uid)
+        if not moduleObj.noPersonal then
+            self[cname] = moduleObj
+            table.insert(self.moduleList, cname)
+        end
+    end
+end
+
+-- 登陆各个模块
+function root:login(session)
+    -- 模块载入热数据
+    self:load_modules()
+
+    -- 初始化session 信息
+    local nodeInfo = {nodeName = session.gateNode, agent = session.gateAgent}
+    sessionData:user_update_cluster_info(self.uid, "gate", nodeInfo)
+    nodeInfo.nodeName = session.gameNode
+    nodeInfo.agent = session.gameAgent
+    sessionData:user_update_cluster_info(self.uid, "game", nodeInfo)
+    -- 记录网关节点信息
+    self.gateNode = session.gateNode
+    self.gateAgent = session.gateAgent
+
+    for _, cname in pairs(self.moduleList) do
+        self[cname]:do_login()
+    end
+end
+
+-- 加载模块
+function root:load_modules()
+    for _, cname in ipairs(self.moduleList) do
+        self[cname]:get_data_from_db()
+    end
+end
+
+-- 登出各个模块
+function root:logout_modules()
+    for _, cname in pairs(self.moduleList) do
+        self[cname]:do_logout()
+    end
+    -- 删除玩家session信息
+    sessionData:user_update_cluster_info(self.uid, "gate")
+    sessionData:user_update_cluster_info(self.uid, "game")
+end
+
+-- 初始化游戏事件
+function root:init_game_event()
+    self.eventIdMap = nil
+    for _, cname in pairs(self.moduleList) do
+        if self[cname].get_listen_event_list then
+            local eventIdList = self[cname]:get_listen_event_list()
+            for _, eventId in ipairs(eventIdList or {}) do
+                self.eventIdMap = self.eventIdMap or {}
+                self.eventIdMap[eventId] = self.eventIdMap[eventId] or {}
+                table.insert(self.eventIdMap[eventId], cname)
+            end
+        end
+    end
+end
+
+-- 分派玩家事件
+function root:dispath_game_event(id, params)
+    if not self.eventIdMap then
+        self:init_game_event()
+    end
+
+    if self.eventIdMap == nil or not self.eventIdMap[id] then
+        return
+    end
+
+    for _, cname in pairs(self.eventIdMap[id]) do
+        self[cname]:user_game_event(id, params)
+    end
+end
+
+return root

nodes/game/lib/roleMgr.lua

@@ -0,0 +1,56 @@
+--[[
+Descripttion:角色管理
+version:
+Author: Neo,Huang
+Date: 2021-08-31 20:45:03
+LastEditors: Neo,Huang
+LastEditTime: 2021-09-24 09:55:30
+--]]
+local role = require "role"
+
+local root = class("roleMgr")
+
+function root:ctor()
+    self.roleList = {}
+    self.amount = 0
+end
+
+function root:login_role(uid, gSession)
+    local roleObj = role.new(uid, gSession)
+    roleObj:login(gSession)
+    log.print("login_role %s", uid)
+    self.roleList[uid] = roleObj
+    self.amount = self.amount + 1
+end
+
+function root:logout_role(uid)
+    local roleObj = self:get_role_obj(uid)
+    if not roleObj then
+        return
+    end
+
+    log.print("logout_role %s", uid)
+    roleObj:logout_modules()
+    self.roleList[uid] = nil
+    self.amount = self.amount - 1
+end
+
+function root:get_role_obj(uid)
+    return self.roleList[uid]
+end
+
+function root:get_role_obj_list()
+    return self.roleList
+end
+
+-- 派发游戏事件
+function root:dispath_game_event(uid, eventId, eventParams)
+    local roleObj = self:get_role_obj(uid)
+    if not roleObj then
+        return
+    end
+
+    roleObj:dispath_game_event(eventId, eventParams)
+end
+
+return root

nodes/game/service/srvAgent.lua

@@ -7,6 +7,7 @@ local jmService = require "jmService"
 local nodeUtil = require("utils.nodeUtil")
 local lib_queue = require("lib_queue")
 local util_event = require("utils.util_event")
+local roleMgr = (require "roleMgr").new()
 
 local mapItf2Module = {}
 
@@ -16,7 +17,7 @@ local root = {
 
 -- 登录
 function root.login(uid, session)
-	root.mapUid2Agent[uid] = session
+	cs(uid)(roleMgr.login_role, roleMgr, uid, gSession)
 	-- 通知 agentmgr
 	skynet.call(".srvAgentMgr", "lua", "login", uid, session)
 
@@ -26,7 +27,7 @@ function root.login(uid, session)
 end
 -- 登出
 function root.logout(uid, session)
-	root.mapUid2Agent[uid] = nil
+	cs(uid)(roleMgr.logout_role, roleMgr, uid)
 
 	skynet.call(".srvAgentMgr", "lua", "logout", uid, session)
 	nodeUtil:user_master_unband_node(uid)
@@ -39,12 +40,12 @@ local function l_c2s_response(uid, protoName, errCode, res, ...)
 	res = res or {}
 	res.code = errCode
 
-	local session = root.mapUid2Agent[uid]
-	if session == nil or session.gateNode == nil or session.gateAgent == nil then
+	local role = roleMgr:get_role_obj(uid)
+	if not role or role.gateNode == nil or role.gateAgent == nil then
 		return
 	end
 
-	nodeUtil:send_to_node(session.gateNode, session.gateAgent, "c2s_response", uid, protoName, res, ...)
+	nodeUtil:send_to_node(role.gateNode, role.gateAgent, "c2s_response", uid, protoName, res, ...)
 end
 
 -- 格式化协议
@@ -52,10 +53,9 @@ local function l_get_interface_and_func(protoName)
 	-- return protoName:match "([^_]*)_(.*)"
 
 	local data = string.split(protoName, "_")
-	local itfName = table.remove(data, 1)
+	local itfName = data[1]
 
-	local funcName = table.concat(data, "_")
-	return itfName, funcName
+	return itfName, protoName
 end
 
 -- 获取接口对象
@@ -67,8 +67,8 @@ end
 
 -- 处理客户端协议数据
 function root.c2s_forward(uid, protoName, args, ...)
-	local session = root.mapUid2Agent[uid]
-	if session == nil then
+	local role = roleMgr:get_role_obj(uid)
+	if role == nil then
 		log.warning("c2s_forward not find role! uid:%s", uid)
 		return l_c2s_response(uid, protoName, code.INNER_SERVER_ERROR)
 	end
@@ -93,7 +93,7 @@ function root.c2s_forward(uid, protoName, args, ...)
 			skynet.error(debug.traceback())
 		end,
 		itfModule,
-		uid,
+		role,
 		args
 	)
 	if not ok then
@@ -117,7 +117,7 @@ function root.c2s_forward(uid, protoName, args, ...)
 			skynet.error(debug.traceback())
 		end,
 		itfModule,
-		uid,
+		role,
 		args
 	)
 	if not ok then
@@ -127,6 +127,11 @@ function root.c2s_forward(uid, protoName, args, ...)
 end
 
 function root.doCmd(uid, itfName, cmd, args)
+	local role = roleMgr:get_role_obj(uid)
+	if not role then
+		log.error("doCmd uid[%s] role nil", tostring(uid))
+		return
+	end
 	local itfModule = l_get_interface_module(itfName)
 	if itfModule == nil then
 		log.error("doCmd dont find module ! itfName:%s, cmd:%s", itfName, cmd)
@@ -145,7 +150,7 @@ function root.doCmd(uid, itfName, cmd, args)
 		function()
 			skynet.error(debug.traceback())
 		end,
-		uid,
+		role,
 		args
 	)
 
@@ -193,12 +198,16 @@ end
 
 -- 在线玩家数
 function root.get_player_count()
-	return #root.mapUid2Agent
+	local count = 0
+	for _, v in pairs(roleMgr.get_role_obj_list()) do
+		count = count + 1
+	end
+	return count
 end
 -- 打印 - 玩家列表
 function root.print_uid_list()
 	local uidList = {}
-	for uid, _ in pairs(root.mapUid2Agent) do
+	for uid, _ in pairs(roleMgr.get_role_obj_list()) do
 		table.insert(uidList, uid)
 	end
 	log.warning("print_uid_list uidList:%s", tostring(uidList))