Browse Source

修改此处的包引用

pull/1/head
pref_mail@163.com 1 year ago
parent
commit
e3792c0d3f
  1. 10
      blade-auth/pom.xml
  2. 18
      blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
  3. 40
      pom.xml

10
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>

18
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());
}

40
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>

Loading…
Cancel
Save