update 解耦 LoginUser 与 SysUser 强关联

This commit is contained in:
疯狂的狮子Li
2021-11-21 01:39:43 +08:00
parent 321bb010cb
commit 019526fbe9
12 changed files with 88 additions and 37 deletions

View File

@ -1,7 +1,6 @@
package com.ruoyi.common.core.domain.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@ -75,31 +74,38 @@ public class LoginUser implements UserDetails {
private Set<String> permissions;
/**
* 用户信息
* 用户
*/
private SysUser user;
private String username;
public LoginUser(SysUser user, Set<String> permissions) {
this.user = user;
/**
* 密码
*/
private String password;
public LoginUser(String username, String password, Set<String> permissions) {
this.username = username;
this.password = password;
this.permissions = permissions;
}
public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions) {
public LoginUser(Long userId, Long deptId, String username, String password, Set<String> permissions) {
this.userId = userId;
this.deptId = deptId;
this.user = user;
this.username = username;
this.password = password;
this.permissions = permissions;
}
@JsonIgnore
@Override
public String getPassword() {
return user.getPassword();
return password;
}
@Override
public String getUsername() {
return user.getUserName();
return username;
}
/**

View File

@ -0,0 +1,28 @@
package com.ruoyi.common.core.service;
import com.ruoyi.common.core.domain.entity.SysUser;
/**
* 通用 用户业务
*
* @author Lion Li
*/
public interface UserService {
/**
* 通过用户名查询用户
*
* @param userName 用户名
* @return 用户对象信息
*/
SysUser selectUserByUserName(String userName);
/**
* 通过用户ID查询用户
*
* @param userId 用户ID
* @return 用户对象信息
*/
SysUser selectUserById(Long userId);
}