Commit Graph
100 Commits
Author SHA1 Message Date
lxk0301 bc7054a2bd Update jd_family.js 2021-01-13 19:37:39 +08:00
lxk0301 f554eb33ef Merge pull request #650 from DoveBoy/patch-2
fix 说明部分404的问题,优化Cron
2021-01-13 19:13:03 +08:00
lxk0301 15d269bf03 fix 2021-01-13 18:04:09 +08:00
lxk0301 50f6aad7c0 test 2021-01-13 17:44:07 +08:00
lxk0301 4fafe75925 test 2021-01-13 17:42:56 +08:00
lxk0301 6bcb1cd8cc 添加timeout超时 2021-01-13 17:18:51 +08:00
lxk0301 63efb9752d Merge remote-tracking branch 'origin/master' 2021-01-13 17:06:59 +08:00
lxk0301 ac52b8686e 添加timeout 2021-01-13 17:06:18 +08:00
lxk0301 30bd2324a0 Merge pull request #647 from Jone2008/patch-3
Update jd_family.js
2021-01-13 16:46:15 +08:00
lxk0301 b8464b47aa 添加当前京豆库存为空的打印提示 2021-01-13 16:31:16 +08:00
lxk0301 bd54cdb344 docker添加京东家庭号 2021-01-13 16:19:02 +08:00
lxk0301 647a1c667d docker添加京东家庭号 2021-01-13 16:10:50 +08:00
lxk0301 bb63f32655 Merge pull request #641 from DoveBoy/patch-2
云函数新增京东家庭号
2021-01-13 16:09:50 +08:00
lxk0301 6636cdf2fb Merge pull request #644 from FanchangWang/master
部分脚本 API 请求增加 timeout=3000,防止 API 请求超时导致进程僵死
2021-01-13 16:01:38 +08:00
lxk0301 569786772b Merge pull request #639 from shylocks/master
京东家庭号
2021-01-13 14:10:27 +08:00
lxk0301 d665a5099a update 2021-01-13 14:09:47 +08:00
lxk0301 973bb01951 update 2021-01-13 13:05:51 +08:00
lxk0301 c547bf349b 增加扫码获取京东cookie,此方式得到的cookie有效期为90天(实际待测试) 2021-01-13 12:58:53 +08:00
lxk0301 6b1c1e5fa0 Merge pull request #633 from shylocks/master
口袋书店加入购物车开关,与东东小窝共享环境变量
2021-01-13 12:40:53 +08:00
lxk0301 6575fc4a36 update 2021-01-13 12:29:41 +08:00
lxk0301 0ee8cdd1e1 update 2021-01-13 12:29:22 +08:00
lxk0301 c481a752e6 Merge pull request #635 from FanchangWang/master
[京喜农场] 增加 水果成熟提醒 & 其他变更(具体看描述)
2021-01-13 12:05:27 +08:00
lxk0301 feba538269 Merge pull request #632 from shylocks/master
Master
2021-01-13 10:25:13 +08:00
lxk0301 20e9244568 Merge remote-tracking branch 'origin/master' 2021-01-13 09:32:15 +08:00
lxk0301 97017b1bf1 update 2021-01-13 09:31:54 +08:00
lxk0301 79fb72220c Merge pull request #630 from FanchangWang/master
[京喜农场] 预测天数采用进一取整 & 捕获随机助力 API 异常
2021-01-12 23:15:21 +08:00
lxk0301 01dd978a5a Merge pull request #629 from an0na/patch-3
QX gallery增加最近的最新活动配置
2021-01-12 18:18:46 +08:00
lxk0301 a3c51e503c Merge pull request #628 from shylocks/master
修改提示
2021-01-12 16:05:54 +08:00
lxk0301 173b748dd4 Merge pull request #621 from DoveBoy/patch-1
fix 因resolve conflict丢失的签到领现金secrect
2021-01-12 15:03:24 +08:00
lxk0301 ea929e9945 Merge pull request #627 from DoveBoy/patch-2
添加京喜农场获取种子token的说明
2021-01-12 15:03:00 +08:00
lxk0301 b3b0325213 delete test2.js 2021-01-12 14:20:35 +08:00
lxk0301 36dcb021dc 在未使用环境变量自定义的前提下,云端添加使用随机UA功能 2021-01-12 14:01:32 +08:00
lxk0301 a7d89cce99 Merge remote-tracking branch 'origin/master' 2021-01-12 12:43:52 +08:00
lxk0301 9660f21189 fix 2021-01-12 12:43:40 +08:00
lxk0301 c25f8537af Merge pull request #620 from Jone2008/patch-2
Update jd_nh.js
2021-01-12 12:38:57 +08:00
lxk0301 1ceb72dd2c docker1添加年货节脚本 2021-01-12 12:36:17 +08:00
lxk0301 f8ba96e954 Merge remote-tracking branch 'origin/master' 2021-01-12 12:33:11 +08:00
lxk0301 c7a14fb6a7 fix 2021-01-12 12:30:02 +08:00
lxk0301 0366b44dc6 Merge pull request #616 from DoveBoy/patch-2
调整secret顺序保持与githubAction.md说明一致,方便后期维护
2021-01-12 11:54:31 +08:00
lxk0301 331680b869 fix 2021-01-12 11:34:03 +08:00
lxk0301 b5fe69f4e1 Merge pull request #618 from DoveBoy/patch-3
云函数新增京东年货节
2021-01-12 11:18:51 +08:00
lxk0301 f27d0d3dec Merge pull request #617 from shylocks/master
京东年货节
2021-01-12 11:18:29 +08:00
lxk0301 b55e5762a5 Merge pull request #614 from DoveBoy/patch-1
云函数新增签到领现金secret
2021-01-12 11:17:07 +08:00
lxk0301 962d1e3a99 Merge pull request #613 from lengmolehongyan/master
Fix log 本次运行获得金币NaN
2021-01-12 11:16:18 +08:00
lxk0301 b38b5662dd 更新互助环境变量集合文档(签到领现金) 2021-01-12 10:21:23 +08:00
lxk0301 5cfec0f9b1 签到领现金。已支持提供互助码相互帮助,环境变量为JD_CASH_SHARECODES 2021-01-12 10:19:53 +08:00
lxk0301 ce2bdbaff6 Merge pull request #610 from DoveBoy/patch-2
update README.md
2021-01-12 08:40:00 +08:00
lxk0301 1678a96755 Merge pull request #609 from DoveBoy/patch-1
云函数新增签到领现金、京喜签到
2021-01-12 08:39:31 +08:00
lxk0301 5f7be71d8d Merge pull request #606 from shylocks/master
领现金增加逛会场
2021-01-12 00:29:10 +08:00
lxk0301 1a2359085d Merge pull request #603 from EvineDeng/master
更新docker的crontab:签到领现金、京喜app签到
2021-01-11 23:40:14 +08:00
lxk0301 f29e628958 Merge pull request #602 from shylocks/master
修复京喜签到报错
2021-01-11 23:32:05 +08:00
lxk0301 0544dbf498 Merge pull request #601 from shylocks/master
京喜签到+领现金京喜双签
2021-01-11 23:20:53 +08:00
lxk0301 fe9f516c1d Merge pull request #600 from shylocks/master
修改cron
2021-01-11 22:47:29 +08:00
lxk0301 4a14c6a2ca Merge pull request #599 from shylocks/master
领现金修复助力上限提示
2021-01-11 22:36:55 +08:00
lxk0301 67d53791b0 Update lxk0301_Task.sgmodule.sgmodule 2021-01-11 22:36:27 +08:00
lxk0301 faf3347658 Merge pull request #597 from shylocks/master
签到领现金
2021-01-11 22:24:27 +08:00
lxk0301 17170565c7 Merge pull request #592 from FanchangWang/master 2021-01-11 21:09:38 +08:00
lxk0301 230580a2f1 Merge pull request #591 from FanchangWang/master
[京喜农场] 添加 助力返回 ret 1021 cannot help self  最大次数限制(限制 3 次)
2021-01-11 19:46:31 +08:00
lxk0301 3cb89b2af4 Update jd_jxnc.js 2021-01-11 19:08:01 +08:00
lxk0301 8b7a340242 Update jd_bookshop.js 2021-01-11 19:05:12 +08:00
lxk0301 da85a393a4 Update jd_bookshop.js 2021-01-11 19:01:42 +08:00
lxk0301 b0c1fc4c7d Merge pull request #589 from DoveBoy/patch-1
云函数新增京喜农场
2021-01-11 18:48:08 +08:00
lxk0301 1adb277fba fix 2021-01-11 17:34:05 +08:00
lxk0301 ec076363e8 Merge pull request #583 from FanchangWang/master
[京喜农场] fix 助力码变量错误 & add 跳过自己账户的助力码
2021-01-11 17:29:51 +08:00
lxk0301 4edf91aa28 Merge pull request #585 from Jone2008/patch-1
Update jd_jxnc.js
2021-01-11 12:30:57 +08:00
lxk0301 c06a2d9311 Merge pull request #579 from DoveBoy/patch-4
调整secret顺序,保持与githubAction.md一致,方便查看
2021-01-11 12:15:50 +08:00
lxk0301 2a6f8b7068 Merge pull request #575 from DoveBoy/patch-1
update iCloud.md
2021-01-11 10:29:41 +08:00
lxk0301 6950a8639c Merge pull request #578 from DoveBoy/patch-3
云函数增加口袋书店secret
2021-01-11 10:29:17 +08:00
lxk0301 0c13f06e6c 更新环境变量文档,新增BOOKSHOP_SHARECODES(京东书店) 2021-01-11 10:26:32 +08:00
lxk0301 0c6e439e3a fix 2021-01-11 10:22:50 +08:00
lxk0301 cfb0b4bb44 Merge pull request #576 from an0na/patch-2
增加自定义助力码【BOOKSHOP_SHARECODES】
2021-01-11 10:22:12 +08:00
lxk0301 4a3882c6a4 Update jd_jxnc.js 2021-01-11 08:52:33 +08:00
lxk0301 59fb475dce Update jd_jxnc.js 2021-01-11 08:38:32 +08:00
lxk0301 49bc43fcf2 Merge pull request #574 from Dellear/master
统一展示效果
2021-01-11 08:34:58 +08:00
lxk0301 7d59876b60 Merge pull request #573 from Dellear/master
修复获取京喜农场active时的报错
2021-01-11 00:00:39 +08:00
lxk0301 8a6fd36471 Merge pull request #572 from FanchangWang/master
[京喜农场] 修复 助力码变量错误 & 增加 预测成熟还需天数
2021-01-10 23:16:40 +08:00
lxk0301 592b8807fd Update jd_car_exchange.js 2021-01-10 20:06:43 +08:00
lxk0301 c864a7abc9 Merge pull request #569 from shylocks/master
口袋书店修复上架、收取金币、签到
2021-01-10 19:15:37 +08:00
lxk0301 392198e732 Merge pull request #568 from DoveBoy/patch-2
云函数增加京喜农场secret
2021-01-10 19:09:21 +08:00
lxk0301 826628f0bd Merge pull request #567 from DoveBoy/patch-1
云函数调整口袋书店运行时间
2021-01-10 18:57:49 +08:00
lxk0301 c7af49701f Merge pull request #563 from xuthus5/master
支持酷推企微推送/邮件推送
2021-01-10 18:57:27 +08:00
lxk0301 ad77aee893 Merge pull request #566 from shylocks/master
修复口袋书店qx、loon、surge报错,增加助力码
2021-01-10 18:56:30 +08:00
lxk0301 c57a72416e Merge pull request #565 from EvineDeng/master
1. 给Docker增加口袋书店、京喜农场的定时任务;2. 补充Readme的任务明细;3. 更新环境变量清单。
2021-01-10 18:53:59 +08:00
lxk0301 32c6af0219 Merge pull request #564 from DoveBoy/patch-1
云函数新增口袋书店
2021-01-10 18:14:40 +08:00
lxk0301 58d0522a21 Merge pull request #562 from shylocks/master
口袋书店
2021-01-10 17:14:49 +08:00
lxk0301 6e4520b708 Merge pull request #561 from FanchangWang/master
恢复 jx_nc.cookie.js url 路径
2021-01-10 17:14:12 +08:00
lxk0301 935ffe6cc5 Merge pull request #552 from FanchangWang/master
jd_get_share_code.js 脚本增加京喜农场互助码获取
2021-01-10 14:23:40 +08:00
lxk0301 4afaccd398 Merge pull request #555 from Dellear/master
格子全部被占有且没有可以合并的JOY,只能回收低级的JOY
2021-01-10 14:11:42 +08:00
lxk0301 dabe811ad8 Merge pull request #560 from iouAkira/patch-1
exclude jd_car_exchange.js
2021-01-10 14:08:36 +08:00
lxk0301 dc055b86b0 Update jd_pet.js 2021-01-10 12:38:22 +08:00
lxk0301 6449b1864f Update jd_pet.js 2021-01-10 12:36:46 +08:00
lxk0301 439b2f44c9 Merge pull request #557 from liandong00/patch-1
Update default_task.sh
2021-01-09 20:41:58 +08:00
lxk0301 a136b2ae4f 修复京喜工厂部分账号做任务火爆,导致任务做不完的情况 2021-01-09 17:50:28 +08:00
lxk0301 1f40228484 添加延迟 2021-01-09 17:11:48 +08:00
lxk0301 5bd4fb80f2 修复京喜工厂 收取招工/劳模电力功能 2021-01-09 17:06:37 +08:00
lxk0301 b0f163b464 修复收取地下零件失效问题 2021-01-09 16:54:05 +08:00
lxk0301 0e931d381c 修改:如果水滴换豆卡使用失败,则继续浇水 2021-01-09 14:13:52 +08:00
lxk0301 01cc401c4f 之前nobady获取cookie的地址已经失效,弹窗提示地址更换成新的 https://bean.m.jd.com/bean/signIndex.action 2021-01-09 13:53:14 +08:00
lxk0301 798ae77640 Update jd_pet.js 2021-01-09 11:23:06 +08:00
lxk0301 e91d6e3566 Update jd_dreamFactory.js 2021-01-09 01:07:10 +08:00