Merge branch 'dev'

dev
mack-a 2023-04-11 11:50:59 +08:00
commit 71fef82f9e
1 changed files with 20 additions and 14 deletions

View File

@ -5942,6 +5942,7 @@ initRealityDest() {
realityDestDomain=${domain}:${port}
else
echoContent skyBlue "\n===== 生成配置回落的域名 例如:[addons.mozilla.org:443] ======\n"
echoContent green "回落域名参考https://www.v2ray-agent.com/archives/1680104902581#heading-8\n"
read -r -p "请输入[回车]使用默认:" realityDestDomain
if [[ -z "${realityDestDomain}" ]]; then
realityDestDomain="addons.mozilla.org:443"
@ -5955,7 +5956,8 @@ initRealityClientServersName() {
realityServerNames=\"${domain}\"
else
echoContent skyBlue "\n================ 配置客户端可用的serverNames ================\n"
echoContent yellow "#注意事项\n"
echoContent yellow "#注意事项"
echoContent green "客户端可用的serverNameshttps://www.v2ray-agent.com/archives/1680104902581#heading-8\n"
echoContent yellow "录入示例:addons.mozilla.org\n"
read -r -p "请输入[回车]使用默认:" realityServerNames
if [[ -z "${realityServerNames}" ]]; then
@ -5975,25 +5977,29 @@ initRealityPort() {
realityPort=${currentRealityPort}
fi
fi
# todo 读取到VLESS_TLS_Vision端口直接使用。这里可能有歧义
# todo 读取到VLESS_TLS_Vision端口提示是否使用使用。这里可能有歧义
if [[ -z "${realityPort}" ]]; then
if [[ -n "${port}" ]]; then
realityPort=${port}
elif [[ -z "${realityPort}" ]]; then
echoContent yellow "请输入端口[建议443]"
echoContent yellow "请输入端口[回车默认使用TLS+Vision端口]"
read -r -p "端口:" realityPort
if [[ -z "${realityPort}" ]]; then
realityPort=${port}
fi
else
echoContent yellow "请输入端口"
read -r -p "端口:" realityPort
fi
if [[ -n "${realityPort}" && "${currentRealityPort}" == "${realityPort}" ]]; then
handleXray stop
else
checkPort "${realityPort}"
if [[ -n "${port}" && "${port}" == "${realityPort}" ]]; then
echoContent red " 端口不可与Vision重复--->"
echo
realityPort=
# if [[ -n "${port}" && "${port}" == "${realityPort}" ]]; then
# echoContent red " 端口不可与Vision重复--->"
# echo
# realityPort=
# fi
fi
fi
fi
if [[ -z "${realityPort}" ]]; then
initRealityPort
else