Commit Graph

3512 Commits

Author SHA1 Message Date
any
2a9a37646e 修复冲突 2021-02-01 13:18:03 +08:00
anonymous
8c6bde5df1 Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
EvineDeng
489d1b6294 Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
anonymous
c342a2628b 小号合卡领卡 2021-02-01 12:51:26 +08:00
any
23bcc402e5 小号合卡领卡 2021-02-01 12:51:26 +08:00
anonymous
b4717746b3 merge remote 2021-02-01 12:46:51 +08:00
any
3b4626b6b2 merge remote 2021-02-01 12:46:51 +08:00
anonymous
a37a16e939 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
any
63fd320cca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
lxk0301
f7011245ad 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301
6b70c6de55 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
anonymous
dae4bda3d1 小号送卡领卡 2021-02-01 12:43:58 +08:00
any
90baffac40 小号送卡领卡 2021-02-01 12:43:58 +08:00
lxk0301
9b7a0062aa 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301
4cccbc9b39 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
anonymous
4ed7575a8f Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
Evine
0456d1b188 Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
lxk0301
f12e839c92 fix 2021-02-01 10:54:26 +08:00
lxk0301
758052c59e fix 2021-02-01 10:54:26 +08:00
lxk0301
aeca907bdd 优化 2021-02-01 10:43:34 +08:00
lxk0301
aebac05824 优化 2021-02-01 10:43:34 +08:00
lxk0301
57354d5f15 fix 2021-02-01 09:58:04 +08:00
lxk0301
fe2405623a fix 2021-02-01 09:58:04 +08:00
lxk0301
ab4f2cc3b8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	docker/crontab_list.sh
2021-02-01 09:56:51 +08:00
lxk0301
35030ed5dd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	docker/crontab_list.sh
2021-02-01 09:56:51 +08:00
lxk0301
cd493ff660 IOS订阅新增京东压岁钱和京东压岁钱抢百元卡脚本,压岁钱脚本互助码环境变量为 JDNY_SHARECODES 2021-02-01 09:55:47 +08:00
lxk0301
8f915d7000 IOS订阅新增京东压岁钱和京东压岁钱抢百元卡脚本,压岁钱脚本互助码环境变量为 JDNY_SHARECODES 2021-02-01 09:55:47 +08:00
lxk0301
86e92a48d7 把短期活动的cron迁移到短期活动区域 2021-02-01 09:48:35 +08:00
lxk0301
44314cebb7 把短期活动的cron迁移到短期活动区域 2021-02-01 09:48:35 +08:00
anonymous
0dc93b6923 Merge remote-tracking branch 'origin/master' 2021-02-01 09:38:46 +08:00
any
5af77e3dc0 Merge remote-tracking branch 'origin/master' 2021-02-01 09:38:46 +08:00
anonymous
5d4b405e4e 修改docker 2021-02-01 09:38:40 +08:00
any
333a839845 修改docker 2021-02-01 09:38:40 +08:00
lxk0301
fd282b14af !68 解决接口访问速度过快。优化逻辑顺序,减少不必要请求
Merge pull request !68 from Meiam/master
2021-02-01 09:37:46 +08:00
lxk0301
08c6a1deec !68 解决接口访问速度过快。优化逻辑顺序,减少不必要请求
Merge pull request !68 from Meiam/master
2021-02-01 09:37:46 +08:00
anonymous
a3bbddde59 修改地址 2021-02-01 09:21:26 +08:00
any
c5786ccbc6 修改地址 2021-02-01 09:21:26 +08:00
anonymous
9aa76ba927 Merge remote-tracking branch 'origin/master' 2021-02-01 09:20:32 +08:00
any
dfc65165de Merge remote-tracking branch 'origin/master' 2021-02-01 09:20:32 +08:00
anonymous
13abc60c02 京东压岁钱 2021-02-01 09:20:18 +08:00
any
e248c3b342 京东压岁钱 2021-02-01 09:20:18 +08:00
lxk0301
b6ade5f8db update 2021-02-01 07:50:13 +08:00
lxk0301
964b53e26a update 2021-02-01 07:50:13 +08:00
anonymous
407887591d 抽奖,入会任务 2021-02-01 00:39:51 +08:00
any
72e3510d50 抽奖,入会任务 2021-02-01 00:39:51 +08:00
Meiam
f9796d3302 update jd_crazy_joy_coin.js.
解决接口访问速度过快。优化逻辑顺序,减少不必要请求
2021-02-01 00:28:20 +08:00
Meiam
a5944eff69 update jd_crazy_joy_coin.js.
解决接口访问速度过快。优化逻辑顺序,减少不必要请求
2021-02-01 00:28:20 +08:00
anonymous
17779f02a2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_nian.js
2021-02-01 00:07:11 +08:00
any
3a94383f37 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_nian.js
2021-02-01 00:07:11 +08:00
anonymous
b6053a60eb debug 2021-02-01 00:05:41 +08:00