sunshine7058
/
ETL-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复登录无响应问题

ruoyi_test
sunshine7058 2024-04-12 15:52:17 +08:00
parent b8d7a1c175
commit bfe96e702d
12 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java
View File

@ -34,7 +34,7 @@ public class TokenController {
@PostMapping("login") @PostMapping("login")
public Result<?> login (@RequestBody LoginBody form) { public Result<?> login (@RequestBody LoginBody form) {
// 用户登录 // 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); LoginUser userInfo = sysLoginService.login(form.getUsernameOrEmail(), form.getPassword());
// 获取登录token // 获取登录token
return Result.success(tokenService.createToken(userInfo)); return Result.success(tokenService.createToken(userInfo));
} }
@ -66,7 +66,7 @@ public class TokenController {
@PostMapping("register") @PostMapping("register")
public Result<?> register (@RequestBody RegisterBody registerBody) { public Result<?> register (@RequestBody RegisterBody registerBody) {
// 用户注册 // 用户注册
sysLoginService.register(registerBody.getUsername(), registerBody.getPassword()); sysLoginService.register(registerBody.getUsernameOrEmail(), registerBody.getPassword());
return Result.success(); return Result.success();
} }
} }

16
muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java
View File

@ -7,28 +7,28 @@ package com.muyu.auth.form;
*/ */
public class LoginBody { public class LoginBody {
/** /**
* 用户名 * 用户名或邮箱
*/ */
private String username; private String usernameOrEmail;
/** /**
* 用户密码 * 用户密码
*/ */
private String password; private String password;
public String getUsername () { public String getUsernameOrEmail() {
return username; return usernameOrEmail;
} }
public void setUsername (String username) { public void setUsernameOrEmail(String usernameOrEmail) {
this.username = username; this.usernameOrEmail = usernameOrEmail;
} }
public String getPassword () { public String getPassword() {
return password; return password;
} }
public void setPassword (String password) { public void setPassword(String password) {
this.password = password; this.password = password;
} }
} }

54
muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
View File

@ -40,36 +40,36 @@ public class SysLoginService {
/** /**
* 登录 * 登录
*/ */
public LoginUser login (String username, String password) { public LoginUser login (String usernameOrEmail, String password) {
// 用户名或密码为空 错误 // 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password)) { if (StringUtils.isAnyBlank(usernameOrEmail, password)) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写"); recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "用户/邮箱/密码必须填写");
throw new ServiceException("用户/密码必须填写"); throw new ServiceException("用户/邮箱/密码必须填写");
} }
// 密码如果不在指定范围内 错误 // 密码如果不在指定范围内 错误
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH) { || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围"); recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "用户密码不在指定范围");
throw new ServiceException("用户密码不在指定范围"); throw new ServiceException("用户密码不在指定范围");
} }
// 用户名不在指定范围内 错误 // 用户名不在指定范围内 错误
if (username.length() < UserConstants.USERNAME_MIN_LENGTH if (usernameOrEmail.length() < UserConstants.USERNAME_MIN_LENGTH
|| username.length() > UserConstants.USERNAME_MAX_LENGTH) { || usernameOrEmail.length() > UserConstants.USERNAME_MAX_LENGTH) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围"); recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "用户名不在指定范围");
throw new ServiceException("用户名不在指定范围"); throw new ServiceException("用户名不在指定范围");
} }
// IP黑名单校验 // IP黑名单校验
String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST)); String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) { if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单"); recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
throw new ServiceException("很遗憾，访问IP已被列入系统黑名单"); throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
} }
// 查询用户信息 // 查询用户信息
Result<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); Result<LoginUser> userResult = remoteUserService.getUserInfo(usernameOrEmail, SecurityConstants.INNER);
if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) { if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在"); recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "登录用户不存在");
throw new ServiceException("登录用户：" + username + " 不存在"); throw new ServiceException("登录用户：" + usernameOrEmail + " 不存在");
} }
if (Result.FAIL == userResult.getCode()) { if (Result.FAIL == userResult.getCode()) {
@ -79,15 +79,15 @@ public class SysLoginService {
LoginUser userInfo = userResult.getData(); LoginUser userInfo = userResult.getData();
SysUser user = userResult.getData().getSysUser(); SysUser user = userResult.getData().getSysUser();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除"); recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
throw new ServiceException("对不起，您的账号：" + username + " 已被删除"); throw new ServiceException("对不起，您的账号：" + usernameOrEmail + " 已被删除");
} }
if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员"); recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
throw new ServiceException("对不起，您的账号：" + username + " 已停用"); throw new ServiceException("对不起，您的账号：" + usernameOrEmail + " 已停用");
} }
passwordService.validate(user, password); passwordService.validate(user, password);
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); recordLogService.recordLogininfor(usernameOrEmail, Constants.LOGIN_SUCCESS, "登录成功");
return userInfo; return userInfo;
} }
@ -98,30 +98,30 @@ public class SysLoginService {
/** /**
* 注册 * 注册
*/ */
public void register (String username, String password) { public void register (String usernameOrEmail, String password) {
// 用户名或密码为空 错误 // 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password)) { if (StringUtils.isAnyBlank(usernameOrEmail, password)) {
throw new ServiceException("用户/密码必须填写"); throw new ServiceException("用户/邮箱/密码必须填写");
} }
if (username.length() < UserConstants.USERNAME_MIN_LENGTH if (usernameOrEmail.length() < UserConstants.USERNAME_MIN_LENGTH
|| username.length() > UserConstants.USERNAME_MAX_LENGTH) { || usernameOrEmail.length() > UserConstants.USERNAME_MAX_LENGTH) {
throw new ServiceException("账户长度必须在2到20个字符之间"); throw new ServiceException("账户长度必须在2到20个字符之间");
} }
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH) { || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
throw new ServiceException("密码长度必须在5到20个字符之间"); throw new ServiceException("密码长度必须在5到20个字符之间");
} }
// 注册用户信息 // 注册用户信息
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setUserName(username); sysUser.setUserName(usernameOrEmail);
sysUser.setNickName(username); sysUser.setNickName(usernameOrEmail);
sysUser.setPassword(SecurityUtils.encryptPassword(password)); sysUser.setPassword(SecurityUtils.encryptPassword(password));
Result<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); Result<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
if (Result.FAIL == registerResult.getCode()) { if (Result.FAIL == registerResult.getCode()) {
throw new ServiceException(registerResult.getMsg()); throw new ServiceException(registerResult.getMsg());
} }
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功"); recordLogService.recordLogininfor(usernameOrEmail, Constants.REGISTER, "注册成功");
} }
} }

6
muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java
View File

@ -22,15 +22,15 @@ public class SysRecordLogService {
/** /**
* 记录登录信息 * 记录登录信息
* *
* @param username 用户名 * @param usernameOrEmail 用户名/邮箱
* @param status 状态 * @param status 状态
* @param message 消息内容 * @param message 消息内容
* *
* @return * @return
*/ */
public void recordLogininfor (String username, String status, String message) { public void recordLogininfor (String usernameOrEmail, String status, String message) {
SysLogininfor logininfor = new SysLogininfor(); SysLogininfor logininfor = new SysLogininfor();
logininfor.setUserName(username); logininfor.setUserName(usernameOrEmail);
logininfor.setIpaddr(IpUtils.getIpAddr()); logininfor.setIpaddr(IpUtils.getIpAddr());
logininfor.setMsg(message); logininfor.setMsg(message);
// 日志状态 // 日志状态

6
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
View File

@ -19,13 +19,13 @@ public interface RemoteUserService {
/** /**
* 通过用户名查询用户信息 * 通过用户名查询用户信息
* *
* @param username 用户名 * @param usernameOrEmail 用户名/邮箱
* @param source 请求来源 * @param source 请求来源
* *
* @return 结果 * @return 结果
*/ */
@GetMapping("/user/info/{username}") @GetMapping("/user/info/{usernameOrEmail}")
public Result<LoginUser> getUserInfo (@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); public Result<LoginUser> getUserInfo (@PathVariable("usernameOrEmail") String usernameOrEmail, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/** /**
* 注册用户信息 * 注册用户信息

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
View File

@ -23,7 +23,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
log.error("用户服务调用失败:{}", throwable.getMessage()); log.error("用户服务调用失败:{}", throwable.getMessage());
return new RemoteUserService() { return new RemoteUserService() {
@Override @Override
public Result<LoginUser> getUserInfo (String username, String source) { public Result<LoginUser> getUserInfo (String usernameOrEmail, String source) {
return Result.error("获取用户失败:" + throwable.getMessage()); return Result.error("获取用户失败:" + throwable.getMessage());
} }

14
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java
View File

@ -44,13 +44,13 @@ public class SysProfileController extends BaseController {
@GetMapping @GetMapping
public Result profile () { public Result profile () {
String username = SecurityUtils.getUsername(); String username = SecurityUtils.getUsername();
SysUser user = userService.selectUserByUserName(username); SysUser user = userService.selectUserByUsernameOrEmail(username);
return Result.success( return Result.success(
ProfileResp.builder() ProfileResp.builder()
.roleGroup( userService.selectUserRoleGroup(username) ) .roleGroup( userService.selectUserRoleGroup(username) )
.postGroup( userService.selectUserPostGroup(username) ) .postGroup( userService.selectUserPostGroup(username) )
.sysUser(user) .sysUser(user)
.build() .build()
); );
} }
@ -87,7 +87,7 @@ public class SysProfileController extends BaseController {
@PutMapping("/updatePwd") @PutMapping("/updatePwd")
public Result updatePwd (String oldPassword, String newPassword) { public Result updatePwd (String oldPassword, String newPassword) {
String username = SecurityUtils.getUsername(); String username = SecurityUtils.getUsername();
SysUser user = userService.selectUserByUserName(username); SysUser user = userService.selectUserByUsernameOrEmail(username);
String password = user.getPassword(); String password = user.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password)) { if (!SecurityUtils.matchesPassword(oldPassword, password)) {
return error("修改密码失败，旧密码错误"); return error("修改密码失败，旧密码错误");

38
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
View File

@ -97,9 +97,9 @@ public class SysUserController extends BaseController {
* 获取当前用户信息 * 获取当前用户信息
*/ */
@InnerAuth @InnerAuth
@GetMapping("/info/{username}") @GetMapping("/info/{usernameOrEmail}")
public Result<LoginUser> info (@PathVariable("username") String username) { public Result<LoginUser> info (@PathVariable("usernameOrEmail") String usernameOrEmail) {
SysUser sysUser = userService.selectUserByUserName(username); SysUser sysUser = userService.selectUserByUsernameOrEmail(usernameOrEmail);
if (StringUtils.isNull(sysUser)) { if (StringUtils.isNull(sysUser)) {
return Result.error("用户名或密码错误"); return Result.error("用户名或密码错误");
} }
@ -120,12 +120,12 @@ public class SysUserController extends BaseController {
@InnerAuth @InnerAuth
@PostMapping("/register") @PostMapping("/register")
public Result<Boolean> register (@RequestBody SysUser sysUser) { public Result<Boolean> register (@RequestBody SysUser sysUser) {
String username = sysUser.getUserName(); String usernameOrEmail = sysUser.getUserName();
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
return Result.error("当前系统没有开启注册功能！"); return Result.error("当前系统没有开启注册功能！");
} }
if (!userService.checkUserNameUnique(sysUser)) { if (!userService.checkUserNameUnique(sysUser)) {
return Result.error("保存用户'" + username + "'失败，注册账号已存在"); return Result.error("保存用户'" + usernameOrEmail + "'失败，注册账号已存在");
} }
return Result.success(userService.registerUser(sysUser)); return Result.success(userService.registerUser(sysUser));
} }
@ -144,11 +144,11 @@ public class SysUserController extends BaseController {
Set<String> permissions = permissionService.getMenuPermission(user); Set<String> permissions = permissionService.getMenuPermission(user);
return Result.success( return Result.success(
UserInfoResp.builder() UserInfoResp.builder()
.user(user) .user(user)
.roles(roles) .roles(roles)
.permissions(permissions) .permissions(permissions)
.build() .build()
); );
} }
@ -163,14 +163,14 @@ public class SysUserController extends BaseController {
List<SysRole> roles = roleService.selectRoleAll(); List<SysRole> roles = roleService.selectRoleAll();
builder.roles( builder.roles(
SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()) SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())
) )
.posts( postService.selectPostAll() ); .posts( postService.selectPostAll() );
if (StringUtils.isNotNull(userId)) { if (StringUtils.isNotNull(userId)) {
SysUser sysUser = userService.selectUserById(userId); SysUser sysUser = userService.selectUserById(userId);
builder.sysUser(sysUser) builder.sysUser(sysUser)
.postIds(postService.selectPostListByUserId(userId)) .postIds(postService.selectPostListByUserId(userId))
.roleIds(sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())) .roleIds(sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()))
.build(); .build();
} }
return Result.success(builder.build()); return Result.success(builder.build());
} }
@ -263,10 +263,10 @@ public class SysUserController extends BaseController {
SysUser user = userService.selectUserById(userId); SysUser user = userService.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId); List<SysRole> roles = roleService.selectRolesByUserId(userId);
return Result.success( return Result.success(
AuthRoleResp.builder() AuthRoleResp.builder()
.roles(SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())) .roles(SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()))
.user(user) .user(user)
.build() .build()
); );
} }

6
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
View File

@ -40,13 +40,13 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
public List<SysUser> selectUnallocatedList (SysUser user); public List<SysUser> selectUnallocatedList (SysUser user);
/** /**
* 通过用户名查询用户 * 通过用户名/邮箱查询用户
* *
* @param userName 用户名 * @param usernameOrEmail 用户名/邮箱
* *
* @return 用户对象信息 * @return 用户对象信息
*/ */
public SysUser selectUserByUserName (String userName); public SysUser selectUserByUsernameOrEmail (String usernameOrEmail);
/** /**
* 通过用户ID查询用户 * 通过用户ID查询用户

6
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java
View File

@ -39,13 +39,13 @@ public interface SysUserService extends IService<SysUser> {
public List<SysUser> selectUnallocatedList (SysUser user); public List<SysUser> selectUnallocatedList (SysUser user);
/** /**
* 通过用户名查询用户 * 通过用户名/邮箱查询用户
* *
* @param userName 用户名 * @param usernameOrEmail 用户名/邮箱
* *
* @return 用户对象信息 * @return 用户对象信息
*/ */
public SysUser selectUserByUserName (String userName); public SysUser selectUserByUsernameOrEmail (String usernameOrEmail);
/** /**
* 通过用户ID查询用户 * 通过用户ID查询用户

10
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -91,15 +91,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} }
/** /**
* 通过用户名查询用户 * 通过用户名/邮箱查询用户
* *
* @param userName 用户名 * @param userName 用户名/邮箱
* *
* @return 用户对象信息 * @return 用户对象信息
*/ */
@Override @Override
public SysUser selectUserByUserName (String userName) { public SysUser selectUserByUsernameOrEmail (String userName) {
return userMapper.selectUserByUserName(userName); return userMapper.selectUserByUsernameOrEmail(userName);
} }
/** /**
@ -463,7 +463,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
for (SysUser user : userList) { for (SysUser user : userList) {
try { try {
// 验证是否存在这个用户 // 验证是否存在这个用户
SysUser u = userMapper.selectUserByUserName(user.getUserName()); SysUser u = userMapper.selectUserByUsernameOrEmail(user.getUserName());
if (StringUtils.isNull(u)) { if (StringUtils.isNull(u)) {
BeanValidators.validateWithException(validator, user); BeanValidators.validateWithException(validator, user);
user.setPassword(SecurityUtils.encryptPassword(password)); user.setPassword(SecurityUtils.encryptPassword(password));

14
muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.system.mapper.SysUserMapper"> <mapper namespace="com.muyu.system.mapper.SysUserMapper">
<resultMap type="com.muyu.common.system.domain.SysUser" id="SysUserResult"> <resultMap type="com.muyu.common.system.domain.SysUser" id="SysUserResult">
@ -150,9 +150,9 @@
${params.dataScope} ${params.dataScope}
</select> </select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult"> <select id="selectUserByUsernameOrEmail" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/> <include refid="selectUserVo"/>
where u.user_name = #{userName} and u.del_flag = '0' where u.user_name = #{usernameOrEmail} or u.email = #{usernameOrEmail} and u.del_flag = '0'
</select> </select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult"> <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
@ -165,7 +165,7 @@
from sys_user from sys_user
where user_name = #{userName} where user_name = #{userName}
and del_flag = '0' and del_flag = '0'
limit 1 limit 1
</select> </select>
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
@ -173,7 +173,7 @@
from sys_user from sys_user
where phonenumber = #{phonenumber} where phonenumber = #{phonenumber}
and del_flag = '0' and del_flag = '0'
limit 1 limit 1
</select> </select>
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
@ -181,7 +181,7 @@
from sys_user from sys_user
where email = #{email} where email = #{email}
and del_flag = '0' and del_flag = '0'
limit 1 limit 1
</select> </select>
<insert id="insertUser" parameterType="com.muyu.common.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId"> <insert id="insertUser" parameterType="com.muyu.common.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">