Merge branch 'cocacola' into dev

@@ -52,4 +52,4 @@ gateway.url=http://192.168.102.205:8080/gateway
 #调用运维发送短信接口时的，需要传入的密码（AES加密）
 sendSMS.password=7jVEde87bLffoTnt6tGxmw==
 #可口可乐活动，微信分享地址
-cocacola.wechat.share.url=http://192.168.102.205:8090/activity/cocacola/html/index1.html
\ No newline at end of file
+cocacola.wechat.share.url=http://devservice.yoho.cn:58077/activity/cocacola/html/index1.html
\ No newline at end of file

@@ -12,7 +12,7 @@
 		<property name="is_debug_enable" defaultValue="false" description="开通接口访问校验" />
 		<property name="execute.timetask.host" defaultValue="192.168.90.9" description="绑定定时任务IP" />
 		<property name="gateway.url" defaultValue="http://192.168.102.205:8080/gateway" description="gateway 的地址" />
-		<property name="cocacola.wechat.share.url" defaultValue="http://192.168.102.205:8090/activity/cocacola/html/index1.html" description="可口可乐活动，微信分享地址" />
+		<property name="cocacola.wechat.share.url" defaultValue="http://testservice.yoho.cn:58077/activity/cocacola/html/index1.html" description="可口可乐活动，微信分享地址" />
 		<property name="sendSMS.password" defaultValue="7jVEde87bLffoTnt6tGxmw==" description="调用运维发送短信接口时的，需要传入的密码（AES加密）" />
 	</group>
 	<script>