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

src/main/resources/application-dev.yml

@@ -5,9 +5,9 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.150.10.139:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false&testWhileIdle=true
-    username: root
-    password: Zwr~-f6H,u6QE^]C-AD_
+    url: jdbc:mysql://10.150.10.136:3308/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false&testWhileIdle=true
+    username: data_tl
+    password: qwe123QWE
     druid:
       # 验证连接的有效性
       test-while-idle: true
@@ -23,15 +23,15 @@ spring:
         datasource:
           master:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://10.150.10.139:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
-            username: root
-            password: Zwr~-f6H,u6QE^]C-AD_
+            url: jdbc:mysql://10.150.10.136:3308/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false&testWhileIdle=true
+            username: data_tl
+            password: qwe123QWE
 
   redis:
-    database: 10
-    host: 10.150.10.139
+    database: 11
+    host: 10.150.10.136
     port: 6379
-    password: wa3re~86Hu&ifniyM   # 密码（默认为空）
+    password: 9mwar,BNq}oMa63cUd?R   # 密码（默认为空）
     timeout: 36000ms  # 连接超时时长（毫秒）
     jedis:
       pool:

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -15,8 +15,8 @@ import java.util.List;
 
 public class FreeMarkerGeneratorTest {
 
-    private static final DataSource ds = new SimpleDataSource("jdbc:mysql://10.150.10.139:3306/tl?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true",
-            "root" , "Zwr~-f6H,u6QE^]C-AD_" );
+    private static final DataSource ds = new SimpleDataSource("jdbc:mysql://10.150.10.136:3306/tl?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true",
+            "data_tl" , "qwe123QWE" );
 
     @Test
     public void generateCodesTest() throws IOException {