Authored by ping

Merge branch 'cocacola' into dev

@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <property name="drawline.luckyUserNotice.interval" defaultValue="5" description="执行定时抽奖任务间隔,5分钟执行一次" /> 11 <property name="drawline.luckyUserNotice.interval" defaultValue="5" description="执行定时抽奖任务间隔,5分钟执行一次" />
12 <property name="is_debug_enable" defaultValue="false" description="开通接口访问校验" /> 12 <property name="is_debug_enable" defaultValue="false" description="开通接口访问校验" />
13 <property name="execute.timetask.host" defaultValue="192.168.90.9" description="绑定定时任务IP" /> 13 <property name="execute.timetask.host" defaultValue="192.168.90.9" description="绑定定时任务IP" />
14 - <property name="gateway.url" defaultValue="http://192.168.102.205:8080/gateway" description="gateway 的地址" /> 14 + <property name="gateway.url" defaultValue="http://testapi.yoho.cn:28078" description="gateway 的地址" />
15 <property name="cocacola.wechat.share.url" defaultValue="http://testservice.yoho.cn:28077/activity/cocacola/html/index1.html" description="可口可乐活动,微信分享地址" /> 15 <property name="cocacola.wechat.share.url" defaultValue="http://testservice.yoho.cn:28077/activity/cocacola/html/index1.html" description="可口可乐活动,微信分享地址" />
16 <property name="sendSMS.password" defaultValue="7jVEde87bLffoTnt6tGxmw==" description="调用运维发送短信接口时的,需要传入的密码(AES加密)" /> 16 <property name="sendSMS.password" defaultValue="7jVEde87bLffoTnt6tGxmw==" description="调用运维发送短信接口时的,需要传入的密码(AES加密)" />
17 </group> 17 </group>