Merge remote-tracking branch 'origin/dev' into test
# Conflicts: # src/main/resources/application-pre.yml
This commit is contained in:
@@ -4,8 +4,7 @@ spring:
|
|||||||
application:
|
application:
|
||||||
name: cashierService
|
name: cashierService
|
||||||
datasource:
|
datasource:
|
||||||
# 内网地址
|
url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
|
||||||
url: jdbc:mysql://rm-bp1kn7h89nz62cno1.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
|
|
||||||
username: cashier
|
username: cashier
|
||||||
password: Cashier@1@
|
password: Cashier@1@
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
|||||||
Reference in New Issue
Block a user