From 43109fd08487b1d0e366cc965c344b6e18253799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Sun, 7 Apr 2024 16:11:43 +0800 Subject: [PATCH] 123 --- .../com/ruoyi/cai/manager/UserForbidManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java index 9be8b7de..3195ede1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserForbidManager.java @@ -152,10 +152,10 @@ public class UserForbidManager { } public CheckForbid checkForbid(Long userId,String usercode, String IMEI, String ip){ - ForbidTypeEnum typeEnum; CheckForbid noForbid = CheckForbid.noForbid(); - String member; - Long forbidId; + ForbidTypeEnum typeEnum = null; + String member = null; + Long forbidId = 0L; if(StringUtils.isNotEmpty(usercode)){ forbidId = forbidCache.checkForbid(usercode, ForbidTypeEnum.USER); if(forbidId == null){ @@ -167,7 +167,8 @@ public class UserForbidManager { noForbid = CheckForbid.forbid(traceId); noForbid.setMessage("您的账号已被封禁"); - }else if(StringUtils.isNotBlank(IMEI)){ + } + if(StringUtils.isNotBlank(IMEI)){ forbidId = forbidCache.checkForbid(IMEI, ForbidTypeEnum.IMEI); if(forbidId == null){ return noForbid; @@ -177,7 +178,8 @@ public class UserForbidManager { String traceId = IdManager.nextIdStr(); noForbid = CheckForbid.forbid(traceId); noForbid.setMessage("您的设备已被封禁"); - }else if(StringUtils.isNotBlank(ip)){ + } + if(StringUtils.isNotBlank(ip)){ forbidId = forbidCache.checkForbid(ip, ForbidTypeEnum.IP); if(forbidId == null){ return noForbid; @@ -187,8 +189,6 @@ public class UserForbidManager { String traceId = IdManager.nextIdStr(); noForbid = CheckForbid.forbid(traceId); noForbid.setMessage("您的IP已被封禁"); - }else{ - return noForbid; } if(noForbid.isForbid()){ // 保存拦截记录