SkyID
/
zheng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
shuzheng 2017-05-15 18:27:36 +08:00
parent 49093ccee3 5b937dace6
commit 8be762c083
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties
View File

@ -1,5 +1,5 @@
app.name=zheng-cms-web app.name=zheng-cms-web
profile.env=dev profile.env=dev
zheng-ui.path=http://ui.zhangshuzheng.cn:1000 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
### activeMq ### activeMq
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)

2
zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties
View File

@ -1,5 +1,5 @@
app.name=zheng-cms-web app.name=zheng-cms-web
profile.env=prod profile.env=prod
zheng-ui.path=http://ui.zhangshuzheng.cn:1000 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
### activeMq ### activeMq
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)

2
zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties
View File

@ -1,5 +1,5 @@
app.name=zheng-cms-web app.name=zheng-cms-web
profile.env=test profile.env=test
zheng-ui.path=http://ui.zhangshuzheng.cn:1000 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
### activeMq ### activeMq
AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)

2
zheng-demo/zheng-demo-web/src/main/resources/profiles/dev.properties
View File

@ -1,4 +1,4 @@
app.name=zheng-demo app.name=zheng-demo
profile.env=dev profile.env=dev
zheng-admin.version=1.0.0 zheng-admin.version=1.0.0
zheng-ui.path=http://ui.zhangshuzheng.cn:1000 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/

2
zheng-demo/zheng-demo-web/src/main/resources/profiles/test.properties
View File

@ -1,4 +1,4 @@
app.name=zheng-demo app.name=zheng-demo
profile.env=test profile.env=test
zheng-admin.version=1.0.0 zheng-admin.version=1.0.0
zheng-ui.path=http://ui.zhangshuzheng.cn:1000 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/

2
zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties
View File

@ -1,3 +1,3 @@
profile.env=dev profile.env=dev
app.name=zheng-ucenter-web app.name=zheng-ucenter-web
zheng-ui.path=http://ui.zhangshuzheng.cn:1000 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/

2
zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties
View File

@ -1,3 +1,3 @@
profile.env=prod profile.env=prod
app.name=zheng-ucenter-web app.name=zheng-ucenter-web
zheng-ui.path=http://ui.zhangshuzheng.cn:1000 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/

2
zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties
View File

@ -1,3 +1,3 @@
profile.env=test profile.env=test
app.name=zheng-ucenter-web app.name=zheng-ucenter-web
zheng-ui.path=http://ui.zhangshuzheng.cn:1000 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/