Authored by 周奇琪

Merge branch 'master' into 'master'

yoho-now配置

yoho-now配置

See merge request !1
  1 +autoconfig.properties = sharedAutoconfig
  2 +
  3 +autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
  4 +
  5 +uic.service.url=http://192.168.102.48:8096/uic/
  6 +mag.service.url=http://ezine-test.yohops.com:9999/index.php?r=Apiemag
  7 +cn.site.url=http://newboys.test.yoho.cn
  8 +hk.site.url=http://hkboys.test.yoho.cn
  9 +
  10 +yohonow.env.namespace = yohonow
  11 +yohonow.env.serverport = 1
  12 +yohonow.env.webapphome = /home/dev/yoho-now/deploy