From 0c8f727bd89677feb4c08b781af72807f4bd143a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 一月 2022 13:03:42 +0800
Subject: [PATCH] update maven-jar-plugin 3.2.0 => 3.2.2 update maven-war-plugin 3.2.0 => 3.2.2 update maven-compiler-plugin 3.1 => 3.9.0 update hutool 5.7.18 => 5.7.20 update springboot-admin 2.6.0 => 2.6.2 update redisson 3.16.7 => 3.16.8 update qiniu 7.9.0 => 7.9.2 update aliyun 3.13.1 => 3.14.0 update qcloud 5.6.58 => 5.6.68 update minio 8.3.4 => 8.3.5
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 109 +++++++++++++++---------------------------------------
1 files changed, 31 insertions(+), 78 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 e13ec1e..c93bd1c 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,32 +1,45 @@
package com.ruoyi.common.core.domain.model;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import lombok.*;
+import com.ruoyi.common.helper.LoginHelper;
+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;
/**
* 鐧诲綍鐢ㄦ埛韬唤鏉冮檺
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
@NoArgsConstructor
@Accessors(chain = true)
-public class LoginUser implements UserDetails
-{
+public class LoginUser implements Serializable {
+
private static final long serialVersionUID = 1L;
+
+ /**
+ * 鐢ㄦ埛ID
+ */
+ private Long userId;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ private Long deptId;
/**
* 鐢ㄦ埛鍞竴鏍囪瘑
*/
private String token;
+
+ /**
+ * 鐢ㄦ埛绫诲瀷
+ */
+ private String userType;
/**
* 鐧诲綍鏃堕棿
@@ -59,85 +72,25 @@
private String os;
/**
- * 鏉冮檺鍒楄〃
+ * 鑿滃崟鏉冮檺
*/
- private Set<String> permissions;
+ private Set<String> menuPermission;
/**
- * 鐢ㄦ埛淇℃伅
+ * 瑙掕壊鏉冮檺
*/
- private SysUser user;
-
- public LoginUser(SysUser user, Set<String> permissions)
- {
- this.user = user;
- this.permissions = permissions;
- }
-
- @JsonIgnore
- @Override
- public String getPassword()
- {
- return user.getPassword();
- }
-
- @JsonIgnore
- @Override
- public String getUsername()
- {
- return user.getUserName();
- }
+ private Set<String> rolePermission;
/**
- * 璐︽埛鏄惁鏈繃鏈�,杩囨湡鏃犳硶楠岃瘉
+ * 鐢ㄦ埛鍚�
*/
- @JsonIgnore
- @Override
- public boolean isAccountNonExpired()
- {
- return true;
- }
+ private String username;
/**
- * 鎸囧畾鐢ㄦ埛鏄惁瑙ｉ攣,閿佸畾鐨勭敤鎴锋棤娉曡繘琛岃韩浠介獙璇�
- *
- * @return
+ * 鑾峰彇鐧诲綍id
*/
- @JsonIgnore
- @Override
- public boolean isAccountNonLocked()
- {
- return true;
+ public String getLoginId() {
+ return userType + LoginHelper.JOIN_CODE + userId;
}
- /**
- * 鎸囩ず鏄惁宸茶繃鏈熺殑鐢ㄦ埛鐨勫嚟鎹�(瀵嗙爜),杩囨湡鐨勫嚟鎹槻姝㈣璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isCredentialsNonExpired()
- {
- return true;
- }
-
- /**
- * 鏄惁鍙敤 ,绂佺敤鐨勭敤鎴蜂笉鑳借韩浠介獙璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isEnabled()
- {
- return true;
- }
-
- @JsonIgnore
- @Override
- public Collection<? extends GrantedAuthority> getAuthorities()
- {
- return null;
- }
}
--
Gitblit v1.9.3