Commit Graph

3580 Commits

Author SHA1 Message Date
lxk0301
96cd55205d Merge remote-tracking branch 'origin/master' 2021-01-13 09:32:15 +08:00
lxk0301
f9a9ed990c update 2021-01-13 09:31:54 +08:00
lxk0301
0f615a14fb update 2021-01-13 09:31:54 +08:00
lxk0301
d4233663c1 Merge pull request #630 from FanchangWang/master
[京喜农场] 预测天数采用进一取整 & 捕获随机助力 API 异常
2021-01-12 23:15:21 +08:00
lxk0301
9c01635153 Merge pull request #630 from FanchangWang/master
[京喜农场] 预测天数采用进一取整 & 捕获随机助力 API 异常
2021-01-12 23:15:21 +08:00
guyuexuan
dbd85e7871 [京喜农场]
变更 预测天数采用进一取整
新增 捕获随机助力 API 异常(防止 API 异常导致脚本终止执行)
2021-01-12 18:40:11 +08:00
guyuexuan
ac1d0837be [京喜农场]
变更 预测天数采用进一取整
新增 捕获随机助力 API 异常(防止 API 异常导致脚本终止执行)
2021-01-12 18:40:11 +08:00
lxk0301
df69ec6396 Merge pull request #629 from an0na/patch-3
QX gallery增加最近的最新活动配置
2021-01-12 18:18:46 +08:00
lxk0301
13557a1e57 Merge pull request #629 from an0na/patch-3
QX gallery增加最近的最新活动配置
2021-01-12 18:18:46 +08:00
an0na
d6a882d5af QX gallery增加最近的最新活动配置 2021-01-12 17:06:23 +08:00
an0na
a03b830319 QX gallery增加最近的最新活动配置 2021-01-12 17:06:23 +08:00
lxk0301
104731e674 Merge pull request #628 from shylocks/master
修改提示
2021-01-12 16:05:54 +08:00
lxk0301
6b98729eb4 Merge pull request #628 from shylocks/master
修改提示
2021-01-12 16:05:54 +08:00
anonymous
be92ec2bc1 修改提示 2021-01-12 15:57:47 +08:00
any
e6d6d26c44 修改提示 2021-01-12 15:57:47 +08:00
lxk0301
2409a4678a Merge pull request #621 from DoveBoy/patch-1
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 15:03:24 +08:00
lxk0301
8f4138bb64 Merge pull request #621 from DoveBoy/patch-1
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 15:03:24 +08:00
lxk0301
1c014409a3 Merge pull request #627 from DoveBoy/patch-2
添加京喜农场获取种子token的说明
2021-01-12 15:03:00 +08:00
lxk0301
2317403274 Merge pull request #627 from DoveBoy/patch-2
添加京喜农场获取种子token的说明
2021-01-12 15:03:00 +08:00
DoveBoy
40a2555a54 添加京喜农场获取种子token的说明
添加京喜农场获取种子token的说明
2021-01-12 14:46:54 +08:00
DoveBoy
1684e7cf9a 添加京喜农场获取种子token的说明
添加京喜农场获取种子token的说明
2021-01-12 14:46:54 +08:00
lxk0301
f693e1c7e7 delete test2.js 2021-01-12 14:20:35 +08:00
lxk0301
3044fbe036 delete test2.js 2021-01-12 14:20:35 +08:00
lxk0301
0e98303a54 在未使用环境变量自定义的前提下,云端添加使用随机UA功能 2021-01-12 14:01:32 +08:00
lxk0301
25a16ebd31 在未使用环境变量自定义的前提下,云端添加使用随机UA功能 2021-01-12 14:01:32 +08:00
lxk0301
2a0497d124 Merge remote-tracking branch 'origin/master' 2021-01-12 12:43:52 +08:00
lxk0301
cd3fe2cad3 Merge remote-tracking branch 'origin/master' 2021-01-12 12:43:52 +08:00
lxk0301
98873a4667 fix 2021-01-12 12:43:40 +08:00
lxk0301
31982977d8 fix 2021-01-12 12:43:40 +08:00
lxk0301
1acf7586c7 Merge pull request #620 from Jone2008/patch-2
Update jd_nh.js
2021-01-12 12:38:57 +08:00
lxk0301
a9625673b8 Merge pull request #620 from Jone2008/patch-2
Update jd_nh.js
2021-01-12 12:38:57 +08:00
lxk0301
ac23a2b716 docker1添加年货节脚本 2021-01-12 12:36:17 +08:00
lxk0301
c93ad7c178 docker1添加年货节脚本 2021-01-12 12:36:17 +08:00
lxk0301
6d634e24fa Merge remote-tracking branch 'origin/master' 2021-01-12 12:33:11 +08:00
lxk0301
3905282154 Merge remote-tracking branch 'origin/master' 2021-01-12 12:33:11 +08:00
DoveBoy
86f17e15e7 fix 因resolve conflict丢失的签到领现金secrect
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 12:32:41 +08:00
DoveBoy
cad907601d fix 因resolve conflict丢失的签到领现金secrect
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 12:32:41 +08:00
lxk0301
b1b9c40548 fix 2021-01-12 12:30:02 +08:00
lxk0301
eb36a90da4 fix 2021-01-12 12:30:02 +08:00
Jone2008
1ecf3b8258 Update jd_nh.js 2021-01-12 12:28:24 +08:00
Jone2008
dabfde7677 Update jd_nh.js 2021-01-12 12:28:24 +08:00
lxk0301
03fe85b89e Merge pull request #616 from DoveBoy/patch-2
调整secret顺序保持与githubAction.md说明一致,方便后期维护
2021-01-12 11:54:31 +08:00
lxk0301
4f3150de37 Merge pull request #616 from DoveBoy/patch-2
调整secret顺序保持与githubAction.md说明一致,方便后期维护
2021-01-12 11:54:31 +08:00
lxk0301
2d923af4ea fix 2021-01-12 11:34:03 +08:00
lxk0301
2acd09dc97 fix 2021-01-12 11:34:03 +08:00
DoveBoy
05e489f0aa Merge branch 'master' into patch-2 2021-01-12 11:23:22 +08:00
DoveBoy
fe69dc5bb8 Merge branch 'master' into patch-2 2021-01-12 11:23:22 +08:00
lxk0301
11233f189a Merge pull request #618 from DoveBoy/patch-3
云函数新增京东年货节
2021-01-12 11:18:51 +08:00
lxk0301
b98bbd4181 Merge pull request #618 from DoveBoy/patch-3
云函数新增京东年货节
2021-01-12 11:18:51 +08:00
lxk0301
a29470871c Merge pull request #617 from shylocks/master
京东年货节
2021-01-12 11:18:29 +08:00