Authored by ping

Merge branch 'dev' into test

... ... @@ -11,8 +11,8 @@
<property name="drawline.luckyUserNotice.interval" defaultValue="5" description="执行定时抽奖任务间隔,5分钟执行一次" />
<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://testapi.yoho.cn:28078" description="gateway 的地址" />
<property name="cocacola.wechat.share.url" defaultValue="http://testservice.yoho.cn:28077/activity/cocacola/html/index1.html" description="可口可乐活动,微信分享地址" />
<property name="gateway.url" defaultValue="http://api.yoho.cn" description="gateway 的地址" />
<property name="cocacola.wechat.share.url" defaultValue="http://service.yoho.cn/activity/cocacola/html/index1.html" description="可口可乐活动,微信分享地址" />
<property name="sendSMS.password" defaultValue="7jVEde87bLffoTnt6tGxmw==" description="调用运维发送短信接口时的,需要传入的密码(AES加密)" />
</group>
<script>
... ...