Commit Graph

737 Commits

Author SHA1 Message Date
lxk0301
48289dfdd7 fix bug 2020-12-24 10:37:47 +08:00
lxk0301
bc01589d81 fix 2020-12-24 10:22:41 +08:00
lxk0301
861934e5fb IOS兼容多账号cookie,即使不用NobyDacookie,也不会提示去获取cookie,cookie失效后,不再自动清除 2020-12-24 10:21:47 +08:00
lxk0301
56c9e1cee6 debug,不用NobyDa获取的京东cookie也可(不提示要去获取cookie) 2020-12-24 10:05:56 +08:00
lxk0301
55dc1a0ae4 update 2020-12-24 09:40:50 +08:00
lxk0301
b6c38d1aec update 2020-12-24 09:38:01 +08:00
lxk0301
ec6f6a862c 分组环境变量,查看根据明朗清晰 2020-12-24 09:29:46 +08:00
lxk0301
cee765690d Update jd_dreamFactory.js 2020-12-24 07:46:21 +08:00
lxk0301
a28010227e Merge pull request #428 from shylocks/master
crazyJoy增加自动领取助力任务奖励
2020-12-24 00:04:28 +08:00
shylocks
77bd616dcf 增加自动领取助力任务奖励 2020-12-23 23:58:17 +08:00
lxk0301
b9bb912391 Update README.md 2020-12-23 22:59:55 +08:00
lxk0301
56eda15d77 Merge pull request #426 from JunzhouLiu/master
增加Ubuntu apt-get安装docker-compsos和Docker安装说明
2020-12-23 22:05:12 +08:00
lxk0301
7762810f6b fix 2020-12-23 19:33:16 +08:00
shylocks
99d0c692f3 Merge pull request #15 from lxk0301/master
Master
2020-12-23 19:20:08 +08:00
JunzhouLiu
9a56695710 增加Ubuntu apt-get安装docker-compsos和Docker安装说明 2020-12-23 18:50:53 +08:00
lxk0301
590901af3c Merge pull request #425 from iouAkira/master
Master
2020-12-23 17:41:57 +08:00
Akira
e0c255dedc 增加CRZAY_JOY_COIN_ENABLE开关配置,默认开启
关闭的话需要配置CRZAY_JOY_COIN_ENABLE=N
2020-12-23 17:38:26 +08:00
lxk0301
6423fe38c6 修复 剩余观看视频次数 为0的情况下, 还继续等待30秒的Bug 2020-12-23 17:35:09 +08:00
Akira
20a17a0d37 Update proc_file.sh 2020-12-23 17:22:48 +08:00
Akira
61d6c43c40 Update crontab_list.sh 2020-12-23 17:22:23 +08:00
lxk0301
4beb617990 Merge remote-tracking branch 'origin/master' 2020-12-23 16:47:51 +08:00
lxk0301
39f24854d0 解决joy不观看广告视频得金币的bug 2020-12-23 16:47:39 +08:00
lxk0301
27aae92b45 Merge pull request #424 from DoveBoy/patch-1
添加疯狂的joy环境变量说明、云函数新增疯狂的joy secret
2020-12-23 16:47:03 +08:00
DoveBoy
64b67204bf 云函数新增疯狂的joy secret
云函数新增疯狂的joy secret
2020-12-23 16:23:10 +08:00
DoveBoy
8bc295e1e7 疯狂的joy环境变量说明
疯狂的joy环境变量说明
2020-12-23 16:16:49 +08:00
lxk0301
62d0c144a7 Merge pull request #422 from shylocks/master
增加joy循环助力/兑换京豆开关,挂机增大延时
2020-12-23 15:43:34 +08:00
shylocks
3c39134a47 增大延时防止问题 2020-12-23 15:23:00 +08:00
shylocks
99b085bcae 循环助力/兑换京豆
默认不开启循环助力,可通过环境变量JDJOY_HELPSELF设置
默认不开启京豆兑换,可通过环境变量JDJOY_APPLYJDBEAN设置,目前最小为500/1000京豆
2020-12-23 15:21:51 +08:00
lxk0301
9f725eaa86 Merge pull request #420 from shylocks/master
加入购买合并joy
2020-12-23 14:57:01 +08:00
shylocks
14ff996463 修复报错 2020-12-23 14:54:50 +08:00
shylocks
b01e888dd3 加入购买合并joy 2020-12-23 14:52:21 +08:00
lxk0301
68065574cb TODO 宠汪汪赛跑 能力补给站(2人赛跑可加5KM,50人赛跑可加25KM),抽空添加 2020-12-23 14:42:17 +08:00
lxk0301
b4c41b6ea7 fix jd_unbind.js,三大软件订阅新增jd_unbind.js 2020-12-23 14:35:25 +08:00
lxk0301
089135eaf4 添加官方说明文档url 2020-12-23 13:48:23 +08:00
lxk0301
348dd9cab5 Merge pull request #408 from RookieZoe/master
添加企业微信机器人通知
2020-12-23 13:45:38 +08:00
lxk0301
0ca4139670 Merge pull request #419 from DoveBoy/patch-1
云函数同步更新疯狂的joy每日任务
2020-12-23 13:41:37 +08:00
DoveBoy
c053165999 云函数同步更新疯狂的joy每日任务
云函数同步更新疯狂的joy每日任务
2020-12-23 13:39:18 +08:00
lxk0301
0997a75922 Merge pull request #418 from shylocks/master
crazyJoy 挂机领金币/看视频领京豆/领补给/做任务
2020-12-23 13:33:00 +08:00
shylocks
d47e9b57ee 修复报错 2020-12-23 13:28:25 +08:00
shylocks
de19ca6a2f 完成crazyJoy 2020-12-23 13:23:40 +08:00
lxk0301
c2b94b0bca Merge pull request #417 from iouAkira/patch-1
提取互助码bug修复 ,延迟任务处理增加提示
2020-12-23 12:24:51 +08:00
shylocks
6aada7dbec crazy 挂机领取金币/看视频/小时补给 2020-12-23 12:04:08 +08:00
Akira
da73c1b007 bug fix
因为之前测试时候日志输出未设置ts,所以$1没问题,默认所有日志有|ts输出,所以需要改取 $4,$5也取是担心中间会有多的空格影响分列
2020-12-23 11:16:08 +08:00
Akira
43ab89ccea 如果RANDOM_DELAY_MAX未配置执行提示sh: 1: unknown operand
如果RANDOM_DELAY_MAX未配置执行提示sh: 1: unknown operand,增一个判断提示
https://github.com/lxk0301/jd_scripts/pull/372
2020-12-23 11:06:19 +08:00
lxk0301
291e1b1408 修复自己账号之间相互助力的bug 2020-12-23 10:29:27 +08:00
lxk0301
97426d8717 添加日志,尝试修复报错 2020-12-23 09:55:26 +08:00
lxk0301
997412b04a 注销店铺会员卡添加json判断避免比较出错 2020-12-23 09:46:29 +08:00
lxk0301
11531b956b Merge pull request #410 from iouAkira/master
增加提取日志中各个账号互助码脚本,把各个账号互助码整理统一到一个文件
2020-12-23 08:22:38 +08:00
Akira
c19dfcfc90 调整每次提取前清空互助码文件 2020-12-22 23:28:44 +08:00
Akira
fafa4db428 1.调整6个大家可以互助的脚本互助码输出格式
2.增加提取日志中各个账号互助码脚本互助码统一整理到一个文件
2020-12-22 23:22:41 +08:00