新增邮件系统

common/core/nodeMgr.lua

@@ -107,13 +107,13 @@ function root.snaxcall(node, name, address, reqType, func, ...)
 end
 
 -- 向所有agent进行广播
-function root.broadcast_game_agent(interface, ...)
+function root.broadcast_game_agent(mdl, cmd, ...)
 	local nodeInfoList = root.get_type_node_list("game")
 	if is_empty(nodeInfoList) then
 		return
 	end
 	for _, v in ipairs(nodeInfoList) do
-		root.send(v, ".srvAgentMgr", "broadcast_agents", interface, ...)
+		root.send(v, ".srvAgentMgr", "broadcast_agents", mdl, cmd, ...)
 	end
 end
 

dev/data/user.lua

@@ -53,6 +53,13 @@ function root:user_is_match_password(uid, password)
     end
     return password == moduleData:hget(uid, MODULE_NAME, "password")
 end
+-- 渠道匹配
+function root:user_is_match_channel(uid, channel)
+    if uid == nil or channel == nil then
+        return false
+    end
+    return channel == moduleData:get_channel(uid)
+end
 
 -- 账号状态
 function root:get_status(uid)

dev/modules/mail.lua

@@ -0,0 +1,31 @@
+--[[
+Descripttion:邮件
+version:
+Author: Neo,Huang
+Date: 2022-08-17 16:04:20
+LastEditors: Neo,Huang
+LastEditTime: 2022-08-19 20:12:34
+--]]
+local root = class("moduleMail", require("base.baseModule"))
+
+function root:ctor(id)
+	root.super.ctor(self, "mail", "id", true, true)
+	self.id = id
+end
+
+function root:mysql_get_init_columns()
+	return {
+		id = "bigint(20) NOT NULL COMMENT '邮件ID'",
+		uid = "bigint(20) DEFAULT 0 COMMENT '接收人'",
+		channel = "int(11) DEFAULT 0 COMMENT '渠道编号'",
+		title = "varchar(50) DEFAULT '系统通知' COMMENT '邮件标题'",
+		cnt = "varchar(400) DEFAULT 1 COMMENT '邮件内容'",
+		items = "json COMMENT '邮件物品列表'",
+		ty = "int(11) DEFAULT 1 COMMENT '邮件类型'",
+		createTime = "int(11) DEFAULT 0 COMMENT '发送时间'",
+		expireTime = "int(11) DEFAULT 0 COMMENT '过期时间 -1:常驻邮件'",
+		src = "varchar(50) DEFAULT 'sys' COMMENT '邮件来源'"
+	}
+end
+
+return root

dev/modules/pmail.lua

@@ -0,0 +1,193 @@
+--[[
+Descripttion:邮件
+version:
+Author: Neo,Huang
+Date: 2022-08-17 16:04:20
+LastEditors: Neo,Huang
+LastEditTime: 2022-08-19 20:12:34
+--]]
+local code = require("code")
+local util_mail = require("utils.util_mail")
+local timeUtil = require("utils.timeUtil")
+local itemUtil = require("utils.itemUtil")
+
+local bagData = require("data.bag")
+
+local root = class("mailSelf", require("base.baseModule"))
+
+function root:ctor(uid)
+	root.super.ctor(self, "tb_mail_self", "uid", true, nil, nil)
+
+	self.uid = uid
+end
+
+function root:getInitColumnNameOptions()
+	return {
+		uid = "bigint(20) unsigned NOT NULL COMMENT '用户ID'",
+		readIdList = "JSON COMMENT '已读邮件ID列表'",
+		delIdList = "JSON COMMENT '已删邮件ID列表'",
+		awardIdList = "JSON COMMENT '已领取奖励邮件ID列表'"
+	}
+end
+
+-- 读邮件 - 新增
+function root:add_read_mail(id)
+	if is_empty(id) then
+		return false
+	end
+	local readIdList = self:redis_get_key_info("readIdList")
+	if table.include(readIdList, id) then
+		return false
+	end
+	table.insetr(readIdList, id)
+	self:redis_update_key_info("readIdList", readIdList)
+end
+-- 是否已读
+function root:is_read(id)
+	if is_empty(id) then
+		return false
+	end
+	local readIdList = self:redis_get_key_info("readIdList")
+	if table.include(readIdList, id) then
+		return true
+	end
+	return false
+end
+
+-- 读邮件 - 新增
+function root:add_del_mail(id)
+	if is_empty(id) then
+		return false
+	end
+	local delIdList = self:redis_get_key_info("delIdList")
+	if table.include(delIdList, id) then
+		return false
+	end
+	table.insetr(delIdList, id)
+	self:redis_update_key_info("delIdList", delIdList)
+end
+-- 是否已读
+function root:is_del(id)
+	if is_empty(id) then
+		return false
+	end
+	local delIdList = self:redis_get_key_info("delIdList")
+	if table.include(delIdList, id) then
+		return true
+	end
+	return false
+end
+
+-- 奖励 - 新增
+function root:add_award_mail(id)
+	if is_empty(id) then
+		return false
+	end
+	local awardIdList = self:redis_get_key_info("awardIdList")
+	if table.include(awardIdList, id) then
+		return false
+	end
+	table.insetr(awardIdList, id)
+	self:redis_update_key_info("awardIdList", awardIdList)
+	return true
+end
+-- 是否已读
+function root:is_awarded(id)
+	if is_empty(id) then
+		return false
+	end
+	local awardIdList = self:redis_get_key_info("awardIdList")
+	if table.include(awardIdList, id) then
+		return true
+	end
+	return false
+end
+
+----------------------------------------
+-- 接口
+----------------------------------------
+-- 模块信息
+function root:itf_get_info(msg)
+	local lastTime = msg.lastTime or 0
+	local list = util_mail:user_get_mail_info_list(self.uid, lastTime)
+	local mailList = {}
+	if not is_empty(list) then
+		for _, v in ipairs(list) do
+			if not self:is_del(v.id) then
+				local info = {
+					id = v.id,
+					title = v.title,
+					cnt = v.cnt,
+					ty = v.ty,
+					createTime = v.createTime,
+					expireTime = v.expireTime,
+					status = v.status,
+					statusItems = self:is_awarded(v.id) and 1 or 0
+				}
+				if not is_empty(v.items) then
+					info.items = cjson_decode(v.items)
+				end
+				info.status = self:is_read(v.id) and 1 or 0
+				table.insert(mailList, info)
+			end
+		end
+	end
+	local ret = {
+		mailList = mailList,
+		sysTime = timeUtil.now(self.uid)
+	}
+	return code.OK, ret
+end
+-- 读取
+function root:itf_read(msg)
+	local idList = msg.idList
+	if msg == nil or is_empty(idList) then
+		return code.PARAMTER_ERROR
+	end
+	for _, id in ipairs(idList) do
+		self:add_read_mail(id)
+	end
+	return code.OK
+end
+-- 删除
+function root:itf_del(msg)
+	local idList = msg.idList
+	if msg == nil or is_empty(idList) then
+		return code.PARAMTER_ERROR
+	end
+	for _, id in ipairs(idList) do
+		self:add_del_mail(id)
+	end
+	return code.OK
+end
+-- 获取邮件奖励
+function root:itf_get_award(msg)
+	local idList = msg.idList
+	if msg == nil or is_empty(idList) then
+		return code.PARAMTER_ERROR
+	end
+
+	local awardIdList = self:redis_get_key_info("awardIdList")
+	local mailItems = nil
+	for _, id in ipairs(idList) do
+		-- 是否已领取
+		if not self:is_awarded(id) then
+			local errCode, items = util_mail:user_get_mail_award(self.uid, id)
+			if not code.is_not_ok(errCode) then
+				table.insert(awardIdList, id)
+				if not is_empty(items) then
+					-- 发放邮件物品
+					local keyEvent = string.format("mail-award-%s", tostring(id))
+					bagData:add_items(self.uid, items, keyEvent)
+				end
+
+				mailItems = itemUtil.items_merge(mailItems, items)
+			end
+		end
+	end
+	self:redis_update_key_info("awardIdList", awardIdList)
+
+	return code.OK, {items = mailItems}
+end
+
+return root

dev/utils/util_global.lua

@@ -0,0 +1,33 @@
+--[[
+Descripttion:玩家事件
+version:
+Author: Neo,Huang
+Date: 2022-07-05 19:59:16
+LastEditors: Neo,Huang
+LastEditTime: 2022-07-05 20:08:31
+--]]
+local lib_game_redis = require("lib_game_redis")
+
+local MODULE_NAME = "global"
+
+local root = {}
+
+-- 创建玩家id
+function root:gen_user_id()
+    local uid = lib_game_redis:hincrby(MODULE_NAME, "user:max:id", 1)
+    if uid < 1000000 then
+        uid = uid + 1000000
+        lib_game_redis:set("user:max:id", uid)
+    end
+
+    return uid
+end
+
+-- 创建邮件id
+function root:gen_mail_id()
+    local id = lib_game_redis:hincrby(MODULE_NAME, "mail:max:id", 1)
+
+    return id
+end
+
+return root

dev/utils/util_mail.lua

@@ -0,0 +1,145 @@
+--[[
+Descripttion:邮件
+version:
+Author: Neo,Huang
+Date: 2022-08-19 20:10:44
+LastEditors: Neo,Huang
+LastEditTime: 2022-08-19 20:10:56
+--]]
+local code = require("code")
+local util_user = require("utils.util_user")
+local nodeMgr = require("nodeMgr")
+local lib_game_mysql = require("lib_game_mysql")
+local util_global = require("utils.util_global")
+
+local mailAdapt = require("adapt.mailAdapt")
+
+local globalData = require("data.global")
+local moduleData = require("data.module")
+
+local root = {}
+
+-- 新增邮件
+-- uid:0为全服邮件 >1000000玩家邮件 -1:渠道邮件
+-- status: 邮件状态 个位:0:新增 1:已读 2:删除 十位:奖励状态 0:未领取 1:已领取
+function root:add_mail(uid, channel, title, cnt, items, ty, createTime, expireTime, src)
+    if uid == nil or title == nil or is_empty(cnt) then
+        return false
+    end
+    local id = util_global:gen_mail_id()
+
+    channel = channel or 0
+    ty = ty or 1
+    createTime = createTime or skynet_time()
+    expireTime = expireTime or (createTime + 7 * 24 * 60 * 60)
+    src = src or "sys"
+    -- 邮件物品
+    if is_empty(items) then
+        items = {}
+    end
+    items = cjson_encode(items)
+
+    -- 插入数据库
+    local values =
+        string.format(
+        "id=%s, uid=%s, channel=%s, title='%s', cnt='%s', items='%s', ty=%s, createTime=%s, expireTime=%s, src='%s'",
+        tostring(id),
+        tostring(uid),
+        tostring(channel),
+        tostring(title),
+        tostring(cnt),
+        tostring(items),
+        tostring(ty),
+        tostring(createTime),
+        tostring(expireTime),
+        tostring(src)
+    )
+    local sql = string.format("insert into mdl_mail set %s;", tostring(values))
+    local ret = lib_game_mysql:query(sql)
+    if ret.errno and ret.errno > 0 then
+        log.error("add_mail 新增邮件失败 ret[%s] sql[%s]", tostring(ret), tostring(sql))
+        return false
+    end
+    -- 通知新邮件
+    if uid == 0 then
+        -- 全服
+        nodeMgr.broadcast_game_agent("mail", "add_new_mail", {id = id})
+    elseif uid == -1 then
+        -- 渠道
+        nodeMgr.broadcast_game_agent("mail", "add_new_mail", {id = id, channel = channel})
+    elseif not is_robot(uid) then
+        -- 通知玩家 - 新增个人邮件
+        self:on_new_mail(uid, id)
+    end
+
+    return true
+end
+
+-- 获取玩家邮件
+function root:user_get_mail_info_list(uid, lastTime)
+    if uid == nil then
+        return
+    end
+    local currTime = skynet_time()
+    local channel = moduleData:get_channel(uid)
+    lastTime = lastTime or 0
+    -- 全局邮件，个人邮件
+    local sectionUser =
+        string.format("((`uid`=%s or `uid`=0) and `expireTime` >= %s)", tostring(uid), tostring(currTime))
+    -- 渠道邮件
+    local sectionChannel =
+        string.format("(`uid`=-1 and `channel` = %s and `expireTime` >= %s)", tostring(channel), tostring(currTime))
+
+    local sql =
+        string.format(
+        "SELECT * FROM `mdl_mail` WHERE createTime >= %s and (%s or %s);",
+        lastTime,
+        sectionUser,
+        sectionChannel
+    )
+    -- log.info("user_get_mail_info_list uid[%s] sql[%s]", tostring(uid), tostring(sql))
+
+    local ret = lib_game_mysql:query(sql)
+    if ret.errno and ret.errno > 0 then
+        log.error("user_get_mail_info_list 获取玩家邮件列表失败 ret[%s] sql[%s]", tostring(ret), tostring(sql))
+        return
+    end
+    return ret
+end
+-- 玩家获取邮件物品
+function root:user_get_mail_award(uid, id)
+    if uid == nil or id == nil then
+        return code.PARAMTER_ERROR
+    end
+
+    -- 获取邮件信息
+    local sql = string.format("SELECT * FROM `mdl_mail` WHERE id=%s;", tostring(id))
+    log.info("user_get_mail_award uid[%s] sql[%s]", tostring(uid), tostring(sql))
+
+    local ret = lib_game_mysql:query(sql)
+    if is_empty(ret) or (ret.errno and ret.errno > 0) then
+        log.error("user_get_mail_award 邮件不存在 ret[%s] sql[%s]", tostring(ret), tostring(sql))
+        return code.MAIL.NOT_FOUND
+    end
+    -- 邮件没有物品
+    if is_empty(ret[1].items) then
+        log.error("user_get_mail_award 邮件物品不存在 ret[%s] sql[%s]", tostring(ret), tostring(sql))
+        return code.MAIL.NOT_MORE_ITEMS
+    end
+
+    local items = cjson_decode(ret[1].items)
+
+    return code.OK, items
+end
+
+-- 通知玩家 - 新增邮件
+function root:on_new_mail(uid, id)
+    if uid == nil or is_robot(uid) or id == nil then
+        return false
+    end
+    local pack = {id = id}
+    util_user:user_proto_notify(uid, "on_new_mail", pack)
+    return true
+end
+
+return root

nodes/game/interface/mail.lua

@@ -0,0 +1,53 @@
+--[[
+Descripttion:邮件
+version:
+Author: Neo,Huang
+Date: 2022-08-17 16:04:20
+LastEditors: Neo,Huang
+LastEditTime: 2022-08-20 09:42:54
+--]]
+local code = require "code"
+local util_mail = require("utils.util_mail")
+
+local userData = require("data.user")
+
+local root = {}
+
+-- 获取邮件信息列表
+function root.mail_get_info(role, msg)
+    return role.pmail:itf_get_info(msg)
+end
+
+-- 读取邮件
+function root.mail_read(role, msg)
+    return role.pmail:itf_read(msg)
+end
+
+-- 删除邮件
+function root.mail_del(role, msg)
+    return role.pmail:itf_del(msg)
+end
+
+-- 获取邮件奖励
+function root.mail_get_award(role, msg)
+    return role.pmail:itf_get_award(msg)
+end
+
+-- 新邮件通知
+function root.add_new_mail(role, msg)
+    local uid = role.uid
+    local id = msg.id
+    local channel = msg.channel
+    if id == nil then
+        return code.PARAMTER_ERROR
+    end
+
+    if channel == nil or userData:user_is_match_channel(uid, channel) then
+        -- 玩家新增邮件
+        util_mail:on_new_mail(uid, id)
+    end
+
+    return code.OK
+end
+
+return root

nodes/game/service/srvAgentMgr.lua

@@ -93,9 +93,9 @@ function root.print_uid_list()
 end
 
 -- 在线玩家广播消息
-function root.broadcast_agents(cmd, ...)
+function root.broadcast_agents(mdl, cmd, ...)
 	for uid, handle in pairs(mapUid2Agent) do
-		pcall(skynet.send, handle, "lua", "doCmd", uid, cmd, ...)
+		pcall(skynet.send, handle, "lua", "doCmd", uid, mdl, cmd, ...)
 	end
 end
 

nodes/login/controllers/usr.lua

@@ -3,6 +3,7 @@ local tokenUtil = require "utils.tokenUtil"
 local serverLogUtil = require("utils.serverLogUtil")
 local util_user = require("utils.util_user")
 local accountModule = require("modules.accountModule")
+local util_global = require("utils.util_global")
 
 local lib_game_mysql = require("lib_game_mysql")
 local lib_game_redis = require("lib_game_redis")
@@ -50,17 +51,6 @@ local function l_uuid_register(msg)
     return errCode, ret
 end
 
-local function l_get_register_uid()
-    local uid = lib_game_redis:incrby("user:max:id", 1)
-    if uid < 1000000 then
-        uid = uid + 1000000
-        lib_game_redis:set("user:max:id", uid)
-    end
-
-    return uid
-end
-
 -- 快速注册
 function root.register(msg)
     local errCode, ret = l_uuid_register(msg)
@@ -69,7 +59,7 @@ function root.register(msg)
     end
 
     -- 正常注册
-    local uid = l_get_register_uid()
+    local uid = util_global:gen_user_id()
 
     userData:user_init_register_info(uid, msg)
     -- 注册埋点
@@ -162,7 +152,7 @@ function root.registerByPhone(msg)
         -- return code.USR.ALREADY_REGISTER
         return root.loginByPhone(msg)
     end
-    local uid = l_get_register_uid()
+    local uid = util_global:gen_user_id()
     -- 注册账号
     moduleData:hset(account, "account", "account", account)
     moduleData:hset(account, "account", "password", password)