rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(deps): 添加Redisson依赖并统一配置版本 

- 在多个模块的pom.xml中添加了redisson-spring-boot-starter依赖
- 移除个别模块中Redisson依赖的版本声明
- 在根pom.xml中新增redisson.version属性统一管理版本号
- 新增nflg-qms-admin模块及其pom.xml配置
- 新增多个服务模块的application-dev.yml和application-sit.yml配置文件
- 配置日志采集loki地址及各模块数据源连接池参数
- 添加sa-token单点登录和OTLP链路追踪相关配置
This commit is contained in:
曹鹏飞 2026-04-11 11:50:24 +08:00
parent 835c0f76d5
commit 77360b7a69
23 changed files with 160 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-qms-admin/pom.xml
View File

@ -154,7 +154,6 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>3.52.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

1
nflg-wms-admin/pom.xml
View File

@ -158,7 +158,6 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>3.52.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

20
nflg-wms-admin/src/main/resources/application-dev.yml
View File

@ -10,21 +10,25 @@ logging:
nacos: debug
org:
springframework: debug
zaxxer:
hikari: debug
# sa-token配置
sa-token:
# SSO-相关配置
sso-client:
# SSO-Server 用户中心地址
server-url: http://sa-sso-server.com:9000
# LDAP
#spring:
# ldap:
# urls:
# - ldap://192.168.0.2:389
# base: dc=nflg
# username: commpub@nflg
# password: Nflg2019#
management:
otlp:
tracing:
endpoint: http://192.168.163.83:4318/v1/traces
spring:
datasource:
hikari:
pool-name: WmsAdminDevPool
maximum-pool-size: 10
minimum-idle: 2
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

10
nflg-wms-admin/src/main/resources/application-sit.yml
View File

@ -28,3 +28,13 @@ management:
otlp:
tracing:
endpoint: http://192.168.163.83:4318/v1/traces
spring:
datasource:
hikari:
pool-name: WmsAdminSitPool
maximum-pool-size: 30
minimum-idle: 5
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

4
nflg-wms-auth/pom.xml
View File

@ -48,6 +48,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>

15
nflg-wms-auth/src/main/java/com/nflg/wms/auth/config/RestTemplateConfig.java
View File

@ -1,15 +0,0 @@
package com.nflg.wms.auth.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
@Configuration
public class RestTemplateConfig {
@Bean
public RestTemplate restTemplate() {
return new RestTemplate();
}
}

10
nflg-wms-auth/src/main/resources/application-dev.yml
View File

@ -8,3 +8,13 @@ logging:
alibaba:
cloud:
nacos: debug
spring:
datasource:
hikari:
pool-name: WmsAuthDevPool
maximum-pool-size: 10
minimum-idle: 2
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

10
nflg-wms-auth/src/main/resources/application-sit.yml
View File

@ -8,3 +8,13 @@ logging:
alibaba:
cloud:
nacos: debug
spring:
datasource:
hikari:
pool-name: WmsAuthSitPool
maximum-pool-size: 30
minimum-idle: 5
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

4
nflg-wms-gateway/pom.xml
View File

@ -81,6 +81,10 @@
<groupId>com.github.loki4j</groupId>
<artifactId>loki-logback-appender</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>

10
nflg-wms-gateway/src/main/resources/application-dev.yml
View File

@ -8,3 +8,13 @@ logging:
alibaba:
cloud:
nacos: warn
spring:
datasource:
hikari:
pool-name: WmsGatewayDevPool
maximum-pool-size: 10
minimum-idle: 2
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

10
nflg-wms-gateway/src/main/resources/application-sit.yml
View File

@ -8,3 +8,13 @@ logging:
alibaba:
cloud:
nacos: warn
spring:
datasource:
hikari:
pool-name: WmsGatewaySitPool
maximum-pool-size: 30
minimum-idle: 5
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

4
nflg-wms-scheduled/pom.xml
View File

@ -54,6 +54,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
</dependencies>
<build>

19
nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/config/RestTemplateConfig.java
View File

@ -1,19 +0,0 @@
package com.nflg.wms.scheduled.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;
@Configuration
public class RestTemplateConfig {
@Bean
public RestTemplate restTemplate() {
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
factory.setConnectTimeout(3_000);
factory.setReadTimeout(10_000);
return new RestTemplate(factory);
}
}

10
nflg-wms-scheduled/src/main/resources/application-dev.yml
View File

@ -8,3 +8,13 @@ logging:
alibaba:
cloud:
nacos: debug
spring:
datasource:
hikari:
pool-name: WmsScheduledDevPool
maximum-pool-size: 10
minimum-idle: 2
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

10
nflg-wms-scheduled/src/main/resources/application-sit.yml
View File

@ -8,3 +8,13 @@ logging:
alibaba:
cloud:
nacos: debug
spring:
datasource:
hikari:
pool-name: WmsScheduledSitPool
maximum-pool-size: 20
minimum-idle: 5
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

5
nflg-wms-shipment/pom.xml
View File

@ -103,7 +103,6 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>3.52.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -132,6 +131,10 @@
<artifactId>hypersistence-tsid</artifactId>
<version>2.1.4</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
</dependencies>
<build>

10
nflg-wms-shipment/src/main/resources/application-dev.yml
View File

@ -28,3 +28,13 @@ management:
otlp:
tracing:
endpoint: http://192.168.163.83:4318/v1/traces
spring:
datasource:
hikari:
pool-name: WmsShipmentDevPool
maximum-pool-size: 10
minimum-idle: 2
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

10
nflg-wms-shipment/src/main/resources/application-sit.yml
View File

@ -28,3 +28,13 @@ management:
otlp:
tracing:
endpoint: http://192.168.163.83:4318/v1/traces
spring:
datasource:
hikari:
pool-name: WmsShipmentSitPool
maximum-pool-size: 30
minimum-idle: 5
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

5
nflg-wms-srm-receive/pom.xml
View File

@ -41,7 +41,10 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>3.52.0</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.sap.conn.jco</groupId>

19
nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/config/RestTemplateConfig.java
View File

@ -1,19 +0,0 @@
package com.nflg.wms.srm.receive.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;
@Configuration
public class RestTemplateConfig {
@Bean
public RestTemplate restTemplate() {
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
factory.setConnectTimeout(3_000);
factory.setReadTimeout(10_000);
return new RestTemplate(factory);
}
}

10
nflg-wms-srm-receive/src/main/resources/application-dev.yml
View File

@ -8,3 +8,13 @@ logging:
alibaba:
cloud:
nacos: debug
spring:
datasource:
hikari:
pool-name: WmsSrmDevPool
maximum-pool-size: 10
minimum-idle: 3
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

10
nflg-wms-srm-receive/src/main/resources/application-sit.yml
View File

@ -8,3 +8,13 @@ logging:
alibaba:
cloud:
nacos: debug
spring:
datasource:
hikari:
pool-name: WmsSrmSitPool
maximum-pool-size: 10
minimum-idle: 3
idle-timeout: 120000
max-lifetime: 300000
connection-timeout: 5000
leak-detection-threshold: 20000

7
pom.xml
View File

@ -49,10 +49,10 @@
<powerjob.version>5.1.1</powerjob.version>
<zxing.version>3.5.3</zxing.version>
<loki-logback-appender.version>2.0.0</loki-logback-appender.version>
<redisson.version>3.52.0</redisson.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
@ -184,6 +184,11 @@
<artifactId>loki-logback-appender</artifactId>
<version>${loki-logback-appender.version}</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>