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

Commit 89233798 authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/master' into dev_ticket_system

parents ccc2706a f1e0a375
...@@ -13,7 +13,7 @@ liquidnet: ...@@ -13,7 +13,7 @@ liquidnet:
refresh-ttl: 525600 refresh-ttl: 525600
blacklist_grace_period: 5 blacklist_grace_period: 5
mysql: mysql:
urlHostAndPort: 39.106.122.201:3308 urlHostAndPort: 39.107.71.112:3308
username: testmall username: testmall
password: zhengzai!mYT password: zhengzai!mYT
rabbitmq: rabbitmq:
...@@ -33,19 +33,19 @@ liquidnet: ...@@ -33,19 +33,19 @@ liquidnet:
redis: redis:
dbs: 0,16 dbs: 0,16
database: 15 database: 15
host: 39.106.122.201 host: 172.17.192.42
port: 6379 port: 6379
password: 3Xa%8p password: 3Xa%8p
dragon: dragon:
host: 39.106.122.201 host: 172.17.192.42
port: 6379 port: 6379
password: 3Xa%8p password: 3Xa%8p
sweet: sweet:
host: 39.106.122.201 host: 172.17.192.42
port: 6379 port: 6379
password: 3Xa%8p password: 3Xa%8p
mongodb: mongodb:
host: 39.106.122.201:27017 host: 172.17.192.42:27017
port: 27017 port: 27017
user: admin user: admin
pwd: S&y$6d*JwJ pwd: S&y$6d*JwJ
...@@ -89,7 +89,7 @@ liquidnet: ...@@ -89,7 +89,7 @@ liquidnet:
executor-main: executor-main:
xxl: xxl:
admin: admin:
addresses: 172.17.205.50:8090 addresses: 172.17.192.42:8090
client: client:
admin: admin:
phpPayUrl: http://devdragon.zhengzai.tv phpPayUrl: http://devdragon.zhengzai.tv
......
...@@ -45,12 +45,12 @@ liquidnet: ...@@ -45,12 +45,12 @@ liquidnet:
port: 6380 port: 6380
password: PO@B!Iud32 password: PO@B!Iud32
mongodb: mongodb:
host: 172.17.205.50:27017 host: 172.17.192.42:27017
port: 27017 port: 27017
user: admin user: admin
pwd: S&y$6d*JwJ pwd: S&y$6d*JwJ
chime: chime:
host: 172.17.205.50:27017 host: 172.17.192.42:27017
port: 27017 port: 27017
user: admin user: admin
pwd: S&y$6d*JwJ pwd: S&y$6d*JwJ
......
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