增加enable

src/main/java/cn/quantgroup/xyqb/aspect/captcha/LoginInterceptorAspect.java

@@ -141,7 +141,7 @@ public class LoginInterceptorAspect {
 
             Long deviceNum = loginInfoRepository.countByDeviceId(deviceId);
 
-            if (DEVICE_REFUSE_COUNT.compareTo(deviceNum) < 0) {
+            if (DEVICE_REFUSE_COUNT.compareTo(deviceNum) <= 0) {
                 if (isWhite(deviceId, KeyType.DEVICEID)) {
                     log.warn("此设备登录命中拒绝策略,但是在白名单deviceId:{}", deviceId, deviceNum);
                     return LoginRefuseResult.builder()
@@ -267,7 +267,7 @@ public class LoginInterceptorAspect {
      * @return
      */
     private boolean isWhite(String key, KeyType type) {
-        return whiteListRepository.countByKeyEqualsAndTypeEquals(key, type) > 0;
+        return whiteListRepository.countByKeyEqualsAndTypeEqualsAndEnableIsTrue(key, type) > 0;
     }
     /**
      * 【登录设备反欺诈策略】

src/main/java/cn/quantgroup/xyqb/repository/WhiteListRepository.java

@@ -7,5 +7,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 public interface WhiteListRepository extends JpaRepository<WhiteList, Long> {
 
 
-    Long countByKeyEqualsAndTypeEquals(String key, KeyType type);
+    Long countByKeyEqualsAndTypeEqualsAndEnableIsTrue(String key, KeyType type);
 }