From 5dbf39beeec75b2539c4636cf50e96d44b56fd3e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 14:22:58 +0800
Subject: [PATCH] update service 统一使用 ServicePlusImpl
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 121 ++++++----------------------------------
1 files changed, 18 insertions(+), 103 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index 9f2962d..e13ec1e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -1,17 +1,24 @@
package com.ruoyi.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.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.entity.SysUser;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.Set;
/**
* 鐧诲綍鐢ㄦ埛韬唤鏉冮檺
- *
+ *
* @author ruoyi
*/
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
public class LoginUser implements UserDetails
{
private static final long serialVersionUID = 1L;
@@ -22,7 +29,7 @@
private String token;
/**
- * 鐧婚檰鏃堕棿
+ * 鐧诲綍鏃堕棿
*/
private Long loginTime;
@@ -61,20 +68,6 @@
*/
private SysUser user;
- public String getToken()
- {
- return token;
- }
-
- public void setToken(String token)
- {
- this.token = token;
- }
-
- public LoginUser()
- {
- }
-
public LoginUser(SysUser user, Set<String> permissions)
{
this.user = user;
@@ -88,6 +81,7 @@
return user.getPassword();
}
+ @JsonIgnore
@Override
public String getUsername()
{
@@ -106,7 +100,7 @@
/**
* 鎸囧畾鐢ㄦ埛鏄惁瑙ｉ攣,閿佸畾鐨勭敤鎴锋棤娉曡繘琛岃韩浠介獙璇�
- *
+ *
* @return
*/
@JsonIgnore
@@ -118,7 +112,7 @@
/**
* 鎸囩ず鏄惁宸茶繃鏈熺殑鐢ㄦ埛鐨勫嚟鎹�(瀵嗙爜),杩囨湡鐨勫嚟鎹槻姝㈣璇�
- *
+ *
* @return
*/
@JsonIgnore
@@ -130,7 +124,7 @@
/**
* 鏄惁鍙敤 ,绂佺敤鐨勭敤鎴蜂笉鑳借韩浠介獙璇�
- *
+ *
* @return
*/
@JsonIgnore
@@ -140,86 +134,7 @@
return true;
}
- public Long getLoginTime()
- {
- return loginTime;
- }
-
- public void setLoginTime(Long loginTime)
- {
- this.loginTime = loginTime;
- }
-
- public String getIpaddr()
- {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr)
- {
- this.ipaddr = ipaddr;
- }
-
- public String getLoginLocation()
- {
- return loginLocation;
- }
-
- public void setLoginLocation(String loginLocation)
- {
- this.loginLocation = loginLocation;
- }
-
- public String getBrowser()
- {
- return browser;
- }
-
- public void setBrowser(String browser)
- {
- this.browser = browser;
- }
-
- public String getOs()
- {
- return os;
- }
-
- public void setOs(String os)
- {
- this.os = os;
- }
-
- public Long getExpireTime()
- {
- return expireTime;
- }
-
- public void setExpireTime(Long expireTime)
- {
- this.expireTime = expireTime;
- }
-
- public Set<String> getPermissions()
- {
- return permissions;
- }
-
- public void setPermissions(Set<String> permissions)
- {
- this.permissions = permissions;
- }
-
- public SysUser getUser()
- {
- return user;
- }
-
- public void setUser(SysUser user)
- {
- this.user = user;
- }
-
+ @JsonIgnore
@Override
public Collection<? extends GrantedAuthority> getAuthorities()
{
--
Gitblit v1.9.3