From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 67 ++-------------------------------
1 files changed, 4 insertions(+), 63 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 0506883..7554e3f 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,13 +1,10 @@
package com.ruoyi.common.core.domain.model;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import java.util.Collection;
+import java.io.Serializable;
import java.util.Set;
/**
@@ -19,7 +16,7 @@
@Data
@NoArgsConstructor
@Accessors(chain = true)
-public class LoginUser implements UserDetails {
+public class LoginUser implements Serializable {
private static final long serialVersionUID = 1L;
@@ -71,72 +68,16 @@
/**
* 鑿滃崟鏉冮檺
*/
- private Set<String> menuPermissions;
+ private Set<String> menuPermission;
/**
* 瑙掕壊鏉冮檺
*/
- private Set<String> rolePermissions;
+ private Set<String> rolePermission;
/**
* 鐢ㄦ埛鍚�
*/
private String username;
- /**
- * 瀵嗙爜
- */
- private String password;
-
- @JsonIgnore
- @Override
- public String getPassword() {
- return password;
- }
-
- @Override
- public String getUsername() {
- return username;
- }
-
- /**
- * 璐︽埛鏄惁鏈繃鏈�,杩囨湡鏃犳硶楠岃瘉
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonExpired() {
- return true;
- }
-
- /**
- * 鎸囧畾鐢ㄦ埛鏄惁瑙ｉ攣,閿佸畾鐨勭敤鎴锋棤娉曡繘琛岃韩浠介獙璇�
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonLocked() {
- return true;
- }
-
- /**
- * 鎸囩ず鏄惁宸茶繃鏈熺殑鐢ㄦ埛鐨勫嚟鎹�(瀵嗙爜),杩囨湡鐨勫嚟鎹槻姝㈣璇�
- */
- @JsonIgnore
- @Override
- public boolean isCredentialsNonExpired() {
- return true;
- }
-
- /**
- * 鏄惁鍙敤 ,绂佺敤鐨勭敤鎴蜂笉鑳借韩浠介獙璇�
- */
- @JsonIgnore
- @Override
- public boolean isEnabled() {
- return true;
- }
-
- @Override
- public Collection<? extends GrantedAuthority> getAuthorities() {
- return null;
- }
}
--
Gitblit v1.9.3