Commit Graph

3476 Commits

Author SHA1 Message Date
any
79188bcd8d 优化 2021-02-01 20:05:58 +08:00
anonymous
2c5ec3ec74 Merge remote-tracking branch 'origin/master' 2021-02-01 18:04:36 +08:00
any
0a89d28244 Merge remote-tracking branch 'origin/master' 2021-02-01 18:04:36 +08:00
anonymous
57f4f951b9 天降爆竹循环互助 2021-02-01 18:04:18 +08:00
any
0e0397d79d 天降爆竹循环互助 2021-02-01 18:04:18 +08:00
lxk0301
7bff480bc3 update 2021-02-01 16:50:43 +08:00
lxk0301
47c7280b48 update 2021-02-01 16:50:43 +08:00
lxk0301
4e5964d3af 修复帮助好友,出现点太快的情况 2021-02-01 14:35:04 +08:00
lxk0301
2347c129a6 修复帮助好友,出现点太快的情况 2021-02-01 14:35:04 +08:00
lxk0301
2f4cbc7d7c IOS通知新增当前五福汪的情况,例如
五福汪情况:省钱JOY(5只) 多多JOY(10只) 好物JOY(10只)
2021-02-01 13:58:01 +08:00
lxk0301
9b90afd870 IOS通知新增当前五福汪的情况,例如
五福汪情况:省钱JOY(5只) 多多JOY(10只) 好物JOY(10只)
2021-02-01 13:58:01 +08:00
anonymous
5dba5c84e2 Merge remote-tracking branch 'origin/master' 2021-02-01 13:18:43 +08:00
any
f96d358f3f Merge remote-tracking branch 'origin/master' 2021-02-01 13:18:43 +08:00
anonymous
35e2f54566 修复冲突 2021-02-01 13:18:03 +08:00
any
e507b013b2 修复冲突 2021-02-01 13:18:03 +08:00
anonymous
e8494172d6 Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
any
afc504cb73 Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
anonymous
a6661105e7 小号合卡领卡 2021-02-01 12:51:26 +08:00
any
cec7ce7a33 小号合卡领卡 2021-02-01 12:51:26 +08:00
anonymous
041c1703d8 merge remote 2021-02-01 12:46:51 +08:00
any
8c1e45d702 merge remote 2021-02-01 12:46:51 +08:00
anonymous
2c242b677f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
any
937e41fa0d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
lxk0301
858b420393 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301
a0636a7c58 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
anonymous
ea350b0460 小号送卡领卡 2021-02-01 12:43:58 +08:00
any
57d27fc8e7 小号送卡领卡 2021-02-01 12:43:58 +08:00
lxk0301
51d6525e2a 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301
ce0c9ec6b0 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
anonymous
ff1e7bdfae Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
any
55e5497b1e Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
lxk0301
734194c612 fix 2021-02-01 10:54:26 +08:00
lxk0301
f04328c1e7 fix 2021-02-01 10:54:26 +08:00
lxk0301
fab2600aca 优化 2021-02-01 10:43:34 +08:00
lxk0301
5e6e24b176 优化 2021-02-01 10:43:34 +08:00
lxk0301
a54cb43d1c fix 2021-02-01 09:58:04 +08:00
lxk0301
bb6ddca934 fix 2021-02-01 09:58:04 +08:00
lxk0301
a1a465be55 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	docker/crontab_list.sh
2021-02-01 09:56:51 +08:00
lxk0301
cea589523f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	docker/crontab_list.sh
2021-02-01 09:56:51 +08:00
lxk0301
294d6fe9ae IOS订阅新增京东压岁钱和京东压岁钱抢百元卡脚本,压岁钱脚本互助码环境变量为 JDNY_SHARECODES 2021-02-01 09:55:47 +08:00
lxk0301
7f2fa9d9dc IOS订阅新增京东压岁钱和京东压岁钱抢百元卡脚本,压岁钱脚本互助码环境变量为 JDNY_SHARECODES 2021-02-01 09:55:47 +08:00
lxk0301
b04e7e8b1d 把短期活动的cron迁移到短期活动区域 2021-02-01 09:48:35 +08:00
lxk0301
b44ec12ad4 把短期活动的cron迁移到短期活动区域 2021-02-01 09:48:35 +08:00
anonymous
0f5f08c198 Merge remote-tracking branch 'origin/master' 2021-02-01 09:38:46 +08:00
any
a17c1de5fd Merge remote-tracking branch 'origin/master' 2021-02-01 09:38:46 +08:00
anonymous
ad17fb9975 修改docker 2021-02-01 09:38:40 +08:00
any
83edbf0473 修改docker 2021-02-01 09:38:40 +08:00
lxk0301
e1479e4968 !68 解决接口访问速度过快。优化逻辑顺序,减少不必要请求
Merge pull request !68 from Meiam/master
2021-02-01 09:37:46 +08:00
lxk0301
28d1711e64 !68 解决接口访问速度过快。优化逻辑顺序,减少不必要请求
Merge pull request !68 from Meiam/master
2021-02-01 09:37:46 +08:00
anonymous
dd57b70345 修改地址 2021-02-01 09:21:26 +08:00