胡伟 / logistics-config-server · 提交

转到一个项目

作者 肖紫光
提交 3b1497f3a7f47f188b2b4dab30e1d61fb656f131 1 个父辈 b55567d6

更新开发环境数据库

内嵌 并排对比
正在显示 14 个修改的文件 包含 14 行增加 和 14 行删除
@@ -5,7 +5,7 @@ spring: @@ -5,7 +5,7 @@ spring:
5 driver-class-name: com.mysql.cj.jdbc.Driver 5 driver-class-name: com.mysql.cj.jdbc.Driver
6 username: logistics 6 username: logistics
7 password: 1qaz@WSX 7 password: 1qaz@WSX
8 - url: jdbc:mysql://10.1.1.86:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 8 + url: jdbc:mysql://172.16.46.26:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
9 freemarker: 9 freemarker:
10 allow-request-override: false 10 allow-request-override: false
11 allow-session-override: false 11 allow-session-override: false
@@ -25,7 +25,7 @@ spring: @@ -25,7 +25,7 @@ spring:
25 driver-class-name: com.mysql.cj.jdbc.Driver 25 driver-class-name: com.mysql.cj.jdbc.Driver
26 username: logistics 26 username: logistics
27 password: 1qaz@WSX 27 password: 1qaz@WSX
28 - url: jdbc:mysql://10.1.1.86:3306/logistics_common?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true 28 + url: jdbc:mysql://172.16.46.26:3306/logistics_common?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
29 29
30 # swagger相关配置,覆盖全局配置 30 # swagger相关配置,覆盖全局配置
31 swagger: 31 swagger:
@@ -12,6 +12,6 @@ spring: @@ -12,6 +12,6 @@ spring:
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: logistics 13 username: logistics
14 password: 1qaz@WSX 14 password: 1qaz@WSX
15 - url: jdbc:mysql://10.1.1.86:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 15 + url: jdbc:mysql://172.16.46.26:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
@@ -26,7 +26,7 @@ spring: @@ -26,7 +26,7 @@ spring:
26 driver-class-name: com.mysql.cj.jdbc.Driver 26 driver-class-name: com.mysql.cj.jdbc.Driver
27 username: logistics 27 username: logistics
28 password: 1qaz@WSX 28 password: 1qaz@WSX
29 - url: jdbc:mysql://10.1.1.86:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true 29 + url: jdbc:mysql://172.16.46.26:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
30 30
31 # swagger相关配置,覆盖全局配置 31 # swagger相关配置,覆盖全局配置
32 swagger: 32 swagger:
@@ -12,7 +12,7 @@ spring: @@ -12,7 +12,7 @@ spring:
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: logistics 13 username: logistics
14 password: 1qaz@WSX 14 password: 1qaz@WSX
15 - url: jdbc:mysql://10.1.1.86:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 15 + url: jdbc:mysql://172.16.46.26:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
18 18
@@ -25,7 +25,7 @@ spring: @@ -25,7 +25,7 @@ spring:
25 driver-class-name: com.mysql.cj.jdbc.Driver 25 driver-class-name: com.mysql.cj.jdbc.Driver
26 username: logistics 26 username: logistics
27 password: 1qaz@WSX 27 password: 1qaz@WSX
28 - url: jdbc:mysql://10.1.1.86:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 28 + url: jdbc:mysql://172.16.46.26:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
29 29
30 # swagger相关配置,覆盖全局配置 30 # swagger相关配置,覆盖全局配置
31 swagger: 31 swagger:
@@ -25,7 +25,7 @@ spring: @@ -25,7 +25,7 @@ spring:
25 driver-class-name: com.mysql.cj.jdbc.Driver 25 driver-class-name: com.mysql.cj.jdbc.Driver
26 username: logistics 26 username: logistics
27 password: 1qaz@WSX 27 password: 1qaz@WSX
28 - url: jdbc:mysql://10.1.1.86:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true 28 + url: jdbc:mysql://172.16.46.26:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
29 29
30 # swagger相关配置,覆盖全局配置 30 # swagger相关配置,覆盖全局配置
31 swagger: 31 swagger:
@@ -26,7 +26,7 @@ spring: @@ -26,7 +26,7 @@ spring:
26 driver-class-name: com.mysql.cj.jdbc.Driver 26 driver-class-name: com.mysql.cj.jdbc.Driver
27 username: logistics 27 username: logistics
28 password: 1qaz@WSX 28 password: 1qaz@WSX
29 - url: jdbc:mysql://10.1.1.86:3306/logistics_integration?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true 29 + url: jdbc:mysql://172.16.46.26:3306/logistics_integration?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
30 30
31 # swagger相关配置,覆盖全局配置 31 # swagger相关配置,覆盖全局配置
32 swagger: 32 swagger:
@@ -26,7 +26,7 @@ spring: @@ -26,7 +26,7 @@ spring:
26 driver-class-name: com.mysql.cj.jdbc.Driver 26 driver-class-name: com.mysql.cj.jdbc.Driver
27 username: logistics 27 username: logistics
28 password: 1qaz@WSX 28 password: 1qaz@WSX
29 - url: jdbc:mysql://10.1.1.86:3306/logistics_oms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true 29 + url: jdbc:mysql://172.16.46.26:3306/logistics_oms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
30 redis: 30 redis:
31 host: logistics-redis.qa.aukeyit.com 31 host: logistics-redis.qa.aukeyit.com
32 port: 6379 32 port: 6379
@@ -25,7 +25,7 @@ spring: @@ -25,7 +25,7 @@ spring:
25 driver-class-name: com.mysql.cj.jdbc.Driver 25 driver-class-name: com.mysql.cj.jdbc.Driver
26 username: logistics 26 username: logistics
27 password: 1qaz@WSX 27 password: 1qaz@WSX
28 - url: jdbc:mysql://10.1.1.86:3306/logistics_wms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true 28 + url: jdbc:mysql://172.16.46.26:3306/logistics_wms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
29 29
30 # swagger相关配置,覆盖全局配置 30 # swagger相关配置,覆盖全局配置
31 swagger: 31 swagger:
@@ -12,6 +12,6 @@ spring: @@ -12,6 +12,6 @@ spring:
12 driver-class-name: com.mysql.cj.jdbc.Driver 12 driver-class-name: com.mysql.cj.jdbc.Driver
13 username: trobs 13 username: trobs
14 password: dfU76$N(kp 14 password: dfU76$N(kp
15 - url: jdbc:mysql://10.1.1.86:3306/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 15 + url: jdbc:mysql://172.16.46.26:3306/trobs_report?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
16 resources: 16 resources:
17 static-locations: classpath:/static/,classpath:/views/ 17 static-locations: classpath:/static/,classpath:/views/
@@ -25,7 +25,7 @@ spring: @@ -25,7 +25,7 @@ spring:
25 driver-class-name: com.mysql.cj.jdbc.Driver 25 driver-class-name: com.mysql.cj.jdbc.Driver
26 username: logistics 26 username: logistics
27 password: 1qaz@WSX 27 password: 1qaz@WSX
28 - url: jdbc:mysql://10.1.1.86:3306/logistics_wms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true 28 + url: jdbc:mysql://172.16.46.26:3306/logistics_wms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
29 29
30 # swagger相关配置,覆盖全局配置 30 # swagger相关配置,覆盖全局配置
31 swagger: 31 swagger:
@@ -26,7 +26,7 @@ spring: @@ -26,7 +26,7 @@ spring:
26 driver-class-name: com.mysql.cj.jdbc.Driver 26 driver-class-name: com.mysql.cj.jdbc.Driver
27 username: logistics 27 username: logistics
28 password: 1qaz@WSX 28 password: 1qaz@WSX
29 - url: jdbc:mysql://10.1.1.86:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 29 + url: jdbc:mysql://172.16.46.26:3306/logistics?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
30 30
31 # swagger相关配置,覆盖全局配置 31 # swagger相关配置,覆盖全局配置
32 swagger: 32 swagger:
@@ -30,7 +30,7 @@ spring: @@ -30,7 +30,7 @@ spring:
30 driver-class-name: com.mysql.cj.jdbc.Driver 30 driver-class-name: com.mysql.cj.jdbc.Driver
31 username: logistics 31 username: logistics
32 password: 1qaz@WSX 32 password: 1qaz@WSX
33 - url: jdbc:mysql://10.1.1.86:3306/logistics_oms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true 33 + url: jdbc:mysql://172.16.46.26:3306/logistics_oms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
34 34
35 # swagger相关配置,覆盖全局配置 35 # swagger相关配置,覆盖全局配置
36 swagger: 36 swagger: