mirror of
https://github.com/mack-a/v2ray-agent.git
synced 2026-09-02 13:56:37 +00:00
fix(脚本): 修复xhttp扫码配置
This commit is contained in:
+8
-8
@@ -1010,7 +1010,7 @@ showInstallStatus() {
|
|||||||
echoContent yellow "VMess+TLS+HTTPUpgrade \c"
|
echoContent yellow "VMess+TLS+HTTPUpgrade \c"
|
||||||
fi
|
fi
|
||||||
if echo ${currentInstallProtocolType} | grep -q ",12,"; then
|
if echo ${currentInstallProtocolType} | grep -q ",12,"; then
|
||||||
echoContent yellow "VLESS+XHTTP \c"
|
echoContent yellow "VLESS+Reality+XHTTP \c"
|
||||||
fi
|
fi
|
||||||
if echo ${currentInstallProtocolType} | grep -q ",13,"; then
|
if echo ${currentInstallProtocolType} | grep -q ",13,"; then
|
||||||
echoContent yellow "AnyTLS \c"
|
echoContent yellow "AnyTLS \c"
|
||||||
@@ -2779,7 +2779,7 @@ initXrayClients() {
|
|||||||
fi
|
fi
|
||||||
# VLESS XHTTP
|
# VLESS XHTTP
|
||||||
if echo "${type}" | grep -q ",12,"; then
|
if echo "${type}" | grep -q ",12,"; then
|
||||||
currentUser="{\"id\":\"${uuid}\",\"email\":\"${email}-VLESS_XHTTP\"}"
|
currentUser="{\"id\":\"${uuid}\",\"email\":\"${email}-VLESS_Reality_XHTTP\"}"
|
||||||
users=$(echo "${users}" | jq -r ". +=[${currentUser}]")
|
users=$(echo "${users}" | jq -r ". +=[${currentUser}]")
|
||||||
fi
|
fi
|
||||||
# trojan grpc
|
# trojan grpc
|
||||||
@@ -3967,7 +3967,7 @@ EOF
|
|||||||
elif [[ -z "$3" ]]; then
|
elif [[ -z "$3" ]]; then
|
||||||
rm /etc/v2ray-agent/xray/conf/03_VLESS_WS_inbounds.json >/dev/null 2>&1
|
rm /etc/v2ray-agent/xray/conf/03_VLESS_WS_inbounds.json >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
# VLESS_XHTTP_TLS
|
# VLESS_Reality_XHTTP_TLS
|
||||||
if echo "${selectCustomInstallType}" | grep -q ",12," || [[ "$1" == "all" ]]; then
|
if echo "${selectCustomInstallType}" | grep -q ",12," || [[ "$1" == "all" ]]; then
|
||||||
initXrayXHTTPort
|
initXrayXHTTPort
|
||||||
initRealityClientServersName
|
initRealityClientServersName
|
||||||
@@ -4861,7 +4861,7 @@ EOF
|
|||||||
vless://${id}@$(getPublicIP):${port}?encryption=none&security=reality&type=xhttp&sni=${xrayVLESSRealityXHTTPServerName}&fp=chrome&path=${path}&pbk=${currentRealityXHTTPPublicKey}&sid=6ba85179e30d4fc2#${email}
|
vless://${id}@$(getPublicIP):${port}?encryption=none&security=reality&type=xhttp&sni=${xrayVLESSRealityXHTTPServerName}&fp=chrome&path=${path}&pbk=${currentRealityXHTTPPublicKey}&sid=6ba85179e30d4fc2#${email}
|
||||||
EOF
|
EOF
|
||||||
echoContent yellow " ---> 二维码 VLESS(VLESS+reality+XHTTP)"
|
echoContent yellow " ---> 二维码 VLESS(VLESS+reality+XHTTP)"
|
||||||
echoContent green " https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless%3A%2F%2F${id}%40$(getPublicIP)%3A${port}%3Fencryption%3Dnone%26security%3Dreality%26type%3Dtcp%26sni%3D${xrayVLESSRealityXHTTPServerName}%26fp%3Dchrome%26path%3D${path}%26host%3D${xrayVLESSRealityXHTTPServerName}%26pbk%3D${currentRealityXHTTPPublicKey}%26sid%3D6ba85179e30d4fc2%23${email}\n"
|
echoContent green " https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless%3A%2F%2F${id}%40$(getPublicIP)%3A${port}%3Fencryption%3Dnone%26security%3Dreality%26type%3Dxhttp%26sni%3D${xrayVLESSRealityXHTTPServerName}%26fp%3Dchrome%26path%3D${path}%26host%3D${xrayVLESSRealityXHTTPServerName}%26pbk%3D${currentRealityXHTTPPublicKey}%26sid%3D6ba85179e30d4fc2%23${email}\n"
|
||||||
|
|
||||||
elif
|
elif
|
||||||
[[ "${type}" == "vlessgrpc" ]]
|
[[ "${type}" == "vlessgrpc" ]]
|
||||||
@@ -5427,9 +5427,9 @@ showAccounts() {
|
|||||||
done < <(echo "${currentCDNAddress}" | tr ',' '\n')
|
done < <(echo "${currentCDNAddress}" | tr ',' '\n')
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
# VLESS XHTTP
|
# VLESS Reality XHTTP
|
||||||
if echo ${currentInstallProtocolType} | grep -q ",12,"; then
|
if echo ${currentInstallProtocolType} | grep -q ",12,"; then
|
||||||
echoContent skyBlue "\n================================ VLESS XHTTP TLS [仅CDN推荐] ================================\n"
|
echoContent skyBlue "\n================================ VLESS Reality XHTTP TLS [仅CDN推荐] ================================\n"
|
||||||
|
|
||||||
jq .inbounds[0].settings.clients//.inbounds[0].users ${configPath}12_VLESS_XHTTP_inbounds.json | jq -c '.[]' | while read -r user; do
|
jq .inbounds[0].settings.clients//.inbounds[0].users ${configPath}12_VLESS_XHTTP_inbounds.json | jq -c '.[]' | while read -r user; do
|
||||||
local email=
|
local email=
|
||||||
@@ -8023,7 +8023,7 @@ customXrayInstall() {
|
|||||||
echoContent yellow "5.VLESS+TLS+gRPC[仅CDN推荐]"
|
echoContent yellow "5.VLESS+TLS+gRPC[仅CDN推荐]"
|
||||||
echoContent yellow "7.VLESS+Reality+uTLS+Vision[推荐]"
|
echoContent yellow "7.VLESS+Reality+uTLS+Vision[推荐]"
|
||||||
# echoContent yellow "8.VLESS+Reality+gRPC"
|
# echoContent yellow "8.VLESS+Reality+gRPC"
|
||||||
echoContent yellow "12.VLESS+XHTTP+TLS"
|
echoContent yellow "12.VLESS+Reality+XHTTP+TLS"
|
||||||
read -r -p "请选择[多选],[例如:1,2,3]:" selectCustomInstallType
|
read -r -p "请选择[多选],[例如:1,2,3]:" selectCustomInstallType
|
||||||
echoContent skyBlue "--------------------------------------------------------------"
|
echoContent skyBlue "--------------------------------------------------------------"
|
||||||
if echo "${selectCustomInstallType}" | grep -q ","; then
|
if echo "${selectCustomInstallType}" | grep -q ","; then
|
||||||
@@ -9512,7 +9512,7 @@ menu() {
|
|||||||
cd "$HOME" || exit
|
cd "$HOME" || exit
|
||||||
echoContent red "\n=============================================================="
|
echoContent red "\n=============================================================="
|
||||||
echoContent green "作者:mack-a"
|
echoContent green "作者:mack-a"
|
||||||
echoContent green "当前版本:v3.4.34"
|
echoContent green "当前版本:v3.4.35"
|
||||||
echoContent green "Github:https://github.com/mack-a/v2ray-agent"
|
echoContent green "Github:https://github.com/mack-a/v2ray-agent"
|
||||||
echoContent green "描述:八合一共存脚本\c"
|
echoContent green "描述:八合一共存脚本\c"
|
||||||
showInstallStatus
|
showInstallStatus
|
||||||
|
|||||||
Reference in New Issue
Block a user