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

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

@@ -10,7 +10,7 @@ spring:
         max-idle: 20
         min-idle: 0
         max-wait: -1ms
-      timeout: 2000ms
+    timeout: 2000ms
   datasource:
     url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root

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

@@ -3,12 +3,12 @@ spring:
     host: pas-redis
     port: 6379
     database: 0
-  lettuce:
-    pool:
-      max-active: 20
-      max-idle: 20
-      min-idle: 0
-      max-wait: -1ms
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
     timeout: 2000ms
     password: cslg_docker_123456
   datasource:

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

@@ -10,7 +10,7 @@ spring:
         max-idle: 20
         min-idle: 0
         max-wait: -1ms
-      timeout: 2000ms
+    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

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

@@ -10,7 +10,7 @@ spring:
         max-idle: 20
         min-idle: 0
         max-wait: -1ms
-      timeout: 2000ms
+    timeout: 2000ms
   datasource:
     url: jdbc:mysql://172.27.247.174:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root