From a6722e9e84d6e3e320a8c70e2d824424c988d2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=96=E6=9F=92Max?= <60207794+jiuqi9997@users.noreply.github.com> Date: Wed, 12 Jul 2023 03:43:14 +0800 Subject: [PATCH] Fix https://github.com/wulabing/Xray_onekey/issues/445 https://github.com/wulabing/Xray_onekey/issues/458 --- ...irect.json => xray_tls_ws_mix-rprx-vision.json} | 2 +- ...rprx-direct.json => xray_xtls-rprx-vision.json} | 2 +- install.sh | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) rename config/{xray_tls_ws_mix-rprx-direct.json => xray_tls_ws_mix-rprx-vision.json} (97%) rename config/{xray_xtls-rprx-direct.json => xray_xtls-rprx-vision.json} (96%) diff --git a/config/xray_tls_ws_mix-rprx-direct.json b/config/xray_tls_ws_mix-rprx-vision.json similarity index 97% rename from config/xray_tls_ws_mix-rprx-direct.json rename to config/xray_tls_ws_mix-rprx-vision.json index f37078c..6ed49ea 100644 --- a/config/xray_tls_ws_mix-rprx-direct.json +++ b/config/xray_tls_ws_mix-rprx-vision.json @@ -12,7 +12,7 @@ "clients": [ { "id": "xx", - "flow": "xtls-rprx-direct" + "flow": "xtls-rprx-vision" } ], "decryption": "none", diff --git a/config/xray_xtls-rprx-direct.json b/config/xray_xtls-rprx-vision.json similarity index 96% rename from config/xray_xtls-rprx-direct.json rename to config/xray_xtls-rprx-vision.json index 90590a1..83c94f4 100644 --- a/config/xray_xtls-rprx-direct.json +++ b/config/xray_xtls-rprx-vision.json @@ -12,7 +12,7 @@ "clients": [ { "id": "xx", - "flow": "xtls-rprx-direct" + "flow": "xtls-rprx-vision" } ], "decryption": "none", diff --git a/install.sh b/install.sh index 80e87f5..061b111 100644 --- a/install.sh +++ b/install.sh @@ -366,13 +366,13 @@ function modify_port() { } function configure_xray() { - cd /usr/local/etc/xray && rm -f config.json && wget -O config.json https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/xray_xtls-rprx-direct.json + cd /usr/local/etc/xray && rm -f config.json && wget -O config.json https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/xray_xtls-rprx-vision.json modify_UUID modify_port } function configure_xray_ws() { - cd /usr/local/etc/xray && rm -f config.json && wget -O config.json https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/xray_tls_ws_mix-rprx-direct.json + cd /usr/local/etc/xray && rm -f config.json && wget -O config.json https://raw.githubusercontent.com/wulabing/Xray_onekey/${github_branch}/config/xray_tls_ws_mix-rprx-vision.json modify_UUID modify_UUID_ws modify_port @@ -547,7 +547,7 @@ function restart_all() { judge "Xray 启动" } -function vless_xtls-rprx-direct_link() { +function vless_xtls-rprx-vision_link() { UUID=$(cat ${xray_conf_dir}/config.json | jq .inbounds[0].settings.clients[0].id | tr -d '"') PORT=$(cat ${xray_conf_dir}/config.json | jq .inbounds[0].port) FLOW=$(cat ${xray_conf_dir}/config.json | jq .inbounds[0].settings.clients[0].flow | tr -d '"') @@ -566,7 +566,7 @@ function vless_xtls-rprx-direct_link() { print_ok "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless://$UUID@$DOMAIN:$PORT?security=xtls%26flow=$FLOW%23XTLS_wulabing-$DOMAIN" } -function vless_xtls-rprx-direct_information() { +function vless_xtls-rprx-vision_information() { UUID=$(cat ${xray_conf_dir}/config.json | jq .inbounds[0].settings.clients[0].id | tr -d '"') PORT=$(cat ${xray_conf_dir}/config.json | jq .inbounds[0].port) FLOW=$(cat ${xray_conf_dir}/config.json | jq .inbounds[0].settings.clients[0].flow | tr -d '"') @@ -630,15 +630,15 @@ function ws_link() { function basic_information() { print_ok "VLESS+TCP+XTLS+Nginx 安装成功" - vless_xtls-rprx-direct_information - vless_xtls-rprx-direct_link + vless_xtls-rprx-vision_information + vless_xtls-rprx-vision_link } function basic_ws_information() { print_ok "VLESS+TCP+TLS+Nginx with WebSocket 混合模式 安装成功" ws_information print_ok "————————————————————————" - vless_xtls-rprx-direct_information + vless_xtls-rprx-vision_information ws_link }