重构环境变量管理，添加脚本查看

shell/code.sh

@@ -1,151 +0,0 @@
-#!/usr/bin/env bash
-
-## 导入通用变量与函数
-dir_shell=/ql/shell
-. $dir_shell/share.sh
-
-## 生成pt_pin清单
-gen_pt_pin_array() {
-    local tmp1 tmp2 i pt_pin_temp
-    for ((user_num = 1; user_num <= $user_sum; user_num++)); do
-        tmp1=Cookie$user_num
-        tmp2=${!tmp1}
-        i=$(($user_num - 1))
-        pt_pin_temp=$(echo $tmp2 | perl -pe "{s|.*pt_pin=([^; ]+)(?=;?).*|\1|; s|%|\\\x|g}")
-        [[ $pt_pin_temp == *\\x* ]] && pt_pin[i]=$(printf $pt_pin_temp) || pt_pin[i]=$pt_pin_temp
-    done
-}
-
-## 导出互助码的通用程序，$1：去掉后缀的脚本名称，$2：config.sh中的后缀，$3：活动中文名称
-export_codes_sub() {
-    local task_name=$1
-    local config_name=$2
-    local chinese_name=$3
-    local config_name_my=My$config_name
-    local config_name_for_other=ForOther$config_name
-    local i j k m n pt_pin_in_log code tmp_grep tmp_my_code tmp_for_other user_num random_num_list
-    if cd $dir_log/$task_name &>/dev/null && [[ $(ls) ]]; then
-        ## 寻找所有互助码以及对应的pt_pin
-        i=0
-        pt_pin_in_log=()
-        code=()
-        pt_pin_and_code=$(ls -r *.log | xargs awk -v var="的$chinese_name好友互助码" 'BEGIN{FS="[（ ）】]+"; OFS="&"} $3~var {print $2,$4}')
-        for line in $pt_pin_and_code; do
-            pt_pin_in_log[i]=$(echo $line | awk -F "&" '{print $1}')
-            code[i]=$(echo $line | awk -F "&" '{print $2}')
-            let i++
-        done
-
-        ## 输出My系列变量
-        if [[ ${#code[*]} -gt 0 ]]; then
-            for ((m = 0; m < ${#pt_pin[*]}; m++)); do
-                tmp_my_code=""
-                j=$((m + 1))
-                for ((n = 0; n < ${#code[*]}; n++)); do
-                    if [[ ${pt_pin[m]} == ${pt_pin_in_log[n]} ]]; then
-                        tmp_my_code=${code[n]}
-                        break
-                    fi
-                done
-                echo "$config_name_my$j='$tmp_my_code'"
-            done
-        else
-            echo "## 从日志中未找到任何互助码"
-        fi
-
-        ## 输出ForOther系列变量
-        if [[ ${#code[*]} -gt 0 ]]; then
-            echo
-            case $HelpType in
-            0) ## 全部一致
-                tmp_for_other=""
-                for ((m = 0; m < ${#pt_pin[*]}; m++)); do
-                    j=$((m + 1))
-                    tmp_for_other="$tmp_for_other@\${$config_name_my$j}"
-                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}\""
-                done
-                ;;
-
-            1) ## 均等助力
-                for ((m = 0; m < ${#pt_pin[*]}; m++)); do
-                    tmp_for_other=""
-                    j=$((m + 1))
-                    for ((n = $m; n < $(($user_sum + $m)); n++)); do
-                        [[ $m -eq $n ]] && continue
-                        if [[ $((n + 1)) -le $user_sum ]]; then
-                            k=$((n + 1))
-                        else
-                            k=$((n + 1 - $user_sum))
-                        fi
-                        tmp_for_other="$tmp_for_other@\${$config_name_my$k}"
-                    done
-                    echo "$config_name_for_other$j=\"$tmp_for_other\"" | perl -pe "s|($config_name_for_other\d+=\")@|\1|"
-                done
-                ;;
-
-            2) ## 本套脚本内账号间随机顺序助力
-                for ((m = 0; m < ${#pt_pin[*]}; m++)); do
-                    tmp_for_other=""
-                    random_num_list=$(seq $user_sum | sort -R)
-                    j=$((m + 1))
-                    for n in $random_num_list; do
-                        [[ $j -eq $n ]] && continue
-                        tmp_for_other="$tmp_for_other@\${$config_name_my$n}"
-                    done
-                    echo "$config_name_for_other$j=\"$tmp_for_other\"" | perl -pe "s|($config_name_for_other\d+=\")@|\1|"
-                done
-                ;;
-
-            *) ## 按编号优先
-                for ((m = 0; m < ${#pt_pin[*]}; m++)); do
-                    tmp_for_other=""
-                    j=$((m + 1))
-                    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}"
-                    done
-                    echo "$config_name_for_other$j=\"$tmp_for_other\"" | perl -pe "s|($config_name_for_other\d+=\")@|\1|"
-                done
-                ;;
-            esac
-        fi
-    else
-        echo "## 未运行过 $task_name.js 脚本，未产生日志"
-    fi
-}
-
-## 汇总输出
-export_all_codes() {
-    gen_pt_pin_array
-    echo -e "\n# 从日志提取互助码，编号和配置文件中Cookie编号完全对应，如果为空就是所有日志中都没有。\n\n# 即使某个MyXxx变量未赋值，也可以将其变量名填在ForOtherXxx中，jtask脚本会自动过滤空值。\n"
-    echo -n "# 你选择的互助码模板为："
-    case $HelpType in
-    0)
-        echo "所有账号助力码全部一致。"
-        ;;
-    1)
-        echo "所有账号机会均等助力。"
-        ;;
-    2)
-        echo "本套脚本内账号间随机顺序助力。"
-        ;;
-    *)
-        echo "按账号编号优先。"
-        ;;
-    esac
-    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]}"
-    done
-}
-
-## 执行并写入日志
-log_time=$(date "+%Y-%m-%d-%H-%M-%S")
-log_path="$dir_code/$log_time.log"
-make_dir "$dir_code"
-export_all_codes | perl -pe "{s|京东种豆|种豆|; s|crazyJoy任务|疯狂的JOY|}" | tee $log_path

shell/share.sh

@@ -18,7 +18,7 @@ ql_static_repo=$dir_repo/static
 
 ## 文件
 file_config_sample=$dir_sample/config.sample.sh
-file_cookie=$dir_config/cookie.sh
+file_env=$dir_config/env.sh
 file_sharecode=$dir_config/sharecode.sh
 file_config_user=$dir_config/config.sh
 file_auth_sample=$dir_sample/auth.sample.json
@@ -53,15 +53,9 @@ original_name=(
 ## 导入配置文件
 import_config() {
     [ -f $file_config_user ] && . $file_config_user
-    user_sum=0
-    for line in $(cat $file_cookie); do
-        let user_sum+=1
-        eval Cookie${user_sum}="\"${line}\""
-    done
 
     command_timeout_time=${CommandTimeoutTime:-"1h"}
     github_proxy_url=${GithubProxyUrl:-""}
-    block_cookie=${TempBlockCookie:-""}
     file_extensions=${RepoFileExtensions:-"js py"}
 }
 
@@ -161,9 +155,9 @@ fix_config() {
         echo
     fi
 
-    if [ ! -f $file_cookie ]; then
-        echo -e "检测到config配置目录下不存在cookie.sh，创建一个空文件用于初始化...\n"
-        touch $file_cookie
+    if [ ! -f $file_env ]; then
+        echo -e "检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...\n"
+        touch $file_env
         echo
     fi
 
@@ -289,13 +283,8 @@ git_pull_scripts() {
     cd $dir_current
 }
 
-init_env() {
-    TempBlockCookie=""
-}
-
 ## 导入配置文件，检测平台，创建软连接，识别命令，修复配置文件
 detect_termux
 detect_macos
 define_cmd
-init_env
 import_config $1

shell/task.sh

@@ -5,41 +5,6 @@ dir_shell=/ql/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
-## 组合Cookie和互助码子程序，$1：要组合的内容
-combine_sub() {
-    local what_combine=$1
-    local combined_all=""
-    local tmp1 tmp2
-    for ((i = 1; i <= $user_sum; i++)); do
-        for num in $block_cookie; do
-            [[ $i -eq $num ]] && continue 2
-        done
-        local tmp1=$what_combine$i
-        local tmp2=${!tmp1}
-        combined_all="$combined_all&$tmp2"
-    done
-    echo $combined_all | perl -pe "{s|^&||; s|^@+||; s|&@|&|g; s|@+&|&|g; s|@+|@|g; s|@+$||}"
-}
-
-## 正常依次运行时，组合所有账号的Cookie与互助码
-combine_all() {
-    for ((i = 0; i < ${#env_name[*]}; i++)); do
-        result=$(combine_sub ${var_name[i]})
-        if [[ $result ]]; then
-            export ${env_name[i]}="$result"
-        fi
-    done
-}
-
-## 并发运行时，直接申明每个账号的Cookie与互助码，$1：用户Cookie编号
-combine_one() {
-    local user_num=$1
-    for ((i = 0; i < ${#env_name[*]}; i++)); do
-        local tmp=${var_name[i]}$user_num
-        export ${env_name[i]}=${!tmp}
-    done
-}
-
 ## 选择python3还是node
 define_program() {
     local p1=$1
@@ -118,7 +83,6 @@ run_normal() {
             random_delay
         fi
     fi
-    combine_all
     log_time=$(date "+%Y-%m-%d-%H-%M-%S")
     log_dir_tmp="${p1##*/}"
     log_dir="$dir_log/${log_dir_tmp%%.*}"
@@ -131,18 +95,20 @@ run_normal() {
     update_cron_status "\"$id\"" "1"
 }
 
-## 并发执行，因为是并发，所以日志只能直接记录在日志文件中（日志文件以Cookie编号结尾），前台执行并发跑时不会输出日志
 ## 并发执行时，设定的 RandomDelay 不会生效，即所有任务立即执行
 run_concurrent() {
     local p1=$1
+    local p3=$3
+    local envs=$(eval echo "\$${p3}")
+    local array=(${envs//&/})
     cd $dir_scripts
     define_program "$p1"
     log_dir="$dir_log/${p1%%.*}"
     make_dir $log_dir
     log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
     echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n"
-    for ((user_num = 1; user_num <= $user_sum; user_num++)); do
-        combine_one $user_num
+    for i in "${!array[@]}"; do
+        export ${p3}=${array[i]}
         log_path="$log_dir/${log_time}_${user_num}.log"
         timeout $command_timeout_time $which_program $p1 &>$log_path &
     done
@@ -173,7 +139,7 @@ main() {
             run_normal $1 $2
             ;;
         conc)
-            run_concurrent $1 $2
+            run_concurrent $1 $2 $3
             ;;
         *)
             run_else "$@"