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

@@ -3,7 +3,7 @@ autoconfig.properties  = sharedAutoconfig
 is_debug_enable        = true
 autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
 
-#uic.service.url=http://192.168.102.27:8096/uic/
+uic.service.url=http://192.168.102.27:8096/uic/
 
 mag.service.url=http://ezine-test.yohops.com:9999/index.php?r=Apiemag
 
@@ -40,5 +40,3 @@ project.server.domain = http://yohonow-test.yohops.com:9999/yohonow/
 project.family.domain=http://192.168.103.98:8026/yoho-family
 project.yohoFamily.enter=http://m.yohobuy.com/home/family
 
-uic.service.url=http://uic.media.gray.yohops.com/uic
-gateway.domain.url=http://api.yoho.cn/

@@ -20,5 +20,4 @@ yohoboy.service.url  = http://newboys.test.yoho.cn/yohoboyins/v5/channel
 
 social.task.switch=true
 
-gateway.api.url  =  http://api.yoho.cn/
-uic.service.url  = http://uic.media.gray.yohops.com/uic/
\ No newline at end of file
+gateway.api.url  =  http://api-test3.yohops.com:9999
\ No newline at end of file