From 80d56300c9bed7a14d394c9418bd52f39cedebcc Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Fri, 26 Feb 2021 14:12:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=A4=9A=E7=94=A8=E6=88=B7xray=E4=BD=BF=E7=94=A8VMess=E6=97=B6?=
 =?UTF-8?q?alterId=E7=BC=BA=E5=A4=B1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/install.sh b/install.sh
index 1c76d85..5ee595b 100644
--- a/install.sh
+++ b/install.sh
@@ -2433,13 +2433,13 @@ addUser() {
 
 		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
 				trojanGoUsers=${trojanGoUsers}\"${uuid}\"
 			fi
 		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
 				trojanGoUsers=${trojanGoUsers}\"${uuid}\",
@@ -2447,24 +2447,24 @@ addUser() {
 		fi
 	done
 
-	# 兼容v2ray-core
+	#	兼容v2ray-core
 	if [[ "${coreInstallType}" == "2" ]]; then
 		#  | sed 's/"flow":"xtls-rprx-direct",/"alterId":1,/g')
-		users="${users//"flow":"xtls-rprx-direct",/"alterId":1,}"
+		users="${users//\"flow\":\"xtls-rprx-direct\"\,/}"
 	fi
 
 	if [[ -n $(echo ${currentInstallProtocolType} | grep 0) ]]; then
-		#  | sed 's/"alterId":1,//g')
-		local vlessUsers="${users/"alterId":1,//}"
+		local vlessUsers="${users//\,\"alterId\":1/}"
+
 		local vlessTcpResult
 		vlessTcpResult=$(jq -r '.inbounds[0].settings.clients += ['${vlessUsers}']' ${configPath}02_VLESS_TCP_inbounds.json)
 		echo "${vlessTcpResult}" | jq . >${configPath}02_VLESS_TCP_inbounds.json
 	fi
 
-	users="${users//"flow":"xtls-rprx-direct",/"alterId":1,}"
+	#	users="${users//"flow":"xtls-rprx-direct",/"alterId":1,}"
 
 	if echo ${currentInstallProtocolType} | grep -q 1; then
-		local vlessUsers="${users//"alterId":1,/}"
+		local vlessUsers="${users//\,\"alterId\":1/}"
 		local vlessWsResult
 		vlessWsResult=$(jq -r '.inbounds[0].settings.clients += ['${vlessUsers}']' ${configPath}03_VLESS_WS_inbounds.json)
 		echo "${vlessWsResult}" | jq . >${configPath}03_VLESS_WS_inbounds.json
@@ -3240,7 +3240,7 @@ menu() {
 	cd "$HOME" || exit
 	echoContent red "\n=============================================================="
 	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 "描述：七合一共存脚本"
 	echoContent red "=============================================================="