diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5033093..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/Scripts/.DS_Store b/Scripts/.DS_Store deleted file mode 100644 index bdbca81..0000000 Binary files a/Scripts/.DS_Store and /dev/null differ diff --git a/Scripts/sh/1custom.sh b/Scripts/sh/1custom.sh index 45fb795..4c82804 100644 --- a/Scripts/sh/1custom.sh +++ b/Scripts/sh/1custom.sh @@ -34,7 +34,7 @@ fi # 下载 config.sh -dl_config_shell(){ +dl_config_shell() { if [ ! -a "$config_shell_path" ]; then touch $config_shell_path fi @@ -55,7 +55,7 @@ fi # 下载 extra.sh -dl_extra_shell(){ +dl_extra_shell() { if [ ! -a "$extra_shell_path" ]; then touch $extra_shell_path fi @@ -71,7 +71,7 @@ dl_extra_shell(){ chmod 755 $extra_shell_path } # extra.sh 预设仓库及默认拉取仓库设置 -set_default_extra(){ +set_default_extra() { echo -e "一、集成仓库(Collected Repositories)\n2-JDHelloWorld\n3-he1pu\n4-shufflewzc\n6-Aaron-lv\n7-yuannian1112" read -p "输入您想拉取集成仓库编号(回车默认为 4),拉取多个请用空格隔开:" CollectedRepo echo -e "二、其他仓库(Other Repositories)\n1-passerby-b\n2-curtinlv\n3-smiek2221\n4-cdle\n5-ZCY01\n6-whyour/hundun\n7-moposmall\n8-Ariszy (Zhiyi-N)\n9-photonmang\n10-jiulan\n12-star261\n13-Wenmoux\n14-Tsukasa007" @@ -84,7 +84,7 @@ set_default_extra(){ sed -i "s/Ninja=\"up\"/Ninja=\"${Ninja}\"/" $extra_shell_path } # 将 ql extra 添加到定时任务 -add_ql_extra(){ +add_ql_extra() { if [ "$(grep -c "ql\ extra" /ql/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:ql extra" else @@ -95,7 +95,7 @@ add_ql_extra(){ fi } # 运行一次 ql extra -run_ql_extra(){ +run_ql_extra() { ql extra sleep 5 } @@ -120,7 +120,7 @@ fi # 下载 code.sh -dl_code_shell(){ +dl_code_shell() { if [ ! -a "$code_shell_path" ]; then touch $code_shell_path fi @@ -136,7 +136,7 @@ dl_code_shell(){ chmod 755 $code_shell_path } # code.sh 预设仓库及默认调用仓库设置 -set_default_code(){ +set_default_code() { echo -e "## 将\"repo=\$repo1\"改成\"repo=\$repo2\"或其他,以默认调用其他仓库脚本日志\nrepo1='panghu999_jd_scripts' #预设的 panghu999 仓库\nrepo2='JDHelloWorld_jd_scripts' #预设的 JDHelloWorld 仓库\nrepo3='he1pu_JDHelp' #预设的 he1pu 仓库\nrepo4='shufflewzc_faker2' #预设的 shufflewzc 仓库\nrepo6='Aaron-lv_sync_jd_scripts' #预设的 Aaron-lv 仓库\nrepoA='yuannian1112_jd_scripts' #预设的 yuannian1112 仓库\nrepo=\$repo1 #默认调用 panghu999 仓库脚本日志" read -p "输入您想调用的仓库编号(默认为 4):" repoNum repoNum=${repoNum:-'4'} @@ -146,7 +146,7 @@ set_default_code(){ fi } # 将 task code.sh 添加到定时任务 -add_task_code(){ +add_task_code() { if [ "$(grep -c "code.sh" /ql/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:task code.sh" else @@ -174,7 +174,7 @@ fi # 下载 task_before.sh -dl_task_before_shell(){ +dl_task_before_shell() { if [ ! -a "$task_before_shell_path" ]; then touch $task_before_shell_path fi @@ -195,7 +195,7 @@ fi # 添加定时任务 ql bot -add_ql_bot(){ +add_ql_bot() { if [ "$(grep -c "ql\ bot" /ql/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:ql bot" else @@ -206,7 +206,7 @@ add_ql_bot(){ fi } # 运行一次并简单设置 bot.json -set_bot_json(){ +set_bot_json() { ql bot echo -e "------ 机器累了,休息 10s ------" sleep 10 @@ -222,7 +222,7 @@ set_bot_json(){ sed -i "s/ASDFAWEFADSFAWEFDSFASFD/${api_hash}/" $bot_json } # 再运行一次 ql bot -run_ql_bot(){ +run_ql_bot() { ql bot echo -e "------ 机器累了,休息 10s ------" sleep 10 @@ -241,7 +241,7 @@ fi # 添加定时任务 自动更新模板 -add_curl_sample(){ +add_curl_sample() { if [ "$(grep -c "config.sample.sh" /ql/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:自动更新模板" else @@ -251,7 +251,7 @@ add_curl_sample(){ curl -s -H 'Accept: application/json' -H "Authorization: Bearer $token" -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept-Language: zh-CN,zh;q=0.9' --data-binary '{"name":"自动更新模板","command":"curl -L https://git.io/config.sh -o /ql/sample/config.sample.sh && cp -rf /ql/sample/config.sample.sh /ql/config","schedule":"45 6,18 * * *"}' --compressed 'http://127.0.0.1:5700/api/crons?t=1627380635389' fi } -run_curl_sample(){ +run_curl_sample() { curl -sL https://git.io/config.sh -o /ql/sample/config.sample.sh && cp -rf /ql/sample/config.sample.sh /ql/config } if [ "${all}" = 1 ]; then diff --git a/Scripts/sh/1customCDN.sh b/Scripts/sh/1customCDN.sh index a605d28..eb15614 100644 --- a/Scripts/sh/1customCDN.sh +++ b/Scripts/sh/1customCDN.sh @@ -45,7 +45,7 @@ check_url() { # 获取有效 config.sh 链接 -get_valid_config(){ +get_valid_config() { config_list=(https://raw.githubusercontents.com/Oreomeow/VIP/main/Conf/Qinglong/config.sample.sh https://raw.sevencdn.com/Oreomeow/VIP/main/Conf/Qinglong/config.sample.sh https://ghproxy.com/https://raw.githubusercontent.com/Oreomeow/VIP/main/Conf/Qinglong/config.sample.sh) for url in ${config_list[@]}; do check_url $url @@ -57,7 +57,7 @@ get_valid_config(){ done } # 下载 config.sh -dl_config_shell(){ +dl_config_shell() { if [ ! -a "$config_shell_path" ]; then touch $config_shell_path fi @@ -78,7 +78,7 @@ fi # 获取有效 extra.sh 链接 -get_valid_extra(){ +get_valid_extra() { extra_list=(https://raw.githubusercontents.com/Oreomeow/VIP/main/Tasks/qlrepo/extra.sh https://raw.sevencdn.com/Oreomeow/VIP/main/Tasks/qlrepo/extra.sh https://ghproxy.com/https://raw.githubusercontent.com/Oreomeow/VIP/main/Tasks/qlrepo/extra.sh) for url in ${extra_list[@]}; do check_url $url @@ -90,7 +90,7 @@ get_valid_extra(){ done } # 下载 extra.sh -dl_extra_shell(){ +dl_extra_shell() { if [ ! -a "$extra_shell_path" ]; then touch $extra_shell_path fi @@ -106,7 +106,7 @@ dl_extra_shell(){ chmod 755 $extra_shell_path } # extra.sh 设置区设置 -set_default_extra(){ +set_default_extra() { echo -e "一、集成仓库(Collected Repositories)\n2-JDHelloWorld\n3-he1pu\n4-shufflewzc\n6-Aaron-lv\n7-yuannian1112" read -p "输入您想拉取集成仓库编号(回车默认为 4),拉取多个请用空格隔开:" CollectedRepo echo -e "二、其他仓库(Other Repositories)\n1-passerby-b\n2-curtinlv\n3-smiek2221\n4-cdle\n5-ZCY01\n6-whyour/hundun\n7-moposmall\n8-Ariszy (Zhiyi-N)\n9-photonmang\n10-jiulan\n12-star261\n13-Wenmoux\n14-Tsukasa007" @@ -119,7 +119,7 @@ set_default_extra(){ sed -i "s/Ninja=\"up\"/Ninja=\"${Ninja}\"/" $extra_shell_path } # 将 ql extra 添加到定时任务 -add_ql_extra(){ +add_ql_extra() { if [ "$(grep -c "ql\ extra" /ql/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:ql extra" else @@ -130,7 +130,7 @@ add_ql_extra(){ fi } # 运行一次 ql extra -run_ql_extra(){ +run_ql_extra() { ql extra sleep 5 } @@ -155,7 +155,7 @@ fi # 获取有效 code.sh 链接 -get_valid_code(){ +get_valid_code() { code_list=(https://raw.githubusercontents.com/Oreomeow/VIP/main/Scripts/sh/Helpcode2.8/code.sh https://raw.sevencdn.com/Oreomeow/VIP/main/Scripts/sh/Helpcode2.8/code.sh https://ghproxy.com/https://raw.githubusercontents.com/Oreomeow/VIP/main/Scripts/sh/Helpcode2.8/code.sh) for url in ${code_list[@]}; do check_url $url @@ -167,7 +167,7 @@ get_valid_code(){ done } # 下载 code.sh -dl_code_shell(){ +dl_code_shell() { if [ ! -a "$code_shell_path" ]; then touch $code_shell_path fi @@ -183,7 +183,7 @@ dl_code_shell(){ chmod 755 $code_shell_path } # code.sh 预设仓库及默认调用仓库设置 -set_default_code(){ +set_default_code() { echo -e "## 将\"repo=\$repo1\"改成\"repo=\$repo2\"或其他,以默认调用其他仓库脚本日志\nrepo1='panghu999_jd_scripts' #预设的 panghu999 仓库\nrepo2='JDHelloWorld_jd_scripts' #预设的 JDHelloWorld 仓库\nrepo3='he1pu_JDHelp' #预设的 he1pu 仓库\nrepo4='shufflewzc_faker2' #预设的 shufflewzc 仓库\nrepo6='Aaron-lv_sync_jd_scripts' #预设的 Aaron-lv 仓库\nrepoA='yuannian1112_jd_scripts' #预设的 yuannian1112 仓库\nrepo=\$repo1 #默认调用 panghu999 仓库脚本日志" read -p "输入您想调用的仓库编号(默认为 4):" repoNum repoNum=${repoNum:-'4'} @@ -193,7 +193,7 @@ set_default_code(){ fi } # 将 task code.sh 添加到定时任务 -add_task_code(){ +add_task_code() { if [ "$(grep -c "code.sh" /ql/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:task code.sh" else @@ -221,7 +221,7 @@ fi # 获取有效 task_before.sh 链接 -get_valid_task_before(){ +get_valid_task_before() { task_before_list=(https://raw.githubusercontents.com/Oreomeow/VIP/main/Scripts/sh/Helpcode2.8/task_before.sh https://raw.sevencdn.com/Oreomeow/VIP/main/Scripts/sh/Helpcode2.8/task_before.sh https://ghproxy.com/https://raw.githubusercontents.com/Oreomeow/VIP/main/Scripts/sh/Helpcode2.8/task_before.sh) for url in ${task_before_list[@]}; do check_url $url @@ -233,7 +233,7 @@ get_valid_task_before(){ done } # 下载 task_before.sh -dl_task_before_shell(){ +dl_task_before_shell() { if [ ! -a "$task_before_shell_path" ]; then touch $task_before_shell_path fi @@ -254,7 +254,7 @@ fi # 添加定时任务 ql bot -add_ql_bot(){ +add_ql_bot() { if [ "$(grep -c "ql\ bot" /ql/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:ql bot" else @@ -265,7 +265,7 @@ add_ql_bot(){ fi } # 运行一次并简单设置 bot.json -set_bot_json(){ +set_bot_json() { ql bot echo -e "------ 机器累了,休息 10s ------" sleep 10 @@ -281,7 +281,7 @@ set_bot_json(){ sed -i "s/ASDFAWEFADSFAWEFDSFASFD/${api_hash}/" $bot_json } # 再运行一次 ql bot -run_ql_bot(){ +run_ql_bot() { ql bot echo -e "------ 机器累了,休息 10s ------" sleep 10 @@ -300,7 +300,7 @@ fi # 添加定时任务 自动更新模板 -add_curl_sample(){ +add_curl_sample() { if [ "$(grep -c "config.sample.sh" /ql/config/crontab.list)" != 0 ]; then echo "您的任务列表中已存在 task:自动更新模板" else @@ -310,7 +310,7 @@ add_curl_sample(){ curl -s -H 'Accept: application/json' -H "Authorization: Bearer $token" -H 'Content-Type: application/json;charset=UTF-8' -H 'Accept-Language: zh-CN,zh;q=0.9' --data-binary '{"name":"自动更新模板","command":"curl -L https://raw.githubusercontents.com/Oreomeow/VIP/main/Conf/Qinglong/config.sample.sh -o /ql/sample/config.sample.sh && cp -rf /ql/sample/config.sample.sh /ql/config","schedule":"45 6,18 * * *"}' --compressed 'http://127.0.0.1:5700/api/crons?t=1627380635389' fi } -run_curl_sample(){ +run_curl_sample() { curl -sL $valid_url -o /ql/sample/config.sample.sh && cp -rf /ql/sample/config.sample.sh /ql/config } if [ "${all}" = 1 ]; then diff --git a/Scripts/sh/Update.sh b/Scripts/sh/Update.sh index 2425777..43fb7f6 100644 --- a/Scripts/sh/Update.sh +++ b/Scripts/sh/Update.sh @@ -31,31 +31,37 @@ HelpType="HelpType=\"0\"" BreakHelpType="BreakHelpType=\"1\"" BreakHelpNum="BreakHelpNum=\"11-1000\"" - +update_config() { curl -sL https://git.io/config.sh > $config_raw_path mv -b $config_raw_path $dir_config sed -ri "s/GithubProxyUrl=\"https\:\/\/ghproxy.com\/\"/GithubProxyUrl=\"${GithubProxyUrl}\"/g" $config_config_path sed -i "s/TG_BOT_TOKEN=\"\"/TG_BOT_TOKEN=\"${TG_BOT_TOKEN}\"/g" $config_config_path sed -i "s/TG_USER_ID=\"\"/TG_USER_ID=\"${TG_USER_ID}\"/g" $config_config_path sed -i "s/openCardBean=\"30\"/openCardBean=\"${openCardBean}\"/g" $config_config_path +} +update_extra() { curl -sL https://git.io/extra.sh > $extra_raw_path mv -b $extra_raw_path $dir_config sed -i "s/CollectedRepo=(4)/CollectedRepo=(${CollectedRepo})/g" $extra_config_path sed -i "s/OtherRepo=()/OtherRepo=(${OtherRepo})/g" $extra_config_path +} +update_code() { curl -sL https://git.io/code.sh > $code_raw_path mv -b $code_raw_path $dir_config - sed -i "s/repo=\$repo4/repo=\$repo${repoNum}/g" $code_config_path sed -i "/^HelpType=/c${HelpType}" $code_config_path sed -i "/^BreakHelpType=/c${BreakHelpType}" $code_config_path sed -i "/^BreakHelpNum=/c${BreakHelpNum}" $code_config_path +} +update_task_before() { curl -sL https://git.io/task_before.sh > $task_before_raw_path mv -b $task_before_raw_path $dir_config +} -random_cookie(){ +random_cookie() { c=1000000 for r in {1..3}; do p=`expr $c - $r` @@ -68,9 +74,27 @@ random_cookie(){ p=`expr $c - $r` sed -ri "s/regular${r}/\"position\"\:${p}/" $file_db done - ql update + ql check } +update_sendNotify() { +cp -rf /ql/config/sendNotify.js /ql/scripts/sendNotify.js +cp -rf /ql/config/sendNotify.js /ql/ninja/backend/sendNotify.js +} + + +update_config +update_extra +update_code +update_task_before +update_sendNotify + if [ $(date "+%H") -eq 18 ]; then random_cookie -fi \ No newline at end of file +fi + +case $@ in + ck) + random_cookie + ;; +esac \ No newline at end of file diff --git a/Scripts/sh/hhl.sh b/Scripts/sh/hhl.sh index 728a753..9776b19 100644 --- a/Scripts/sh/hhl.sh +++ b/Scripts/sh/hhl.sh @@ -35,7 +35,7 @@ inp() { echo -e "\e[33m\n$1 \e[0m\n" } -opt(){ +opt() { echo -n -e "\e[36m输入您的选择->\e[0m" } @@ -72,7 +72,7 @@ docker_install() { } # 配置文件保存目录 -set_savedir(){ +set_savedir() { echo -n -e "\e[33m\n一、请输入配置文件保存的绝对路径(示例:/root),回车默认为当前目录:\e[0m" read jd_path if [ -z "$jd_path" ]; then @@ -183,7 +183,7 @@ fi log "3.开始创建容器并执行" -run_v(){ +run_v() { docker run -dit \ -t \ -v $HHL_PATH:/scripts \ @@ -191,7 +191,7 @@ run_v(){ --restart always \ $DOCKER_IMG_NAME:$TAG } -run_nov(){ +run_nov() { docker run -dit \ -t \ --name $CONTAINER_NAME \ diff --git a/Scripts/sh/ql.sh b/Scripts/sh/ql.sh index d1a1a0a..960ac72 100644 --- a/Scripts/sh/ql.sh +++ b/Scripts/sh/ql.sh @@ -43,7 +43,7 @@ inp() { echo -e "\e[33m\n$1 \e[0m\n" } -opt(){ +opt() { echo -n -e "\e[36m输入您的选择->\e[0m" } @@ -181,7 +181,7 @@ if [ "$Ninja" = "2" ]; then fi # 端口问题 -modify_ql_port(){ +modify_ql_port() { inp "是否修改青龙端口[默认 5700]:\n1) 修改\n2) 不修改[默认]" opt read change_ql_port @@ -190,7 +190,7 @@ modify_ql_port(){ read JD_PORT fi } -modify_Ninja_port(){ +modify_Ninja_port() { inp "是否修改 Ninja 端口[默认 5701]:\n1) 修改\n2) 不修改[默认]" opt read change_Ninja_port @@ -239,7 +239,7 @@ if [ $HAS_IMAGE = true ] && [ $PULL_IMAGE = true ]; then fi # 端口存在检测 -check_port(){ +check_port() { echo "正在检测端口:$1" netstat -tlpn | grep "\b$1\b" } diff --git a/Scripts/sh/team.sh b/Scripts/sh/team.sh index 60cb656..e1884b9 100644 --- a/Scripts/sh/team.sh +++ b/Scripts/sh/team.sh @@ -14,7 +14,7 @@ scr2=`find ${dir_script} -type f -name "*jd_sddd.js" -o -name "*sendBeans.js"|he scr3="${dir_script}/Tsukasa007_my_script_master_jd_opencard_teamBean5_enc.js" ## 组队任务 -team_task(){ +team_task() { local p=$1 ## 组队总账号数 local q=$2 ## 每个账号发起组队的最大队伍数量 local scr=$3 ## 活动脚本完整文件名 diff --git a/Scripts/sh/v2p.sh b/Scripts/sh/v2p.sh index ff0fb12..3abfb43 100644 --- a/Scripts/sh/v2p.sh +++ b/Scripts/sh/v2p.sh @@ -40,7 +40,7 @@ inp() { echo -e "\e[33m\n$1 \e[0m\n" } -opt(){ +opt() { echo -n -e "\e[36m输入您的选择->\e[0m" } @@ -77,7 +77,7 @@ docker_install() { } # 配置文件保存目录 -set_savedir(){ +set_savedir() { echo -n -e "\e[33m\n一、请输入配置文件保存的绝对路径(示例:/root),回车默认为当前目录:\e[0m" read v2p_path if [ -z "$v2p_path" ]; then @@ -250,7 +250,7 @@ fi log "3.开始创建容器并执行" -run_v(){ +run_v() { docker run -dit \ -t \ -e TZ=Asia/Shanghai \ @@ -268,7 +268,7 @@ run_v(){ --network $NETWORK \ $DOCKER_IMG_NAME:$TAG } -run_nov(){ +run_nov() { docker run -dit \ -t \ -e TZ=Asia/Shanghai \ diff --git a/Scripts/sh/v4.sh b/Scripts/sh/v4.sh index 59fb0ff..d638ae8 100644 --- a/Scripts/sh/v4.sh +++ b/Scripts/sh/v4.sh @@ -46,7 +46,7 @@ inp() { echo -e "\e[33m\n$1 \e[0m\n" } -opt(){ +opt() { echo -n -e "\e[36m输入您的选择->\e[0m" } @@ -203,7 +203,7 @@ if [ "$pannel" = "2" ]; then fi # 端口问题 -modify_v4_port(){ +modify_v4_port() { inp "是否修改 V4 端口[默认 5678]:\n1) 修改\n2) 不修改[默认]" opt read change_port