更新封号逻辑

script/module/scene/BanLogic.lua

@@ -97,7 +97,6 @@ end
 -- 收到跨服推送的封禁数据
 function NS_Init_BanData(banList)
     for k ,v in pairs(banList) do
-        print("===========NS_Init_BanData============", k,v)
         updateBanCache(k, v)
     end
 end
@@ -114,7 +113,6 @@ end
 
 -- 收到跨服推送的要更新的封禁数据
 function NS_Update_BanData(banStr)
-    print("============NS_Update_BanData==============", banStr)
     local banInfo = Json.Decode(banStr)
 
     -- 禁账号
@@ -134,7 +132,6 @@ function NS_Update_BanData(banStr)
     -- 禁设备
     if banInfo.appBanInfo then
         local banTime = tonumber(banInfo.appBanInfo.banTime)
-
         if  banTime > 0 then
             kickPlayerByDeviceNo(banInfo.appBanInfo.appId)
         end
@@ -154,7 +151,7 @@ function Update_Ban_Info(banInfo)
         local banTime = tonumber(banInfo.roleBanInfo.banTime)
         local banTag = banInfo.roleBanInfo.roleTag
 
-        if banTime > 0 then
+        if banTime > os.time() then
             kickPlayerByuuid(banTag)
         end
 
@@ -167,11 +164,7 @@ end
 
 -- 是否被禁止登录
 function CheckBan(uuid, channelId, account, appId)
-    print("=============CheckBan0============")
     local banListCache = getBanCache()
-    for k ,v in pairs(banListCache) do
-        print("=============CheckBan1============", k,v)
-    end
 
     local now = os.time()
     if banListCache[uuid] and banListCache[uuid] > now then
@@ -214,7 +207,6 @@ end
 function CS_Get_BanData(msg)
     local banData = getBanData()
 
-    print("=============CS_Get_BanData============", type(banData))
     if banData then
         local tMsgData = InnerMsg.wl.WL_QUERY_BAN_INFO
 
@@ -231,8 +223,8 @@ end
 
 -- 当前服为跨服, 收到普通服请求更新封禁数据
 function CS_Update_BanData(banStr)
-    print("============CS_Update_BanData==============", banStr)
     local banTag, banTime
+    local bl = false
     local banInfo = Json.Decode(banStr)
 
     local banData = getBanData()
@@ -243,7 +235,11 @@ function CS_Update_BanData(banStr)
         banTag = banInfo.roleBanInfo.roleTag
         banTime = tonumber(banInfo.roleBanInfo.banTime)
 
-        banData[banTag] = banTime
+        if banTime == 0 or banTime > os.time() then
+            bl = true
+            banData[banTag] = banTime
+        end
+
         if banTime == 0 then
             banData[banTag] = nil
         end
@@ -256,7 +252,11 @@ function CS_Update_BanData(banStr)
         local banTbl = {banInfo.accountBanInfo.channelTag, banInfo.accountBanInfo.accountTag}
         banTag = generateTag(banTbl)
 
-        banData[banTag] = banTime
+        if banTime == 0 or banTime > os.time() then
+            bl = true
+            banData[banTag] = banTime
+        end
+
         if banTime == 0 then
             banData[banTag] = nil
         end
@@ -265,15 +265,23 @@ function CS_Update_BanData(banStr)
 
     -- 禁设备
     if banInfo.appBanInfo then
-        banTag = banInfo.appBanInfo.appId
-        print("================appBanInfo============", type(banTag))
+        banTag = tostring(banInfo.appBanInfo.appId)
         banTime = tonumber(banInfo.appBanInfo.banTime)
-        banData[banTag] = banTime
+
+        if banTime == 0 or banTime > os.time() then
+            bl = true
+            banData[banTag] = banTime
+        end
+
         if banTime == 0 then
             banData[banTag] = nil
         end
     end
 
+    if not bl then
+        return
+    end
+
     --更新数据库
     updateBanData(banData)
 

script/module/scene/Handler.lua

@@ -123,7 +123,7 @@ function setLoginParams(human, msg, params)
     human.gameName = params.gameName or ""
     human.version = params.version or nil
 	human.serverTag = msg.serverTag
-	human.deviceNo  = msg.deviceNo or ""  --设备号
+	human.deviceNo  = params.deviceNo or ""  --设备号
 
 	human.pf_info = human.pf_info or {}
 	human.pf_info.openid = params.openid or ""
@@ -202,7 +202,7 @@ function CG_ASK_LOGIN(fd, msg)
 	local serverTag = msg.serverTag
 	local params = Json.Decode(msg.params)
 
-	print("CG_ASK_LOGIN", msg.account, msg.serverTag, params.phpChanelID, type(params.phpChanelID))
+	print("CG_ASK_LOGIN", msg.account, msg.serverTag, params.phpChanelID, type(params.phpChanelID), params.deviceNo, type(params.deviceNo))
 
 	--如果是已经登录的，也断开连接
 	--local human_old = ObjHuman.onlineAccount[account]
@@ -220,8 +220,7 @@ function CG_ASK_LOGIN(fd, msg)
 
 
 	-- 禁止登录检测
-	if isBan(human.db and human.db._id, params.phpChanelID, account, params.appid) then
-		print("=======================isBan=====================")
+	if isBan(human.db and human.db._id, params.phpChanelID, account, params.deviceNo) then
 		return
 	end