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

Merge remote-tracking branch 'origin/ruoyi_test' into ruoyi_test 

# Conflicts:
#	muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
#	muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java
#	muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
#	muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java
#	muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
#	muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
#	muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java
#	muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
ruoyi_test
sunshine7058 2024-04-12 15:53:46 +08:00
parent bfe96e702d aef10363b1
commit c152425dd4
5 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java
View File

@ -46,7 +46,7 @@ public class TokenService {
String userName = loginUser.getSysUser().getUserName(); String userName = loginUser.getSysUser().getUserName();
loginUser.setToken(token); loginUser.setToken(token);
loginUser.setUserid(userId); loginUser.setUserid(userId);
loginUser.setUsername(userName); loginUser.setUsernameOrEmail(userName);
loginUser.setIpaddr(IpUtils.getIpAddr()); loginUser.setIpaddr(IpUtils.getIpAddr());
refreshToken(loginUser); refreshToken(loginUser);

10
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java
View File

@ -25,7 +25,7 @@ public class LoginUser implements Serializable {
/** /**
* 用户名 * 用户名
*/ */
private String username; private String usernameOrEmail;
/** /**
* 登录时间 * 登录时间
@ -73,12 +73,12 @@ public class LoginUser implements Serializable {
this.userid = userid; this.userid = userid;
} }
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 Long getLoginTime () { public Long getLoginTime () {

10
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
View File

@ -49,7 +49,7 @@ public class SysUser extends BaseEntity {
* 用户账号 * 用户账号
*/ */
@Excel(name = "登录名称") @Excel(name = "登录名称")
private String userName; private String usernameOrEmail;
/** /**
* 用户昵称 * 用户昵称
@ -179,11 +179,11 @@ public class SysUser extends BaseEntity {
@NotBlank(message = "用户账号不能为空") @NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
public String getUserName () { public String getUserName () {
return userName; return usernameOrEmail;
} }
public void setUserName (String userName) { public void setUserName (String usernameOrEmail) {
this.userName = userName; this.usernameOrEmail = usernameOrEmail;
} }
@Email(message = "邮箱格式不正确") @Email(message = "邮箱格式不正确")
@ -306,7 +306,7 @@ public class SysUser extends BaseEntity {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("userId", getUserId()) .append("userId", getUserId())
.append("deptId", getDeptId()) .append("deptId", getDeptId())
.append("userName", getUserName()) .append("usernameOrEmail", getUserName())
.append("nickName", getNickName()) .append("nickName", getNickName())
.append("email", getEmail()) .append("email", getEmail())
.append("phonenumber", getPhonenumber()) .append("phonenumber", getPhonenumber())

7
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.muyu.system.service.impl; package com.muyu.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.LoginUser;
import com.muyu.system.domain.SysUserOnline; import com.muyu.system.domain.SysUserOnline;
@ -40,7 +39,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
*/ */
@Override @Override
public SysUserOnline selectOnlineByUserName (String userName, LoginUser user) { public SysUserOnline selectOnlineByUserName (String userName, LoginUser user) {
if (StringUtils.equals(userName, user.getUsername())) { if (StringUtils.equals(userName, user.getUsernameOrEmail())) {
return loginUserToUserOnline(user); return loginUserToUserOnline(user);
} }
return null; return null;
@ -57,7 +56,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
*/ */
@Override @Override
public SysUserOnline selectOnlineByInfo (String ipaddr, String userName, LoginUser user) { public SysUserOnline selectOnlineByInfo (String ipaddr, String userName, LoginUser user) {
if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) { if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsernameOrEmail())) {
return loginUserToUserOnline(user); return loginUserToUserOnline(user);
} }
return null; return null;
@ -77,7 +76,7 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
} }
SysUserOnline sysUserOnline = new SysUserOnline(); SysUserOnline sysUserOnline = new SysUserOnline();
sysUserOnline.setTokenId(user.getToken()); sysUserOnline.setTokenId(user.getToken());
sysUserOnline.setUserName(user.getUsername()); sysUserOnline.setUserName(user.getUsernameOrEmail());
sysUserOnline.setIpaddr(user.getIpaddr()); sysUserOnline.setIpaddr(user.getIpaddr());
sysUserOnline.setLoginTime(user.getLoginTime()); sysUserOnline.setLoginTime(user.getLoginTime());
return sysUserOnline; return sysUserOnline;

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

@ -7,7 +7,7 @@
<resultMap type="com.muyu.common.system.domain.SysUser" id="SysUserResult"> <resultMap type="com.muyu.common.system.domain.SysUser" id="SysUserResult">
<id property="userId" column="user_id"/> <id property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/> <result property="deptId" column="dept_id"/>
<result property="userName" column="user_name"/> <result property="usernameOrEmail" column="user_name"/>
<result property="nickName" column="nick_name"/> <result property="nickName" column="nick_name"/>
<result property="email" column="email"/> <result property="email" column="email"/>
<result property="phonenumber" column="phonenumber"/> <result property="phonenumber" column="phonenumber"/>
@ -91,8 +91,8 @@
<if test="userId != null and userId != 0"> <if test="userId != null and userId != 0">
AND u.user_id = #{userId} AND u.user_id = #{userId}
</if> </if>
<if test="userName != null and userName != ''"> <if test="usernameOrEmail != null and usernameOrEmail != ''">
AND u.user_name like concat('%', #{userName}, '%') AND u.user_name like concat('%', #{usernameOrEmail}, '%')
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND u.status = #{status} AND u.status = #{status}
@ -121,8 +121,8 @@
left join sys_user_role ur on u.user_id = ur.user_id left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id left join sys_role r on r.role_id = ur.role_id
where u.del_flag = '0' and r.role_id = #{roleId} where u.del_flag = '0' and r.role_id = #{roleId}
<if test="userName != null and userName != ''"> <if test="usernameOrEmail != null and usernameOrEmail != ''">
AND u.user_name like concat('%', #{userName}, '%') AND u.user_name like concat('%', #{usernameOrEmail}, '%')
</if> </if>
<if test="phonenumber != null and phonenumber != ''"> <if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber like concat('%', #{phonenumber}, '%') AND u.phonenumber like concat('%', #{phonenumber}, '%')
@ -140,8 +140,8 @@
where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL) where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and
ur.role_id = #{roleId}) ur.role_id = #{roleId})
<if test="userName != null and userName != ''"> <if test="usernameOrEmail != null and usernameOrEmail != ''">
AND u.user_name like concat('%', #{userName}, '%') AND u.user_name like concat('%', #{usernameOrEmail}, '%')
</if> </if>
<if test="phonenumber != null and phonenumber != ''"> <if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber like concat('%', #{phonenumber}, '%') AND u.phonenumber like concat('%', #{phonenumber}, '%')
@ -163,7 +163,7 @@
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult"> <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
select user_id, user_name select user_id, user_name
from sys_user from sys_user
where user_name = #{userName} where user_name = #{usernameOrEmail}
and del_flag = '0' and del_flag = '0'
limit 1 limit 1
</select> </select>
@ -188,7 +188,7 @@
insert into sys_user( insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if> <if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if> <if test="usernameOrEmail != null and usernameOrEmail != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if> <if test="nickName != null and nickName != ''">nick_name,</if>
<if test="email != null and email != ''">email,</if> <if test="email != null and email != ''">email,</if>
<if test="avatar != null and avatar != ''">avatar,</if> <if test="avatar != null and avatar != ''">avatar,</if>
@ -202,7 +202,7 @@
)values( )values(
<if test="userId != null and userId != ''">#{userId},</if> <if test="userId != null and userId != ''">#{userId},</if>
<if test="deptId != null and deptId != ''">#{deptId},</if> <if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if> <if test="usernameOrEmail != null and usernameOrEmail != ''">#{usernameOrEmail},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if> <if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if> <if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</if> <if test="avatar != null and avatar != ''">#{avatar},</if>
@ -220,7 +220,7 @@
update sys_user update sys_user
<set> <set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if> <if test="usernameOrEmail != null and usernameOrEmail != ''">user_name = #{usernameOrEmail},</if>
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if> <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="email != null ">email = #{email},</if> <if test="email != null ">email = #{email},</if>
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if> <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
@ -246,13 +246,13 @@
<update id="updateUserAvatar" parameterType="com.muyu.common.system.domain.SysUser"> <update id="updateUserAvatar" parameterType="com.muyu.common.system.domain.SysUser">
update sys_user update sys_user
set avatar = #{avatar} set avatar = #{avatar}
where user_name = #{userName} where user_name = #{usernameOrEmail}
</update> </update>
<update id="resetUserPwd" parameterType="com.muyu.common.system.domain.SysUser"> <update id="resetUserPwd" parameterType="com.muyu.common.system.domain.SysUser">
update sys_user update sys_user
set password = #{password} set password = #{password}
where user_name = #{userName} where user_name = #{usernameOrEmail}
</update> </update>
<delete id="deleteUserById" parameterType="Long"> <delete id="deleteUserById" parameterType="Long">