diff --git a/Loon/lxk0301_LoonTask.conf b/Loon/lxk0301_LoonTask.conf index 39a18a57..58bce94d 100644 --- a/Loon/lxk0301_LoonTask.conf +++ b/Loon/lxk0301_LoonTask.conf @@ -19,12 +19,12 @@ cron "0 0 0 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/j # 口袋书店 cron "1 8,12,18 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_bookshop.js,tag=口袋书店 -# 京东汽车 -cron "10 7 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_car.js, tag=京东汽车 - # 京东汽车兑换 cron "0 0 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_car_exchange.js, tag=京东汽车兑换 +# 京东汽车 +cron "10 7 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_car.js, tag=京东汽车 + # 签到领现金 cron "2 0-23/4 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_cash.js,tag=签到领现金 @@ -34,15 +34,15 @@ cron "5 0,8,13,19 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/ma # 摇京豆 cron "5 0 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_club_lottery.js,tag=摇京豆 -# crazyJoy任务 -cron "10 7 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_crazy_joy.js,tag=crazyJoy任务 - # 监控crazyJoy分红 cron "10 12 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_crazy_joy_bonus.js,tag=监控crazyJoy分红 # crazyJoy挂机 cron "10 1,12 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_crazy_joy_coin.js,tag=crazyJoy挂机 +# crazyJoy任务 +cron "10 7 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_crazy_joy.js,tag=crazyJoy任务 + # 天天提鹅 cron "10 * * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_daily_egg.js,tag=天天提鹅 @@ -73,20 +73,19 @@ cron "10 * * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd # 京东赚赚 cron "10 0 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_jdzz.js,tag=京东赚赚 -# 宠汪汪 -cron "15 0-23/2 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_joy.js,tag=京东宠汪汪 - # 宠汪汪🐕喂食 cron "15 0-23/1 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_joy_feedPets.js,tag=京东宠汪汪喂食 # 宠汪汪强制为别人助力 http-request ^https:\/\/draw\.jdfcloud\.com\/\/common\/pet\/enterRoom\/h5\?invitePin=.*(&inviteSource=task_invite&shareSource=\w+&inviteTimeStamp=\d+&openId=\w+)?&reqSource=weapp|^https:\/\/draw\.jdfcloud\.com(\/mirror)?\/\/pet\/helpFriend\?friendPin script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_joy_help.js, requires-body=true, timeout=3600, tag=宠汪汪强制为别人助力 +# 宠汪汪 +cron "15 0-23/2 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_joy.js,tag=京东宠汪汪 + # 宠汪汪积分兑换奖品 cron "0 0-16/8 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_joy_reward.js,tag=宠汪汪积分兑换奖品 # 宠汪汪赛跑 -jsjiami.com.v6 cron "15 10 * * *" script-path=https://gitee.com/lxk0301/jd_scripts/raw/master/jd_joy_run.js, tag=宠汪汪邀请助力与赛跑助力 # 宠汪汪助力更新Token diff --git a/update_list.sh b/update_list.sh index 123961fe..c22b079f 100644 --- a/update_list.sh +++ b/update_list.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -## Author: https://github.com/EvineDeng -## Modified: 2021-03-02 -## Version: v1.0.4 +## Author: https://github.com/nevinee +## Modified: 2021-03-18 +## Version: v1.0.5 ## 网址、路径、文件、标记信息以及表头 WorkDir=$(cd $(dirname $0); pwd) @@ -21,9 +21,9 @@ perl -i -ne "{print unless $StartLine .. eof}" "$FileReadme" cd $WorkDir Sheet=$SheetHead for ((i=0; i<${#JsList[*]}; i++)); do - Name=$(grep "new Env" ${JsList[i]} | awk -F "'|\"" '{print $2}') - Entry=$(grep -E "^ *活动入口" ${JsList[i]} | awk -F ":|: " '{print $2}') - [[ -z $Entry ]] || [[ $Entry == 暂无 ]] && Entry=$(grep -E "^ *活动地址" ${JsList[i]} | awk -F ":|: " '{print $2}') + Name=$(grep "new Env" ${JsList[i]} | awk -F "'|\"" '{print $2}' | head -1) + Entry=$(grep -E "^ *活动入口" ${JsList[i]} | awk -F ":|: " '{print $2}' | head -1) + [[ -z $Entry ]] || [[ $Entry == 暂无 ]] && Entry=$(grep -E "^ *活动地址" ${JsList[i]} | awk -F ":|: " '{print $2}' | head -1) [[ $Entry == http* ]] && Entry="[活动地址]($Entry)" Raw="$UrlRaw${JsList[i]}" Sheet="$Sheet\n|$(($i + 1))|[${JsList[i]}]($Raw)|$Name|$Entry|" diff --git a/update_task.sh b/update_task.sh index ed308780..a476694c 100644 --- a/update_task.sh +++ b/update_task.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -## Author: https://github.com/EvineDeng -## Modified: 2021-02-23 -## Version: v1.0.2 +## Author: https://github.com/nevinee +## Modified: 2021-03-18 +## Version: v1.0.3 ## 路径与清单 WorkDir=$(cd $(dirname $0); pwd) @@ -17,11 +17,9 @@ FileSurge=$WorkDir/Surge/lxk0301_Task.sgmodule.sgmodule CommentsLoon="# IOS Loon Task&Cookies配置 By LXK9301\n# GitHub主页(https://gitee.com/lxk0301/jd_scripts/tree/master)\n# TG讨论组 (https://t.me/JD_fruit_pet)\n# TG通知频道 (https://t.me/jdfruit)\n# Loon的Task&Cookies脚本订阅链接: https://gitee.com/lxk0301/jd_scripts/raw/master/Loon/lxk0301_LoonTask.conf\n# 使用方法:打开APP,顶部的配置 -> 脚本 -> 订阅脚本- > 点击右上角+号 -> 添加url链接 (https://gitee.com/lxk0301/jd_scripts/raw/master/Loon/lxk0301_LoonTask.conf)\n\nhostname = me-api.jd.com, draw.jdfcloud.com, jdjoy.jd.com, account.huami.com" CommentsQx='{\n "name": "LXK9301 task gallery",\n "description": "https://gitee.com/lxk0301/jd_scripts/tree/master",\n "task": [' CommentsQxRe="hostname = draw.jdfcloud.com, jdjoy.jd.com, account.huami.com, me-api.jd.com" - CommentsSurgeHead="#!name=LXK9301 iOS Tasks&Cookies Module\n#!desc=iOS Tasks&Cookies 模块配置\n\n# Task&Cookies模块配置 By LXK9301\n# GitHub主页(https://gitee.com/lxk0301/jd_scripts/tree/master)\n# TG讨论组 (https://t.me/JD_fruit_pet)\n# TG通知频道 (https://t.me/jdfruit)\n# Surge的Task&Cookies脚本模块地址: https://gitee.com/lxk0301/jd_scripts/raw/master/Surge/lxk0301_Task.sgmodule.sgmodule\n\n[Script]" CommentsSurgeTail="\n[MITM]\nhostname = %APPEND% me-api.jd.com, draw.jdfcloud.com, jdjoy.jd.com, account.huami.com" - ## 执行写入 cd $WorkDir echo -e $CommentsLoon > $FileLoon @@ -30,7 +28,7 @@ echo -e $CommentsQxRe > $FileQxRe echo -e $CommentsSurgeHead > $FileSurge for file in $JsList do - TaskName=$(grep "new Env" $file | awk -F "'|\"" '{print $2}') + TaskName=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1) if [[ -n $TaskName ]]; then echo -e "\n# $TaskName" >> $FileLoon grep -E "cron.+script-path.+https://gitee\.com.+tag" $file >> $FileLoon