From 5c7683580a10782d17ca19358466c173f250e2ac Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 29 Jun 2022 11:11:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=AF=86=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=8E=A5=E5=8F=A3=E4=B8=8D=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/connector/filter/global.ts | 2 +-
 game-server/app/services/checkParam.ts             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/game-server/app/servers/connector/filter/global.ts b/game-server/app/servers/connector/filter/global.ts
index 2d99900a3..5bdd182a5 100644
--- a/game-server/app/servers/connector/filter/global.ts
+++ b/game-server/app/servers/connector/filter/global.ts
@@ -278,7 +278,7 @@ class Filter {
 
     private checkTimeStamp(msg: { ts: number }) {
         let ts = msg.ts;
-        let result = isNumber(ts) && Date.now() - ts < gameData.serverConst.TIME_STAMP_OVER && Date.now() > ts;
+        let result = isNumber(ts) && Date.now() - ts <= gameData.serverConst.TIME_STAMP_OVER && ts - Date.now() <= gameData.serverConst.TIME_STAMP_OVER;
         delete msg.ts;
         return result;
     }
diff --git a/game-server/app/services/checkParam.ts b/game-server/app/services/checkParam.ts
index caf1d233e..b07732604 100644
--- a/game-server/app/services/checkParam.ts
+++ b/game-server/app/services/checkParam.ts
@@ -556,9 +556,9 @@ export function checkRouteParam(route: string, msg: any) {
             }
         case "battle.normalBattleHandler.battleEnd":
             {
-                let { battleCode, battleId, isSuccess, heroes, star, stars, activityId = 0, pageIndex = 0 } = msg;
+                let { battleCode, battleId, isSuccess, heroes, stars, activityId = 0, pageIndex = 0 } = msg;
                 if(!checkNaturalStrings(battleCode)) return false;
-                if(!checkNaturalNumbers(battleId, star, activityId, pageIndex)) return false;
+                if(!checkNaturalNumbers(battleId, activityId, pageIndex)) return false;
                 if(!checkBoolean(isSuccess)) return false;
                 if(!checkNumberArray(heroes, stars)) return false;
                 break;