|
@@ -23,6 +23,7 @@ import com.nb.web.service.system.service.ISysMenuService;
|
|
|
import com.nb.web.service.system.service.ISysRoleService;
|
|
import com.nb.web.service.system.service.ISysRoleService;
|
|
|
import com.nb.web.service.system.service.ISysUserService;
|
|
import com.nb.web.service.system.service.ISysUserService;
|
|
|
import com.nb.web.service.system.utils.CaptchaTool;
|
|
import com.nb.web.service.system.utils.CaptchaTool;
|
|
|
|
|
+import com.nb.core.utils.PswUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
@@ -94,12 +95,18 @@ public class WebAuthGranter implements IAuthGranter {
|
|
|
log.info("登录用户:{}已被停用", source.getUsername());
|
|
log.info("登录用户:{}已被停用", source.getUsername());
|
|
|
throw new CustomException("对不起,您的账号已被停用");
|
|
throw new CustomException("对不起,您的账号已被停用");
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
log.info("登录用户:{}", source.getUsername());
|
|
log.info("登录用户:{}", source.getUsername());
|
|
|
|
|
+ if(PswUtils.validatePsw(source.getPassword())){
|
|
|
|
|
+ sysUser.setPswNeedReset(false);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ sysUser.setPswNeedReset(true);
|
|
|
|
|
+ }
|
|
|
|
|
+ sysUserService.updateById(sysUser);
|
|
|
// 查询角色列表
|
|
// 查询角色列表
|
|
|
List<SysRole> sysRoleList = sysRoleService.listSysRoleByUserId(sysUser.getId(),String.valueOf(sysUser.getTenantId()));
|
|
List<SysRole> sysRoleList = sysRoleService.listSysRoleByUserId(sysUser.getId(),String.valueOf(sysUser.getTenantId()));
|
|
|
// 查询权限标识
|
|
// 查询权限标识
|
|
|
Set<String> permissions = sysMenuService.getPermissionsByUserId(sysUser.getId());
|
|
Set<String> permissions = sysMenuService.getPermissionsByUserId(sysUser.getId());
|
|
|
-
|
|
|
|
|
// 登录
|
|
// 登录
|
|
|
StpLogic stpLogic = SecurityUtil.getStpLogic(StpTypeEnum.DEFAULT.getText());
|
|
StpLogic stpLogic = SecurityUtil.getStpLogic(StpTypeEnum.DEFAULT.getText());
|
|
|
stpLogic.login(sysUser.getId());
|
|
stpLogic.login(sysUser.getId());
|
|
@@ -116,6 +123,7 @@ public class WebAuthGranter implements IAuthGranter {
|
|
|
loginUser.setNickName(sysUser.getNickname());
|
|
loginUser.setNickName(sysUser.getNickname());
|
|
|
loginUser.setId(sysUser.getId());
|
|
loginUser.setId(sysUser.getId());
|
|
|
loginUser.setLoginType(StpTypeEnum.DEFAULT.getText());
|
|
loginUser.setLoginType(StpTypeEnum.DEFAULT.getText());
|
|
|
|
|
+ loginUser.setPswNeedReset(sysUser.getPswNeedReset());
|
|
|
fillUserAgentInfo(loginUser);
|
|
fillUserAgentInfo(loginUser);
|
|
|
// 设置用户信息
|
|
// 设置用户信息
|
|
|
stpLogic.getTokenSession().set(LOGIN_USER_KEY,loginUser);
|
|
stpLogic.getTokenSession().set(LOGIN_USER_KEY,loginUser);
|