Merge branch 'master' into test

# Conflicts:
#	script/src/main/resources/application-local.yml

script/src/main/resources/application-local.yml

@@ -15,4 +15,8 @@ spring:
         max-active: 8
         max-idle: 8
         min-idle: 0
-        max-wait: 1000
+        max-wait: 1000
+aliyun:
+  dns:
+    RR:
+      - local

script/src/main/resources/application-nas.yml

@@ -1,12 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://192.168.2.10:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
-    password: Admin@123
-    driver-class-name: com.mysql.cj.jdbc.Driver
-
-aliyun:
-  dns:
-    RR:
-      - client
-      - file

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

@@ -1,6 +1,24 @@
 spring:
   datasource:
-    url: jdbc:mysql://172.28.159.213:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://192.168.2.10:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
     username: root
-    password: 123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    password: Admin@123
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  redis:
+    host: 192.168.2.10
+    port: 6379
+    password: Admin@123  # 如果无密码可以省略
+    database: 0
+    timeout: 5000
+    lettuce:
+      pool:
+        max-active: 8
+        max-idle: 8
+        min-idle: 0
+        max-wait: 1000
+
+aliyun:
+  dns:
+    RR:
+      - client
+      - file

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

@@ -0,0 +1,23 @@
+spring:
+  datasource:
+    url: jdbc:mysql://172.28.159.213:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: root
+    password: 123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  redis:
+    host: r-bp1dqqbzlfw04fldp3pd.redis.rds.aliyuncs.com
+    port: 6379
+    password: Admin@123  # 如果无密码可以省略
+    database: 0
+    timeout: 5000
+    lettuce:
+      pool:
+        max-active: 8
+        max-idle: 8
+        min-idle: 0
+        max-wait: 1000
+
+aliyun:
+  dns:
+    RR:
+      - test