Merge remote-tracking branch 'origin/dev' into dev

PCS/src/main/resources/application-dev.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 9
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+      timeout: 2000ms
   datasource:
     url: jdbc:mysql://47.101.137.223:3306/PCS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root

PCS/src/main/resources/application-docker.yml

@@ -3,7 +3,13 @@ spring:
     host: pas-redis
     port: 6379
     database: 0
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+      timeout: 2000ms
     password: cslg_docker_123456
   datasource:
     url: jdbc:mysql://pas-mysql:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8

PCS/src/main/resources/application-prod.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+  lettuce:
+    pool:
+      max-active: 20
+      max-idle: 20
+      min-idle: 0
+      max-wait: -1ms
+    timeout: 2000ms
   datasource:
     url: jdbc:mysql://172.27.247.174:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root

PCS/src/main/resources/application-test.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 9
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+      timeout: 2000ms
   datasource:
     url: jdbc:mysql://47.101.137.223:3306/PCS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root