Commit Graph

3480 Commits

Author SHA1 Message Date
lxk0301
76d64d382d Merge remote-tracking branch 'origin/master' 2021-01-13 09:32:15 +08:00
lxk0301
505ed02d5e update 2021-01-13 09:31:54 +08:00
lxk0301
502976c680 update 2021-01-13 09:31:54 +08:00
lxk0301
2a67c0aeb2 Merge pull request #630 from FanchangWang/master
[京喜农场] 预测天数采用进一取整 & 捕获随机助力 API 异常
2021-01-12 23:15:21 +08:00
lxk0301
12597ef113 Merge pull request #630 from FanchangWang/master
[京喜农场] 预测天数采用进一取整 & 捕获随机助力 API 异常
2021-01-12 23:15:21 +08:00
guyuexuan
749c604e70 [京喜农场]
变更 预测天数采用进一取整
新增 捕获随机助力 API 异常(防止 API 异常导致脚本终止执行)
2021-01-12 18:40:11 +08:00
guyuexuan
7e72c649be [京喜农场]
变更 预测天数采用进一取整
新增 捕获随机助力 API 异常(防止 API 异常导致脚本终止执行)
2021-01-12 18:40:11 +08:00
lxk0301
fe904be758 Merge pull request #629 from an0na/patch-3
QX gallery增加最近的最新活动配置
2021-01-12 18:18:46 +08:00
lxk0301
663cb732dc Merge pull request #629 from an0na/patch-3
QX gallery增加最近的最新活动配置
2021-01-12 18:18:46 +08:00
an0na
0219141573 QX gallery增加最近的最新活动配置 2021-01-12 17:06:23 +08:00
an0na
037e92a7bb QX gallery增加最近的最新活动配置 2021-01-12 17:06:23 +08:00
lxk0301
75a917ee6d Merge pull request #628 from shylocks/master
修改提示
2021-01-12 16:05:54 +08:00
lxk0301
ee730c4b7d Merge pull request #628 from shylocks/master
修改提示
2021-01-12 16:05:54 +08:00
anonymous
1b5329c63b 修改提示 2021-01-12 15:57:47 +08:00
any
22057ca5f2 修改提示 2021-01-12 15:57:47 +08:00
lxk0301
058db3ceff Merge pull request #621 from DoveBoy/patch-1
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 15:03:24 +08:00
lxk0301
5b71da9cab Merge pull request #621 from DoveBoy/patch-1
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 15:03:24 +08:00
lxk0301
55a4004b79 Merge pull request #627 from DoveBoy/patch-2
添加京喜农场获取种子token的说明
2021-01-12 15:03:00 +08:00
lxk0301
25449dce46 Merge pull request #627 from DoveBoy/patch-2
添加京喜农场获取种子token的说明
2021-01-12 15:03:00 +08:00
DoveBoy
8fc35c849c 添加京喜农场获取种子token的说明
添加京喜农场获取种子token的说明
2021-01-12 14:46:54 +08:00
DoveBoy
135745f1bd 添加京喜农场获取种子token的说明
添加京喜农场获取种子token的说明
2021-01-12 14:46:54 +08:00
lxk0301
6482e1c515 delete test2.js 2021-01-12 14:20:35 +08:00
lxk0301
6d6c950a55 delete test2.js 2021-01-12 14:20:35 +08:00
lxk0301
9412bbbc35 在未使用环境变量自定义的前提下,云端添加使用随机UA功能 2021-01-12 14:01:32 +08:00
lxk0301
2b39b4714d 在未使用环境变量自定义的前提下,云端添加使用随机UA功能 2021-01-12 14:01:32 +08:00
lxk0301
9894e51d7e Merge remote-tracking branch 'origin/master' 2021-01-12 12:43:52 +08:00
lxk0301
19030e0e99 Merge remote-tracking branch 'origin/master' 2021-01-12 12:43:52 +08:00
lxk0301
91887ee8e8 fix 2021-01-12 12:43:40 +08:00
lxk0301
63fab7285a fix 2021-01-12 12:43:40 +08:00
lxk0301
0562f5df97 Merge pull request #620 from Jone2008/patch-2
Update jd_nh.js
2021-01-12 12:38:57 +08:00
lxk0301
2e2e2944ac Merge pull request #620 from Jone2008/patch-2
Update jd_nh.js
2021-01-12 12:38:57 +08:00
lxk0301
d7b91d7477 docker1添加年货节脚本 2021-01-12 12:36:17 +08:00
lxk0301
c7b4e03c3a docker1添加年货节脚本 2021-01-12 12:36:17 +08:00
lxk0301
0c866c1e67 Merge remote-tracking branch 'origin/master' 2021-01-12 12:33:11 +08:00
lxk0301
44ac1b179d Merge remote-tracking branch 'origin/master' 2021-01-12 12:33:11 +08:00
DoveBoy
fdedcb6298 fix 因resolve conflict丢失的签到领现金secrect
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 12:32:41 +08:00
DoveBoy
423ed29807 fix 因resolve conflict丢失的签到领现金secrect
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 12:32:41 +08:00
lxk0301
07c6a3e4a6 fix 2021-01-12 12:30:02 +08:00
lxk0301
e16aa99870 fix 2021-01-12 12:30:02 +08:00
Jone2008
2632d4a19f Update jd_nh.js 2021-01-12 12:28:24 +08:00
Jone2008
fcbe492f75 Update jd_nh.js 2021-01-12 12:28:24 +08:00
lxk0301
a4c14da279 Merge pull request #616 from DoveBoy/patch-2
调整secret顺序保持与githubAction.md说明一致,方便后期维护
2021-01-12 11:54:31 +08:00
lxk0301
6bd7153a5b Merge pull request #616 from DoveBoy/patch-2
调整secret顺序保持与githubAction.md说明一致,方便后期维护
2021-01-12 11:54:31 +08:00
lxk0301
592b89e6ea fix 2021-01-12 11:34:03 +08:00
lxk0301
e867d0142d fix 2021-01-12 11:34:03 +08:00
DoveBoy
c0cece9fb1 Merge branch 'master' into patch-2 2021-01-12 11:23:22 +08:00
DoveBoy
31db63bc10 Merge branch 'master' into patch-2 2021-01-12 11:23:22 +08:00
lxk0301
50270c1d53 Merge pull request #618 from DoveBoy/patch-3
云函数新增京东年货节
2021-01-12 11:18:51 +08:00
lxk0301
68d63994b9 Merge pull request #618 from DoveBoy/patch-3
云函数新增京东年货节
2021-01-12 11:18:51 +08:00
lxk0301
8d2d9029a8 Merge pull request #617 from shylocks/master
京东年货节
2021-01-12 11:18:29 +08:00