From a1cf719d268a9d16db81ece94e75037c844f898f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 18 二月 2020 14:47:23 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java | 396 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 228 insertions(+), 168 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java
index 46afd22..e6b997e 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -1,168 +1,228 @@
-package com.ruoyi.framework.security;
-
-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.project.system.domain.SysUser;
-
-/**
- * 鐧诲綍鐢ㄦ埛韬唤鏉冮檺
- *
- * @author ruoyi
- */
-public class LoginUser implements UserDetails
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * 鐢ㄦ埛鍞竴鏍囪瘑
- */
- private String token;
-
- /**
- * 鐧婚檰鏃堕棿
- */
- private Long loginTime;
-
- /**
- * 杩囨湡鏃堕棿
- */
- private Long expireTime;
-
- /**
- * 鏉冮檺鍒楄〃
- */
- private Set<String> permissions;
-
- /**
- * 鐢ㄦ埛淇℃伅
- */
- 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;
- this.permissions = permissions;
- }
-
- @JsonIgnore
- @Override
- public String getPassword()
- {
- return user.getPassword();
- }
-
- @Override
- public String getUsername()
- {
- return user.getUserName();
- }
-
- /**
- * 璐︽埛鏄惁鏈繃鏈�,杩囨湡鏃犳硶楠岃瘉
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonExpired()
- {
- return true;
- }
-
- /**
- * 鎸囧畾鐢ㄦ埛鏄惁瑙ｉ攣,閿佸畾鐨勭敤鎴锋棤娉曡繘琛岃韩浠介獙璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonLocked()
- {
- return true;
- }
-
- /**
- * 鎸囩ず鏄惁宸茶繃鏈熺殑鐢ㄦ埛鐨勫嚟鎹�(瀵嗙爜),杩囨湡鐨勫嚟鎹槻姝㈣璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isCredentialsNonExpired()
- {
- return true;
- }
-
- /**
- * 鏄惁鍙敤 ,绂佺敤鐨勭敤鎴蜂笉鑳借韩浠介獙璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isEnabled()
- {
- return true;
- }
-
- public Long getLoginTime()
- {
- return loginTime;
- }
-
- public void setLoginTime(Long loginTime)
- {
- this.loginTime = loginTime;
- }
-
- 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;
- }
-
- @Override
- public Collection<? extends GrantedAuthority> getAuthorities()
- {
- return null;
- }
-}
+package com.ruoyi.framework.security;
+
+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.project.system.domain.SysUser;
+
+/**
+ * 鐧诲綍鐢ㄦ埛韬唤鏉冮檺
+ *
+ * @author ruoyi
+ */
+public class LoginUser implements UserDetails
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鐢ㄦ埛鍞竴鏍囪瘑
+ */
+ private String token;
+
+ /**
+ * 鐧婚檰鏃堕棿
+ */
+ private Long loginTime;
+
+ /**
+ * 杩囨湡鏃堕棿
+ */
+ private Long expireTime;
+
+ /**
+ * 鐧诲綍IP鍦板潃
+ */
+ private String ipaddr;
+
+ /**
+ * 鐧诲綍鍦扮偣
+ */
+ private String loginLocation;
+
+ /**
+ * 娴忚鍣ㄧ被鍨�
+ */
+ private String browser;
+
+ /**
+ * 鎿嶄綔绯荤粺
+ */
+ private String os;
+
+ /**
+ * 鏉冮檺鍒楄〃
+ */
+ private Set<String> permissions;
+
+ /**
+ * 鐢ㄦ埛淇℃伅
+ */
+ 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;
+ this.permissions = permissions;
+ }
+
+ @JsonIgnore
+ @Override
+ public String getPassword()
+ {
+ return user.getPassword();
+ }
+
+ @Override
+ public String getUsername()
+ {
+ return user.getUserName();
+ }
+
+ /**
+ * 璐︽埛鏄惁鏈繃鏈�,杩囨湡鏃犳硶楠岃瘉
+ */
+ @JsonIgnore
+ @Override
+ public boolean isAccountNonExpired()
+ {
+ return true;
+ }
+
+ /**
+ * 鎸囧畾鐢ㄦ埛鏄惁瑙ｉ攣,閿佸畾鐨勭敤鎴锋棤娉曡繘琛岃韩浠介獙璇�
+ *
+ * @return
+ */
+ @JsonIgnore
+ @Override
+ public boolean isAccountNonLocked()
+ {
+ return true;
+ }
+
+ /**
+ * 鎸囩ず鏄惁宸茶繃鏈熺殑鐢ㄦ埛鐨勫嚟鎹�(瀵嗙爜),杩囨湡鐨勫嚟鎹槻姝㈣璇�
+ *
+ * @return
+ */
+ @JsonIgnore
+ @Override
+ public boolean isCredentialsNonExpired()
+ {
+ return true;
+ }
+
+ /**
+ * 鏄惁鍙敤 ,绂佺敤鐨勭敤鎴蜂笉鑳借韩浠介獙璇�
+ *
+ * @return
+ */
+ @JsonIgnore
+ @Override
+ public boolean isEnabled()
+ {
+ 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;
+ }
+
+ @Override
+ public Collection<? extends GrantedAuthority> getAuthorities()
+ {
+ return null;
+ }
+}
--
Gitblit v1.9.3