Commit Graph

930 Commits

Author SHA1 Message Date
lxk0301
bd98829528 update 2020-12-24 09:40:50 +08:00
lxk0301
72eb2b3685 update 2020-12-24 09:38:01 +08:00
lxk0301
2cac649820 分组环境变量,查看根据明朗清晰 2020-12-24 09:29:46 +08:00
lxk0301
f1c30950c2 Update jd_dreamFactory.js 2020-12-24 07:46:21 +08:00
Akira
985a1420e9 - 调整crazyjoy任务互助输出格式
- 增加crazyjoy任务互助码提取
- crazyjoycoin任务日志增加戳,并在重启的时候清空之前的日志
2020-12-24 00:06:35 +08:00
lxk0301
b0095f0a6e Merge pull request #428 from shylocks/master
crazyJoy增加自动领取助力任务奖励
2020-12-24 00:04:28 +08:00
shylocks
b8e701bbc8 增加自动领取助力任务奖励 2020-12-23 23:58:17 +08:00
Akira
31f86c17cc Merge pull request #1 from lxk0301/master
Master
2020-12-23 23:57:59 +08:00
lxk0301
efe2caeb91 Update README.md 2020-12-23 22:59:55 +08:00
lxk0301
ae7128ce5b Merge pull request #426 from JunzhouLiu/master
增加Ubuntu apt-get安装docker-compsos和Docker安装说明
2020-12-23 22:05:12 +08:00
lxk0301
2b55610091 fix 2020-12-23 19:33:16 +08:00
shylocks
f44fafee98 Merge pull request #15 from lxk0301/master
Master
2020-12-23 19:20:08 +08:00
JunzhouLiu
ce90e2576e 增加Ubuntu apt-get安装docker-compsos和Docker安装说明 2020-12-23 18:50:53 +08:00
lxk0301
c6e6a1dca8 Merge pull request #425 from iouAkira/master
Master
2020-12-23 17:41:57 +08:00
Akira
aa2e4b462e 增加CRZAY_JOY_COIN_ENABLE开关配置,默认开启
关闭的话需要配置CRZAY_JOY_COIN_ENABLE=N
2020-12-23 17:38:26 +08:00
lxk0301
b0cc074c8d 修复 剩余观看视频次数 为0的情况下, 还继续等待30秒的Bug 2020-12-23 17:35:09 +08:00
Akira
1e21dd06e4 Update proc_file.sh 2020-12-23 17:22:48 +08:00
Akira
8c7a5c86d4 Update crontab_list.sh 2020-12-23 17:22:23 +08:00
lxk0301
4a1ea8709c Merge remote-tracking branch 'origin/master' 2020-12-23 16:47:51 +08:00
lxk0301
bfee693b24 解决joy不观看广告视频得金币的bug 2020-12-23 16:47:39 +08:00
lxk0301
b19d19c059 Merge pull request #424 from DoveBoy/patch-1
添加疯狂的joy环境变量说明、云函数新增疯狂的joy secret
2020-12-23 16:47:03 +08:00
DoveBoy
9bb7317d54 云函数新增疯狂的joy secret
云函数新增疯狂的joy secret
2020-12-23 16:23:10 +08:00
DoveBoy
e99f6f454a 疯狂的joy环境变量说明
疯狂的joy环境变量说明
2020-12-23 16:16:49 +08:00
lxk0301
18f45b77e5 Merge pull request #422 from shylocks/master
增加joy循环助力/兑换京豆开关,挂机增大延时
2020-12-23 15:43:34 +08:00
shylocks
250af70b25 增大延时防止问题 2020-12-23 15:23:00 +08:00
shylocks
b06cb2ea53 循环助力/兑换京豆
默认不开启循环助力,可通过环境变量JDJOY_HELPSELF设置
默认不开启京豆兑换,可通过环境变量JDJOY_APPLYJDBEAN设置,目前最小为500/1000京豆
2020-12-23 15:21:51 +08:00
lxk0301
064317b679 Merge pull request #420 from shylocks/master
加入购买合并joy
2020-12-23 14:57:01 +08:00
shylocks
0beb9de9b8 修复报错 2020-12-23 14:54:50 +08:00
shylocks
4b65426bbb 加入购买合并joy 2020-12-23 14:52:21 +08:00
lxk0301
76e8637450 TODO 宠汪汪赛跑 能力补给站(2人赛跑可加5KM,50人赛跑可加25KM),抽空添加 2020-12-23 14:42:17 +08:00
lxk0301
534a11956c fix jd_unbind.js,三大软件订阅新增jd_unbind.js 2020-12-23 14:35:25 +08:00
lxk0301
40f46fd73c 添加官方说明文档url 2020-12-23 13:48:23 +08:00
lxk0301
97b8115c55 Merge pull request #408 from RookieZoe/master
添加企业微信机器人通知
2020-12-23 13:45:38 +08:00
lxk0301
a95645a3b7 Merge pull request #419 from DoveBoy/patch-1
云函数同步更新疯狂的joy每日任务
2020-12-23 13:41:37 +08:00
DoveBoy
2518f3c07e 云函数同步更新疯狂的joy每日任务
云函数同步更新疯狂的joy每日任务
2020-12-23 13:39:18 +08:00
lxk0301
6f14c008cc Merge pull request #418 from shylocks/master
crazyJoy 挂机领金币/看视频领京豆/领补给/做任务
2020-12-23 13:33:00 +08:00
shylocks
d3baaabeac 修复报错 2020-12-23 13:28:25 +08:00
shylocks
8921d55538 完成crazyJoy 2020-12-23 13:23:40 +08:00
lxk0301
8cca614230 Merge pull request #417 from iouAkira/patch-1
提取互助码bug修复 ,延迟任务处理增加提示
2020-12-23 12:24:51 +08:00
shylocks
b51f7decce crazy 挂机领取金币/看视频/小时补给 2020-12-23 12:04:08 +08:00
Akira
9a2466506f bug fix
因为之前测试时候日志输出未设置ts,所以$1没问题,默认所有日志有|ts输出,所以需要改取 $4,$5也取是担心中间会有多的空格影响分列
2020-12-23 11:16:08 +08:00
Akira
d397f5c85a 如果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
0e1fa925d9 修复自己账号之间相互助力的bug 2020-12-23 10:29:27 +08:00
lxk0301
90615c0c3a 添加日志,尝试修复报错 2020-12-23 09:55:26 +08:00
lxk0301
81bc48fffb 注销店铺会员卡添加json判断避免比较出错 2020-12-23 09:46:29 +08:00
lxk0301
ca91dbfbdd Merge pull request #410 from iouAkira/master
增加提取日志中各个账号互助码脚本,把各个账号互助码整理统一到一个文件
2020-12-23 08:22:38 +08:00
Akira
369c6138e0 调整每次提取前清空互助码文件 2020-12-22 23:28:44 +08:00
Akira
b2ec0dfc54 1.调整6个大家可以互助的脚本互助码输出格式
2.增加提取日志中各个账号互助码脚本互助码统一整理到一个文件
2020-12-22 23:22:41 +08:00
lxk0301
1fb17e8b9f Merge pull request #409 from DoveBoy/patch-4
云函数同步京东看一看secret
2020-12-22 21:17:45 +08:00
DoveBoy
1df5b271fb 云函数同步京东看一看secret
云函数同步京东看一看secret
2020-12-22 21:16:43 +08:00