Merge branch 'master' into prod
This commit is contained in:
commit
fb58803efb
|
|
@ -1,17 +1,17 @@
|
|||
spring:
|
||||
datasource:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
|
||||
username: cashier
|
||||
password: Cashier@1@
|
||||
url: jdbc:mysql://192.168.1.31:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
|
||||
username: root
|
||||
password: Chaozg123.
|
||||
|
||||
data:
|
||||
redis:
|
||||
host: 121.40.109.122
|
||||
host: 192.168.1.31
|
||||
port: 6379
|
||||
password: chaozg123
|
||||
timeout: 5000
|
||||
database: 1
|
||||
password: Chaozg123.
|
||||
timeout: 1000
|
||||
database: 0
|
||||
|
||||
cloud:
|
||||
nacos:
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
spring:
|
||||
datasource:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
|
||||
username: cashier
|
||||
password: Cashier@1@
|
||||
url: jdbc:mysql://192.168.1.31:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
|
||||
username: root
|
||||
password: Chaozg123.
|
||||
|
||||
data:
|
||||
redis:
|
||||
host: 121.40.109.122
|
||||
host: 192.168.1.31
|
||||
port: 6379
|
||||
password: chaozg123
|
||||
password: Chaozg123.
|
||||
timeout: 1000
|
||||
database: 1
|
||||
database: 0
|
||||
|
||||
cloud:
|
||||
nacos:
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
spring:
|
||||
datasource:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
|
||||
username: cashier
|
||||
password: Cashier@1@
|
||||
url: jdbc:mysql://192.168.1.31:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
|
||||
username: root
|
||||
password: Chaozg123.
|
||||
|
||||
data:
|
||||
redis:
|
||||
host: 121.40.109.122
|
||||
host: 192.168.1.31
|
||||
port: 6379
|
||||
password: chaozg123
|
||||
timeout: 5000
|
||||
database: 1
|
||||
password: Chaozg123.
|
||||
timeout: 1000
|
||||
database: 0
|
||||
lettuce:
|
||||
pool:
|
||||
min-idle: 0
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
spring:
|
||||
datasource:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
|
||||
username: cashier
|
||||
password: Cashier@1@
|
||||
url: jdbc:mysql://192.168.1.31:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
|
||||
username: root
|
||||
password: Chaozg123.
|
||||
|
||||
data:
|
||||
redis:
|
||||
host: 121.40.109.122
|
||||
host: 192.168.1.31
|
||||
port: 6379
|
||||
password: chaozg123
|
||||
password: Chaozg123.
|
||||
timeout: 1000
|
||||
database: 1
|
||||
database: 0
|
||||
lettuce:
|
||||
pool:
|
||||
min-idle: 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue