zhangqiyang
/
logManage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	out/production/resources/AccessInterface.yml
#	out/production/resources/application.properties
master
zhangqiyang 11 months ago
parent
48c4f3e03f 9859ed93c4
commit
1753dbe90c
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      out/production/resources/application.properties

2
out/production/resources/application.properties
Unescape View File

@ -68,6 +68,7 @@ db.default.url=jdbc:mysql://117.78.10.170:3006/app_zhangqiyang_app_master_pre?us
db.default.user=app_zhangqiyang db.default.user=app_zhangqiyang
db.default.password=Asdf123!@# db.default.password=Asdf123!@#
#db.company1.name=Company 1 #db.company1.name=Company 1
#db.company1.driver=com.mysql.cj.jdbc.Driver #db.company1.driver=com.mysql.cj.jdbc.Driver
#db.company1.url=jdbc:mysql://localhost:3306/hy_iot_paas2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false #db.company1.url=jdbc:mysql://localhost:3306/hy_iot_paas2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
@ -389,6 +390,5 @@ logging.level.com.hypaas=INFO

Write Preview
Loading…
Cancel
Save