mirror of https://github.com/mack-a/v2ray-agent
feat(脚本): 优化用户展示(删除uuid显示)、优化订阅(email显示)
parent
76e2a76003
commit
c052a38c3e
23
install.sh
23
install.sh
|
@ -2675,9 +2675,9 @@ showAccounts() {
|
||||||
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)_$(echo "${user}" | jq -r .id)"
|
echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)"
|
||||||
echo
|
echo
|
||||||
defaultBase64Code vlesstcp "$(echo "${user}" | jq -r .email)_$(echo "${user}" | jq -r .id)" "$(echo "${user}" | jq -r .id)"
|
defaultBase64Code vlesstcp "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -2686,14 +2686,14 @@ 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)_$(echo "${user}" | jq -r .id)"
|
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
|
||||||
# echoContent yellow "Xray的0-RTT path后面会有,不兼容以v2ray为核心的客户端,请手动删除后使用\n"
|
# echoContent yellow "Xray的0-RTT path后面会有,不兼容以v2ray为核心的客户端,请手动删除后使用\n"
|
||||||
# path="${currentPath}ws"
|
# path="${currentPath}ws"
|
||||||
# fi
|
# fi
|
||||||
defaultBase64Code vlessws "$(echo "${user}" | jq -r .email)_$(echo "${user}" | jq -r .id)" "$(echo "${user}" | jq -r .id)"
|
defaultBase64Code vlessws "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -2705,9 +2705,9 @@ 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)_$(echo "${user}" | jq -r .id)"
|
echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)"
|
||||||
echo
|
echo
|
||||||
defaultBase64Code vmessws "$(echo "${user}" | jq -r .email)_$(echo "${user}" | jq -r .id)" "$(echo "${user}" | jq -r .id)"
|
defaultBase64Code vmessws "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -2718,9 +2718,9 @@ 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)_$(echo "${user}" | jq -r .id)"
|
echoContent skyBlue "\n ---> 帐号:$(echo "${user}" | jq -r .email)"
|
||||||
echo
|
echo
|
||||||
defaultBase64Code vlessgrpc "$(echo "${user}" | jq -r .email)_$(echo "${user}" | jq -r .id)" "$(echo "${user}" | jq -r .id)"
|
defaultBase64Code vlessgrpc "$(echo "${user}" | jq -r .email)" "$(echo "${user}" | jq -r .id)"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -4601,12 +4601,13 @@ subscribe() {
|
||||||
|
|
||||||
if [[ -n $(ls /etc/v2ray-agent/subscribe/) ]]; then
|
if [[ -n $(ls /etc/v2ray-agent/subscribe/) ]]; then
|
||||||
find /etc/v2ray-agent/subscribe/* | while read -r email; do
|
find /etc/v2ray-agent/subscribe/* | while read -r email; do
|
||||||
email=$(echo "${email}" | awk -F "[s][u][b][s][c][r][i][b][e][/]" '{print $2}')
|
email=$(echo "${email}" | awk -F "[b][e][/]" '{print $2}')
|
||||||
|
|
||||||
local base64Result
|
local base64Result
|
||||||
base64Result=$(base64 -w 0 "/etc/v2ray-agent/subscribe/${email}")
|
base64Result=$(base64 -w 0 "/etc/v2ray-agent/subscribe/${email}")
|
||||||
echo "${base64Result}" >"/etc/v2ray-agent/subscribe/${email}"
|
echo "${base64Result}" >"/etc/v2ray-agent/subscribe/${email}"
|
||||||
echoContent skyBlue "--------------------------------------------------------------"
|
echoContent skyBlue "--------------------------------------------------------------"
|
||||||
echoContent yellow "email:$(echo "${email}" | awk -F "[_]" '{print $1}')\n"
|
echoContent yellow "email:$(echo "${email}")\n"
|
||||||
local currentDomain=${currentHost}
|
local currentDomain=${currentHost}
|
||||||
|
|
||||||
if [[ -n "${currentDefaultPort}" && "${currentDefaultPort}" != "443" ]]; then
|
if [[ -n "${currentDefaultPort}" && "${currentDefaultPort}" != "443" ]]; then
|
||||||
|
@ -4671,7 +4672,7 @@ menu() {
|
||||||
cd "$HOME" || exit
|
cd "$HOME" || exit
|
||||||
echoContent red "\n=============================================================="
|
echoContent red "\n=============================================================="
|
||||||
echoContent green "作者:mack-a"
|
echoContent green "作者:mack-a"
|
||||||
echoContent green "当前版本:v2.5.65"
|
echoContent green "当前版本:v2.5.66"
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue