From c429d14af4a996b12e8b48d245477ff8309fafdd Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 30 Dec 2024 17:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud-app-server-biz/pom.xml            |  4 +++
 ...cloudTocDefaultUserDetailsServiceImpl.java | 26 ++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pjcloud-app-server/pjcloud-app-server-biz/pom.xml b/pjcloud-app-server/pjcloud-app-server-biz/pom.xml
index 6788632a8..cfd96feff 100644
--- a/pjcloud-app-server/pjcloud-app-server-biz/pom.xml
+++ b/pjcloud-app-server/pjcloud-app-server-biz/pom.xml
@@ -13,6 +13,10 @@
     <artifactId>pjcloud-app-server-biz</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.bsd</groupId>
+            <artifactId>pjcloud-upms-api</artifactId>
+        </dependency>
         <!--必备: undertow容器-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/pjcloud-common/pjcloud-common-security/src/main/java/com/bsd/pjcloud/common/security/service/PjcloudTocDefaultUserDetailsServiceImpl.java b/pjcloud-common/pjcloud-common-security/src/main/java/com/bsd/pjcloud/common/security/service/PjcloudTocDefaultUserDetailsServiceImpl.java
index 30770e223..b93b7fbac 100644
--- a/pjcloud-common/pjcloud-common-security/src/main/java/com/bsd/pjcloud/common/security/service/PjcloudTocDefaultUserDetailsServiceImpl.java
+++ b/pjcloud-common/pjcloud-common-security/src/main/java/com/bsd/pjcloud/common/security/service/PjcloudTocDefaultUserDetailsServiceImpl.java
@@ -17,6 +17,8 @@
 package com.bsd.pjcloud.common.security.service;
 
 import cn.hutool.core.util.ArrayUtil;
+import com.bsd.pjcloud.admin.api.dto.UserInfo;
+import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.app.api.dto.AppUserInfo;
 import com.bsd.pjcloud.app.api.entity.AppUser;
 import com.bsd.pjcloud.app.api.feign.RemoteAppUserService;
@@ -57,6 +59,8 @@ public class PjcloudTocDefaultUserDetailsServiceImpl implements PjcloudUserDetai
 
     private final Optional<RemoteAppUserService> remoteAppUserServiceOptional;
 
+    private final RemoteUserService remoteUserService;
+
     /**
      * 用户密码登录
      *
@@ -66,16 +70,26 @@ public class PjcloudTocDefaultUserDetailsServiceImpl implements PjcloudUserDetai
     @Override
     @SneakyThrows
     public UserDetails loadUserByUsername(String username) {
-        Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS_MINI);
+//        Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS_MINI);
+//        if (Objects.nonNull(cache) && Objects.nonNull(cache.get(username))) {
+//            AppUserInfo appUserInfo = cache.get(username, AppUserInfo.class);
+//            return getUserDetailsAppUser(R.ok(appUserInfo));
+//        }
+//
+//        R<AppUserInfo> result = remoteAppUserServiceOptional.get().info(username);
+//        Optional<AppUserInfo> userInfoOptional = RetOps.of(result).getData();
+//        userInfoOptional.ifPresent(userInfo -> Objects.requireNonNull(cache).put(username, userInfo));
+//        return getUserDetailsAppUser(result);
+
+        Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS);
         if (Objects.nonNull(cache) && Objects.nonNull(cache.get(username))) {
-            AppUserInfo appUserInfo = cache.get(username, AppUserInfo.class);
-            return getUserDetailsAppUser(R.ok(appUserInfo));
+            return getUserDetails(Optional.ofNullable(cache.get(username, UserInfo.class)));
         }
 
-        R<AppUserInfo> result = remoteAppUserServiceOptional.get().info(username);
-        Optional<AppUserInfo> userInfoOptional = RetOps.of(result).getData();
+        R<UserInfo> result = remoteUserService.info(username);
+        Optional<UserInfo> userInfoOptional = RetOps.of(result).getData();
         userInfoOptional.ifPresent(userInfo -> Objects.requireNonNull(cache).put(username, userInfo));
-        return getUserDetailsAppUser(result);
+        return getUserDetails(userInfoOptional);
     }
 
     @Override