Merge branch 'master' into songpengmaster
commit
50f5cb0390
|
@ -19,9 +19,9 @@ spring:
|
||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://127.0.0.1:3306/sparchetype?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong
|
url: jdbc:mysql://192.168.52.76:3306/sparchetype?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong&allowPublicKeyRetrieval=true
|
||||||
username: root
|
username: admin
|
||||||
password: root
|
password: 123456
|
||||||
druid:
|
druid:
|
||||||
initial-size: 8
|
initial-size: 8
|
||||||
min-idle: 5
|
min-idle: 5
|
||||||
|
|
|
@ -16,8 +16,8 @@ spring:
|
||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://127.0.0.1:3306/sparchetype?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong
|
url: jdbc:mysql://192.168.52.76:3306/sparchetype?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong
|
||||||
username: root
|
username: admin
|
||||||
password: 123456
|
password: 123456
|
||||||
druid:
|
druid:
|
||||||
initial-size: 8
|
initial-size: 8
|
||||||
|
|
Loading…
Reference in New Issue