|
@@ -2,6 +2,7 @@ package com.ozs.common.core.domain.model;
|
|
|
|
|
|
import java.util.Collection;
|
|
|
import java.util.Set;
|
|
|
+
|
|
|
import org.springframework.security.core.GrantedAuthority;
|
|
|
import org.springframework.security.core.userdetails.UserDetails;
|
|
|
import com.alibaba.fastjson2.annotation.JSONField;
|
|
@@ -12,8 +13,7 @@ import com.ozs.common.core.domain.entity.SysUser;
|
|
|
*
|
|
|
* @author hx
|
|
|
*/
|
|
|
-public class LoginUser implements UserDetails
|
|
|
-{
|
|
|
+public class LoginUser implements UserDetails {
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
|
|
/**
|
|
@@ -76,13 +76,11 @@ public class LoginUser implements UserDetails
|
|
|
*/
|
|
|
private SysUser user;
|
|
|
|
|
|
- public Long getId()
|
|
|
- {
|
|
|
+ public Long getId() {
|
|
|
return id;
|
|
|
}
|
|
|
|
|
|
- public void setId(Long id)
|
|
|
- {
|
|
|
+ public void setId(Long id) {
|
|
|
this.id = id;
|
|
|
}
|
|
|
|
|
@@ -94,40 +92,33 @@ public class LoginUser implements UserDetails
|
|
|
this.userId = userId;
|
|
|
}
|
|
|
|
|
|
- public Long getDeptId()
|
|
|
- {
|
|
|
+ public Long getDeptId() {
|
|
|
return deptId;
|
|
|
}
|
|
|
|
|
|
- public void setDeptId(Long deptId)
|
|
|
- {
|
|
|
+ public void setDeptId(Long deptId) {
|
|
|
this.deptId = deptId;
|
|
|
}
|
|
|
|
|
|
- public String getToken()
|
|
|
- {
|
|
|
+ public String getToken() {
|
|
|
return token;
|
|
|
}
|
|
|
|
|
|
- public void setToken(String token)
|
|
|
- {
|
|
|
+ public void setToken(String token) {
|
|
|
this.token = token;
|
|
|
}
|
|
|
|
|
|
- public LoginUser()
|
|
|
- {
|
|
|
+ public LoginUser() {
|
|
|
}
|
|
|
|
|
|
- public LoginUser(SysUser user, Set<String> permissions)
|
|
|
- {
|
|
|
+ public LoginUser(SysUser user, Set<String> permissions) {
|
|
|
this.user = user;
|
|
|
this.permissions = permissions;
|
|
|
}
|
|
|
|
|
|
- public LoginUser(Long id,String userId, Long deptId, SysUser user, Set<String> permissions)
|
|
|
- {
|
|
|
+ public LoginUser(Long id, String userId, Long deptId, SysUser user, Set<String> permissions) {
|
|
|
this.id = id;
|
|
|
- this.userId=userId;
|
|
|
+ this.userId = userId;
|
|
|
this.deptId = deptId;
|
|
|
this.user = user;
|
|
|
this.permissions = permissions;
|
|
@@ -135,14 +126,12 @@ public class LoginUser implements UserDetails
|
|
|
|
|
|
@JSONField(serialize = false)
|
|
|
@Override
|
|
|
- public String getPassword()
|
|
|
- {
|
|
|
+ public String getPassword() {
|
|
|
return user.getPassword();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public String getUsername()
|
|
|
- {
|
|
|
+ public String getUsername() {
|
|
|
return user.getUserName();
|
|
|
}
|
|
|
|
|
@@ -151,8 +140,7 @@ public class LoginUser implements UserDetails
|
|
|
*/
|
|
|
@JSONField(serialize = false)
|
|
|
@Override
|
|
|
- public boolean isAccountNonExpired()
|
|
|
- {
|
|
|
+ public boolean isAccountNonExpired() {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -163,8 +151,7 @@ public class LoginUser implements UserDetails
|
|
|
*/
|
|
|
@JSONField(serialize = false)
|
|
|
@Override
|
|
|
- public boolean isAccountNonLocked()
|
|
|
- {
|
|
|
+ public boolean isAccountNonLocked() {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -175,8 +162,7 @@ public class LoginUser implements UserDetails
|
|
|
*/
|
|
|
@JSONField(serialize = false)
|
|
|
@Override
|
|
|
- public boolean isCredentialsNonExpired()
|
|
|
- {
|
|
|
+ public boolean isCredentialsNonExpired() {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -187,94 +173,76 @@ public class LoginUser implements UserDetails
|
|
|
*/
|
|
|
@JSONField(serialize = false)
|
|
|
@Override
|
|
|
- public boolean isEnabled()
|
|
|
- {
|
|
|
+ public boolean isEnabled() {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
- public Long getLoginTime()
|
|
|
- {
|
|
|
+ public Long getLoginTime() {
|
|
|
return loginTime;
|
|
|
}
|
|
|
|
|
|
- public void setLoginTime(Long loginTime)
|
|
|
- {
|
|
|
+ public void setLoginTime(Long loginTime) {
|
|
|
this.loginTime = loginTime;
|
|
|
}
|
|
|
|
|
|
- public String getIpaddr()
|
|
|
- {
|
|
|
+ public String getIpaddr() {
|
|
|
return ipaddr;
|
|
|
}
|
|
|
|
|
|
- public void setIpaddr(String ipaddr)
|
|
|
- {
|
|
|
+ public void setIpaddr(String ipaddr) {
|
|
|
this.ipaddr = ipaddr;
|
|
|
}
|
|
|
|
|
|
- public String getLoginLocation()
|
|
|
- {
|
|
|
+ public String getLoginLocation() {
|
|
|
return loginLocation;
|
|
|
}
|
|
|
|
|
|
- public void setLoginLocation(String loginLocation)
|
|
|
- {
|
|
|
+ public void setLoginLocation(String loginLocation) {
|
|
|
this.loginLocation = loginLocation;
|
|
|
}
|
|
|
|
|
|
- public String getBrowser()
|
|
|
- {
|
|
|
+ public String getBrowser() {
|
|
|
return browser;
|
|
|
}
|
|
|
|
|
|
- public void setBrowser(String browser)
|
|
|
- {
|
|
|
+ public void setBrowser(String browser) {
|
|
|
this.browser = browser;
|
|
|
}
|
|
|
|
|
|
- public String getOs()
|
|
|
- {
|
|
|
+ public String getOs() {
|
|
|
return os;
|
|
|
}
|
|
|
|
|
|
- public void setOs(String os)
|
|
|
- {
|
|
|
+ public void setOs(String os) {
|
|
|
this.os = os;
|
|
|
}
|
|
|
|
|
|
- public Long getExpireTime()
|
|
|
- {
|
|
|
+ public Long getExpireTime() {
|
|
|
return expireTime;
|
|
|
}
|
|
|
|
|
|
- public void setExpireTime(Long expireTime)
|
|
|
- {
|
|
|
+ public void setExpireTime(Long expireTime) {
|
|
|
this.expireTime = expireTime;
|
|
|
}
|
|
|
|
|
|
- public Set<String> getPermissions()
|
|
|
- {
|
|
|
+ public Set<String> getPermissions() {
|
|
|
return permissions;
|
|
|
}
|
|
|
|
|
|
- public void setPermissions(Set<String> permissions)
|
|
|
- {
|
|
|
+ public void setPermissions(Set<String> permissions) {
|
|
|
this.permissions = permissions;
|
|
|
}
|
|
|
|
|
|
- public SysUser getUser()
|
|
|
- {
|
|
|
+ public SysUser getUser() {
|
|
|
return user;
|
|
|
}
|
|
|
|
|
|
- public void setUser(SysUser user)
|
|
|
- {
|
|
|
+ public void setUser(SysUser user) {
|
|
|
this.user = user;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Collection<? extends GrantedAuthority> getAuthorities()
|
|
|
- {
|
|
|
+ public Collection<? extends GrantedAuthority> getAuthorities() {
|
|
|
return null;
|
|
|
}
|
|
|
}
|