diff --git a/nflg-qms-admin/pom.xml b/nflg-qms-admin/pom.xml index 8c31f78e..b1220fe7 100644 --- a/nflg-qms-admin/pom.xml +++ b/nflg-qms-admin/pom.xml @@ -154,7 +154,6 @@ org.redisson redisson-spring-boot-starter - 3.52.0 org.springframework.boot diff --git a/nflg-wms-admin/pom.xml b/nflg-wms-admin/pom.xml index 85b45213..3ead7cbe 100644 --- a/nflg-wms-admin/pom.xml +++ b/nflg-wms-admin/pom.xml @@ -158,7 +158,6 @@ org.redisson redisson-spring-boot-starter - 3.52.0 org.springframework.boot diff --git a/nflg-wms-admin/src/main/resources/application-dev.yml b/nflg-wms-admin/src/main/resources/application-dev.yml index 446f955a..a6a48ee9 100644 --- a/nflg-wms-admin/src/main/resources/application-dev.yml +++ b/nflg-wms-admin/src/main/resources/application-dev.yml @@ -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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-admin/src/main/resources/application-sit.yml b/nflg-wms-admin/src/main/resources/application-sit.yml index 446f955a..b9bbc4b9 100644 --- a/nflg-wms-admin/src/main/resources/application-sit.yml +++ b/nflg-wms-admin/src/main/resources/application-sit.yml @@ -27,4 +27,14 @@ sa-token: management: otlp: tracing: - endpoint: http://192.168.163.83:4318/v1/traces \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-auth/pom.xml b/nflg-wms-auth/pom.xml index 568457cb..f3614fd4 100644 --- a/nflg-wms-auth/pom.xml +++ b/nflg-wms-auth/pom.xml @@ -48,6 +48,10 @@ org.springframework.boot spring-boot-starter-actuator + + org.redisson + redisson-spring-boot-starter + com.jcraft jsch diff --git a/nflg-wms-auth/src/main/java/com/nflg/wms/auth/config/RestTemplateConfig.java b/nflg-wms-auth/src/main/java/com/nflg/wms/auth/config/RestTemplateConfig.java deleted file mode 100644 index 66d884fa..00000000 --- a/nflg-wms-auth/src/main/java/com/nflg/wms/auth/config/RestTemplateConfig.java +++ /dev/null @@ -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(); - } - -} diff --git a/nflg-wms-auth/src/main/resources/application-dev.yml b/nflg-wms-auth/src/main/resources/application-dev.yml index 578f1702..cbe36fc0 100644 --- a/nflg-wms-auth/src/main/resources/application-dev.yml +++ b/nflg-wms-auth/src/main/resources/application-dev.yml @@ -7,4 +7,14 @@ logging: nflg: debug alibaba: cloud: - nacos: debug \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-auth/src/main/resources/application-sit.yml b/nflg-wms-auth/src/main/resources/application-sit.yml index 578f1702..98cd354d 100644 --- a/nflg-wms-auth/src/main/resources/application-sit.yml +++ b/nflg-wms-auth/src/main/resources/application-sit.yml @@ -7,4 +7,14 @@ logging: nflg: debug alibaba: cloud: - nacos: debug \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-gateway/pom.xml b/nflg-wms-gateway/pom.xml index a85ce990..b9b1d274 100644 --- a/nflg-wms-gateway/pom.xml +++ b/nflg-wms-gateway/pom.xml @@ -81,6 +81,10 @@ com.github.loki4j loki-logback-appender + + org.redisson + redisson-spring-boot-starter + com.jcraft jsch diff --git a/nflg-wms-gateway/src/main/resources/application-dev.yml b/nflg-wms-gateway/src/main/resources/application-dev.yml index ee5c5596..b85fe999 100644 --- a/nflg-wms-gateway/src/main/resources/application-dev.yml +++ b/nflg-wms-gateway/src/main/resources/application-dev.yml @@ -7,4 +7,14 @@ logging: nflg: debug alibaba: cloud: - nacos: warn \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-gateway/src/main/resources/application-sit.yml b/nflg-wms-gateway/src/main/resources/application-sit.yml index ee5c5596..4eb17db8 100644 --- a/nflg-wms-gateway/src/main/resources/application-sit.yml +++ b/nflg-wms-gateway/src/main/resources/application-sit.yml @@ -7,4 +7,14 @@ logging: nflg: debug alibaba: cloud: - nacos: warn \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-scheduled/pom.xml b/nflg-wms-scheduled/pom.xml index 0cea5c1c..89ce7f7a 100644 --- a/nflg-wms-scheduled/pom.xml +++ b/nflg-wms-scheduled/pom.xml @@ -54,6 +54,10 @@ org.springframework.boot spring-boot-starter-actuator + + org.redisson + redisson-spring-boot-starter + diff --git a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/config/RestTemplateConfig.java b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/config/RestTemplateConfig.java deleted file mode 100644 index 5b678a19..00000000 --- a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/config/RestTemplateConfig.java +++ /dev/null @@ -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); - } - -} diff --git a/nflg-wms-scheduled/src/main/resources/application-dev.yml b/nflg-wms-scheduled/src/main/resources/application-dev.yml index 578f1702..c161f306 100644 --- a/nflg-wms-scheduled/src/main/resources/application-dev.yml +++ b/nflg-wms-scheduled/src/main/resources/application-dev.yml @@ -7,4 +7,14 @@ logging: nflg: debug alibaba: cloud: - nacos: debug \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-scheduled/src/main/resources/application-sit.yml b/nflg-wms-scheduled/src/main/resources/application-sit.yml index 578f1702..38044d9c 100644 --- a/nflg-wms-scheduled/src/main/resources/application-sit.yml +++ b/nflg-wms-scheduled/src/main/resources/application-sit.yml @@ -7,4 +7,14 @@ logging: nflg: debug alibaba: cloud: - nacos: debug \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-shipment/pom.xml b/nflg-wms-shipment/pom.xml index 4a6b59c9..1e278ecd 100644 --- a/nflg-wms-shipment/pom.xml +++ b/nflg-wms-shipment/pom.xml @@ -103,7 +103,6 @@ org.redisson redisson-spring-boot-starter - 3.52.0 org.springframework.boot @@ -132,6 +131,10 @@ hypersistence-tsid 2.1.4 + + org.redisson + redisson-spring-boot-starter + diff --git a/nflg-wms-shipment/src/main/resources/application-dev.yml b/nflg-wms-shipment/src/main/resources/application-dev.yml index 446f955a..de2367d9 100644 --- a/nflg-wms-shipment/src/main/resources/application-dev.yml +++ b/nflg-wms-shipment/src/main/resources/application-dev.yml @@ -27,4 +27,14 @@ sa-token: management: otlp: tracing: - endpoint: http://192.168.163.83:4318/v1/traces \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-shipment/src/main/resources/application-sit.yml b/nflg-wms-shipment/src/main/resources/application-sit.yml index 446f955a..ae86c613 100644 --- a/nflg-wms-shipment/src/main/resources/application-sit.yml +++ b/nflg-wms-shipment/src/main/resources/application-sit.yml @@ -27,4 +27,14 @@ sa-token: management: otlp: tracing: - endpoint: http://192.168.163.83:4318/v1/traces \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-srm-receive/pom.xml b/nflg-wms-srm-receive/pom.xml index a4eb0f4e..5d3b8b27 100644 --- a/nflg-wms-srm-receive/pom.xml +++ b/nflg-wms-srm-receive/pom.xml @@ -41,7 +41,10 @@ org.redisson redisson-spring-boot-starter - 3.52.0 + + + org.redisson + redisson-spring-boot-starter com.sap.conn.jco diff --git a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/config/RestTemplateConfig.java b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/config/RestTemplateConfig.java deleted file mode 100644 index a7253724..00000000 --- a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/config/RestTemplateConfig.java +++ /dev/null @@ -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); - } - -} \ No newline at end of file diff --git a/nflg-wms-srm-receive/src/main/resources/application-dev.yml b/nflg-wms-srm-receive/src/main/resources/application-dev.yml index 578f1702..92444c0d 100644 --- a/nflg-wms-srm-receive/src/main/resources/application-dev.yml +++ b/nflg-wms-srm-receive/src/main/resources/application-dev.yml @@ -7,4 +7,14 @@ logging: nflg: debug alibaba: cloud: - nacos: debug \ No newline at end of file + 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 \ No newline at end of file diff --git a/nflg-wms-srm-receive/src/main/resources/application-sit.yml b/nflg-wms-srm-receive/src/main/resources/application-sit.yml index 578f1702..30b67bab 100644 --- a/nflg-wms-srm-receive/src/main/resources/application-sit.yml +++ b/nflg-wms-srm-receive/src/main/resources/application-sit.yml @@ -7,4 +7,14 @@ logging: nflg: debug alibaba: cloud: - nacos: debug \ No newline at end of file + 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 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3190045a..c92197a2 100644 --- a/pom.xml +++ b/pom.xml @@ -49,10 +49,10 @@ 5.1.1 3.5.3 2.0.0 + 3.52.0 - org.springframework.cloud spring-cloud-dependencies @@ -184,6 +184,11 @@ loki-logback-appender ${loki-logback-appender.version} + + org.redisson + redisson-spring-boot-starter + ${redisson.version} +