he2802 1 年之前
父节点
当前提交
658b879d8e

+ 4 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -815,12 +815,13 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             SEVEN_OFFICIALPUSH_INFOACCOUNT = configService.selectConfigByKeyNoCache("seven.office.account");
             SEVEN_OFFICIALPUSH_TOKEN = configService.selectConfigByKeyNoCache("seven.office.token");
         }
-        String jsonStr = configService.selectConfigByKeyNoCache("home.header");
+        String jsonStr = configService.selectConfigByKeyNoCache("client.config");
         boolean sevenPushAuth = false; //无需校验
         if(Validator.isNotEmpty(jsonStr)){
             JSONObject objectJson = JSON.parseObject(jsonStr);
-            if(Validator.isNotEmpty(objectJson)&&objectJson.containsKey("sevenPushAuth")){
-                Integer authRs = objectJson.getInteger("sevenPushAuth");
+            if(Validator.isNotEmpty(objectJson)&&objectJson.containsKey("other")){
+                JSONObject jsonObject = objectJson.getJSONObject("other");
+                Integer authRs = jsonObject.getInteger("sevenPushAuth");
                 if(authRs==1){
                     sevenPushAuth = true;
                 }

+ 4 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserLoginErrorServiceImpl.java

@@ -102,11 +102,12 @@ public class UserLoginErrorServiceImpl extends ServiceImpl<UserLoginErrorMapper,
         lqwExam.eq(UserLoginError::getLoginAccount, loginAccount);
         lqwExam.eq(UserLoginError::getDate, DateUtils.getTodayZeroTime());
         Integer count = baseMapper.selectCount(lqwExam);
-        String jsonStr = configService.selectConfigByKey("home.header");
+        String jsonStr = configService.selectConfigByKey("client.config");
         if(Validator.isNotEmpty(jsonStr)){
             JSONObject objectJson = JSON.parseObject(jsonStr);
-            if(Validator.isNotEmpty(objectJson)&&objectJson.containsKey("loginLimit")){
-                Integer maxCount = objectJson.getInteger("loginLimit");
+            if(Validator.isNotEmpty(objectJson)&&objectJson.containsKey("other")){
+                JSONObject jsonObject = objectJson.getJSONObject("other");
+                Integer maxCount = jsonObject.getInteger("loginLimit");
                 if(maxCount>0&&count>=maxCount){
                     throw new CustomException("今天你的错误次数已超过"+maxCount+"次,请明天再登录");
                 }