From e3792c0d3ffa3c82724e5db006862144c9fcf2ad Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Mon, 30 Oct 2023 13:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A4=E5=A4=84=E7=9A=84?=
 =?UTF-8?q?=E5=8C=85=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-auth/pom.xml                            | 10 ++---
 .../service/BladeUserDetailsServiceImpl.java  | 18 ++++-----
 pom.xml                                       | 40 +++++++------------
 3 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index 50545a4a..c758dcd6 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -117,11 +117,11 @@
         </dependency>-->
 
 
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>logpm-basicdata-api</artifactId>
-            <version>3.2.0.RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>logpm-basicdata-api</artifactId>-->
+<!--            <version>3.2.0.RELEASE</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>
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 4448bb43..eca9bddc 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
@@ -18,9 +18,9 @@ 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 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;
@@ -70,7 +70,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 	private final BladeRedis bladeRedis;
 	private final JwtProperties jwtProperties;
 
-	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+//	private final IBasicdataWarehouseClient basicdataWarehouseClient;
 
 	@Override
 	@SneakyThrows
@@ -163,11 +163,11 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 
 			// 绑定仓库
 			try {
-				BasicdataWarehouseEntity bls = basicdataWarehouseClient.addWarehouseSingle(user.getDeptId(), user.getTenantId(), user.getId());
-				if (ObjectUtil.isNotEmpty(bls)) {
-					userInfo.getDetail().put("warehouse_id", bls.getId());
-					userInfo.getDetail().put("warehouse_name", bls.getName());
-				}
+//				BasicdataWarehouseEntity bls = basicdataWarehouseClient.addWarehouseSingle(user.getDeptId(), user.getTenantId(), user.getId());
+//				if (ObjectUtil.isNotEmpty(bls)) {
+//					userInfo.getDetail().put("warehouse_id", bls.getId());
+//					userInfo.getDetail().put("warehouse_name", bls.getName());
+//				}
 			} catch ( Exception e) {
 				log.error("登录获取仓库信息报错 {}", e.getMessage());
 			}
diff --git a/pom.xml b/pom.xml
index 00919435..8e7c349d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,19 +84,12 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
 
-    <!-- 本地打包部署jar  -->
-    <distributionManagement>
-        <repository>
-            <!--此名称要和.m2/settings.xml中设置的ID一致 -->
-            <id>logpm</id>
-            <url>http://192.168.10.100:8081/repository/logpm-release/</url>
-        </repository>
-    </distributionManagement>
+
+
 
     <build>
         <finalName>${project.name}</finalName>
@@ -203,11 +196,6 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>logpm</id>
-            <name>BladeX Release Repository</name>
-            <url>http://192.168.10.100:8081/repository/maven-public/</url>
-        </repository>
         <repository>
             <id>aliyun-repos</id>
             <name>Aliyun Public Repository</name>
@@ -233,17 +221,17 @@
         </pluginRepository>
     </pluginRepositories>
 
-<!--    <distributionManagement>-->
-<!--        <repository>-->
-<!--            <id>bladex</id>-->
-<!--            <name>BladeX Release Repository</name>-->
-<!--            <url>https://center.javablade.com/api/packages/blade/maven</url>-->
-<!--        </repository>-->
-<!--        <snapshotRepository>-->
-<!--            <id>bladex</id>-->
-<!--            <name>BladeX Snapshot Repository</name>-->
-<!--            <url>https://center.javablade.com/api/packages/blade/maven</url>-->
-<!--        </snapshotRepository>-->
-<!--    </distributionManagement>-->
+    <distributionManagement>
+
+        <repository>
+            <!--此名称要和.m2/settings.xml中设置的ID一致 -->
+            <id>logpm</id>
+            <name>logpm</name>
+            <url>http://192.168.10.100:8081/repository/logpm-release/</url>
+        </repository>
+
+
+    </distributionManagement>
+
 
 </project>