sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/RemoteUserService.java

@@ -84,10 +84,4 @@ public interface RemoteUserService
      */
     @GetMapping("/user/getUserList")
     public R<List<SysUser>> getUserList(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    /**
-    * 查询密码是否需要修改
-    */
-    @GetMapping("/user/userPwdState")
-    public String userPwdState(String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java

@@ -61,11 +61,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             public R<List<SysUser>> getUserList(SysUser sysUser, String source) {
                 return R.fail("获取用户失败:" + throwable.getMessage());
             }
-
-            @Override
-            public String userPwdState(String username, String source) {
-                return null;
-            }
         };
     }
 }

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java

@@ -67,14 +67,6 @@ public class LoginUser implements Serializable
      */
     private Set<String> roles;
 
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
     /**
      * 用户信息
      */
@@ -85,16 +77,6 @@ public class LoginUser implements Serializable
      */
     private String loginMethod;
 
-    public String getForceChangePwd() {
-        return forceChangePwd;
-    }
-
-    public void setForceChangePwd(String forceChangePwd) {
-        this.forceChangePwd = forceChangePwd;
-    }
-
-    private String forceChangePwd;
-
     public String getLoginMethod() {
         return loginMethod;
     }

sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java

@@ -93,9 +93,14 @@ public class SysLoginService {
             throw new ServiceException("对不起，您的账号：" + username + " 已停用");
         }
         passwordService.validate(user, password);
+
+        // 检查用户是否需要更改初始密码
+        if (user.getForceChangePwd().equals(1)) {
+            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "请先修改初始密码");
+            throw new ServiceException("请先修改初始密码");
+        }
+
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
-        String forceChangePwd = remoteUserService.userPwdState(username,SecurityConstants.INNER);
-        userInfo.setForceChangePwd(forceChangePwd);
         return userInfo;
     }
 

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java

@@ -83,12 +83,6 @@ public class SysUserController extends BaseController {
         return getDataTable(list);
     }
 
-    @GetMapping("/userPwdState")
-    public String userPwdState(String username) {
-        startPage();
-        String state = userService.selectforceChangePwd(username);
-        return state;
-    }
     /**
      * 获取用户列表内部请求
      */

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/SysUserMapper.java

@@ -134,6 +134,4 @@ public interface SysUserMapper
     List<SysUser> selectUserByRole(SysUser sysUser);
 
     void updatePurchaseNoticePerson(SysUser user);
-
-    String selectforceChangePwd(String username);
 }

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/ISysUserService.java

@@ -224,6 +224,4 @@ public interface ISysUserService
      * @return
      */
     AjaxResult urgentProcessingUser(UrgentProcessingUser urgentProcessingUser);
-
-    String selectforceChangePwd(String username);
 }

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java

@@ -575,9 +575,4 @@ public class SysUserServiceImpl implements ISysUserService {
         log.info("ToDoServiceImpl  urgentProcessingUser {} end" ,urgentProcessingUser);
         return success(userList);
     }
-
-    @Override
-    public String selectforceChangePwd(String username) {
-        return userMapper.selectforceChangePwd(username);
-    }
 }

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -180,9 +180,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				</foreach>
 			</if>
 	</select>
-	<select id="selectforceChangePwd" resultType="java.lang.String">
-		select force_change_pwd from sys_user where user_name = #{username}
-	</select>
 
 	<insert id="insertUser" parameterType="com.bonus.sgzb.system.api.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(