Mobai
/
finallyTest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

邮箱登录

master
Saisai Liu 2024-04-12 12:12:31 +08:00
parent 599ba80804
commit d8974355f6
5 changed files with 67 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,8 +43,8 @@ public class SysLoginService {
public LoginUser login (String username, String password) {
// 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password)) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
throw new ServiceException("用户/密码必须填写");
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户或邮箱/密码必须填写");
throw new ServiceException("用户或邮箱/密码必须填写");
}
// 密码如果不在指定范围内 错误
if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
@ -69,6 +69,7 @@ public class SysLoginService {
if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
throw new ServiceException("登录用户：" + username + " 不存在");
}

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

@ -101,7 +101,7 @@ public class SysUserController extends BaseController {
public Result<LoginUser> info (@PathVariable("username") String username) {
SysUser sysUser = userService.selectUserByUserName(username);
if (StringUtils.isNull(sysUser)) {
return Result.error("用户名或密码错误");
return Result.error("用户名/邮箱或密码错误");
}
// 角色集合
Set<String> roles = permissionService.getRolePermission(sysUser);

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

@ -16,7 +16,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 根据条件分页查询用户列表
*
* @param sysUser 用户信息
*
* @return 用户信息集合信息
*/
public List<SysUser> selectUserList(SysUser sysUser);
@ -25,7 +24,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 根据条件分页查询已配用户角色列表
*
* @param user 用户信息
*
* @return 用户信息集合信息
*/
public List<SysUser> selectAllocatedList(SysUser user);
@ -34,7 +32,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 根据条件分页查询未分配用户角色列表
*
* @param user 用户信息
*
* @return 用户信息集合信息
*/
public List<SysUser> selectUnallocatedList(SysUser user);
@ -43,16 +40,22 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 通过用户名查询用户
*
* @param userName 用户名
*
* @return 用户对象信息
*/
public SysUser selectUserByUserName(String userName);
/**
* 通过用户名查询用户
*
* @param userName 用户名
* @return 用户对象信息
*/
public SysUser selectUserByUserNameAndEmail(String userName);
/**
* 通过用户ID查询用户
*
* @param userId 用户ID
*
* @return 用户对象信息
*/
public SysUser selectUserById(Long userId);
@ -61,7 +64,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 新增用户信息
*
* @param user 用户信息
*
* @return 结果
*/
public int insertUser(SysUser user);
@ -70,7 +72,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 修改用户信息
*
* @param user 用户信息
*
* @return 结果
*/
public int updateUser(SysUser user);
@ -80,7 +81,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @param userName 用户名
* @param avatar 头像地址
*
* @return 结果
*/
public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
@ -90,7 +90,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*
* @param userName 用户名
* @param password 密码
*
* @return 结果
*/
public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
@ -99,7 +98,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 通过用户ID删除用户
*
* @param userId 用户ID
*
* @return 结果
*/
public int deleteUserById(Long userId);
@ -108,7 +106,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 批量删除用户信息
*
* @param userIds 需要删除的用户ID
*
* @return 结果
*/
public int deleteUserByIds(Long[] userIds);
@ -117,7 +114,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 校验用户名称是否唯一
*
* @param userName 用户名称
*
* @return 结果
*/
public SysUser checkUserNameUnique(String userName);
@ -126,7 +122,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 校验手机号码是否唯一
*
* @param phonenumber 手机号码
*
* @return 结果
*/
public SysUser checkPhoneUnique(String phonenumber);
@ -135,7 +130,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* 校验email是否唯一
*
* @param email 用户邮箱
*
* @return 结果
*/
public SysUser checkEmailUnique(String email);

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

@ -1,5 +1,6 @@
package com.muyu.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.constant.UserConstants;
import com.muyu.common.core.exception.ServiceException;
@ -55,7 +56,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 根据条件分页查询用户列表
*
* @param user 用户信息
*
* @return 用户信息集合信息
*/
@Override
@ -68,7 +68,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 根据条件分页查询已分配用户角色列表
*
* @param user 用户信息
*
* @return 用户信息集合信息
*/
@Override
@ -81,7 +80,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 根据条件分页查询未分配用户角色列表
*
* @param user 用户信息
*
* @return 用户信息集合信息
*/
@Override
@ -94,19 +92,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 通过用户名查询用户
*
* @param userName 用户名
*
* @return 用户对象信息
*/
@Override
public SysUser selectUserByUserName(String userName) {
return userMapper.selectUserByUserName(userName);
return userMapper.selectUserByUserNameAndEmail(userName);
// LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>() {{
// eq(SysUser::getUserName, userName);
// or().eq(SysUser::getEmail, userName);
// }};
// return this.getOne(queryWrapper);
}
/**
* 通过用户ID查询用户
*
* @param userId 用户ID
*
* @return 用户对象信息
*/
@Override
@ -118,7 +119,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 查询用户所属角色组
*
* @param userName 用户名
*
* @return 结果
*/
@Override
@ -134,7 +134,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 查询用户所属岗位组
*
* @param userName 用户名
*
* @return 结果
*/
@Override
@ -150,7 +149,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 校验用户名称是否唯一
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@ -167,7 +165,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 校验手机号码是否唯一
*
* @param user 用户信息
*
* @return
*/
@Override
@ -184,7 +181,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 校验email是否唯一
*
* @param user 用户信息
*
* @return
*/
@Override
@ -230,7 +226,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 新增保存用户信息
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@ -249,7 +244,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 注册用户信息
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@ -261,7 +255,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 修改保存用户信息
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@ -296,7 +289,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 修改用户状态
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@ -308,7 +300,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 修改用户基本信息
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@ -321,7 +312,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*
* @param userName 用户名
* @param avatar 头像地址
*
* @return 结果
*/
@Override
@ -333,7 +323,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 重置用户密码
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@ -346,7 +335,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*
* @param userName 用户名
* @param password 密码
*
* @return 结果
*/
@Override
@ -407,7 +395,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 通过用户ID删除用户
*
* @param userId 用户ID
*
* @return 结果
*/
@Override
@ -424,7 +411,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 批量删除用户信息
*
* @param userIds 需要删除的用户ID
*
* @return 结果
*/
@Override
@ -447,7 +433,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
* @param operName 操作用户
*
* @return 结果
*/
@Override

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

@ -155,6 +155,13 @@
where u.user_name = #{userName} and u.del_flag = '0'
</select>
<select id="selectUserByUserNameAndEmail" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where (u.user_name = #{userName} and u.del_flag = '0') or u.email = #{userName}
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}