From fcdf7653d287b4c066c89e14b90ac095305f5e20 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 12 Jul 2021 17:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=ACUpdate=207.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Conf/Qinglong/config.sample.sh | 2 +- Scripts/sh/Helpcode2.8/Doc.txt | 38 ++- Scripts/sh/Helpcode2.8/Updatelog.txt | 18 ++ Scripts/sh/Helpcode2.8/Usage.txt | 119 ++++---- Scripts/sh/Helpcode2.8/code.sh | 352 +++++++++++++----------- Scripts/sh/Helpcode2.8/config_sample.sh | 53 +++- Scripts/sh/Helpcode2.8/task_before.sh | 20 +- Tasks/qlrepo/extra.sh | 9 +- 8 files changed, 369 insertions(+), 242 deletions(-) diff --git a/Conf/Qinglong/config.sample.sh b/Conf/Qinglong/config.sample.sh index 6ee9dc2..adaee7d 100644 --- a/Conf/Qinglong/config.sample.sh +++ b/Conf/Qinglong/config.sample.sh @@ -18,7 +18,7 @@ RepoFileExtensions="js py ts" GithubProxyUrl="" ## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天 -CommandTimeoutTime="1h" +CommandTimeoutTime="3h" ## 设置批量执行任务时的并发数，默认同时执行5个任务 MaxConcurrentNum="20" diff --git a/Scripts/sh/Helpcode2.8/Doc.txt b/Scripts/sh/Helpcode2.8/Doc.txt index e512ccc..07226e5 100644 --- a/Scripts/sh/Helpcode2.8/Doc.txt +++ b/Scripts/sh/Helpcode2.8/Doc.txt @@ -1,20 +1,48 @@ -[ ļ : code.sh ] -2021.7.7.002 -1task_before.shϴεʾעͷ# +[ : code.sh ] +2021.7.11.003 +1ijЩģʽķΧ BUG (л @tianliu Է) +2ÿǰǿֹһ code.sh ̡ + +2021.7.11.002 +1޸curtinlvжһű cookies IJԭ򣺸û config.sh Ч + +2021.7.11.001 +1Ľ»ͻĴ롣ʱ˺ʱ˺ſǰλԶ޳ task_before.sh жĻͻ + +2021.7.10.001 +1Ľģʽ pt_pin ûУ飬ӦʱʺŽʱģʽŴ⡣⣬־ֱģʽĻ +2޸ȫһģĴ +3ʽûĽΪʽû COOKIES V4 ; +4ĽԶòֿű־÷űʹ÷ +5ɾָǰ task_before ļĹܣ +6ڳڹ۲죬Ĭ߳̿µ 7 ߳ +עڵǰڽűܲBUGԽ鶨ʱͳһij bash /ql/config/code.sh &⻥ 2021.7.7.001 1ָʹָģ幦ܡ 2ÿֻģ־ 3Ӹд task_before.shʾϴɸ»ͻʱ䡣 -[ ļ : task_before.sh ] +[ : task_before.sh ] 2021.7.3 1 config.sh ģʱij COOKIES μijʵӦܡ 2021.7.2 1˾ϲũ Token ԭʼģ塣ھϲƸ֡ -[ ļ : config_sample.sh ] +[ : config_sample.sh ] +2021.7.11.005 +1 cdle "ǩֽһ"(Զ룬ĬΪ2Ԫֽ𣬿Ըijɶ10Ԫֽ) + +2021.7.11.004 +1 cdle "ȫ˶"(ֶץ) + +2021.7.11.003 +1 cdle "ŭĽ"(Զ룬д) + +2021.7.11.002 +1 curtinlvжһű cookies IJԭ򣺸û config.sh Ч + 2021.7.7.001 1Curtinlvע͡ diff --git a/Scripts/sh/Helpcode2.8/Updatelog.txt b/Scripts/sh/Helpcode2.8/Updatelog.txt index 1f054de..14e7241 100644 --- a/Scripts/sh/Helpcode2.8/Updatelog.txt +++ b/Scripts/sh/Helpcode2.8/Updatelog.txt @@ -1,5 +1,23 @@ ־ +2021.7.11.003 +1ijЩģʽķΧ BUG (л @tianliu Է) +2ÿǰǿֹһ code.sh ̡ + +2021.7.11.002 +1޸curtinlvжһű cookies IJԭ򣺸û config.sh Ч + +2021.7.11.001 +1Ľ»ͻĴ롣ʱ˺ʱ˺ſǰλԶ޳ task_before.sh жĻͻ + +2021.7.10.001 +1Ľģʽ pt_pin ûУ飬ӦʱʺŽʱģʽŴ⡣⣬־ֱģʽĻ +2޸ȫһģĴ +3ʽûĽΪʽû COOKIES V4 ; +4ĽԶòֿű־÷űʹ÷ +5ɾָǰ task_before ļĹܡ +עڵǰڽűܲBUGԽ鶨ʱͳһij bash /ql/config/code.sh &⻥ + 2021.7.7.002 1task_before.shϴεʾעͷ# diff --git a/Scripts/sh/Helpcode2.8/Usage.txt b/Scripts/sh/Helpcode2.8/Usage.txt index a29e6bd..2999434 100644 --- a/Scripts/sh/Helpcode2.8/Usage.txt +++ b/Scripts/sh/Helpcode2.8/Usage.txt @@ -1,93 +1,98 @@ ʹ÷ -code.sh ǻ 2.2.0 code.sh ޸Ķֻ֧ 2.8.0 ϡֻ֧ģ޸ģֻ֧ʾȡ +code.sh ǻ 2.2.0 code.sh ޸Ķ֧ 2.8.0 ϡҪܰʽͻ򣬲Զд task_before.sh ļеĻͻ򣻢ֻ֧ģ޸ģָ֧ָģ壻֧ʱij˺ű(Щ˺Կ˺)֧ COOKIES ʽ֧Զݾɵ task_before.sh ɾڵı(Զʱ) + Ҫԭ -a) code.shз׶Σ -1һ׶ΣӸű־룬 COOKIES УԺѡĻģ壬ɶӦĻĻͻ code.sh ־·/ql/log/code/ +a) code.sh Ҫ׶Σ +1һ׶ΣӸű־룬 COOKIES pt_pin (û)УѡĻģ壬ɶӦĻĻͻ code.sh ־־· /ql/log/code/ +2ڶ׶Σȡ code.sh ־ task_before.sh Уÿһͻݣݲһ£Զд task_before.sh Ļͻ򡣵 code.sh ־лǿֵ undefined ǿֵʱд task_before.sh ӦĻͻ -2ڶ׶Σȡ code.sh ־ task_before.sh Уÿһͻݣݲһ£Զд task_before.sh Ļ򡣵 code.sh ־лǿֵ undefined ǿֵʱд task_before.sh ӦĻͻ - -b) ЩűĻ벻ȫ10˺ţĿǰһ룬־ֻ5ô code.sh Ҳֻ5л룬5ֵ - code.sh 治Ὣ־лͻĿֵ undefined дtask_before.sh code.sh ܵôԽ࣬task_before.sh ĻͻԽ +b) Щ»űĻ벻ȫ磺 10 ˺ţĿǰűֻһ룬־ֻ 5 ô code.sh Ҳֻ 5 л룬5 ֵ + code.sh 治Ὣ־лͻĿֵ undefined д task_before.sh code.sh ܵôԽ࣬task_before.sh ĻͻԽ һ廥Զ¼񡣿Զȡµĸʽ־Զ task_before.sh еĻ롣 1 code.sh ׵ task_before.sh ű·/ql/config/ǰѽ·ӳ򿽱Ӧ·ɣ -ע code.sh ṩ task_before.sh ģʹáʹļ³ֻύʧܵ⣬Ҽ֡ +ע code.sh ṩ task_before.sh ģʹáʹļ³ֻύʧܵ⣬Ҽ֡ 2ʽ»Ķʱ ƣʽ» -bash /ql/config/code.sh +bash /ql/config/code.sh & ʱ10 * * * * -עǧҪ task /ql/config/code.shֱҿܵ»ͻд벻 +עǧҪ task /ql/config/code.shֱҿܵ»ͻд벻Ŀǰ"ֶ;޷" BUGʵĩβ" &"()ʱԹܸ BUG -3Ҫȡű־ܸʽĻ뼰ĿǰֿĽű־ȡȼ˳Ϊ -2ʽ»Ķʱ -ƣʽ» -bash /ql/config/code.sh -ʱ10 * * * * -עǧҪ task /ql/config/code.shֱҿܵ»ͻд벻 - -3Ҫȡű־ܸʽĻ뼰ĿǰֿĽű־ȡȼ˳Ϊ -a)ʣֻά lxk0301 ֿ⣺ -ƣʣֻά lxk0301 ֿ -ql repo https://github.com/panghu999/jd_scripts.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|jd_try|format_" "^jd[^_]|USER" -ʱ1 1-23/4 * * * - -b)JDHelloWorld ά lxk0301 ֿ⣺ -ƣJDHelloWorld ά lxk0301 ֿ -ql repo https://github.com/JDHelloWorld/jd_scripts.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|enen" "^jd[^_]|USER" -ʱ2 1-23/4 * * * - -c)lxk0301 ֿ(ֹͣάʹ) -ƣlxk0301 ֿ -ql repo https://github.com/chinnkarahoi/jd_scripts.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon" "^jd[^_]|USER" -ʱ3 1-23/4 * * * +3Ҫȡű־ܸʽĻ뼰򡣶ӦIJֿȡö"XXXXXXXXXX:XXάIJֿ" +## ԤIJֿ⼰Ĭϵòֿ +## "repo=$repo1"ijrepo=$repo2"Ĭϵֿű־ +## Ҳűڵ"name_js=(""name_js_only","repo"ij"repo2"ϵòֿĽű־ +repo1='panghu999_jd_scripts' #Ԥ panghu999 ֿ +repo2='JDHelloWorld_jd_scripts' #Ԥ JDHelloWorld ֿ +repo3='he1pu_JDHelp' #Ԥ he1pu ֿ +repo4='shufflewzc_faker2' #Ԥ shufflewzc ֿ +repo=$repo1 #Ĭϵ panghu999 ֿű־ 4ϲũ Token ķ a) ǰ᣺µ task_before.sh ģ壬ϲƸ޷ȡ token b) 裺һ code.shٸ־ʾȲֿ⣬һξϲƸűһ code.sh +עb) code.sh ʱϾϲƸԶҪע⣺ٴϲƸĶʱȽϳʱҲܳԶҪȵ賿ǰŻ token ռ롣config.sh ĬϵĶʱʱʱΪ 1h ʺűȽ϶࣬1h ϲƸ꣬ôͻᵼ token ʼռ롣Ҹ˰ѳʱʱó 3hCommandTimeoutTime="3h" c⣺ 1) task_before.sh Token ǿֵ -𣺱һȲֿľϲƸű code.sh Token ܻ޷дд벻 +𣺱 code.sh "ϲƸĽűʽϲtoken"ܽһȲֿľϲƸű code.sh Token ܻ޷дд벻 2) task_before.sh Token дǾϲƸֻǶȡ Token 𣺢ȷ task_before.sh °棬Աȶļöģĵ Build š - ھϲƸ conc JD_COOKIE ̣߳ᵼ Token ȡ쳣 + ھϲƸ conc JD_COOKIE ̣߳ᵼ Token ȡ쳣 ԶIJã 1Զ廥ģ嶨 -code.sh ĬϻΪȻģ塱ԼעͲ޸ģ壻 ## jcode űĻģʽѡ -## ʹá˳ģ塱Cookieǰ -## 0 ʹáȫһģ塱˻Ҫȫһ -## 1 ʹáȻģ塱˻һ -## 2 ʹá˳ģ塱׽ű˺ż˳ÿɵ˳򶼲һ¡ +## ʹá˳ģ塱Cookieǰ +## 0 ʹáȫһ»ģ塱˻Ҫȫһ +## 1 ʹáȻụģ塱˻һ +## 2 ʹá˳ģ塱׽ű˺ż˳ÿɵ˳򶼲һ¡ HelpType="1" +## ָָĻģ塣 +## 趨ֵΪ DiyHelpType="1" ʾùܣݱʾܡ +## ֻҪijִijֻ򣬿Բο case +## Ʋμ name_config ݣڱű name_config=( Ϥ +DiyHelpType="0" +diy_help_rules(){ + case $1 in + Fruit) + tmp_helptype="0" # ũʹáȫһ»ģ塱˻Ҫȫһ + ;; + DreamFactory | JdFactory) + tmp_helptype="1" # ϲͶʹáȻụģ塱˻һ + ;; + Jdzz | Joy) + tmp_helptype="2" # ׬׬ͷJoyʹá˳ģ塱׽ű˺ż˳ÿɵ˳򶼲һ¡ + ;; + *) + tmp_helptype=$HelpType # ԰Ĭϻģ + ;; + esac +} + 2ԶǷ޸ļ ## ǷԶļеĻͻĬΪ1ʾ£ջֵʾ¡ UpdateType="1" -3ֿԶ -ű߶£ -repo1='panghu999' -repo2='JDHelloWorld' -repo3='chinnkarahoi' -ҪϽűģ name_js ڽűǰ׺"repo"滻ָ"repo1" "repo2""repo3" -עеĽű־Ļı򲢲ͳһֻ߲롣ݲ֧еɶ塣㷢ֲֿ֧⣬뼰ʱϵ +3Զ task_before.sh ɾָǰıļ +## ļأĬ1ʾΪ0ʾرա· /ql/config/bak/ +BACKUP="1" +## ǷɾָǰıļأĬ1ʾΪ0ʾرաɾ· /ql/config/bak/ +CLEANBAK="1" +## ɾָǰıļ +CLEANBAK_DAYS="2" -4Զ task_before.sh ļأĬ1ʾΪ0ʾرա· /ql/config/bak/ -BAKUP="1"; +4֧Զָij˺Ųμij(ö config_sample.sh task_before.sh ģʹ) -5Զָ˻ӰЩʺʺš code.sh ݣ +5Զָ˻ӰЩʺʺš code.sh ݣ -6Ѽ⵽ code.shУ˵code.sh̹߳࣬ǿУܻᵼ»͹д쳣ǵһԡҪǿУ£ - -ǿз +6Ѽ⵽ code.shУ˵ code.sh ̹߳࣬ǿУܻᵼ»͹д쳣ǵһԡҪǿУ£ ޸config.sh DEBUG="1" -־߳9 +־߳ 9 -code.sh -$(ps | grep code.sh | grep -v grep | wc -l)" -gt 7 - -7ij9Ȼcode.shУôΪһơ \ No newline at end of file + code.sh +"$ps_num" -le 7 "$ps_num" -gt 7 + 7 ij 9Ȼ code.sh ͿˣôΪһơ \ No newline at end of file diff --git a/Scripts/sh/Helpcode2.8/code.sh b/Scripts/sh/Helpcode2.8/code.sh index 3a8ffcb..57ceba8 100644 --- a/Scripts/sh/Helpcode2.8/code.sh +++ b/Scripts/sh/Helpcode2.8/code.sh @@ -1,30 +1,29 @@ #!/usr/bin/env bash -#Build 20210707-002 +#Build 20210711-003 ## 导入通用变量与函数 dir_shell=/ql/shell . $dir_shell/share.sh -## 判断仓库类别及日志存在与否 -repo1='panghu999' -repo2='JDHelloWorld' -repo3='chinnkarahoi' -if [ "$(ls $dir_log |grep panghu999_jd_scripts | wc -l)" -gt 0 ]; then - repo=$repo1 -elif [ "$(ls $dir_log |grep JDHelloWorld | wc -l)" -gt 0 ]; then - repo=$repo2 -elif [ "$(ls $dir_log |grep chinnkarahoi | wc -l)" -gt 0 ]; then - repo=$repo3 -else - repo='' -fi +## 预设的仓库及默认调用仓库设置 +## 将"repo=$repo1"改成repo=$repo2"或其他，以默认调用其他仓库脚本日志 +## 也可自行搜索本脚本内的"name_js=("和"name_js_only",将"repo"改成"repo2"或其他，用以自由组合调用仓库的脚本日志 +repo1='panghu999_jd_scripts' #预设的 panghu999 仓库 +repo2='JDHelloWorld_jd_scripts' #预设的 JDHelloWorld 仓库 +repo3='he1pu_JDHelp' #预设的 he1pu 仓库 +repo4='shufflewzc_faker2' #预设的 shufflewzc 仓库 +repo=$repo1 #默认调用 panghu999 仓库脚本日志 ## 调试模式开关，默认是0，表示关闭；设置为1，表示开启 DEBUG="1" ## 备份配置文件开关，默认是1，表示开启；设置为0，表示关闭。备份路径 /ql/config/bak/ -BAKUP="1" +BACKUP="1" +## 是否删除指定天数以前的备份文件开关，默认是1，表示开启；设置为0，表示关闭。删除路径 /ql/config/bak/ +CLEANBAK="1" +## 定义删除指定天数以前的备份文件 +CLEANBAK_DAYS="2" ## 定义 jcode 脚本导出的互助码模板样式（选填） ## 不填 使用“按编号顺序互助模板”，Cookie编号在前的优先助力 @@ -38,7 +37,7 @@ HelpType="1" ## 如果只是想要控制某个活动以执行某种互助规则，可以参考下面 case 这个命令的例子来控制 ## 活动名称参见 name_config 定义内容；具体可在本脚本中搜索 name_config=( 获悉 DiyHelpType="0" -testcode(){ +diy_help_rules(){ case $1 in Fruit) tmp_helptype="0" # 东东农场使用“全部一致互助模板”，所有账户要助力的码全部一致 @@ -59,9 +58,9 @@ testcode(){ ## 设定值为 BreakHelpType="1" 表示启用屏蔽模式；不填或填其他内容表示不开启功能。 ## 自定义屏蔽账号序号或序号区间。当 BreakHelpType="1"时生效。 ## 设定值为一个或多个不相同正整数，每个正整数不大于账号总数；也可以设置正整数区间，最大正整数不大于账号总数； -## 如：a) 设定为 BreakHelpNum="3" 表示从第 3 个账号不被助力； -## b) 设定为 BreakHelpNum="5 7 8 10" 表示从第 5 7 8 10 个账号均不被助力； -## c) 设定为 BreakHelpNum="6-12" 表示从第 6 个账号到第 12 个账号均不被助力； +## 如：a) 设定为 BreakHelpNum="3" 表示第 3 个账号不被助力； +## b) 设定为 BreakHelpNum="5 7 8 10" 表示第 5 7 8 10 个账号均不被助力； +## c) 设定为 BreakHelpNum="6-12" 表示从第 6 至 12 个账号均不被助力； ## d) 设定为 BreakHelpNum="4 9-14 15~18 19_21" 表示第4个账号、第9至14账号、第15至18账号、第19至21账号均不被助力。注意序号区间连接符仅支持 - ~ _； ## 不按示例填写可能引发报错。 BreakHelpType="0" ## 屏蔽模式 @@ -111,21 +110,21 @@ var_name=( ## 所有有互助码的活动，把脚本名称列在 name_js 中，对应 config.sh 中互助码后缀列在 name_config 中，中文名称列在 name_chinese 中。 ## name_js、name_config 和 name_chinese 中的三个名称必须一一对应。 name_js=( - "$repo"_jd_scripts_jd_fruit - "$repo"_jd_scripts_jd_pet - "$repo"_jd_scripts_jd_plantBean - "$repo"_jd_scripts_jd_dreamFactory - "$repo"_jd_scripts_jd_jdfactory - "$repo"_jd_scripts_jd_crazy_joy - "$repo"_jd_scripts_jd_jdzz - "$repo"_jd_scripts_jd_jxnc - "$repo"_jd_scripts_jd_bookshop - "$repo"_jd_scripts_jd_cash - "$repo"_jd_scripts_jd_sgmh - "$repo"_jd_scripts_jd_cfd - "$repo"_jd_scripts_jd_health - "$repo"_jd_scripts_jd_carnivalcity - "$repo"_jd_scripts_jd_city + "$repo"_jd_fruit + "$repo"_jd_pet + "$repo"_jd_plantBean + "$repo"_jd_dreamFactory + "$repo"_jd_jdfactory + "$repo"_jd_crazy_joy + "$repo"_jd_jdzz + "$repo"_jd_jxnc + "$repo"_jd_bookshop + "$repo"_jd_cash + "$repo"_jd_sgmh + "$repo"_jd_cfd + "$repo"_jd_health + "$repo"_jd_carnivalcity + "$repo"_jd_city ) name_config=( @@ -166,7 +165,7 @@ name_chinese=( #仅输出互助码的环境变量 name_js_only=( - "$repo"_jd_scripts_jd_cfd + "$repo"_jd_cfd ) name_config_only=( @@ -196,7 +195,10 @@ export_codes_sub() { local config_name_my=My$config_name local config_name_for_other=ForOther$config_name local tmp_helptype=$HelpType - local i j k m n pt_pin_in_log code tmp_grep tmp_my_code tmp_for_other user_num random_num_list + local BreakHelpInterval=$(echo $BreakHelpNum | perl -pe "{s|~|-|; s|_|-|}" | sed 's/\(\d\+\)-\(\d\+\)/{\1..\2}/g') + local BreakHelpNumArray=($(eval echo $BreakHelpInterval)) + local BreakHelpNumVerify=$(echo $BreakHelpNum | sed 's/ //g' | perl -pe "{s|-||; s|~||; s|_||}" | sed 's/^\d\+$//g') + local i j k m n t pt_pin_in_log code tmp_grep tmp_my_code tmp_for_other user_num random_num_list local envs=$(eval echo "\$JD_COOKIE") local array=($(echo $envs | sed 's/&/ /g')) local user_sum=${#array[*]} @@ -231,7 +233,7 @@ export_codes_sub() { ## 输出ForOther系列变量 if [[ ${#code[*]} -gt 0 ]]; then - [[ $DiyHelpType = "1" ]] && testcode $2 + [[ $DiyHelpType = "1" ]] && diy_help_rules $2 case $tmp_helptype in 0) ## 全部一致 HelpTemp="全部一致" @@ -239,12 +241,24 @@ export_codes_sub() { tmp_for_other="" for ((m = 0; m < ${#pt_pin[*]}; m++)); do j=$((m + 1)) - tmp_for_other="$tmp_for_other@\${$config_name_my$j}" + if [ $BreakHelpType = 1 ]; then + if [ "$BreakHelpNumVerify" = "" ]; then + for ((t = 0; t < ${#BreakHelpNumArray[*]}; t++)); do + [[ "${BreakHelpNumArray[t]}" = "$j" ]] && continue 2 + done + tmp_for_other="$tmp_for_other@\${$config_name_my$j}" + else + echo -e "\n#$cur_time 变量值填写不规范，请检查后重试！" + tmp_for_other="$tmp_for_other@\${$config_name_my$j}" + fi + else + tmp_for_other="$tmp_for_other@\${$config_name_my$j}" + fi done echo "${config_name_for_other}1=\"$tmp_for_other\"" | perl -pe "s|($config_name_for_other\d+=\")@|\1|" for ((m = 1; m < ${#pt_pin[*]}; m++)); do j=$((m + 1)) - echo "$config_name_for_other$j=\"\${${config_name_for_other}1}\"" + echo "$config_name_for_other$j=\"$tmp_for_other\"" | perl -pe "s|($config_name_for_other\d+=\")@|\1|" done ;; @@ -261,7 +275,19 @@ export_codes_sub() { else k=$((n + 1 - $user_sum)) fi - tmp_for_other="$tmp_for_other@\${$config_name_my$k}" + if [ $BreakHelpType = 1 ]; then + if [ "$BreakHelpNumVerify" = "" ]; then + for ((t = 0; t < ${#BreakHelpNumArray[*]}; t++)); do + [[ "${BreakHelpNumArray[t]}" = "$k" ]] && continue 2 + done + tmp_for_other="$tmp_for_other@\${$config_name_my$k}" + else + echo -e "\n#$cur_time 变量值填写不规范，请检查后重试！" + tmp_for_other="$tmp_for_other@\${$config_name_my$k}" + fi + else + tmp_for_other="$tmp_for_other@\${$config_name_my$k}" + fi done echo "$config_name_for_other$j=\"$tmp_for_other\"" | perl -pe "s|($config_name_for_other\d+=\")@|\1|" done @@ -276,7 +302,19 @@ export_codes_sub() { j=$((m + 1)) for n in $random_num_list; do [[ $j -eq $n ]] && continue - tmp_for_other="$tmp_for_other@\${$config_name_my$n}" + if [ $BreakHelpType = 1 ]; then + if [ "$BreakHelpNumVerify" = "" ]; then + for ((t = 0; t < ${#BreakHelpNumArray[*]}; t++)); do + [[ "${BreakHelpNumArray[t]}" = "$n" ]] && continue 2 + done + tmp_for_other="$tmp_for_other@\${$config_name_my$n}" + else + echo -e "\n#$cur_time 变量值填写不规范，请检查后重试！" + tmp_for_other="$tmp_for_other@\${$config_name_my$n}" + fi + else + tmp_for_other="$tmp_for_other@\${$config_name_my$n}" + fi done echo "$config_name_for_other$j=\"$tmp_for_other\"" | perl -pe "s|($config_name_for_other\d+=\")@|\1|" done @@ -291,7 +329,19 @@ export_codes_sub() { for ((n = 0; n < ${#pt_pin[*]}; n++)); do [[ $m -eq $n ]] && continue k=$((n + 1)) - tmp_for_other="$tmp_for_other@\${$config_name_my$k}" + if [ $BreakHelpType = 1 ]; then + if [ "$BreakHelpNumVerify" = "" ]; then + for ((t = 0; t < ${#BreakHelpNumArray[*]}; t++)); do + [[ "${BreakHelpNumArray[t]}" = "$k" ]] && continue 2 + done + tmp_for_other="$tmp_for_other@\${$config_name_my$k}" + else + echo -e "\n#$cur_time 变量值填写不规范，请检查后重试！" + tmp_for_other="$tmp_for_other@\${$config_name_my$k}" + fi + else + tmp_for_other="$tmp_for_other@\${$config_name_my$k}" + fi done echo "$config_name_for_other$j=\"$tmp_for_other\"" | perl -pe "s|($config_name_for_other\d+=\")@|\1|" done @@ -306,7 +356,6 @@ export_codes_sub() { ## 汇总输出 export_all_codes() { gen_pt_pin_array - ps_num="$(ps | grep code.sh | grep -v grep | wc -l)" [[ $DEBUG = "1" ]] && echo -e "\n#$cur_time 当前 code.sh 的线程数量：$ps_num" [[ $DEBUG = "1" ]] && echo -e "\n#$cur_time 预设的 JD_COOKIE 数量：`echo $JD_COOKIE | grep -o 'pt_key' | wc -l`" [[ $DEBUG = "1" ]] && echo -e "\n#$cur_time 预设的 JD_COOKIE 环境变量数量：`echo $JD_COOKIE | sed 's/&/\n/g' | wc -l`" @@ -331,19 +380,19 @@ export_all_codes() { ;; esac fi - if [ "$ps_num" -gt 8 ]; then + [[ $BreakHelpType = 1 ]] && echo -e "\n#$cur_time 您已启用屏蔽模式，账号 $BreakHelpNum 将不被助力！" + if [ "$ps_num" -gt 7 ]; then echo -e "\n#$cur_time 检测到 code.sh 的线程过多 ，请稍后再试！" - exit + exit elif [ -z $repo ]; then echo -e "\n#$cur_time 未检测到兼容的活动脚本日志，无法读取互助码，退出！" - exit + exit else - echo -e "\n#$cur_time 优先读取 $repo 的脚本日志，格式化导出互助码，生成互助规则！" - echo -e "\n## 账号用户名整理如下：" - echo -e "$("dump_user_name")" + echo -e "\n#$cur_time 默认调用 $repo 的脚本日志，格式化导出互助码，生成互助规则！" + dump_user_info for ((i = 0; i < ${#name_js[*]}; i++)); do - echo -e "\n## ${name_chinese[i]}：" - export_codes_sub "${name_js[i]}" "${name_config[i]}" "${name_chinese[i]}" + echo -e "\n## ${name_chinese[i]}：" + export_codes_sub "${name_js[i]}" "${name_config[i]}" "${name_chinese[i]}" done for ((i = 0; i < ${#name_js_only[*]}; i++)); do echo -e "\n## ${name_chinese_only[i]}：" @@ -353,84 +402,95 @@ export_all_codes() { } #更新配置文件中互助码的函数 -help_codes(){ -if [ -z "$(cat $file_task_before | grep "^My$1\d")" ]; then - echo "" >> $file_task_before - echo "My"$1"1=''" >> $file_task_before - echo "" >> $file_task_before -fi +help_codes_rules(){ local envs=$(eval echo "\$JD_COOKIE") local array=($(echo $envs | sed 's/&/ /g')) local user_sum=${#array[*]} -for ((i=1; i<=$user_sum; i++)); do - if [ ! -z "$(cat $log_path | grep "^My$1$i=.*'$")" ]; then - new_code="$(cat $log_path | grep "^My$1$i=.*'$" | sed "s/.*'\(.*\)'.*/\1/")" - old_code="$(cat $file_task_before | grep "^My$1$i=.*'$" | sed "s/.*'\(.*\)'.*/\1/")" - if [ -z "$(grep "^My$1$i" $file_task_before)" ]; then - sed -i "/^My$1$[$i-1]='.*'/ s/$/\nMy$1$i=\'\'/" $file_task_before +local config_name=$1 +local config_name_my=My$config_name +local config_name_for_other=ForOther$config_name +local i j k + +#更新配置文件中的互助码 +if [ -z "$(cat $file_task_before | grep "^$config_name_my\d")" ]; then + echo -e "\n${config_name_my}1=''\n" >> $file_task_before +fi +for ((i=1; i<=100; i++)); do + if [[ $i -le $user_sum ]] && [[ ! -z "$(cat $log_path | grep "^$config_name_my$i=.*'$")" ]]; then + new_code="$(cat $log_path | grep "^$config_name_my$i=.*'$" | sed "s/.*'\(.*\)'.*/\1/")" + old_code="$(cat $file_task_before | grep "^$config_name_my$i=.*'$" | sed "s/.*'\(.*\)'.*/\1/")" + if [ -z "$(grep "^$config_name_my$i" $file_task_before)" ]; then + sed -i "/^$config_name_my$[$i-1]='.*'/ s/$/\n$config_name_my$i=\'\'/" $file_task_before fi if [[ "$new_code" != "" ]] && [[ "$new_code" != "undefined" ]] && [[ "$new_code" != "{}" ]]; then if [ "$new_code" != "$old_code" ]; then - sed -i "s/^My$1$i='$old_code'$/My$1$i='$new_code'/" $file_task_before + sed -i "s/^$config_name_my$i='$old_code'$/$config_name_my$i='$new_code'/" $file_task_before fi fi fi + if [[ $i -gt $user_sum ]] && [[ ! -z "$(cat $file_task_before | grep "^$config_name_my$i")" ]]; then + sed -i "/^$config_name_my$i/d" $file_task_before + fi +done + +#更新配置文件中的互助规则 +if [ -z "$(cat $file_task_before | grep "^$config_name_for_other\d")" ]; then + echo -e "${config_name_for_other}1=\"\"\n" >> $file_task_before +fi +for ((j=1; j<=100; j++)); do + if [[ $j -le $user_sum ]] && [[ ! -z "$(cat $log_path | grep "^$config_name_for_other$j=.*\"$")" ]]; then + new_rule="$(cat $log_path | grep "^$config_name_for_other$j=.*\"$" | sed "s/.*\"\(.*\)\".*/\1/")" + old_rule="$(cat $file_task_before | grep "^$config_name_for_other$j=.*\"$" | sed "s/.*\"\(.*\)\".*/\1/")" + if [ -z "$(grep "^$config_name_for_other$j" $file_task_before)" ]; then + sed -i "/^$config_name_for_other$[$j-1]=".*"/ s/$/\n$config_name_for_other$j=\"\"/" $file_task_before + fi + if [ "$new_rule" != "" ]; then + if [ "$new_rule" != "$old_rule" ]; then + sed -i "s/^$config_name_for_other$j=\"$old_rule\"$/$config_name_for_other$j=\"$new_rule\"/" $file_task_before + fi + fi + fi + if [[ $j -gt $user_sum ]] && [[ ! -z "$(cat $file_task_before | grep "^$config_name_for_other$j")" ]]; then + sed -i "/^$config_name_for_other$j/d" $file_task_before + fi done } help_codes_only(){ -if [ -z "$(cat $file_task_before | grep "^$1\d")" ]; then - echo "" >> $file_task_before - echo ""$1"1=''" >> $file_task_before - echo "" >> $file_task_before -fi local envs=$(eval echo "\$JD_COOKIE") local array=($(echo $envs | sed 's/&/ /g')) local user_sum=${#array[*]} -for ((i=1; i<=$user_sum; i++)); do - if [ ! -z "$(cat $log_path | grep "^$1$i=.*'$")" ]; then - new_jxtoken="$(cat $log_path | grep "^$1$i=.*'$" | sed "s/.*'\(.*\)'.*/\1/")" - old_jxtoken="$(cat $file_task_before | grep "^$1$i=.*'$" | sed "s/.*'\(.*\)'.*/\1/")" - if [ -z "$(grep "^$1$i" $file_task_before)" ]; then - sed -i "/^$1$[$i-1]='.*'/ s/$/\n$1$i=\'\'/" $file_task_before +local config_name=$1 +local config_name_my=My$config_name +local config_name_for_other=ForOther$config_name +local i j k + +#更新配置文件中的互助码 +if [ -z "$(cat $file_task_before | grep "^$config_name\d")" ]; then + echo -e "\n${config_name}1=''\n" >> $file_task_before +fi +for ((k=1; k<=100; k++)); do + if [[ $k -le $user_sum ]] && [[ ! -z "$(cat $log_path | grep "^$config_name$k=.*'$")" ]]; then + new_code="$(cat $log_path | grep "^$config_name$k=.*'$" | sed "s/.*'\(.*\)'.*/\1/")" + old_code="$(cat $file_task_before | grep "^$config_name$k=.*'$" | sed "s/.*'\(.*\)'.*/\1/")" + if [ -z "$(grep "^$config_name$k" $file_task_before)" ]; then + sed -i "/^$config_name$[$k-1]='.*'/ s/$/\n$config_name$k=\'\'/" $file_task_before fi - if [[ "$new_jxtoken" != "" ]] && [[ "$new_jxtoken" != "undefined" ]] && [[ "$new_jxtoken" != "{}" ]]; then - if [ "$new_jxtoken" != "$old_jxtoken" ]; then - sed -i "s/^$1$i='$old_jxtoken'$/$1$i='$new_jxtoken'/" $file_task_before + if [[ "$new_code" != "" ]] && [[ "$new_code" != "undefined" ]] && [[ "$new_code" != "{}" ]]; then + if [ "$new_code" != "$old_code" ]; then + sed -i "s/^$config_name$k='$old_code'$/$config_name$k='$new_code'/" $file_task_before fi fi fi -done -} - -#更新配置文件中互助规则的函数 -help_rules(){ -if [ -z "$(cat $file_task_before | grep "^ForOther$1\d")" ]; then - echo "ForOther"$1"1=\"\"" >> $file_task_before - echo "" >> $file_task_before -fi -local envs=$(eval echo "\$JD_COOKIE") -local array=($(echo $envs | sed 's/&/ /g')) -local user_sum=${#array[*]} -for ((i=1; i<=$user_sum; i++)); do - if [ ! -z "$(cat $log_path | grep "^ForOther$1$i=.*\"$")" ]; then - new_rule="$(cat $log_path | grep "^ForOther$1$i=.*\"$" | sed "s/.*\"\(.*\)\".*/\1/")" - old_rule="$(cat $file_task_before | grep "^ForOther$1$i=.*\"$" | sed "s/.*\"\(.*\)\".*/\1/")" - if [ -z "$(grep "^ForOther$1$i" $file_task_before)" ]; then - sed -i "/^ForOther$1$[$i-1]=".*"/ s/$/\nForOther$1$i=\"\"/" $file_task_before - fi - if [ "$new_rule" != "" ]; then - if [ "$new_rule" != "$old_rule" ]; then - sed -i "s/^ForOther$1$i=\"$old_rule\"$/ForOther$1$i=\"$new_rule\"/" $file_task_before - fi - fi + if [[ $k -gt $user_sum ]] && [[ ! -z "$(cat $file_task_before | grep "^$config_name$k")" ]]; then + sed -i "/^$config_name$k/d" $file_task_before fi done } export_codes_sub_only(){ -if [ "$(cat $dir_scripts/"$repo"_jd_scripts_jd_cfd.js | grep "// console.log(\`token")" != "" ]; then - echo -e "\n# 正在修改 "$repo"_jd_scripts_jd_cfd.js ，待完全运行 "$repo"_jd_scripts_jd_cfd.js 后即可输出 token ！" +if [ "$(cat $dir_scripts/"$repo"_jd_cfd.js | grep "// console.log(\`token")" != "" ]; then + echo -e "\n# 正在修改 "$repo"_jd_cfd.js ，待完全运行 "$repo"_jd_cfd.js 后即可输出 token ！" fi sed -i 's/.*\(c.*log\).*\(${JSON.*token)}\).*/ \1(\`\\n【京东账号${$.index}（${$.UserName}）的京喜token好友互助码】\2\\n\`)/g' /ql/scripts/*_jd_cfd.js local task_name=$1 @@ -471,66 +531,21 @@ sed -i 's/.*\(c.*log\).*\(${JSON.*token)}\).*/ \1(\`\\n【京东账号${$.i fi } -break_help(){ -local BreakHelpInterval=$(echo $BreakHelpNum | perl -pe "{s|~|-|; s|_|-|}" | sed 's/\(\d\+\)-\(\d\+\)/{\1..\2}/g') -local BreakHelpNumType=$(echo $BreakHelpNum | sed 's/ //g' | perl -pe "{s|-||; s|~||; s|_||}" | sed 's/^\d\+$//g') -if [ $BreakHelpType = 1 ]; then - echo -e "\n#$cur_time 您已启用屏蔽助力功能！" - if [ "$BreakHelpNumType" = "" ]; then - echo -e "\n#$cur_time 当前屏蔽的账号序号或区间： $BreakHelpInterval " - echo -e "\n#$cur_time 开始调整互助规则" - for i in $(eval echo $BreakHelpInterval); do - sed -i "s/@\${My[A-Za-z]\+$i}\|\${My[A-Za-z]\+$i}@//g" $file_task_before - done - echo -e "\n#$cur_time 互助规则调整完成" - else - echo -e "\n#$cur_time 变量值填写不规范，请检查后重试！" - fi -fi -} - #更新互助码和互助规则 update_help(){ #latest_log=$(ls -r $dir_code | head -1) latest_log=$log_path case $UpdateType in - 1) - if [ -f $log_path ] && [ -f $file_task_before ]; then - mkdir -p $dir_config/bak - [[ $BAKUP = "1" ]] && cp $file_task_before $dir_config/bak/task_before_$log_time.sh + 1) + if [ "$ps_num" -le 7 ] && [ -f $log_path ] && [ -f $file_task_before ]; then + backup_del echo -e "\n#$cur_time 开始更新配置文件的互助码和互助规则" | tee -a $latest_log - help_codes Fruit - help_rules Fruit - help_codes Pet - help_rules Pet - help_codes Bean - help_rules Bean - help_codes JdFactory - help_rules JdFactory - help_codes DreamFactory - help_rules DreamFactory - help_codes Jdzz - help_rules Jdzz - help_codes Joy - help_rules Joy - help_codes BookShop - help_rules BookShop - help_codes Cash - help_rules Cash - help_codes Jxnc - help_rules Jxnc - help_codes Sgmh - help_rules Sgmh - help_codes Cfd - help_rules Cfd - help_codes Health - help_rules Health - help_codes Carni - help_rules Carni - help_codes City - help_rules City - help_codes_only TokenJxnc - break_help + for i in ${name_config[@]}; do + help_codes_rules $i + done + for i in ${name_config_only[@]}; do + help_codes_only $i + done sed -i "4c ## 上次导入时间：$(date +%Y年%m月%d日\ %X)" /ql/config/task_before.sh echo -e "\n#$cur_time 配置文件的互助码和互助规则已完成更新" | tee -a $latest_log elif [ ! -f $log_path ]; then @@ -545,9 +560,19 @@ case $UpdateType in esac } -dump_user_name(){ -echo $JD_COOKIE | sed "s/&/\n/g; s/\S*;pt_pin=\(\S\+\);\S*/\1/g;" | -awk 'BEGIN{for(i=0;i<10;i++)hex[i]=i;hex["A"]=hex["a"]=10;hex["B"]=hex["b"]=11;hex["C"]=hex["c"]=12;hex["D"]=hex["d"]=13;hex["E"]=hex["e"]=14;hex["F"]=hex["f"]=15;}{gsub(/\+/," ");i=$0;while(match(i,/%../)){;if(RSTART>1);printf"%s",substr(i,1,RSTART-1);printf"%c",hex[substr(i,RSTART+1,1)]*16+hex[substr(i,RSTART+2,1)];i=substr(i,RSTART+RLENGTH);}print i;}'|awk '$0="## 账号"NR":"$0' +dump_user_info(){ +echo -e "\n## 账号用户名及 COOKIES 整理如下：" +local envs=$(eval echo "\$JD_COOKIE") +local array=($(echo $envs | sed 's/&/ /g')) + for ((m = 0; m < ${#pt_pin[*]}; m++)); do + j=$((m + 1)) + echo -e "## 用户名 $j：${pt_pin[m]}\n## Cookie$j=\"${array[m]}\"" + done +} + +backup_del(){ +[[ $BACKUP = "1" ]] && mkdir -p $dir_config/bak/ && cp $file_task_before $dir_config/bak/task_before_$log_time.sh +[[ $CLEANBAK = "1" ]] && find $dir_config/bak/ -type f -mtime +$CLEANBAK_DAYS | xargs rm -rvf } @@ -557,6 +582,11 @@ cur_time="【$(date +%X)】" log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_path="$dir_code/$log_time.log" make_dir "$dir_code" +ps_num="$(ps | grep code.sh | grep -v grep | wc -l)" +[[ ! -z "$(ps -ef|grep -w 'code.sh'|grep -v grep)" ]] && ps -ef|grep -w 'code.sh'|grep -v grep|awk '{print $3}'|xargs kill -9 export_all_codes | perl -pe "{s|京东种豆|种豆|; s|crazyJoy任务|疯狂的JOY|}" | tee $log_path sleep 5 update_help + +## 修改curtinlv京东超市兑换脚本的参数 +sed -i "s/cookies=''/cookies='$JD_COOKIE'/g" /ql/scripts/*_jd_blueCoin.py diff --git a/Scripts/sh/Helpcode2.8/config_sample.sh b/Scripts/sh/Helpcode2.8/config_sample.sh index e20fdf8..99996d8 100644 --- a/Scripts/sh/Helpcode2.8/config_sample.sh +++ b/Scripts/sh/Helpcode2.8/config_sample.sh @@ -1,6 +1,6 @@ ## Version: v2.8.0 ## Date: 2021-06-20 -## Mod: Build20210707-001 +## Mod: Build20210711-005 ## Update Content: 可持续发展纲要\n1. session管理破坏性修改\n2. 配置管理可编辑config下文件\n3. 自定义脚本改为查看脚本\n4. 移除互助相关 ## 上面版本号中，如果第2位数字有变化，那么代表增加了新的参数，如果只有第3位数字有变化，仅代表更新了注释，没有增加新的参数，可更新可不更新 @@ -127,7 +127,7 @@ export GOBOT_QQ="" ## ;; ## esac case $1 in - jd_fruit) + *jd_fruit*) TempBlockCookie="" ;; *jd_dreamFactory* | *jd_jdfactory*) @@ -324,6 +324,12 @@ export cashinviteCode2="" export cashinviteCode3="" ## 13、大老板农场 新增自定义变量通知开关。true通知打开，false为关闭 export dlbtz="true" +## 14、零食街自动兑换变量 +### 自行取消注释和注释 +##export ljsdh="jdAward1" ##兑换5豆 +##export ljsdh="jdAward2" ##兑换10豆 +export ljsdh="jdAward3" ##兑换100豆 +##export ljsdh="jdAward4" ##兑换牛奶 # curtinlv 环境变量 ## 1、赚京豆 @@ -350,6 +356,19 @@ export printlog="true" export sleepNum="0.5" ### 布尔值，True:使用作者远程仓库更新的id，False：使用本地shopid.txt的id export isRemoteSid="true" +## 5、东东超市商品兑换 +### 您的ck格式：pt_key=xxx;pt_pin=xxx; (多账号&分隔)。无效变量，已集成改写代码至最新 code.sh +### export cookies='' +### 【填写您要兑换的商品】 +export coinToBeans="京豆包" +### 轮次 +export startMaxNum="30" +### 多线程并发，相当于每秒点击兑换次数...适当调整，手机会发烫 +export dd_thread="30" +### 开始抢兑时间 +export starttime="23:59:59.00000000" +### 结束时间 +export endtime="00:00:30.00000000" # Wenmoux 部分环境变量 ## 1、QQ星系牧场自动兑换20豆 @@ -364,7 +383,31 @@ export Read10UA="" ## 填true推送消息，默认不推送 export jrpush="" -## 其他命令： -## 1、一键改写京东兑蓝币脚本的cookies；需手动运行 -## sed -i "s/cookies=''/cookies='$(. /ql/shell/share.sh && . /ql/config/config.sh && echo $JD_COOKIE)'/g" /ql/scripts/*_jd_blueCoin.py +# smiek2221 环境变量 +## 1、燃动夏季—入会 +export summer_movement_joinjoinjoinhui="false" ##是否入会 true 入会，false 不入会 +## 2、燃动夏季—百元守卫战SH +export summer_movement_ShHelpFlag="1" ##0 不开启也不助力 1 开启并助力 2 开启但不助力 默认开启并助力 +## 3、燃动夏季-新增只做邀请助力功能 +export summer_movement_HelpHelpHelpFlag="true" ##是否只执行邀请助力 true 是 false 不是 默认 false +### 可以设置13点执行一下脚本 +if [ $(date "+%H") -eq 13 ]; then + export summer_movement_HelpHelpHelpFlag="true" +fi +# cdle 环境变量 +## 1、愤怒的锦鲤 +### 助力账号，填写pt_pin或用户名的值。多个 pt_pin 值用 @ 连接 +### export kois="$(echo $JD_COOKIE | sed "s/&/\n/g; s/\S*;pt_pin=\(\S\+\);\S*/\1/g; s/\n/@/g;" | awk 'BEGIN{for(i=0;i<10;i++)hex[i]=i;hex["A"]=hex["a"]=10;hex["B"]=hex["b"]=11;hex["C"]=hex["c"]=12;hex["D"]=hex["d"]=13;hex["E"]=hex["e"]=14;hex["F"]=hex["f"]=15;}{gsub(/\+/," ");i=$0;while(match(i,/%../)){;if(RSTART>1);printf"%s",substr(i,1,RSTART-1);printf"%c",hex[substr(i,RSTART+1,1)]*16+hex[substr(i,RSTART+2,1)];i=substr(i,RSTART+RLENGTH);}print i;}')" ## 支持中文用户名 +export kois="$(echo $JD_COOKIE | sed "s/&/\n/g; s/\S*;pt_pin=\(\S\+\);\S*/\1/g; s/\n/@/g;")" +## 2、全民运动会守卫红包 +### 助力码，需手动抓包 +export olympicgames_inviteId="" +## 3、签到领现金兑换 +### 填写 pt_pin@金额，pt_pin为用户名，可以在 COOKIES 中提取；金额为 2 或 10，例如 LiLei@2 或 HanMeimei@10。多值用 & 连接，例如 LiLei@2&HanMeimei@10 +### export exchangeAccounts="$(echo $JD_COOKIE | sed "s/&/\n/g; s/\S*;pt_pin=\(\S\+\);\S*/\1@10/g; s/\n/\&/g;")" ##兑10元现金，比较难兑 +export exchangeAccounts="$(echo $JD_COOKIE | sed "s/&/\n/g; s/\S*;pt_pin=\(\S\+\);\S*/\1@2/g; s/\n/\&/g;")" ##兑2元现金 + +## 其他命令： +## 1、一键改写京东兑蓝币脚本的cookies；需手动运行 (已集成至最新的 code.sh) +## sed -i "s/cookies=''/cookies='$(. /ql/shell/share.sh && . /ql/config/env.sh && echo $JD_COOKIE)'/g" /ql/scripts/*_jd_blueCoin.py diff --git a/Scripts/sh/Helpcode2.8/task_before.sh b/Scripts/sh/Helpcode2.8/task_before.sh index 3ad63fa..c3031f0 100644 --- a/Scripts/sh/Helpcode2.8/task_before.sh +++ b/Scripts/sh/Helpcode2.8/task_before.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -#Build 20210703-001 +#Build 20210711-001 ## 东东农场： MyFruit1='' @@ -145,6 +145,11 @@ combine_sub() { local array=($(echo $envs | sed 's/&/ /g')) local user_sum=${#array[*]} for ((i = 1; i <= $user_sum; i++)); do + for num in ${TempBlockCookie}; do + if [[ $i -eq $num ]]; then + continue 2 + fi + done local tmp1=$what_combine$i local tmp2=${!tmp1} combined_all="$combined_all&$tmp2" @@ -162,15 +167,8 @@ combine_all() { done } -#if [[ $(ls $dir_code) ]]; then -# latest_log=$(ls -r $dir_code | head -1) -# . $dir_code/$latest_log - combine_all -#fi - ## 临时屏蔽某账号运行活动脚本 TempBlock_JD_COOKIE(){ - . /$file_env local envs=$(eval echo "\$JD_COOKIE") local array=($(echo $envs | sed 's/&/ /g')) for i in $TempBlockCookie; do @@ -181,3 +179,9 @@ TempBlock_JD_COOKIE(){ } TempBlock_JD_COOKIE + +#if [[ $(ls $dir_code) ]]; then +# latest_log=$(ls -r $dir_code | head -1) +# . $dir_code/$latest_log + combine_all +#fi diff --git a/Tasks/qlrepo/extra.sh b/Tasks/qlrepo/extra.sh index 668678f..ffae8cc 100644 --- a/Tasks/qlrepo/extra.sh +++ b/Tasks/qlrepo/extra.sh @@ -7,9 +7,9 @@ # 整库 # 1. Unknown 备份托管等 ## (1) JDHelloWorld -## ql repo https://github.com/JDHelloWorld/jd_scripts.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|enen|update" "^jd[^_]|USER" +ql repo https://github.com/JDHelloWorld/jd_scripts.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|enen|update" "^jd[^_]|USER" ## (2) he1pu（自动提交助力码-京喜工厂、种豆得豆、东东工厂、东东农场、健康社区、京喜财富岛、东东萌宠、闪购盲盒，随机从数据库中选取助力码互助） -ql repo https://github.com/he1pu/JDHelp.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|update" "^jd[^_]|USER|MovementFaker|JDJRValidator_Pure|sign_graphics_validate|ZooFaker_Necklace" +## ql repo https://github.com/he1pu/JDHelp.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|update" "^jd[^_]|USER|MovementFaker|JDJRValidator_Pure|sign_graphics_validate|ZooFaker_Necklace" ## (3) shufflewzc ## ql repo https://github.com/shufflewzc/faker2.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|update" "^jd[^_]|USER" ## (4) panghu999 @@ -57,7 +57,7 @@ ql repo https://github.com/star261/jd.git "jd_|star" "" "^MovementFaker" ## 名称之后标注﹢的单脚本，若上面已拉取仓库的可以不拉，否则会重复拉取。这里适用于只拉取部分脚本使用 # 1. curtinlv﹢ ## 抢京豆 0 0 * * * -## ql raw https://raw.githubusercontent.com/Oreomeow/JD-Script/main/jd_qjd.py +## ql raw https://raw.githubusercontent.com/curtinlv/JD-Script/main/jd_qjd.py ## 入会 15 8 * * * ## ql raw https://raw.githubusercontent.com/curtinlv/JD-Script/main/OpenCard/jd_OpenCard.py ## 关注 15 8 * * * @@ -75,8 +75,7 @@ cd scripts && npm i -S png-js ## 安装 ts 脚本依赖库，拉取 JDHelloWorld，京喜财富岛新版 ts 脚本并挂机 jxcfd_ts(){ cd /ql/scripts/ -ql repo https://github.com/JDHelloWorld/jd_scripts.git " -jd_|jx_|getJDCookie" "activity|backUp|Coupon|enen" "^jd[^_]|USER" +## ql repo https://github.com/JDHelloWorld/jd_scripts.git "jd_|jx_|getJDCookie" "activity|backUp|Coupon|enen" "^jd[^_]|USER" cp /ql/repo/JDHelloWorld_jd_scripts/package.json . npm i npm i -g ts-node typescript @types/node date-fns axios