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

fix(脚本): 修复v2ray-core的alterId问题

pull/534/merge
mack-a 2021-01-07 16:06:54 +08:00
parent 6c9a579450
commit f1cda23841
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install.sh
View File

@ -2252,9 +2252,10 @@ defaultBase64Code(){
local add=$6 local add=$6
if [[ "${type}" = "vlesstcp" ]] if [[ "${type}" = "vlesstcp" ]]
then then
local VLESSID=`echo ${id}|awk -F "[\"]" '{print $2}'` local VLESSID=`echo ${id}|awk -F "[\"]" '{print $2}'`
local VLESSEmail=`echo ${ps}|awk -F "[\"]" '{print $2}'` local VLESSEmail=`echo ${ps}|awk -F "[\"]" '{print $2}'`
if [[ "${coreInstallType}" = "1" ]]
then
echoContent yellow " ---> 通用格式(VLESS+TCP+TLS/xtls-rprx-direct)" echoContent yellow " ---> 通用格式(VLESS+TCP+TLS/xtls-rprx-direct)"
echoContent green " vless://${VLESSID}@${host}:${port}?security=xtls&encryption=none&host=${host}&headerType=none&type=tcp&flow=xtls-rprx-direct#${VLESSEmail}\n" echoContent green " vless://${VLESSID}@${host}:${port}?security=xtls&encryption=none&host=${host}&headerType=none&type=tcp&flow=xtls-rprx-direct#${VLESSEmail}\n"
echoContent yellow " ---> 二维码 VLESS(VLESS+TCP+TLS/xtls-rprx-direct)" echoContent yellow " ---> 二维码 VLESS(VLESS+TCP+TLS/xtls-rprx-direct)"
@ -2265,6 +2266,14 @@ defaultBase64Code(){
echoContent yellow " ---> 二维码 VLESS(VLESS+TCP+TLS/xtls-rprx-splice)" echoContent yellow " ---> 二维码 VLESS(VLESS+TCP+TLS/xtls-rprx-splice)"
echoContent green "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless%3a%2f%2f${VLESSID}%40${host}%3a${port}%3fsecurity%3dxtls%26encryption%3dnone%26host%3d${host}%26headerType%3dnone%26type%3dtcp%26flow%3dxtls%2drprx%2dsplice%23${VLESSEmail}\n" echoContent green "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless%3a%2f%2f${VLESSID}%40${host}%3a${port}%3fsecurity%3dxtls%26encryption%3dnone%26host%3d${host}%26headerType%3dnone%26type%3dtcp%26flow%3dxtls%2drprx%2dsplice%23${VLESSEmail}\n"
elif [[ "${coreInstallType}" = "2" || "${coreInstallType}" = "3" ]]
then
echoContent yellow " ---> 通用格式(VLESS+TCP+TLS)"
echoContent green " vless://${VLESSID}@${host}:${port}?security=tls&encryption=none&host=${host}&headerType=none&type=tcp#${VLESSEmail}\n"
echoContent yellow " ---> 二维码 VLESS(VLESS+TCP+TLS)"
echoContent green "https://api.qrserver.com/v1/create-qr-code/?size=400x400&data=vless%3a%2f%2f${VLESSID}%40${host}%3a${port}%3fsecurity%3dtls%26encryption%3dnone%26host%3d${host}%26headerType%3dnone%26type%3dtcp%23${VLESSEmail}\n"
fi
elif [[ "${type}" = "vmessws" ]] elif [[ "${type}" = "vmessws" ]]
then then
qrCodeBase64Default=`echo -n '{"port":"'${port}'","ps":'${ps}',"tls":"tls","id":'"${id}"',"aid":"1","v":"2","host":"'${host}'","type":"none","path":"/'${path}'","net":"ws","add":"'${add}'","allowInsecure":0,"method":"none","peer":"'${host}'"}'|sed 's#/#\\\/#g'|base64` qrCodeBase64Default=`echo -n '{"port":"'${port}'","ps":'${ps}',"tls":"tls","id":'"${id}"',"aid":"1","v":"2","host":"'${host}'","type":"none","path":"/'${path}'","net":"ws","add":"'${add}'","allowInsecure":0,"method":"none","peer":"'${host}'"}'|sed 's#/#\\\/#g'|base64`
@ -2691,12 +2700,13 @@ addUser(){
# 兼容v2ray-core # 兼容v2ray-core
if [[ "${coreInstallType}" = "2" ]] if [[ "${coreInstallType}" = "2" ]]
then then
users=`echo ${users}|sed 's/"flow":"xtls-rprx-direct",//g'` users=`echo ${users}|sed 's/"flow":"xtls-rprx-direct",/"alterId":1,/g'`
fi fi
if [[ ! -z `echo ${currentInstallProtocolType} | grep 0` ]] if [[ ! -z `echo ${currentInstallProtocolType} | grep 0` ]]
then then
local vlessTcpResult=`cat ${configPath}02_VLESS_TCP_inbounds.json|jq -r '.inbounds[0].settings.clients += ['${users}']'` local vlessUsers=`echo ${users}|sed 's/"alterId":1,//g'`
local vlessTcpResult=`cat ${configPath}02_VLESS_TCP_inbounds.json|jq -r '.inbounds[0].settings.clients += ['${vlessUsers}']'`
echo ${vlessTcpResult} | jq . > ${configPath}02_VLESS_TCP_inbounds.json echo ${vlessTcpResult} | jq . > ${configPath}02_VLESS_TCP_inbounds.json
fi fi
@ -2704,7 +2714,8 @@ addUser(){
if [[ ! -z `echo ${currentInstallProtocolType} | grep 1` ]] if [[ ! -z `echo ${currentInstallProtocolType} | grep 1` ]]
then then
local vlessWsResult=`cat ${configPath}03_VLESS_WS_inbounds.json|jq -r '.inbounds[0].settings.clients += ['${users}']'` local vlessUsers=`echo ${users}|sed 's/"alterId":1,//g'`
local vlessWsResult=`cat ${configPath}03_VLESS_WS_inbounds.json|jq -r '.inbounds[0].settings.clients += ['${vlessUsers}']'`
echo ${vlessWsResult}|jq . > ${configPath}03_VLESS_WS_inbounds.json echo ${vlessWsResult}|jq . > ${configPath}03_VLESS_WS_inbounds.json
fi fi