From 0c7f08384ed9aebb85be9d221d3fe584eaab4575 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 10 Oct 2024 18:16:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-auth/pom.xml | 10 +++++----- .../auth/service/BladeUserDetailsServiceImpl.java | 11 ++--------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 5f180ba4..2c9d00c9 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -124,11 +124,11 @@ - - org.springblade - blade-log - ${bladex.project.version} - + + + + + diff --git a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java index 1fdb3eff..a834c21b 100644 --- a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java +++ b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java @@ -16,12 +16,7 @@ */ package org.springblade.auth.service; -import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.common.utils.StringUtils; -//import com.logpm.basicdata.entity.BasicdataWarehouseEntity; -//import com.logpm.basicdata.entity.WarehouseParcelListEntity; -//import com.logpm.basicdata.feign.IBasicdataWarehouseClient; - import io.jsonwebtoken.Claims; import lombok.AllArgsConstructor; import lombok.SneakyThrows; @@ -31,17 +26,15 @@ import org.springblade.auth.utils.TokenUtil; import org.springblade.common.cache.CacheNames; import org.springblade.core.jwt.JwtUtil; import org.springblade.core.jwt.props.JwtProperties; -import org.springblade.core.log.feign.ILogClient; -import org.springblade.core.log.model.LogUsual; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; import org.springblade.system.cache.ParamCache; import org.springblade.system.entity.Tenant; -import org.springblade.system.feign.ISysClient; import org.springblade.system.entity.User; import org.springblade.system.entity.UserInfo; import org.springblade.system.enums.UserEnum; +import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.userdetails.UserDetailsService; @@ -73,7 +66,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService { private final BladeRedis bladeRedis; private final JwtProperties jwtProperties; - private final ILogClient logClient; +// private final ILogClient logClient; // private final IBasicdataWarehouseClient basicdataWarehouseClient;