记得上下班打卡 | git大法好,push需谨慎

Commit d122bdb7 authored by 张国柄's avatar 张国柄

Merge remote-tracking branch 'origin/consumer_unite' into dev_bd_rm_consumer_od

parents 0475657c 3cd93560
...@@ -130,7 +130,6 @@ liquidnet: ...@@ -130,7 +130,6 @@ liquidnet:
chime: chime:
url: http://ttestchime.zhengzai.tv url: http://ttestchime.zhengzai.tv
galaxy: galaxy:
# url: http://ttestgalaxy.zhengzai.tv
temp-file-path: /data/galaxy/tempFilePath temp-file-path: /data/galaxy/tempFilePath
router: zxinchain,xuper router: zxinchain,xuper
zxlnft: zxlnft:
......
...@@ -10,7 +10,7 @@ liquidnet: ...@@ -10,7 +10,7 @@ liquidnet:
path: /data/logs path: /data/logs
name: service-goblin name: service-goblin
max-history: 7 max-history: 7
level: debug level: info
mysql: mysql:
database-name: test_ln_scene database-name: test_ln_scene
mongodb: mongodb:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment