From 1717438d72c023b3217577085c4943ec5418d785 Mon Sep 17 00:00:00 2001 From: mack-a Date: Thu, 13 Oct 2022 17:36:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97):=20?= =?UTF-8?q?=E5=B8=90=E5=8F=B7->=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documents/how_to_use.md | 8 ++++---- install.sh | 18 +++++++++--------- shell/install_en.sh | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/documents/how_to_use.md b/documents/how_to_use.md index 7051eaac..cc23ca7c 100644 --- a/documents/how_to_use.md +++ b/documents/how_to_use.md @@ -64,7 +64,7 @@ ### 7.添加智能DNS智能解析 -如果选择y，则查看帐号的时候 address是优选后的域名解析，则会出现address是脚本提供的域名，伪装域名或SNI或peer则是个人的域名，详情原理解析请查看[此文章](https://github.com/mack-a/v2ray-agent/blob/master/documents/optimize_V2Ray.md)，仅支持ws的传输方式 +如果选择y，则查看账号的时候 address是优选后的域名解析，则会出现address是脚本提供的域名，伪装域名或SNI或peer则是个人的域名，详情原理解析请查看[此文章](https://github.com/mack-a/v2ray-agent/blob/master/documents/optimize_V2Ray.md)，仅支持ws的传输方式 @@ -86,7 +86,7 @@ ### 11.完成 -恭喜到这里就是最后一步了，接下来会检测服务是否正常，正常则会展示帐号 +恭喜到这里就是最后一步了，接下来会检测服务是否正常，正常则会展示账号 # 2.进阶教学 @@ -94,7 +94,7 @@ ### 1.查看订阅 -当【查看订阅】时脚本会自动创建一个唯一的订阅地址，不【查看订阅】时不会自动生成。 每次帐号更改时需要重新【查看订阅】才会生成新的内容。 此操作完全在你的服务器存放，不需要担心是否泄漏。 +当【查看订阅】时脚本会自动创建一个唯一的订阅地址，不【查看订阅】时不会自动生成。 每次账号更改时需要重新【查看订阅】才会生成新的内容。 此操作完全在你的服务器存放，不需要担心是否泄漏。 ### 2.添加用户/删除用户 @@ -135,7 +135,7 @@ netflix、bahamut、hulu、hbo、disney、bbc、4chan、fox、abema、dmm、nico ### 7.添加新端口 -不影响443端口的使用，查看帐号时仅展示443端口的帐号，支持多个端口的添加和删除。 +不影响443端口的使用，查看账号时仅展示443端口的账号，支持多个端口的添加和删除。 diff --git a/install.sh b/install.sh index d5c3b59a..0037e847 100644 --- a/install.sh +++ b/install.sh @@ -2342,7 +2342,7 @@ initXrayFrontingConfig() { echoContent red "\n==============================================================" echoContent yellow "# 注意事项\n" echoContent yellow "会将前置替换为${xtlsType}" - echoContent yellow "如果前置是Trojan，查看帐号时则会出现两个Trojan协议的节点，有一个不可用xtls" + echoContent yellow "如果前置是Trojan，查看账号时则会出现两个Trojan协议的节点，有一个不可用xtls" echoContent yellow "再次执行可切换至上一次的前置\n" echoContent yellow "1.切换至${xtlsType}" @@ -2972,14 +2972,14 @@ showAccounts() { if echo "${currentInstallProtocolType}" | grep -q trojan; then echoContent skyBlue "===================== Trojan TCP TLS/XTLS-direct/XTLS-splice ======================\n" jq .inbounds[0].settings.clients ${configPath}02_trojan_TCP_inbounds.json | jq -c '.[]' | while read -r user; do - echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)" + echoContent skyBlue "\n ---> 账号:$(echo "${user}" | jq -r .email)" defaultBase64Code trojanTCPXTLS "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .password)" done else echoContent skyBlue "===================== VLESS TCP TLS/XTLS-direct/XTLS-splice ======================\n" jq .inbounds[0].settings.clients ${configPath}02_VLESS_TCP_inbounds.json | jq -c '.[]' | while read -r user; do - echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)" + echoContent skyBlue "\n ---> 账号:$(echo "${user}" | jq -r .email)" echo defaultBase64Code vlesstcp "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)" done @@ -2990,7 +2990,7 @@ showAccounts() { echoContent skyBlue "\n================================ VLESS WS TLS CDN ================================\n" jq .inbounds[0].settings.clients ${configPath}03_VLESS_WS_inbounds.json | jq -c '.[]' | while read -r user; do - echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)" + echoContent skyBlue "\n ---> 账号:$(echo "${user}" | jq -r .email)" echo local path="${currentPath}ws" # if [[ ${coreInstallType} == "1" ]]; then @@ -3009,7 +3009,7 @@ showAccounts() { path="${currentPath}vws" fi jq .inbounds[0].settings.clients ${configPath}05_VMess_WS_inbounds.json | jq -c '.[]' | while read -r user; do - echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)" + echoContent skyBlue "\n ---> 账号:$(echo "${user}" | jq -r .email)" echo defaultBase64Code vmessws "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)" done @@ -3022,7 +3022,7 @@ showAccounts() { # local serviceName # serviceName=$(jq -r .inbounds[0].streamSettings.grpcSettings.serviceName ${configPath}06_VLESS_gRPC_inbounds.json) jq .inbounds[0].settings.clients ${configPath}06_VLESS_gRPC_inbounds.json | jq -c '.[]' | while read -r user; do - echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)" + echoContent skyBlue "\n ---> 账号:$(echo "${user}" | jq -r .email)" echo defaultBase64Code vlessgrpc "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)" done @@ -3033,7 +3033,7 @@ showAccounts() { if echo ${currentInstallProtocolType} | grep -q 4; then echoContent skyBlue "\n================================== Trojan TLS ==================================\n" jq .inbounds[0].settings.clients ${configPath}04_trojan_TCP_inbounds.json | jq -c '.[]' | while read -r user; do - echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)" + echoContent skyBlue "\n ---> 账号:$(echo "${user}" | jq -r .email)" defaultBase64Code trojan "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .password)" done @@ -3045,7 +3045,7 @@ showAccounts() { # local serviceName= # serviceName=$(jq -r .inbounds[0].streamSettings.grpcSettings.serviceName ${configPath}04_trojan_gRPC_inbounds.json) jq .inbounds[0].settings.clients ${configPath}04_trojan_gRPC_inbounds.json | jq -c '.[]' | while read -r user; do - echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)" + echoContent skyBlue "\n ---> 账号:$(echo "${user}" | jq -r .email)" echo defaultBase64Code trojangrpc "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .password)" done @@ -3195,7 +3195,7 @@ addCorePort() { echoContent yellow "# 注意事项\n" echoContent yellow "支持批量添加" echoContent yellow "不影响443端口的使用" - echoContent yellow "查看帐号时，只会展示默认端口443的帐号" + echoContent yellow "查看账号时，只会展示默认端口443的账号" echoContent yellow "不允许有特殊字符，注意逗号的格式" echoContent yellow "录入示例:2053,2083,2087\n" diff --git a/shell/install_en.sh b/shell/install_en.sh index ae81db93..0e800735 100644 --- a/shell/install_en.sh +++ b/shell/install_en.sh @@ -2620,7 +2620,7 @@ showAccounts() { path="${currentPath}vws?ed=2048" fi jq .inbounds[0].settings.clients ${configPath}05_VMess_WS_inbounds.json | jq -c '.[]' | while read -r user; do - echoContent skyBlue "\n ---> 帐号：$(echo "${user}" | jq -r .email )_$(echo "${user}" | jq -r .id)" + echoContent skyBlue "\n ---> 账号：$(echo "${user}" | jq -r .email )_$(echo "${user}" | jq -r .id)" echo defaultBase64Code vmessws $(echo "${user}" | jq -r .email) $(echo "${user}" | jq -r .id) "${currentHost}:${currentPort}" ${path} ${currentAdd} done