Commit Graph

962 Commits

Author SHA1 Message Date
DoveBoy
9a423f28d4 fix 说明部分404的问题,优化Cron
fix 说明部分404的问题,优化Cron
2021-01-13 19:12:02 +08:00
lxk0301
d0728d1888 fix 2021-01-13 18:04:09 +08:00
lxk0301
546aa47ec3 test 2021-01-13 17:44:07 +08:00
lxk0301
db8aad76e2 test 2021-01-13 17:42:56 +08:00
lxk0301
f94280d756 添加timeout超时 2021-01-13 17:18:51 +08:00
lxk0301
df397f10ad Merge remote-tracking branch 'origin/master' 2021-01-13 17:06:59 +08:00
lxk0301
d80b253e47 添加timeout 2021-01-13 17:06:18 +08:00
lxk0301
4bc3f538fe Merge pull request #647 from Jone2008/patch-3
Update jd_family.js
2021-01-13 16:46:15 +08:00
Jone2008
e665d4a8cd Update jd_family.js 2021-01-13 16:39:46 +08:00
lxk0301
344dbb5785 添加当前京豆库存为空的打印提示 2021-01-13 16:31:16 +08:00
lxk0301
27fa462d9a docker添加京东家庭号 2021-01-13 16:19:02 +08:00
lxk0301
00cf134d11 docker添加京东家庭号 2021-01-13 16:10:50 +08:00
lxk0301
ba98b15bd1 Merge pull request #641 from DoveBoy/patch-2
云函数新增京东家庭号
2021-01-13 16:09:50 +08:00
lxk0301
b20b16b714 Merge pull request #644 from FanchangWang/master
部分脚本 API 请求增加 timeout=3000,防止 API 请求超时导致进程僵死
2021-01-13 16:01:38 +08:00
guyuexuan
d884415793 API 请求超时由 3000 改为 10000 2021-01-13 15:50:26 +08:00
guyuexuan
b504689511 部分脚本 API 请求增加 timeout=3000,防止 API 请求超时导致进程僵死 2021-01-13 15:39:13 +08:00
DoveBoy
990b25721e 云函数新增京东家庭号
云函数新增京东家庭号
2021-01-13 14:40:44 +08:00
lxk0301
a6602713b5 Merge pull request #639 from shylocks/master
京东家庭号
2021-01-13 14:10:27 +08:00
lxk0301
cb9842f357 update 2021-01-13 14:09:47 +08:00
lxk0301
401313ccc7 update 2021-01-13 13:05:51 +08:00
lxk0301
892b964dea 增加扫码获取京东cookie,此方式得到的cookie有效期为90天(实际待测试) 2021-01-13 12:58:53 +08:00
lxk0301
6418007d16 Merge pull request #633 from shylocks/master
口袋书店加入购物车开关,与东东小窝共享环境变量
2021-01-13 12:40:53 +08:00
lxk0301
a1b9158dc3 update 2021-01-13 12:29:41 +08:00
lxk0301
7de6c3d4ef update 2021-01-13 12:29:22 +08:00
lxk0301
94709e25af Merge pull request #635 from FanchangWang/master
[京喜农场] 增加 水果成熟提醒 & 其他变更(具体看描述)
2021-01-13 12:05:27 +08:00
guyuexuan
1f56647f94 [京喜农场]
重置 答题答案选项 = 0
got 调用 API 增加 timeout=3000 防止 API 请求导致进程僵死
增加 水果成熟提醒
2021-01-13 12:02:19 +08:00
lxk0301
8125a102ba Merge pull request #632 from shylocks/master
Master
2021-01-13 10:25:13 +08:00
lxk0301
ead4aae4e5 Merge remote-tracking branch 'origin/master' 2021-01-13 09:32:15 +08:00
lxk0301
68c3744dda update 2021-01-13 09:31:54 +08:00
lxk0301
d65a51ad18 Merge pull request #630 from FanchangWang/master
[京喜农场] 预测天数采用进一取整 & 捕获随机助力 API 异常
2021-01-12 23:15:21 +08:00
guyuexuan
31f49cc259 [京喜农场]
变更 预测天数采用进一取整
新增 捕获随机助力 API 异常(防止 API 异常导致脚本终止执行)
2021-01-12 18:40:11 +08:00
lxk0301
a068a28588 Merge pull request #629 from an0na/patch-3
QX gallery增加最近的最新活动配置
2021-01-12 18:18:46 +08:00
an0na
5269d0a4c4 QX gallery增加最近的最新活动配置 2021-01-12 17:06:23 +08:00
lxk0301
4f90232c73 Merge pull request #628 from shylocks/master
修改提示
2021-01-12 16:05:54 +08:00
lxk0301
fb0b75c7df Merge pull request #621 from DoveBoy/patch-1
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 15:03:24 +08:00
lxk0301
350852f138 Merge pull request #627 from DoveBoy/patch-2
添加京喜农场获取种子token的说明
2021-01-12 15:03:00 +08:00
DoveBoy
5a8abbd756 添加京喜农场获取种子token的说明
添加京喜农场获取种子token的说明
2021-01-12 14:46:54 +08:00
lxk0301
d94ea9b4c6 delete test2.js 2021-01-12 14:20:35 +08:00
lxk0301
e6c9611cb7 在未使用环境变量自定义的前提下,云端添加使用随机UA功能 2021-01-12 14:01:32 +08:00
lxk0301
ed039a6848 Merge remote-tracking branch 'origin/master' 2021-01-12 12:43:52 +08:00
lxk0301
2abadd68b9 fix 2021-01-12 12:43:40 +08:00
lxk0301
af0553e82d Merge pull request #620 from Jone2008/patch-2
Update jd_nh.js
2021-01-12 12:38:57 +08:00
lxk0301
1936387d57 docker1添加年货节脚本 2021-01-12 12:36:17 +08:00
lxk0301
91205d4b83 Merge remote-tracking branch 'origin/master' 2021-01-12 12:33:11 +08:00
DoveBoy
416d270bd8 fix 因resolve conflict丢失的签到领现金secrect
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 12:32:41 +08:00
lxk0301
ba9453c2a9 fix 2021-01-12 12:30:02 +08:00
Jone2008
4ac4bc90aa Update jd_nh.js 2021-01-12 12:28:24 +08:00
lxk0301
6b699e9b5a Merge pull request #616 from DoveBoy/patch-2
调整secret顺序保持与githubAction.md说明一致,方便后期维护
2021-01-12 11:54:31 +08:00
lxk0301
57984cc082 fix 2021-01-12 11:34:03 +08:00
DoveBoy
6ddad92d95 Merge branch 'master' into patch-2 2021-01-12 11:23:22 +08:00