mack-a
/
v2ray-agent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(修改文字): 帐号->账号

pull/534/merge
mack-a 2022-10-13 17:36:38 +08:00
parent dd0251d462
commit 7add118f04
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
documents/how_to_use.md
View File

@ -64,7 +64,7 @@
### 7.添加智能DNS智能解析 ### 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的传输方式
<img src="https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/how_to_use/07.png" width=700> <img src="https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/how_to_use/07.png" width=700>
@ -86,7 +86,7 @@
### 11.完成 ### 11.完成
恭喜到这里就是最后一步了，接下来会检测服务是否正常，正常则会展示帐号 恭喜到这里就是最后一步了，接下来会检测服务是否正常，正常则会展示账号
# 2.进阶教学 # 2.进阶教学
@ -94,7 +94,7 @@
### 1.查看订阅 ### 1.查看订阅
当【查看订阅】时脚本会自动创建一个唯一的订阅地址，不【查看订阅】时不会自动生成。 每次帐号更改时需要重新【查看订阅】才会生成新的内容。 此操作完全在你的服务器存放，不需要担心是否泄漏。 当【查看订阅】时脚本会自动创建一个唯一的订阅地址，不【查看订阅】时不会自动生成。 每次账号更改时需要重新【查看订阅】才会生成新的内容。 此操作完全在你的服务器存放，不需要担心是否泄漏。
### 2.添加用户/删除用户 ### 2.添加用户/删除用户
@ -135,7 +135,7 @@ netflix、bahamut、hulu、hbo、disney、bbc、4chan、fox、abema、dmm、nico
### 7.添加新端口 ### 7.添加新端口
不影响443端口的使用，查看帐号时仅展示443端口的帐号，支持多个端口的添加和删除。 不影响443端口的使用，查看账号时仅展示443端口的账号，支持多个端口的添加和删除。
<img src="https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/how_to_use/14.png" width=700> <img src="https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/how_to_use/14.png" width=700>

18
install.sh
View File

@ -2342,7 +2342,7 @@ initXrayFrontingConfig() {
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent yellow "# 注意事项\n" echoContent yellow "# 注意事项\n"
echoContent yellow "会将前置替换为${xtlsType}" echoContent yellow "会将前置替换为${xtlsType}"
echoContent yellow "如果前置是Trojan，查看帐号时则会出现两个Trojan协议的节点，有一个不可用xtls" echoContent yellow "如果前置是Trojan，查看账号时则会出现两个Trojan协议的节点，有一个不可用xtls"
echoContent yellow "再次执行可切换至上一次的前置\n" echoContent yellow "再次执行可切换至上一次的前置\n"
echoContent yellow "1.切换至${xtlsType}" echoContent yellow "1.切换至${xtlsType}"
@ -2972,14 +2972,14 @@ showAccounts() {
if echo "${currentInstallProtocolType}" | grep -q trojan; then if echo "${currentInstallProtocolType}" | grep -q trojan; then
echoContent skyBlue "===================== Trojan TCP TLS/XTLS-direct/XTLS-splice ======================\n" 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 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)" defaultBase64Code trojanTCPXTLS "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .password)"
done done
else else
echoContent skyBlue "===================== VLESS TCP TLS/XTLS-direct/XTLS-splice ======================\n" 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 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 echo
defaultBase64Code vlesstcp "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)" defaultBase64Code vlesstcp "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)"
done done
@ -2990,7 +2990,7 @@ showAccounts() {
echoContent skyBlue "\n================================ VLESS WS TLS CDN ================================\n" 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 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 echo
local path="${currentPath}ws" local path="${currentPath}ws"
# if [[ ${coreInstallType} == "1" ]]; then # if [[ ${coreInstallType} == "1" ]]; then
@ -3009,7 +3009,7 @@ showAccounts() {
path="${currentPath}vws" path="${currentPath}vws"
fi fi
jq .inbounds[0].settings.clients ${configPath}05_VMess_WS_inbounds.json | jq -c '.[]' | while read -r user; do 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 echo
defaultBase64Code vmessws "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)" defaultBase64Code vmessws "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)"
done done
@ -3022,7 +3022,7 @@ showAccounts() {
# local serviceName # local serviceName
# serviceName=$(jq -r .inbounds[0].streamSettings.grpcSettings.serviceName ${configPath}06_VLESS_gRPC_inbounds.json) # 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 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 echo
defaultBase64Code vlessgrpc "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)" defaultBase64Code vlessgrpc "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)"
done done
@ -3033,7 +3033,7 @@ showAccounts() {
if echo ${currentInstallProtocolType} | grep -q 4; then if echo ${currentInstallProtocolType} | grep -q 4; then
echoContent skyBlue "\n================================== Trojan TLS ==================================\n" echoContent skyBlue "\n================================== Trojan TLS ==================================\n"
jq .inbounds[0].settings.clients ${configPath}04_trojan_TCP_inbounds.json | jq -c '.[]' | while read -r user; do 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)" defaultBase64Code trojan "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .password)"
done done
@ -3045,7 +3045,7 @@ showAccounts() {
# local serviceName= # local serviceName=
# serviceName=$(jq -r .inbounds[0].streamSettings.grpcSettings.serviceName ${configPath}04_trojan_gRPC_inbounds.json) # 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 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 echo
defaultBase64Code trojangrpc "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .password)" defaultBase64Code trojangrpc "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .password)"
done done
@ -3195,7 +3195,7 @@ addCorePort() {
echoContent yellow "# 注意事项\n" echoContent yellow "# 注意事项\n"
echoContent yellow "支持批量添加" echoContent yellow "支持批量添加"
echoContent yellow "不影响443端口的使用" echoContent yellow "不影响443端口的使用"
echoContent yellow "查看帐号时，只会展示默认端口443的帐号" echoContent yellow "查看账号时，只会展示默认端口443的账号"
echoContent yellow "不允许有特殊字符，注意逗号的格式" echoContent yellow "不允许有特殊字符，注意逗号的格式"
echoContent yellow "录入示例:2053,2083,2087\n" echoContent yellow "录入示例:2053,2083,2087\n"

2
shell/install_en.sh
View File

@ -2620,7 +2620,7 @@ showAccounts() {
path="${currentPath}vws?ed=2048" path="${currentPath}vws?ed=2048"
fi fi
jq .inbounds[0].settings.clients ${configPath}05_VMess_WS_inbounds.json | jq -c '.[]' | while read -r user; do 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 echo
defaultBase64Code vmessws $(echo "${user}" | jq -r .email) $(echo "${user}" | jq -r .id) "${currentHost}:${currentPort}" ${path} ${currentAdd} defaultBase64Code vmessws $(echo "${user}" | jq -r .email) $(echo "${user}" | jq -r .id) "${currentHost}:${currentPort}" ${path} ${currentAdd}
done done