Merge branch 'develop' into qms/develop

nflg-qms-admin/pom.xml

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

nflg-wms-admin/pom.xml

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

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

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

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

nflg-wms-auth/pom.xml

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

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

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

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

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

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

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

nflg-wms-gateway/pom.xml

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

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

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

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

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

nflg-wms-repository/src/main/resources/mapper/AdminPermissionRoleUserMapMapper.xml

@@ -3,11 +3,12 @@
 <mapper namespace="com.nflg.wms.repository.mapper.AdminPermissionRoleUserMapMapper">
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.AdminUserSimpleVO">
-        SELECT u.id as "userId",u.user_name,u.avatar,u.user_code,dept.dept_name as "department_name"
+        SELECT u.id as "userId",u.user_name,u.avatar,u.user_code,dept.name as "department_name"
         FROM admin_permission_role role
         INNER JOIN admin_permission_role_user_map map ON role.id=map.role_id
-        INNER JOIN admin_user u ON map.user_id=u.id
+        INNER JOIN "user" u ON map.user_id=u.id
-        LEFT JOIN t_base_department dept ON u.department_id=dept.id
+        INNER JOIN user_interior ui ON u."id"=ui.user_id
+        LEFT JOIN department dept ON ui.dept_id=dept.id
         where role.id=#{request.roleId}
         <if test="request.name!=null and request.name!=''">
             and u.user_name like concat('%',#{request.name},'%')

nflg-wms-scheduled/pom.xml

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

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

@@ -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);
-    }
-
-}

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

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

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

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

nflg-wms-shipment/pom.xml

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

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

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

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

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

nflg-wms-srm-receive/pom.xml

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

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

@@ -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);
-    }
-
-}

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

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

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

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

pom.xml

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