3.2.5 bug修复

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ClientLoginParam.java

@@ -16,14 +16,9 @@ import javax.validation.constraints.NotBlank;
 public class ClientLoginParam {
 
     @ApiModelProperty(value = "登录名")
-//    @NotBlank(message = "请输入登录名")
-    @Length(message = "登录名不能超过{max}个字符", max = 50)
     private String loginName;
 
     @ApiModelProperty(value = "密码")
-//    @NotBlank(message = "请输入密码")
-    @Length(message = "密码不能少于{min}位", min = 6)
-    @Length(message = "密码不能超过{max}位", max = 30)
     private String password;
 
     @ApiModelProperty(value = "学校code")

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -169,10 +169,10 @@ public class SysController {
 
             //用户不存在
             if (userList == null || userList.isEmpty()) {
-                throw ExceptionResultEnum.ERROR.exception("用户名或者密码错误");
+                throw ExceptionResultEnum.ERROR.exception("用户名或密码错误");
             }
             if (userList.size() > 1) {
-                throw ExceptionResultEnum.ERROR.exception("用户名或者密码错误");
+                throw ExceptionResultEnum.ERROR.exception("用户名或密码错误");
             }
 
             SysUser sysUser = userList.get(0);
@@ -181,7 +181,7 @@ public class SysController {
             }
 
             if (!password.equals(userList.get(0).getPassword())) {
-                throw ExceptionResultEnum.ERROR.exception("用户名或者密码错误");
+                throw ExceptionResultEnum.ERROR.exception("用户名或密码错误");
             }
 
             //2022.11.10日加入用户/密码模式是否开启短信验证

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicSchoolServiceImpl.java

@@ -49,7 +49,7 @@ public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, Basic
     public List<SchoolDto> listSchool() {
         List<SchoolDto> schoolDtos = this.baseMapper.listSchool();
         for (SchoolDto schoolDto : schoolDtos) {
-            if(StringUtils.isNotBlank(schoolDto.getInitPassword())){
+            if (StringUtils.isNotBlank(schoolDto.getInitPassword())) {
                 schoolDto.setInitPassword(new String(Base64Util.decode(schoolDto.getInitPassword())));
             }
         }
@@ -68,9 +68,6 @@ public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, Basic
                 basicSchool.setLogo(toBase64);
             } catch (Exception e) {
                 log.error(SystemConstant.LOG_ERROR, e);
-            } finally {
-                commonCacheService.removeSchoolCache(basicSchool.getCode());
-                commonCacheService.removeSchoolCache(basicSchool.getId());
             }
         }
 
@@ -78,14 +75,18 @@ public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, Basic
         String oldInitPassword = Base64Util.encode(SystemConstant.OLD_INIT_PASSWORD.getBytes());
         String currentInitPassword = basicSchool.getInitPassword();
         String newInitPassword = Base64Util.encode(initPassword.getBytes());
-        if(StringUtils.isBlank(currentInitPassword) || !currentInitPassword.equals(initPassword)){
+        if (StringUtils.isBlank(currentInitPassword) || !currentInitPassword.equals(initPassword)) {
             UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
             updateWrapper.lambda().set(SysUser::getPassword, newInitPassword)
                     .eq(SysUser::getSchoolId, id)
-                    .and(q->q.eq(SysUser::getPassword, oldInitPassword).or().eq(SysUser::getPassword, currentInitPassword));
+                    .and(q -> q.eq(SysUser::getPassword, oldInitPassword).or().eq(SysUser::getPassword, currentInitPassword));
             sysUserService.update(updateWrapper);
         }
 
+        // 清除学校缓存
+        commonCacheService.removeSchoolCache(basicSchool.getCode());
+        commonCacheService.removeSchoolCache(basicSchool.getId());
+
         basicSchool.setInitPassword(newInitPassword);
         return this.updateById(basicSchool);
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -191,6 +191,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         //如果原密码和旧密码不一致，需要重新登录
         if (!Objects.equals(user.getPassword(), oldPassword)) {
+            user.setPwdCount(0);
             commonService.removeUserInfo(user.getId(), false);
         }
         return this.updateById(user);