From 26bdfc96270f97883e11c36586c37eccd75c2f73 Mon Sep 17 00:00:00 2001 From: Leon Date: Sat, 31 Jul 2021 19:53:04 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A5=A7Many?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Conf/Qinglong/config.sample.sh | 20 +++++++++++++-- Conf/Readme.md | 47 ++++++++++++++++++++++++++++++++++ INS/JD/qinglong/Readme.md | 6 ++--- Tasks/qlrepo/Readme.md | 22 +++++++++------- Tasks/qlrepo/extra.sh | 23 +++++++++-------- 5 files changed, 94 insertions(+), 24 deletions(-) diff --git a/Conf/Qinglong/config.sample.sh b/Conf/Qinglong/config.sample.sh index a99ac39..6dfb23c 100644 --- a/Conf/Qinglong/config.sample.sh +++ b/Conf/Qinglong/config.sample.sh @@ -1,6 +1,6 @@ ## Version: v2.8.0 ## Date: 2021-06-20 -## Mod: Build20210729-001 +## Mod: Build20210731-001 ## Update Content: 可持续发展纲要\n1. session管理破坏性修改\n2. 配置管理可编辑config下文件\n3. 自定义脚本改为查看脚本\n4. 移除互助相关 ## 上面版本号中，如果第2位数字有变化，那么代表增加了新的参数，如果只有第3位数字有变化，仅代表更新了注释，没有增加新的参数，可更新可不更新 @@ -493,4 +493,20 @@ export validate_num="" ##你需要的数值 # Aaron-lv 环境变量 ## 1、京东健康社区京豆兑换 -export JD_HEALTH_REWARD_NAME="20" ##只能兑换京豆，填写纯数字20 10 5 3 \ No newline at end of file +export JD_HEALTH_REWARD_NAME="20" ##只能兑换京豆，填写纯数字20 10 5 3 + +# Ninja 环境变量 +## 1、通知黑名单 +### 使用 & 分隔，例如 东东乐园&东东萌宠 +export NOTIFY_SKIP_LIST="" + +# 不知名大佬 环境变量 +## 1、清空购物车 +### 将需要跳过清理的账号(cookie中的pt_pin)放到变量CleanUsers中，多个用@隔开 +export CleanUsers="" + +# Tsukasa007 环境变量 +## 1、定格夺冠 +### 一天只能领400豆1个ck20豆，不设置变量默认只会运行到ck21 +### 填写11就是跑到11个ck就停止，填写21就是跑到21个ck就停止，如果没豆那就改变量，ck多每天改一次收益最大化 +export Jd_opencard_championship="" diff --git a/Conf/Readme.md b/Conf/Readme.md index eb7bb06..179f732 100644 --- a/Conf/Readme.md +++ b/Conf/Readme.md @@ -637,6 +637,53 @@ export JD_HEALTH_REWARD_NAME="20" ##只能兑换京豆，填写纯数字20 10 5 ``` +# Ninja 环境变量 + +## 青龙内设置 +``` +## 1、通知黑名单 +### 使用 & 分隔，例如 东东乐园&东东萌宠 +export NOTIFY_SKIP_LIST="" +``` + +## .env 设置 +``` +# 是否允许添加账号 不允许添加时则只允许已有账号登录 +ALLOW_ADD=true + +#允许添加账号的最大数量 +ALLOW_NUM=40 + +# Ninja 运行端口 +NINJA_PORT=5701 + +# Ninja 是否发送通知 +NINJA_NOTIFY=true + +# user-agent +# NINJA_UA="" +``` + + +# 不知名大佬 环境变量 + +``` +## 1、清空购物车 +### 将需要跳过清理的账号(cookie中的pt_pin)放到变量CleanUsers中，多个用@隔开 +export CleanUsers="" +``` + + +# Tsukasa007 环境变量 + +``` +## 1、定格夺冠 +### 一天只能领400豆1个ck20豆，不设置变量默认只会运行到ck21 +### 填写11就是跑到11个ck就停止，填写21就是跑到21个ck就停止，如果没豆那就改变量，ck多每天改一次收益最大化 +export Jd_opencard_championship="" +``` + + ## 通知环境变量 ``` diff --git a/INS/JD/qinglong/Readme.md b/INS/JD/qinglong/Readme.md index 839927b..bf2edbd 100644 --- a/INS/JD/qinglong/Readme.md +++ b/INS/JD/qinglong/Readme.md @@ -23,10 +23,10 @@ docker pull whyour/qinglong:latest docker run -dit \ -v $PWD/ql/config:/ql/config \ -v $PWD/ql/db:/ql/db \ + -v $PWD/ql/log:/ql/log \ -v $PWD/ql/repo:/ql/repo \ -v $PWD/ql/raw:/ql/raw \ -v $PWD/ql/scripts:/ql/scripts \ - -v $PWD/ql/log:/ql/log \ -v $PWD/ql/jbot:/ql/jbot \ -p 5700:5700 \ -e ENABLE_HANGUP=true \ @@ -44,10 +44,10 @@ docker run -dit \ docker run -dit \ -v $PWD/ql/config:/ql/config \ -v $PWD/ql/db:/ql/db \ + -v $PWD/ql/log:/ql/log \ -v $PWD/ql/repo:/ql/repo \ -v $PWD/ql/raw:/ql/raw \ -v $PWD/ql/scripts:/ql/scripts \ - -v $PWD/ql/log:/ql/log \ -v $PWD/ql/jbot:/ql/jbot \ -e ENABLE_HANGUP=true \ -e ENABLE_TG_BOT=true \ @@ -72,10 +72,10 @@ docker run -dit \ --mac-address C2:F2:9C:C5:B1:01 \ -v $PWD/ql/config:/ql/config \ -v $PWD/ql/db:/ql/db \ + -v $PWD/ql/log:/ql/log \ -v $PWD/ql/repo:/ql/repo \ -v $PWD/ql/raw:/ql/raw \ -v $PWD/ql/scripts:/ql/scripts \ - -v $PWD/ql/log:/ql/log \ -v $PWD/ql/jbot:/ql/jbot \ -e ENABLE_HANGUP=true \ -e ENABLE_TG_BOT=true \ diff --git a/Tasks/qlrepo/Readme.md b/Tasks/qlrepo/Readme.md index 8568ba5..6e2ad35 100644 --- a/Tasks/qlrepo/Readme.md +++ b/Tasks/qlrepo/Readme.md @@ -19,11 +19,11 @@ ql raw ``` 2. `he1pu`（自动提交助力码-京喜工厂、种豆得豆、东东工厂、东东农场、健康社区、京喜财富岛、东东萌宠、闪购盲盒，随机从数据库中选取助力码互助） ``` - ql repo https://github.com/he1pu/JDHelp.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|update" "^jd[^_]|USER|utils|^MovementFaker|^JDJRValidator|^sign|^ZooFaker" + ql repo https://github.com/he1pu/JDHelp.git "jd_|jx_|getJDCookie" "Coupon|update" "^jd[^_]|USER|^sign|^ZooFaker|utils" ``` 3. `shufflewzc` ``` - ql repo https://github.com/shufflewzc/faker2.git "jd_|jx_|gua_|jddj_|getJDCookie" "activity|backUp|update" "^jd[^_]|USER|^ZooFaker|^JDJRValidator|^sign" + ql repo https://github.com/shufflewzc/faker2.git "jd_|jx_|gua_|jddj_|getJDCookie" "activity|backUp" "^jd[^_]|USER|^JS|^TS|^JDJRValidator_Pure|^ZooFaker|^sign" ``` 4. `Aaron-lv` ``` @@ -48,11 +48,11 @@ ql repo https://github.com/curtinlv/JD-Script.git "jd_" ``` - `smiek2221` ``` -ql repo https://github.com/smiek2221/scripts.git "jd_|gua_" "" "^ZooFaker|^JDJRValidator|^sign" +ql repo https://github.com/smiek2221/scripts.git "jd_|gua_" "" "^MovementFaker|^JDJRValidator|^ZooFaker|^sign" ``` - `cdle` ``` -ql repo https://github.com/cdle/jd_study.git "jd_" "expired" +ql repo https://github.com/cdle/jd_study.git "jd_" "disposable|expired|jdc" ``` - `ZCY01` ``` @@ -76,11 +76,7 @@ ql repo https://github.com/photonmang/quantumultX.git "JDscripts" ``` - `jiulan` ``` -ql repo https://github.com/jiulan/platypus.git -``` -- `panghu999/panghu` -``` -ql repo https://github.com/panghu999/panghu.git "jd_" +ql repo https://github.com/jiulan/platypus.git "jd_|jx_" "" "overdue" "main" ``` - `star261` ``` @@ -90,6 +86,10 @@ ql repo https://github.com/star261/jd.git "jd_|star" "" "code" "main" ``` ql repo https://github.com/Wenmoux/scripts.git "other|jd" "" "" "wen" ``` +- `Tsukasa007` +``` +ql repo https://github.com/Tsukasa007/my_script.git "jd_|jx_" "jdCookie|USER_AGENTS|sendNotify|backup" "" "master" +``` ## 单脚本 ### 名称之后标注`﹢`的单脚本，若上面已拉取仓库的可以不拉，否则会重复拉取。这里适用于只拉取部分脚本使用 @@ -162,3 +162,7 @@ ql repo https://github.com/zooPanda/zoo.git "zoo" ``` ql repo https://github.com/longzhuzhu/nianyu.git "qx" ``` +- `panghu999/panghu` +``` +ql repo https://github.com/panghu999/panghu.git "jd_" +``` diff --git a/Tasks/qlrepo/extra.sh b/Tasks/qlrepo/extra.sh index a07e234..2249850 100644 --- a/Tasks/qlrepo/extra.sh +++ b/Tasks/qlrepo/extra.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -## Mod: Build20210731V3 +## Mod: Build20210731V4 ## 添加你需要重启自动执行的任意命令，比如 ql repo ## 安装node依赖使用 pnpm install -g xxx xxx（Build 20210728-002 及以上版本的 code.sh，可忽略） ## 安装python依赖使用 pip3 install xxx（Build 20210728-002 及以上版本的 code.sh，可忽略） @@ -15,7 +15,7 @@ ### （2）若需要在此处使用，请在设置区设置 ## 3. Ninja ### （1）默认不启动和更新 -### （2）若需要启动和更新，则令 Ninja=up。此情况下未运行成功将强制重装 +### （2）若需要启动和更新，则令 Ninja="up"，此情况下未运行成功将强制重装 ### （3）⚠未修改容器映射的请勿修改，否则会出现青龙打不开或者设备死机等不良后果，映射参考 https://github.com/MoonBegonia/ninja#%E5%AE%B9%E5%99%A8%E5%86%85 @@ -37,7 +37,7 @@ Ninja="down" ##up为运行，down为不运行，谨慎修改 3-he1pu 4-shufflewzc 6-Aaron-lv -7-Tsukasa007 +7-yuannian1112 二、其他仓库（Other Repositories） 1-passerby-b 2-curtinlv @@ -49,9 +49,9 @@ Ninja="down" ##up为运行，down为不运行，谨慎修改 8-Ariszy (Zhiyi-N) 9-photonmang 10-jiulan -11-panghu999/panghu 12-star261 13-Wenmoux +14-Tsukasa007 EOF @@ -61,16 +61,16 @@ CR2(){ ql repo https://github.com/JDHelloWorld/jd_scripts.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|enen|update|test" "^jd[^_]|USER|^TS|utils|notify|env|package|ken.js" } CR3(){ - ql repo https://github.com/he1pu/JDHelp.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|update" "^jd[^_]|USER|utils|^MovementFaker|^JDJRValidator|^sign|^ZooFaker" + ql repo https://github.com/he1pu/JDHelp.git "jd_|jx_|getJDCookie" "Coupon|update" "^jd[^_]|USER|^sign|^ZooFaker|utils" } CR4(){ - ql repo https://github.com/shufflewzc/faker2.git "jd_|jx_|gua_|jddj_|getJDCookie" "activity|backUp|update" "^jd[^_]|USER|^ZooFaker|^JDJRValidator|^sign" + ql repo https://github.com/shufflewzc/faker2.git "jd_|jx_|gua_|jddj_|getJDCookie" "activity|backUp|Coupon|update" "^jd[^_]|USER|^JS|^TS|^JDJRValidator_Pure|^ZooFaker|^sign" } CR6(){ ql repo https://github.com/Aaron-lv/sync.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon" "^jd[^_]|USER|utils" "jd_scripts" } CR7(){ - ql repo https://github.com/Tsukasa007/my_script.git "" "jdCookie|USER_AGENTS|sendNotify|backup" "" "master" + ql repo https://github.com/yuannian1112/jd_scripts.git "jd_|jx_|getJDCookie" "activity|backUp" "^jd[^_]|USER|utils" } for i in ${CollectedRepo[@]}; do CR$i @@ -83,10 +83,10 @@ OR2(){ ql repo https://github.com/curtinlv/JD-Script.git "jd_" } OR3(){ - ql repo https://github.com/smiek2221/scripts.git "jd_|gua_" "" "^ZooFaker|^JDJRValidator|^sign" + ql repo https://github.com/smiek2221/scripts.git "jd_|gua_" "" "^MovementFaker|^JDJRValidator|^ZooFaker|^sign" } OR4(){ - ql repo https://github.com/cdle/jd_study.git "jd_" "expired" + ql repo https://github.com/cdle/jd_study.git "jd_" "disposable|expired|jdc" } OR5(){ ql repo https://github.com/ZCY01/daily_scripts.git "jd_" @@ -104,7 +104,7 @@ OR9(){ ql repo https://github.com/photonmang/quantumultX.git "JDscripts" } OR10(){ - ql repo https://github.com/jiulan/platypus.git "jd_|jx_" "" "" "main" + ql repo https://github.com/jiulan/platypus.git "jd_|jx_" "" "overdue" "main" } OR11(){ ql repo https://github.com/panghu999/panghu.git "jd_" @@ -115,6 +115,9 @@ OR12(){ OR13(){ ql repo https://github.com/Wenmoux/scripts.git "other|jd" "" "" "wen" } +OR14(){ + ql repo https://github.com/Tsukasa007/my_script.git "jd_|jx_" "jdCookie|USER_AGENTS|sendNotify|backup" "" "master" +} for i in ${OtherRepo[@]}; do OR$i done