Commit 327d51304eba8da640baac68d2a5f72af452aba9

Authored by pengyongcheng
2 parents 7864653c 7f83e1de

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

huaheng-wms-core/src/main/resources/application-prod.yml
... ... @@ -141,9 +141,9 @@ spring:
141 141 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
142 142 datasource:
143 143 master:
144   - url: jdbc:mysql://localhost:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
  144 + url: jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
145 145 username: root
146   - password: HHsoft123.
  146 + password: hhsoftware
147 147 driver-class-name: com.mysql.cj.jdbc.Driver
148 148 # sqlserver 数据源配置
149 149 # url: jdbc:sqlserver://172.16.29.88:1433;DatabaseName=wms4;encrypt=false;SelectMethod=cursor;
... ...