From fbab383bd78e9ca1bd84e5a158d5833e5888f5ac Mon Sep 17 00:00:00 2001
From: 张利 <zhangli_wei555@163.com>
Date: Thu, 02 Nov 2023 10:57:04 +0800
Subject: [PATCH] update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java. 此处新密码加密了两次，多余的操作，且会导致新生成的数据库密码与缓存中的密码不同，如果修改的不对还请讲解回复下，谢谢。
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 7b1d896..95e169c 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,11 +1,11 @@
package com.ruoyi.common.core.domain.model;
-import java.util.Collection;
-import java.util.Set;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.ruoyi.common.core.domain.entity.SysUser;
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 java.util.Collection;
+import java.util.Set;
/**
* 登录用户身份权限
@@ -71,6 +71,24 @@
*/
private SysUser user;
+ public LoginUser()
+ {
+ }
+
+ public LoginUser(SysUser user, Set<String> permissions)
+ {
+ this.user = user;
+ this.permissions = permissions;
+ }
+
+ public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+ {
+ this.userId = userId;
+ this.deptId = deptId;
+ this.user = user;
+ this.permissions = permissions;
+ }
+
public Long getUserId()
{
return userId;
@@ -101,25 +119,7 @@
this.token = token;
}
- public LoginUser()
- {
- }
-
- public LoginUser(SysUser user, Set<String> permissions)
- {
- this.user = user;
- this.permissions = permissions;
- }
-
- public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
- {
- this.userId = userId;
- this.deptId = deptId;
- this.user = user;
- this.permissions = permissions;
- }
-
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public String getPassword()
{
@@ -135,7 +135,7 @@
/**
* 账户是否未过期,过期无法验证
*/
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public boolean isAccountNonExpired()
{
@@ -147,7 +147,7 @@
*
* @return
*/
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public boolean isAccountNonLocked()
{
@@ -159,7 +159,7 @@
*
* @return
*/
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public boolean isCredentialsNonExpired()
{
@@ -171,7 +171,7 @@
*
* @return
*/
- @JsonIgnore
+ @JSONField(serialize = false)
@Override
public boolean isEnabled()
{
--
Gitblit v1.9.2