From 349473d79ee8c93bf9879f5f29297dc019629455 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Thu, 14 Mar 2024 14:57:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=BB=E6=84=8F=E7=BB=84=E5=90=88=E5=AE=89=E8=A3=85=E6=97=B6?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=90=8E=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=81sing-box=E8=AE=A2=E9=98=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=E4=B8=8E=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=88=87=E6=8D=A2=E3=80=81=E4=BF=AE=E6=94=B9sing-box?= =?UTF-8?q?=E8=AE=A2=E9=98=85dns=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documents/sing-box.json | 47 +++++++++++++++++++++++++++++------------ install.sh | 13 ++++++------ 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/documents/sing-box.json b/documents/sing-box.json index b43224c..320fd94 100644 --- a/documents/sing-box.json +++ b/documents/sing-box.json @@ -9,7 +9,7 @@ "external_controller": "127.0.0.1:9090", "external_ui": "metacubexd", "external_ui_download_url": "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip", - "external_ui_download_detour": "全局代理", + "external_ui_download_detour": "手动切换", "default_mode": "rule" }, "cache_file": { @@ -23,7 +23,7 @@ "address": "https://1.1.1.1/dns-query", "address_resolver": "dns_resolver", "strategy": "ipv4_only", - "detour": "select" + "detour": "手动切换" }, { "tag": "dns_direct", @@ -94,9 +94,19 @@ } ], "outbounds": [ + { + "type": "urltest", + "tag": "自动选择", + "outbounds": [ + ], + "url": "https://www.gstatic.com/generate_204", + "interval": "3m", + "tolerance": 50, + "interrupt_exist_connections": false + }, { "type": "selector", - "tag": "全局代理", + "tag": "手动切换", "outbounds": [ ] }, @@ -104,35 +114,40 @@ "type": "selector", "tag": "Telegram", "outbounds": [ - "全局代理" + "手动切换", + "自动选择" ] }, { "type": "selector", "tag": "YouTube", "outbounds": [ - "全局代理" + "手动切换", + "自动选择" ] }, { "type": "selector", "tag": "netflix", "outbounds": [ - "全局代理" + "手动切换", + "自动选择" ] }, { "type": "selector", "tag": "OpenAI", "outbounds": [ - "全局代理" + "手动切换", + "自动选择" ] }, { "type": "selector", "tag": "Apple", "outbounds": [ - "全局代理", + "手动切换", + "自动选择", "direct" ] }, @@ -140,14 +155,16 @@ "type": "selector", "tag": "Google", "outbounds": [ - "全局代理" + "手动切换", + "自动选择" ] }, { "type": "selector", "tag": "Microsoft", "outbounds": [ - "全局代理", + "手动切换", + "自动选择", "direct" ] }, @@ -155,7 +172,8 @@ "type": "selector", "tag": "Github", "outbounds": [ - "全局代理", + "手动切换", + "自动选择", "direct" ] }, @@ -164,7 +182,8 @@ "tag": "本地直连", "outbounds": [ "direct", - "全局代理" + "手动切换", + "自动选择" ], "default": "direct" }, @@ -322,7 +341,7 @@ "rules": [ { "clash_mode": "global", - "outbound": "全局代理" + "outbound": "手动切换" }, { "clash_mode": "direct", @@ -401,7 +420,7 @@ }, { "rule_set": "geosite-geolocation-!cn", - "outbound": "全局代理" + "outbound": "手动切换" }, { "rule_set": [ diff --git a/install.sh b/install.sh index 8f8c787..91dd282 100644 --- a/install.sh +++ b/install.sh @@ -1809,7 +1809,7 @@ nginxBlog() { if [[ "${nginxBlogInstallStatus}" == "y" ]]; then rm -rf "${nginxStaticPath}" randomNum=$((RANDOM % 6 + 1)) - wget -q "${wgetShowProgressStatus}" -P "${nginxStaticPath}" https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${randomNum}.zip >/dev/null + wget -q "${wgetShowProgressStatus}" -P "${nginxStaticPath}" https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${randomNum}.zip unzip -o "${nginxStaticPath}html${randomNum}.zip" -d "${nginxStaticPath}" >/dev/null rm -f "${nginxStaticPath}html${randomNum}.zip*" echoContent green " ---> 添加伪装站点成功" @@ -5118,7 +5118,7 @@ updateNginxBlog() { if [[ "${selectInstallNginxBlogType}" =~ ^[1-9]$ ]]; then rm -rf "${nginxStaticPath}" - wget -q "${wgetShowProgressStatus}" -P "${nginxStaticPath}" "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${selectInstallNginxBlogType}.zip" >/dev/null + wget -q "${wgetShowProgressStatus}" -P "${nginxStaticPath}" "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${selectInstallNginxBlogType}.zip" unzip -o "${nginxStaticPath}html${selectInstallNginxBlogType}.zip" -d "${nginxStaticPath}" >/dev/null rm -f "${nginxStaticPath}html${selectInstallNginxBlogType}.zip*" @@ -7328,10 +7328,9 @@ customXrayInstall() { # selectCustomInstallType="${selectCustomInstallType}," # fi # - # if [[ "${selectCustomInstallType:0:1}" != "," ]]; then - # selectCustomInstallType=",${selectCustomInstallType}," - # fi - + if [[ "${selectCustomInstallType:0:1}" != "," ]]; then + selectCustomInstallType=",${selectCustomInstallType}," + fi if [[ "${selectCustomInstallType//,/}" =~ ^[0-7]+$ ]]; then unInstallSubscribe checkBTPanel @@ -8711,7 +8710,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者：mack-a" - echoContent green "当前版本：v3.2.22" + echoContent green "当前版本：v3.2.23" echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "描述：八合一共存脚本\c" showInstallStatus