Merge branch 'dev' into pre-production

blade-auth/pom.xml

@@ -124,11 +124,11 @@
 <!--        </dependency>-->
 
 
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-log</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>blade-log</artifactId>-->
+<!--            <version>${bladex.project.version}</version>-->
+<!--        </dependency>-->
 
     </dependencies>
 

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;