From fe98fba5b51ae4f1ef62cbdbd9b6a8ec20e8e623 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 12 七月 2022 18:01:56 +0800
Subject: [PATCH] !527 调增数组格式声明，random随机转换修正 Merge pull request !527 from 靖少毅/jsy20220705
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 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 d389ff8..41490e7 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
@@ -4,7 +4,7 @@
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.alibaba.fastjson2.annotation.JSONField;
import com.ruoyi.common.core.domain.entity.SysUser;
/**
@@ -15,6 +15,16 @@
public class LoginUser implements UserDetails
{
private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户ID
+ */
+ private Long userId;
+
+ /**
+ * 部门ID
+ */
+ private Long deptId;
/**
* 用户唯一标识
@@ -61,6 +71,26 @@
*/
private SysUser user;
+ public Long getUserId()
+ {
+ return userId;
+ }
+
+ public void setUserId(Long userId)
+ {
+ this.userId = userId;
+ }
+
+ public Long getDeptId()
+ {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId)
+ {
+ this.deptId = deptId;
+ }
+
public String getToken()
{
return token;
@@ -81,7 +111,15 @@
this.permissions = permissions;
}
- @JsonIgnore
+ public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+ {
+ this.userId = userId;
+ this.deptId = deptId;
+ this.user = user;
+ this.permissions = permissions;
+ }
+
+ @JSONField(serialize = false)
@Override
public String getPassword()
{
@@ -97,7 +135,7 @@
/**
* 账户是否未过期,过期无法验证
*/
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public boolean isAccountNonExpired()
{
@@ -109,7 +147,7 @@
*
* @return
*/
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public boolean isAccountNonLocked()
{
@@ -121,7 +159,7 @@
*
* @return
*/
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public boolean isCredentialsNonExpired()
{
@@ -133,7 +171,7 @@
*
* @return
*/
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public boolean isEnabled()
{
--
Gitblit v1.9.2