Commit Graph

717 Commits

Author SHA1 Message Date
lxk0301
3467e88ca1 Merge pull request #425 from iouAkira/master
Master
2020-12-23 17:41:57 +08:00
Akira
0e3dce0484 增加CRZAY_JOY_COIN_ENABLE开关配置,默认开启
关闭的话需要配置CRZAY_JOY_COIN_ENABLE=N
2020-12-23 17:38:26 +08:00
lxk0301
8408ff4430 修复 剩余观看视频次数 为0的情况下, 还继续等待30秒的Bug 2020-12-23 17:35:09 +08:00
Akira
4b127e6632 Update proc_file.sh 2020-12-23 17:22:48 +08:00
Akira
7ce0388f62 Update crontab_list.sh 2020-12-23 17:22:23 +08:00
lxk0301
474e5619a5 Merge remote-tracking branch 'origin/master' 2020-12-23 16:47:51 +08:00
lxk0301
24a2ecae2a 解决joy不观看广告视频得金币的bug 2020-12-23 16:47:39 +08:00
lxk0301
850cd37c6d Merge pull request #424 from DoveBoy/patch-1
添加疯狂的joy环境变量说明、云函数新增疯狂的joy secret
2020-12-23 16:47:03 +08:00
DoveBoy
184421ae7c 云函数新增疯狂的joy secret
云函数新增疯狂的joy secret
2020-12-23 16:23:10 +08:00
DoveBoy
d844a8c8e3 疯狂的joy环境变量说明
疯狂的joy环境变量说明
2020-12-23 16:16:49 +08:00
lxk0301
429789d3ba Merge pull request #422 from shylocks/master
增加joy循环助力/兑换京豆开关,挂机增大延时
2020-12-23 15:43:34 +08:00
any
e213e7ee08 增大延时防止问题 2020-12-23 15:23:00 +08:00
any
56e435dfba 循环助力/兑换京豆
默认不开启循环助力,可通过环境变量JDJOY_HELPSELF设置
默认不开启京豆兑换,可通过环境变量JDJOY_APPLYJDBEAN设置,目前最小为500/1000京豆
2020-12-23 15:21:51 +08:00
lxk0301
59288925ce Merge pull request #420 from shylocks/master
加入购买合并joy
2020-12-23 14:57:01 +08:00
any
63b8c15619 修复报错 2020-12-23 14:54:50 +08:00
any
0e3272ce97 加入购买合并joy 2020-12-23 14:52:21 +08:00
lxk0301
902c58e8ad TODO 宠汪汪赛跑 能力补给站(2人赛跑可加5KM,50人赛跑可加25KM),抽空添加 2020-12-23 14:42:17 +08:00
lxk0301
c3708c2319 fix jd_unbind.js,三大软件订阅新增jd_unbind.js 2020-12-23 14:35:25 +08:00
lxk0301
2fef8a1963 添加官方说明文档url 2020-12-23 13:48:23 +08:00
lxk0301
8f3345e9b6 Merge pull request #408 from RookieZoe/master
添加企业微信机器人通知
2020-12-23 13:45:38 +08:00
lxk0301
2f661b82aa Merge pull request #419 from DoveBoy/patch-1
云函数同步更新疯狂的joy每日任务
2020-12-23 13:41:37 +08:00
DoveBoy
deeb62bda4 云函数同步更新疯狂的joy每日任务
云函数同步更新疯狂的joy每日任务
2020-12-23 13:39:18 +08:00
lxk0301
933f5df415 Merge pull request #418 from shylocks/master
crazyJoy 挂机领金币/看视频领京豆/领补给/做任务
2020-12-23 13:33:00 +08:00
any
0b5da84124 修复报错 2020-12-23 13:28:25 +08:00
any
65c5c04e9e 完成crazyJoy 2020-12-23 13:23:40 +08:00
lxk0301
0bcc99d8be Merge pull request #417 from iouAkira/patch-1
提取互助码bug修复 ,延迟任务处理增加提示
2020-12-23 12:24:51 +08:00
any
70a137ef5c crazy 挂机领取金币/看视频/小时补给 2020-12-23 12:04:08 +08:00
Akira
05dedb5acb bug fix
因为之前测试时候日志输出未设置ts,所以$1没问题,默认所有日志有|ts输出,所以需要改取 $4,$5也取是担心中间会有多的空格影响分列
2020-12-23 11:16:08 +08:00
Akira
a95f460da4 如果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
e648f60427 修复自己账号之间相互助力的bug 2020-12-23 10:29:27 +08:00
lxk0301
774d376dbe 添加日志,尝试修复报错 2020-12-23 09:55:26 +08:00
lxk0301
eec633b278 注销店铺会员卡添加json判断避免比较出错 2020-12-23 09:46:29 +08:00
lxk0301
5b55996b00 Merge pull request #410 from iouAkira/master
增加提取日志中各个账号互助码脚本,把各个账号互助码整理统一到一个文件
2020-12-23 08:22:38 +08:00
Akira
1bb3e2b91d 调整每次提取前清空互助码文件 2020-12-22 23:28:44 +08:00
Akira
cf251f55e7 1.调整6个大家可以互助的脚本互助码输出格式
2.增加提取日志中各个账号互助码脚本互助码统一整理到一个文件
2020-12-22 23:22:41 +08:00
lxk0301
3f031360fa Merge pull request #409 from DoveBoy/patch-4
云函数同步京东看一看secret
2020-12-22 21:17:45 +08:00
DoveBoy
b86e643ef0 云函数同步京东看一看secret
云函数同步京东看一看secret
2020-12-22 21:16:43 +08:00
lxk0301
4f42db3916 Merge pull request #407 from DoveBoy/patch-2
云函数新增注销京东会员卡Crontab
2020-12-22 21:08:14 +08:00
lxk0301
649047892b Merge pull request #406 from DoveBoy/patch-1
云函数新增注销京东已开的店铺会员secret
2020-12-22 21:07:58 +08:00
Rookie_Zoe
53f9a4a5db add 企业微信机器人通知 2020-12-22 20:35:43 +08:00
DoveBoy
f4a282f667 云函数新增注销京东会员卡Crontab
云函数新增注销京东会员卡Crontab
2020-12-22 19:31:56 +08:00
lxk0301
41fff19cd9 Merge remote-tracking branch 'origin/master' 2020-12-22 18:47:47 +08:00
lxk0301
3a8ef30a6c 修复东东小窝自己账号相互助力功能 2020-12-22 18:47:34 +08:00
DoveBoy
6a0b35f0b6 云函数新增注销京东已开的店铺会员secret
云函数新增注销京东已开的店铺会员secret
2020-12-22 18:11:34 +08:00
lxk0301
480e52294b Merge pull request #403 from EvineDeng/master
增加注销店铺会员的环境变量说明,增加Docker1注销店铺会员的定时任务,默认每周六运行一次。
2020-12-22 17:35:31 +08:00
lxk0301
d67d8a6c17 fix bug 2020-12-22 17:33:40 +08:00
EvineDeng
f6c918f57f Fix 2020-12-22 17:33:34 +08:00
EvineDeng
3a2db98753 增加注销店铺会员的环境变量说明,增加Docker1注销店铺会员的定时任务,默认每周六运行一次。 2020-12-22 15:46:17 +08:00
lxk0301
5e782eca2d 修复无会员账号脚本出错的问题 2020-12-22 14:50:36 +08:00
lxk0301
0e8a8eb256 修复bug 2020-12-22 14:39:38 +08:00