From c9a136324df7503e6af4254c09c9c0c8d3b81efa Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 7 Mar 2023 22:44:39 +0800 Subject: [PATCH] =?UTF-8?q?:fire:=20=E5=88=A0=E9=99=A4=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E7=A4=BE=E4=BA=A4=E7=99=BB=E5=BD=95=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/PigxMobileUserDetailServiceImpl.java | 16 ---------------- .../PigxTocMobileUserDetailsServiceImpl.java | 15 +-------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobileUserDetailServiceImpl.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobileUserDetailServiceImpl.java index 546c440a8..98603e9af 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobileUserDetailServiceImpl.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobileUserDetailServiceImpl.java @@ -2,17 +2,13 @@ package com.pig4cloud.pigx.common.security.service; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.feign.RemoteUserService; -import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.Cache; -import org.springframework.cache.CacheManager; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.stereotype.Component; /** * @author aeizzz @@ -25,22 +21,10 @@ public class PigxMobileUserDetailServiceImpl implements PigxUserDetailsService { private final RemoteUserService remoteUserService; - private final CacheManager cacheManager; - @Override @SneakyThrows public UserDetails loadUserByUsername(String phone) { - Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS); - if (cache != null && cache.get(phone) != null) { - return cache.get(phone, PigxUser.class); - } - R result = remoteUserService.social(phone, SecurityConstants.FROM_IN); - - UserDetails userDetails = getUserDetails(result); - if (cache != null) { - cache.put(phone, userDetails); - } return getUserDetails(result); } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxTocMobileUserDetailsServiceImpl.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxTocMobileUserDetailsServiceImpl.java index cab359b60..1d6c074ae 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxTocMobileUserDetailsServiceImpl.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxTocMobileUserDetailsServiceImpl.java @@ -20,7 +20,6 @@ import cn.hutool.core.util.ArrayUtil; import com.pig4cloud.pigx.app.api.dto.AppUserInfo; import com.pig4cloud.pigx.app.api.entity.AppUser; import com.pig4cloud.pigx.app.api.feign.RemoteAppUserService; -import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.enums.UserTypeEnum; @@ -30,8 +29,6 @@ import com.pig4cloud.pigx.common.core.util.WebUtils; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.springframework.cache.Cache; -import org.springframework.cache.CacheManager; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.userdetails.UserDetails; @@ -51,8 +48,6 @@ import java.util.Set; @RequiredArgsConstructor public class PigxTocMobileUserDetailsServiceImpl implements PigxUserDetailsService { - private final CacheManager cacheManager; - private final RemoteAppUserService remoteAppUserService; /** @@ -63,16 +58,8 @@ public class PigxTocMobileUserDetailsServiceImpl implements PigxUserDetailsServi @Override @SneakyThrows public UserDetails loadUserByUsername(String phone) { - Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS_MINI); - if (cache != null && cache.get(phone) != null) { - return cache.get(phone, PigxUser.class); - } R info = remoteAppUserService.social(phone, SecurityConstants.FROM_IN); - UserDetails userDetailsAppUser = this.getUserDetailsAppUser(info); - if (cache != null) { - cache.put(phone, userDetailsAppUser); - } - return userDetailsAppUser; + return this.getUserDetailsAppUser(info); } @Override