Commit Graph
100 Commits
Author SHA1 Message Date
lxk0301 659d8688fe Update jd_family.js
暂时关闭通知
2021-01-13 21:52:29 +08:00
lxk0301 c4e00009e5 Update jd_family.js 2021-01-13 21:15:40 +08:00
lxk0301 41f6658015 Update jd_family.js 2021-01-13 19:37:39 +08:00
lxk0301 767dbbb7d7 Merge pull request #650 from DoveBoy/patch-2
fix 说明部分404的问题,优化Cron
2021-01-13 19:13:03 +08:00
lxk0301 c073627a38 fix 2021-01-13 18:04:09 +08:00
lxk0301 ac05448239 test 2021-01-13 17:44:07 +08:00
lxk0301 d2cf326e81 test 2021-01-13 17:42:56 +08:00
lxk0301 58d0c2e36f 添加timeout超时 2021-01-13 17:18:51 +08:00
lxk0301 ba04ab0101 Merge remote-tracking branch 'origin/master' 2021-01-13 17:06:59 +08:00
lxk0301 72afc90cc0 添加timeout 2021-01-13 17:06:18 +08:00
lxk0301 49bd5547a0 Merge pull request #647 from Jone2008/patch-3
Update jd_family.js
2021-01-13 16:46:15 +08:00
lxk0301 c2feafa125 添加当前京豆库存为空的打印提示 2021-01-13 16:31:16 +08:00
lxk0301 1691f53cc9 docker添加京东家庭号 2021-01-13 16:19:02 +08:00
lxk0301 94f43c73e4 docker添加京东家庭号 2021-01-13 16:10:50 +08:00
lxk0301 d682b050ed Merge pull request #641 from DoveBoy/patch-2
云函数新增京东家庭号
2021-01-13 16:09:50 +08:00
lxk0301 bde9cc7e02 Merge pull request #644 from FanchangWang/master
部分脚本 API 请求增加 timeout=3000,防止 API 请求超时导致进程僵死
2021-01-13 16:01:38 +08:00
lxk0301 9ebc6c5fa0 Merge pull request #639 from shylocks/master
京东家庭号
2021-01-13 14:10:27 +08:00
lxk0301 0432249f75 update 2021-01-13 14:09:47 +08:00
lxk0301 3e40d0a7f4 update 2021-01-13 13:05:51 +08:00
lxk0301 e254b5cd68 增加扫码获取京东cookie,此方式得到的cookie有效期为90天(实际待测试) 2021-01-13 12:58:53 +08:00
lxk0301 3f509158d4 Merge pull request #633 from shylocks/master
口袋书店加入购物车开关,与东东小窝共享环境变量
2021-01-13 12:40:53 +08:00
lxk0301 f14194ea12 update 2021-01-13 12:29:41 +08:00
lxk0301 4e5d817fee update 2021-01-13 12:29:22 +08:00
lxk0301 708dd2b603 Merge pull request #635 from FanchangWang/master
[京喜农场] 增加 水果成熟提醒 & 其他变更(具体看描述)
2021-01-13 12:05:27 +08:00
lxk0301 7dbcfb0436 Merge pull request #632 from shylocks/master
Master
2021-01-13 10:25:13 +08:00
lxk0301 96cd55205d Merge remote-tracking branch 'origin/master' 2021-01-13 09:32:15 +08:00
lxk0301 0f615a14fb update 2021-01-13 09:31:54 +08:00
lxk0301 9c01635153 Merge pull request #630 from FanchangWang/master
[京喜农场] 预测天数采用进一取整 & 捕获随机助力 API 异常
2021-01-12 23:15:21 +08:00
lxk0301 13557a1e57 Merge pull request #629 from an0na/patch-3
QX gallery增加最近的最新活动配置
2021-01-12 18:18:46 +08:00
lxk0301 6b98729eb4 Merge pull request #628 from shylocks/master
修改提示
2021-01-12 16:05:54 +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 2317403274 Merge pull request #627 from DoveBoy/patch-2
添加京喜农场获取种子token的说明
2021-01-12 15:03:00 +08:00
lxk0301 3044fbe036 delete test2.js 2021-01-12 14:20:35 +08:00
lxk0301 25a16ebd31 在未使用环境变量自定义的前提下,云端添加使用随机UA功能 2021-01-12 14:01:32 +08:00
lxk0301 cd3fe2cad3 Merge remote-tracking branch 'origin/master' 2021-01-12 12:43:52 +08:00
lxk0301 31982977d8 fix 2021-01-12 12:43:40 +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 c93ad7c178 docker1添加年货节脚本 2021-01-12 12:36:17 +08:00
lxk0301 3905282154 Merge remote-tracking branch 'origin/master' 2021-01-12 12:33:11 +08:00
lxk0301 eb36a90da4 fix 2021-01-12 12:30:02 +08:00
lxk0301 4f3150de37 Merge pull request #616 from DoveBoy/patch-2
调整secret顺序保持与githubAction.md说明一致,方便后期维护
2021-01-12 11:54:31 +08:00
lxk0301 2acd09dc97 fix 2021-01-12 11:34:03 +08:00
lxk0301 b98bbd4181 Merge pull request #618 from DoveBoy/patch-3
云函数新增京东年货节
2021-01-12 11:18:51 +08:00
lxk0301 dd3a568cc4 Merge pull request #617 from shylocks/master
京东年货节
2021-01-12 11:18:29 +08:00
lxk0301 d05a24cbb1 Merge pull request #614 from DoveBoy/patch-1
云函数新增签到领现金secret
2021-01-12 11:17:07 +08:00
lxk0301 b03f34f959 Merge pull request #613 from lengmolehongyan/master
Fix log 本次运行获得金币NaN
2021-01-12 11:16:18 +08:00
lxk0301 ee95c4a753 更新互助环境变量集合文档(签到领现金) 2021-01-12 10:21:23 +08:00
lxk0301 9859debaed 签到领现金。已支持提供互助码相互帮助,环境变量为JD_CASH_SHARECODES 2021-01-12 10:19:53 +08:00
lxk0301 aa4a318cad Merge pull request #610 from DoveBoy/patch-2
update README.md
2021-01-12 08:40:00 +08:00
lxk0301 fbc5b25325 Merge pull request #609 from DoveBoy/patch-1
云函数新增签到领现金、京喜签到
2021-01-12 08:39:31 +08:00
lxk0301 a210529a1a Merge pull request #606 from shylocks/master
领现金增加逛会场
2021-01-12 00:29:10 +08:00
lxk0301 f2bb71796c Merge pull request #603 from EvineDeng/master
更新docker的crontab:签到领现金、京喜app签到
2021-01-11 23:40:14 +08:00
lxk0301 ccb1ca1db3 Merge pull request #602 from shylocks/master
修复京喜签到报错
2021-01-11 23:32:05 +08:00
lxk0301 456d2ddaac Merge pull request #601 from shylocks/master
京喜签到+领现金京喜双签
2021-01-11 23:20:53 +08:00
lxk0301 cc62431c3c Merge pull request #600 from shylocks/master
修改cron
2021-01-11 22:47:29 +08:00
lxk0301 1eed9b803d Merge pull request #599 from shylocks/master
领现金修复助力上限提示
2021-01-11 22:36:55 +08:00
lxk0301 8be6640b11 Update lxk0301_Task.sgmodule.sgmodule 2021-01-11 22:36:27 +08:00
lxk0301 82498cf18d Merge pull request #597 from shylocks/master
签到领现金
2021-01-11 22:24:27 +08:00
lxk0301 25c75512b1 Merge pull request #592 from FanchangWang/master 2021-01-11 21:09:38 +08:00
lxk0301 5eb2c14763 Merge pull request #591 from FanchangWang/master
[京喜农场] 添加 助力返回 ret 1021 cannot help self  最大次数限制(限制 3 次)
2021-01-11 19:46:31 +08:00
lxk0301 5c225fe339 Update jd_jxnc.js 2021-01-11 19:08:01 +08:00
lxk0301 f3c5d6b62a Update jd_bookshop.js 2021-01-11 19:05:12 +08:00
lxk0301 f1a8b350ba Update jd_bookshop.js 2021-01-11 19:01:42 +08:00
lxk0301 5510fc34ef Merge pull request #589 from DoveBoy/patch-1
云函数新增京喜农场
2021-01-11 18:48:08 +08:00
lxk0301 2f17a06ff9 fix 2021-01-11 17:34:05 +08:00
lxk0301 dff0f22fde Merge pull request #583 from FanchangWang/master
[京喜农场] fix 助力码变量错误 & add 跳过自己账户的助力码
2021-01-11 17:29:51 +08:00
lxk0301 96ffd01c58 Merge pull request #585 from Jone2008/patch-1
Update jd_jxnc.js
2021-01-11 12:30:57 +08:00
lxk0301 1586aa3865 Merge pull request #579 from DoveBoy/patch-4
调整secret顺序,保持与githubAction.md一致,方便查看
2021-01-11 12:15:50 +08:00
lxk0301 cb86f48c2e Merge pull request #575 from DoveBoy/patch-1
update iCloud.md
2021-01-11 10:29:41 +08:00
lxk0301 c63154da20 Merge pull request #578 from DoveBoy/patch-3
云函数增加口袋书店secret
2021-01-11 10:29:17 +08:00
lxk0301 6df9ebed31 更新环境变量文档,新增BOOKSHOP_SHARECODES(京东书店) 2021-01-11 10:26:32 +08:00
lxk0301 99c509fff2 fix 2021-01-11 10:22:50 +08:00
lxk0301 36dc3bc5d9 Merge pull request #576 from an0na/patch-2
增加自定义助力码【BOOKSHOP_SHARECODES】
2021-01-11 10:22:12 +08:00
lxk0301 8bd1d1cf89 Update jd_jxnc.js 2021-01-11 08:52:33 +08:00
lxk0301 fcfed15b7f Update jd_jxnc.js 2021-01-11 08:38:32 +08:00
lxk0301 72d16ac83d Merge pull request #574 from Dellear/master
统一展示效果
2021-01-11 08:34:58 +08:00
lxk0301 04ab0c5b1f Merge pull request #573 from Dellear/master
修复获取京喜农场active时的报错
2021-01-11 00:00:39 +08:00
lxk0301 cc317bb31c Merge pull request #572 from FanchangWang/master
[京喜农场] 修复 助力码变量错误 & 增加 预测成熟还需天数
2021-01-10 23:16:40 +08:00
lxk0301 98568da7b0 Update jd_car_exchange.js 2021-01-10 20:06:43 +08:00
lxk0301 2099f55555 Merge pull request #569 from shylocks/master
口袋书店修复上架、收取金币、签到
2021-01-10 19:15:37 +08:00
lxk0301 717d54747e Merge pull request #568 from DoveBoy/patch-2
云函数增加京喜农场secret
2021-01-10 19:09:21 +08:00
lxk0301 95c5057e5a Merge pull request #567 from DoveBoy/patch-1
云函数调整口袋书店运行时间
2021-01-10 18:57:49 +08:00
lxk0301 8db39a2f75 Merge pull request #563 from xuthus5/master
支持酷推企微推送/邮件推送
2021-01-10 18:57:27 +08:00
lxk0301 842a228804 Merge pull request #566 from shylocks/master
修复口袋书店qx、loon、surge报错,增加助力码
2021-01-10 18:56:30 +08:00
lxk0301 f944de6307 Merge pull request #565 from EvineDeng/master
1. 给Docker增加口袋书店、京喜农场的定时任务;2. 补充Readme的任务明细;3. 更新环境变量清单。
2021-01-10 18:53:59 +08:00
lxk0301 dd57f91ad8 Merge pull request #564 from DoveBoy/patch-1
云函数新增口袋书店
2021-01-10 18:14:40 +08:00
lxk0301 1b5b75cfe1 Merge pull request #562 from shylocks/master
口袋书店
2021-01-10 17:14:49 +08:00
lxk0301 44ede504f6 Merge pull request #561 from FanchangWang/master
恢复 jx_nc.cookie.js url 路径
2021-01-10 17:14:12 +08:00
lxk0301 adec33a5b1 Merge pull request #552 from FanchangWang/master
jd_get_share_code.js 脚本增加京喜农场互助码获取
2021-01-10 14:23:40 +08:00
lxk0301 6b3746ceac Merge pull request #555 from Dellear/master
格子全部被占有且没有可以合并的JOY,只能回收低级的JOY
2021-01-10 14:11:42 +08:00
lxk0301 cb6f699e71 Merge pull request #560 from iouAkira/patch-1
exclude jd_car_exchange.js
2021-01-10 14:08:36 +08:00
lxk0301 a1c6a5e232 Update jd_pet.js 2021-01-10 12:38:22 +08:00
lxk0301 72a2c3f89b Update jd_pet.js 2021-01-10 12:36:46 +08:00
lxk0301 76b5e6a2c5 Merge pull request #557 from liandong00/patch-1
Update default_task.sh
2021-01-09 20:41:58 +08:00
lxk0301 220a2d4583 修复京喜工厂部分账号做任务火爆,导致任务做不完的情况 2021-01-09 17:50:28 +08:00
lxk0301 91f86e8132 添加延迟 2021-01-09 17:11:48 +08:00
lxk0301 b981917b90 修复京喜工厂 收取招工/劳模电力功能 2021-01-09 17:06:37 +08:00
lxk0301 da8bc78453 修复收取地下零件失效问题 2021-01-09 16:54:05 +08:00
lxk0301 b41570490c 修改:如果水滴换豆卡使用失败,则继续浇水 2021-01-09 14:13:52 +08:00
lxk0301 2e414086a9 之前nobady获取cookie的地址已经失效,弹窗提示地址更换成新的 https://bean.m.jd.com/bean/signIndex.action 2021-01-09 13:53:14 +08:00