From 84b87e197e81fb7b6f1d62bb45db624b835c345b Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Mon, 12 Jun 2023 14:48:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20vmess=E5=88=86?= =?UTF-8?q?=E6=B5=81=E6=94=AF=E6=8C=81=E5=A2=9E=E9=87=8F=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E3=80=81domain=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 67 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 65 deletions(-) diff --git a/install.sh b/install.sh index a3db73a..7f84dda 100644 --- a/install.sh +++ b/install.sh @@ -5786,32 +5786,7 @@ setVMessWSRoutingOutbounds() { echo "${outbounds}" | jq . >${configPath}10_ipv4_outbounds.json - if [[ -f "${configPath}09_routing.json" ]]; then - unInstallRouting VMess-out outboundTag - - local routing - - routing=$(jq -r ".routing.rules += [{\"type\":\"field\",\"domain\":[\"ip.sb\",\"geosite:${domainList//,/\",\"geosite:}\"],\"outboundTag\":\"VMess-out\"}]" ${configPath}09_routing.json) - - echo "${routing}" | jq . >${configPath}09_routing.json - else - cat <${configPath}09_routing.json -{ - "routing": { - "rules": [ - { - "type": "field", - "domain": [ - "ip.sb", - "geosite:${domainList//,/\",\"geosite:}" - ], - "outboundTag": "VMess-out" - } - ] - } -} -EOF - fi + addInstallRouting VMess-out outboundTag "${domainList}" reloadCore echoContent green " ---> 添加分流成功" exit 0 @@ -5844,44 +5819,6 @@ setDokodemoDoorRoutingOutbounds() { echo "${outbounds}" | jq . >${configPath}10_ipv4_outbounds.json - # if [[ -f "${configPath}09_routing.json" ]]; then - # unInstallRouting dokodemoDoor-80 outboundTag - # unInstallRouting dokodemoDoor-443 outboundTag - # - # local routing - # - # routing=$(jq -r ".routing.rules += [{\"type\":\"field\",\"port\":80,\"domain\":[\"ip.sb\",\"geosite:${domainList//,/\",\"geosite:}\"],\"outboundTag\":\"dokodemoDoor-80\"},{\"type\":\"field\",\"port\":443,\"domain\":[\"ip.sb\",\"geosite:${domainList//,/\",\"geosite:}\"],\"outboundTag\":\"dokodemoDoor-443\"}]" ${configPath}09_routing.json) - # - # echo "${routing}" | jq . >${configPath}09_routing.json - # else - # cat <${configPath}09_routing.json - #{ - # "routing": { - # "domainStrategy": "AsIs", - # "rules": [ - # { - # "type": "field", - # "port": 80, - # "domain": [ - # "ip.sb", - # "geosite:${domainList//,/\",\"geosite:}" - # ], - # "outboundTag": "dokodemoDoor-80" - # }, - # { - # "type": "field", - # "port": 443, - # "domain": [ - # "ip.sb", - # "geosite:${domainList//,/\",\"geosite:}" - # ], - # "outboundTag": "dokodemoDoor-443" - # } - # ] - # } - #} - #EOF - # fi reloadCore echoContent green " ---> 添加任意门分流成功" exit 0 @@ -7395,7 +7332,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v2.9.14" + echoContent green "当前版本:v2.9.15" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:八合一共存脚本\c" showInstallStatus