github
/
v2ray-agent
mirror of https://github.com/mack-a/v2ray-agent
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(脚本): 修改多用户xray使用VMess时alterId缺失的bug

pull/534/merge
mack-a 2021-02-26 14:12:44 +08:00
parent 25d5152e43
commit 80d56300c9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install.sh
View File

@ -2433,13 +2433,13 @@ addUser() {
if [[ ${userNum} == 0 ]]; then if [[ ${userNum} == 0 ]]; then
users=${users}{\"id\":\"${uuid}\",\"flow\":\"xtls-rprx-direct\",\"email\":\"${email}\"} users=${users}{\"id\":\"${uuid}\",\"flow\":\"xtls-rprx-direct\",\"email\":\"${email}\",\"alterId\":1}
if echo ${currentInstallProtocolType} | grep -q 4; then if echo ${currentInstallProtocolType} | grep -q 4; then
trojanGoUsers=${trojanGoUsers}\"${uuid}\" trojanGoUsers=${trojanGoUsers}\"${uuid}\"
fi fi
else else
users=${users}{\"id\":\"${uuid}\",\"flow\":\"xtls-rprx-direct\",\"email\":\"${email}\"}, users=${users}{\"id\":\"${uuid}\",\"flow\":\"xtls-rprx-direct\",\"email\":\"${email}\",\"alterId\":1},
if echo ${currentInstallProtocolType} | grep -q 4; then if echo ${currentInstallProtocolType} | grep -q 4; then
trojanGoUsers=${trojanGoUsers}\"${uuid}\", trojanGoUsers=${trojanGoUsers}\"${uuid}\",
@ -2450,21 +2450,21 @@ addUser() {
# 兼容v2ray-core # 兼容v2ray-core
if [[ "${coreInstallType}" == "2" ]]; then if [[ "${coreInstallType}" == "2" ]]; then
# | sed 's/"flow":"xtls-rprx-direct",/"alterId":1,/g') # | sed 's/"flow":"xtls-rprx-direct",/"alterId":1,/g')
users="${users//"flow":"xtls-rprx-direct",/"alterId":1,}" users="${users//\"flow\":\"xtls-rprx-direct\"\,/}"
fi fi
if [[ -n $(echo ${currentInstallProtocolType} | grep 0) ]]; then if [[ -n $(echo ${currentInstallProtocolType} | grep 0) ]]; then
# | sed 's/"alterId":1,//g') local vlessUsers="${users//\,\"alterId\":1/}"
local vlessUsers="${users/"alterId":1,//}"
local vlessTcpResult local vlessTcpResult
vlessTcpResult=$(jq -r '.inbounds[0].settings.clients += ['${vlessUsers}']' ${configPath}02_VLESS_TCP_inbounds.json) vlessTcpResult=$(jq -r '.inbounds[0].settings.clients += ['${vlessUsers}']' ${configPath}02_VLESS_TCP_inbounds.json)
echo "${vlessTcpResult}" | jq . >${configPath}02_VLESS_TCP_inbounds.json echo "${vlessTcpResult}" | jq . >${configPath}02_VLESS_TCP_inbounds.json
fi fi
users="${users//"flow":"xtls-rprx-direct",/"alterId":1,}" # users="${users//"flow":"xtls-rprx-direct",/"alterId":1,}"
if echo ${currentInstallProtocolType} | grep -q 1; then if echo ${currentInstallProtocolType} | grep -q 1; then
local vlessUsers="${users//"alterId":1,/}" local vlessUsers="${users//\,\"alterId\":1/}"
local vlessWsResult local vlessWsResult
vlessWsResult=$(jq -r '.inbounds[0].settings.clients += ['${vlessUsers}']' ${configPath}03_VLESS_WS_inbounds.json) vlessWsResult=$(jq -r '.inbounds[0].settings.clients += ['${vlessUsers}']' ${configPath}03_VLESS_WS_inbounds.json)
echo "${vlessWsResult}" | jq . >${configPath}03_VLESS_WS_inbounds.json echo "${vlessWsResult}" | jq . >${configPath}03_VLESS_WS_inbounds.json
@ -3240,7 +3240,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.3.20" echoContent green "当前版本：v2.3.21"
echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "Github：https://github.com/mack-a/v2ray-agent"
echoContent green "描述：七合一共存脚本" echoContent green "描述：七合一共存脚本"
echoContent red "==============================================================" echoContent red "=============================================================="