Commit Graph

723 Commits

Author SHA1 Message Date
Akira
794d6b0c30 - 调整crazyjoy任务互助输出格式
- 增加crazyjoy任务互助码提取
- crazyjoycoin任务日志增加戳,并在重启的时候清空之前的日志
2020-12-24 00:06:35 +08:00
Akira
77c090d53d Merge pull request #1 from lxk0301/master
Master
2020-12-23 23:57:59 +08:00
lxk0301
42bba8f542 Update README.md 2020-12-23 22:59:55 +08:00
lxk0301
1c14edb8bf Merge pull request #426 from JunzhouLiu/master
增加Ubuntu apt-get安装docker-compsos和Docker安装说明
2020-12-23 22:05:12 +08:00
lxk0301
e161ed45fa fix 2020-12-23 19:33:16 +08:00
JunzhouLiu
acaab83f93 增加Ubuntu apt-get安装docker-compsos和Docker安装说明 2020-12-23 18:50:53 +08:00
lxk0301
5e1edba32a Merge pull request #425 from iouAkira/master
Master
2020-12-23 17:41:57 +08:00
Akira
3b4531cd42 增加CRZAY_JOY_COIN_ENABLE开关配置,默认开启
关闭的话需要配置CRZAY_JOY_COIN_ENABLE=N
2020-12-23 17:38:26 +08:00
lxk0301
35e4cf5372 修复 剩余观看视频次数 为0的情况下, 还继续等待30秒的Bug 2020-12-23 17:35:09 +08:00
Akira
b6108201b5 Update proc_file.sh 2020-12-23 17:22:48 +08:00
Akira
9358f77f2c Update crontab_list.sh 2020-12-23 17:22:23 +08:00
lxk0301
21583d181a Merge remote-tracking branch 'origin/master' 2020-12-23 16:47:51 +08:00
lxk0301
a6b5b63fb0 解决joy不观看广告视频得金币的bug 2020-12-23 16:47:39 +08:00
lxk0301
4efa7c952e Merge pull request #424 from DoveBoy/patch-1
添加疯狂的joy环境变量说明、云函数新增疯狂的joy secret
2020-12-23 16:47:03 +08:00
DoveBoy
8da2e36bc2 云函数新增疯狂的joy secret
云函数新增疯狂的joy secret
2020-12-23 16:23:10 +08:00
DoveBoy
3c50f9fe05 疯狂的joy环境变量说明
疯狂的joy环境变量说明
2020-12-23 16:16:49 +08:00
lxk0301
2da360fdc6 Merge pull request #422 from shylocks/master
增加joy循环助力/兑换京豆开关,挂机增大延时
2020-12-23 15:43:34 +08:00
any
3ece7961b5 增大延时防止问题 2020-12-23 15:23:00 +08:00
any
077f6e3bdf 循环助力/兑换京豆
默认不开启循环助力,可通过环境变量JDJOY_HELPSELF设置
默认不开启京豆兑换,可通过环境变量JDJOY_APPLYJDBEAN设置,目前最小为500/1000京豆
2020-12-23 15:21:51 +08:00
lxk0301
502e6cdf48 Merge pull request #420 from shylocks/master
加入购买合并joy
2020-12-23 14:57:01 +08:00
any
bf20c28388 修复报错 2020-12-23 14:54:50 +08:00
any
cf397c0a3b 加入购买合并joy 2020-12-23 14:52:21 +08:00
lxk0301
4d72da095b TODO 宠汪汪赛跑 能力补给站(2人赛跑可加5KM,50人赛跑可加25KM),抽空添加 2020-12-23 14:42:17 +08:00
lxk0301
fc3f3c2615 fix jd_unbind.js,三大软件订阅新增jd_unbind.js 2020-12-23 14:35:25 +08:00
lxk0301
c4fd91cb47 添加官方说明文档url 2020-12-23 13:48:23 +08:00
lxk0301
66b97a2f78 Merge pull request #408 from RookieZoe/master
添加企业微信机器人通知
2020-12-23 13:45:38 +08:00
lxk0301
6a24f4441a Merge pull request #419 from DoveBoy/patch-1
云函数同步更新疯狂的joy每日任务
2020-12-23 13:41:37 +08:00
DoveBoy
c5eb6d1790 云函数同步更新疯狂的joy每日任务
云函数同步更新疯狂的joy每日任务
2020-12-23 13:39:18 +08:00
lxk0301
fd68a0723b Merge pull request #418 from shylocks/master
crazyJoy 挂机领金币/看视频领京豆/领补给/做任务
2020-12-23 13:33:00 +08:00
any
7516ade309 修复报错 2020-12-23 13:28:25 +08:00
any
5094ad0457 完成crazyJoy 2020-12-23 13:23:40 +08:00
lxk0301
af981e7436 Merge pull request #417 from iouAkira/patch-1
提取互助码bug修复 ,延迟任务处理增加提示
2020-12-23 12:24:51 +08:00
any
f8514ea2d6 crazy 挂机领取金币/看视频/小时补给 2020-12-23 12:04:08 +08:00
Akira
30fa135174 bug fix
因为之前测试时候日志输出未设置ts,所以$1没问题,默认所有日志有|ts输出,所以需要改取 $4,$5也取是担心中间会有多的空格影响分列
2020-12-23 11:16:08 +08:00
Akira
e14a255a03 如果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
ea9f8174a5 修复自己账号之间相互助力的bug 2020-12-23 10:29:27 +08:00
lxk0301
ade6c7fd3c 添加日志,尝试修复报错 2020-12-23 09:55:26 +08:00
lxk0301
bafa9244d3 注销店铺会员卡添加json判断避免比较出错 2020-12-23 09:46:29 +08:00
lxk0301
22a8ab42be Merge pull request #410 from iouAkira/master
增加提取日志中各个账号互助码脚本,把各个账号互助码整理统一到一个文件
2020-12-23 08:22:38 +08:00
Akira
da35ee86e8 调整每次提取前清空互助码文件 2020-12-22 23:28:44 +08:00
Akira
5e10408ed8 1.调整6个大家可以互助的脚本互助码输出格式
2.增加提取日志中各个账号互助码脚本互助码统一整理到一个文件
2020-12-22 23:22:41 +08:00
lxk0301
2edf9b3d29 Merge pull request #409 from DoveBoy/patch-4
云函数同步京东看一看secret
2020-12-22 21:17:45 +08:00
DoveBoy
165a6c0cd8 云函数同步京东看一看secret
云函数同步京东看一看secret
2020-12-22 21:16:43 +08:00
lxk0301
4bd9fc9005 Merge pull request #407 from DoveBoy/patch-2
云函数新增注销京东会员卡Crontab
2020-12-22 21:08:14 +08:00
lxk0301
79373ba9e3 Merge pull request #406 from DoveBoy/patch-1
云函数新增注销京东已开的店铺会员secret
2020-12-22 21:07:58 +08:00
Rookie_Zoe
692128e322 add 企业微信机器人通知 2020-12-22 20:35:43 +08:00
DoveBoy
6dedbdcd96 云函数新增注销京东会员卡Crontab
云函数新增注销京东会员卡Crontab
2020-12-22 19:31:56 +08:00
lxk0301
8de1efc57f Merge remote-tracking branch 'origin/master' 2020-12-22 18:47:47 +08:00
lxk0301
644434b619 修复东东小窝自己账号相互助力功能 2020-12-22 18:47:34 +08:00
DoveBoy
76f167f743 云函数新增注销京东已开的店铺会员secret
云函数新增注销京东已开的店铺会员secret
2020-12-22 18:11:34 +08:00