Merge branch 'cn/develop' into cn/publish/release

jiyue
2 parents a2242df4 9ad83c89
Showing 5 changed files with 80 additions and 11 deletions Show diff stats
src/ProtocolCode.lua
src/actions/HttpAction.lua
src/actions/RoleAction.lua
src/models/Role.lua
src/utils/MysqlUtil.lua
@@ -65,6 +65,8 @@ actionCodes = {
 	Role_worldLineRouletteRpc = 146, --世界线抽轮盘
 	Role_worldLineRewardRpc = 147, -- 世界线一键领取奖励
 	Role_itemConvertDevilTicketRpc = 148, -- 兑换魔鬼训练营门票
+	Role_unRegisterRpc = 149, --注销账号
+	Role_searchAllRoleRpc = 150, --查询所有服的角色信息
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
+require "utils.MysqlUtil"
  
 local _M = {}
  
@@ -264,4 +265,20 @@ function _M.hero_draw_pro(query)
 	return gmFuncs[query.cmd]()
 end
  
+function _M.role_by_uid(query)
+    local ret, res= roleByUid(query.uid)
+	local rsp = {}
+    rsp.code = 0
+	if not ret then
+		rsp.code = -1
+        return json.encode(rsp)
+	end
+
+	rsp.id = res["id"]
+	rsp.name = res["name"]
+	rsp.level = res["level"]
+	rsp.code = 0
+    return json.encode(rsp)
+end
+
 return _M
 \ No newline at end of file
@@ -345,15 +345,6 @@ function _M.loginRpc( agent, data )
 		end
 	end
  
-	-- 临时处理方式，清空电台活动队伍
-		local radioTask = role:getProperty("radioTask")
-		for id, data in pairs(radioTask) do
-			if (data["actid"] or 0) ~= 0 then
-				radioTask[id] = nil
-			end
-		end
-	---
-
 	return true
 end
  
@@ -506,6 +497,48 @@ function _M.createRpc(agent, data)
 	return true
 end
  
+function _M.unRegisterRpc(agent, data)
+    local role = agent.role
+	local roleId = role:getProperty("id")
+	local msg = MsgPack.unpack(data)
+	local id = msg.roleId
+	if id ~= roleId then
+        return 0
+	end
+
+	if not roleUnRegister(roleId) then return 1 end
+	SendPacket(actionCodes.Role_unRegisterRpc, MsgPack.pack({}))
+	return true
+end
+
+function _M.searchAllRoleRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    local uid = msg.sdk_uid
+    if not uid then return 0 end
+
+
+
+	local serverId = skynet.getenv("servId")
+	local codeurl = skynet.getenv("codeurl")
+	local content = {
+		["serverid"]= serverId,
+		["uid"]= uid,
+	}
+
+	local status, body = httpc.get(codeurl, "/search_role?" .. httpGetFormatData(content), {})
+	if status ~= 200 then return 1 end
+
+	local result = json.decode(body)
+	local ret = tonum(result.errorCode)
+	if ret ~= 0 then return 2 end
+
+
+	SendPacket(actionCodes.Role_searchAllRoleRpc, MsgPack.pack(result.data or {}))
+	return true
+end
+
+
 function _M.changeNameRpc(agent, data)
 	local role = agent.role
 	local roleId = role:getProperty("id")
@@ -217,6 +217,7 @@ Role.schema = {
  
 	worldChangePoints   = {"table", {}}, 	-- 世界变动积分 {[1]= 转盘抽取次数, [2]= 获得的积分, [3]=魔导石消耗, [4]= 虹光玉消耗}
     worldLineReward 	= {"table", {}},    -- 世界积分 领取记录 {[id] = 1}
+	del   				= {"number", 0}, 	-- 标记删除 0=未删除，1=已删除
 }
  
  
@@ -51,7 +51,7 @@ function delFriend(roleId, friendId)
 end
  
 function roleExists(roleId)
-    local res = mysqlproxy:query(string.format("SELECT `id` FROM `Role` WHERE `id` = %s", roleId))
+    local res = mysqlproxy:query(string.format("SELECT `id` FROM `Role` WHERE `del` = 0 and `id` = %s", roleId))
     if res["errno"] or not next(res) then
         return false
     end
@@ -60,10 +60,26 @@ function roleExists(roleId)
 end
  
 function roleUidExists(uid)
-    local res = mysqlproxy:query(string.format("SELECT `name` FROM `Role` WHERE `uid` = '%s'", uid))
+    local res = mysqlproxy:query(string.format("SELECT `name` FROM `Role` WHERE `del` = 0 and `uid` = '%s'", uid))
     if res["errno"] or not next(res) then
         return false
     end
  
     return true, res[1]["name"]
+end
+
+function roleUnRegister(roleId)
+    local res = mysqlproxy:query(string.format("UPDATE`Role` SET `del` = 1 WHERE `id` = %s", roleId))
+    if res["errno"] or not next(res) then
+        return false
+    end
+    return true
+end
+
+function roleByUid(uid)
+    local res = mysqlproxy:query(string.format("SELECT id, name, level FROM `Role` WHERE `del` = 0 and `uid` = '%s'", uid))
+    if res["errno"] or not next(res) then
+        return false
+    end
+    return true, res[1]
 end
 \ No newline at end of file