Authored by jimi.ji

Merge branch 'master' of git.yoho.cn:yohoops/auto_deploy_test

@@ -3,7 +3,7 @@ autoconfig.properties = sharedAutoconfig @@ -3,7 +3,7 @@ autoconfig.properties = sharedAutoconfig
3 is_debug_enable = true 3 is_debug_enable = true
4 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties 4 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
5 5
6 -#uic.service.url=http://192.168.102.27:8096/uic/ 6 +uic.service.url=http://192.168.102.27:8096/uic/
7 7
8 mag.service.url=http://ezine-test.yohops.com:9999/index.php?r=Apiemag 8 mag.service.url=http://ezine-test.yohops.com:9999/index.php?r=Apiemag
9 9
@@ -40,5 +40,3 @@ project.server.domain = http://yohonow-test.yohops.com:9999/yohonow/ @@ -40,5 +40,3 @@ project.server.domain = http://yohonow-test.yohops.com:9999/yohonow/
40 project.family.domain=http://192.168.103.98:8026/yoho-family 40 project.family.domain=http://192.168.103.98:8026/yoho-family
41 project.yohoFamily.enter=http://m.yohobuy.com/home/family 41 project.yohoFamily.enter=http://m.yohobuy.com/home/family
42 42
43 -uic.service.url=http://uic.media.gray.yohops.com/uic  
44 -gateway.domain.url=http://api.yoho.cn/  
@@ -20,5 +20,4 @@ yohoboy.service.url = http://newboys.test.yoho.cn/yohoboyins/v5/channel @@ -20,5 +20,4 @@ yohoboy.service.url = http://newboys.test.yoho.cn/yohoboyins/v5/channel
20 20
21 social.task.switch=true 21 social.task.switch=true
22 22
23 -gateway.api.url = http://api.yoho.cn/  
24 -uic.service.url = http://uic.media.gray.yohops.com/uic/  
  23 +gateway.api.url = http://api-test3.yohops.com:9999