From 83c4dd24f674b5f2c3d10ab98d04e8562202449b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 21:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java b/applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java
index 54ce4fb..4355152 100644
--- a/applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java
+++ b/applet/src/main/java/com/jilongda/applet/security/SecurityUserDetails.java
@@ -1,7 +1,7 @@
package com.jilongda.applet.security;
+import com.jilongda.applet.model.TAppUser;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import lombok.Setter;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@@ -15,9 +15,8 @@
* @Description
* @date 2020-08-20 20:36
*/
-@EqualsAndHashCode(callSuper = true)
@Data
-public class SecurityUserDetails extends SecurityUserRoleResouce implements UserDetails, Serializable {
+public class SecurityUserDetails extends TAppUser implements UserDetails, Serializable {
private static final long serialVersionUID = 8154896751339152731L;
@Setter
private Boolean accountNonExpired = true;
@@ -26,7 +25,7 @@
@Setter
private Boolean credentialsNonExpired = true;
@Setter
- private Boolean enabled = false;
+ private Boolean enabled = true;
/**
@@ -41,12 +40,14 @@
@Override
public String getPassword() {
- return super.getPassword();
+// return super.getPassword();
+ return null;
}
@Override
public String getUsername() {
- return super.getAccount();
+// return super.getAccount();
+ return super.getOpenId();
}
@Override
--
Gitblit v1.7.1