mirror of https://gitlab.com/rwkgyg/CFwarp.git
Update CFwarp1.sh
This commit is contained in:
parent
159058a9a3
commit
23f5e2e32c
|
@ -116,7 +116,7 @@ flow=`echo "scale=2; $warppflow/1000000000" | bc`
|
|||
[[ -e /etc/wireguard/wgcf+p.log ]] && cfplus="WARP+普通账户(有限WARP+流量:$flow GB),设备名称:$(grep -s 'Device name' /etc/wireguard/wgcf+p.log | awk '{ print $NF }')" || cfplus="WARP+Teams账户(无限WARP+流量)"
|
||||
if [[ -n $v4 ]]; then
|
||||
wgcfv4=$(curl -s4 https://www.cloudflare.com/cdn-cgi/trace -k | grep warp | cut -d= -f2)
|
||||
isp4a=`curl -sm6 --user-agent "${UA_Browser}" http://ip-api.com/json/$v4?lang=zh-CN -k | awk -F "org" '{print $2}' | awk "as" '{print $1}' | sed "s/[,\":]//g"`
|
||||
isp4a=`curl -sm6 --user-agent "${UA_Browser}" http://ip-api.com/json/$v4?lang=zh-CN -k | cut -f13 -d ":" | cut -f2 -d '"'`
|
||||
isp4b=`curl -sm6 --user-agent "${UA_Browser}" https://api.ip.sb/geoip/$v4 -k | awk -F "isp" '{print $2}' | awk -F "offset" '{print $1}' | sed "s/[,\":]//g"`
|
||||
[[ -n $isp4a ]] && isp4=$isp4a || isp4=$isp4b
|
||||
nonf=$(curl -sm6 --user-agent "${UA_Browser}" http://ip-api.com/json/$v4?lang=zh-CN -k | cut -f2 -d"," | cut -f4 -d '"')
|
||||
|
@ -142,7 +142,7 @@ WARPIPv4Status=$(white "IPV4状态:\c" ; red "不存在IPV4地址 ")
|
|||
fi
|
||||
if [[ -n $v6 ]]; then
|
||||
wgcfv6=$(curl -s6 https://www.cloudflare.com/cdn-cgi/trace -k | grep warp | cut -d= -f2)
|
||||
isp6a=`curl -sm6 --user-agent "${UA_Browser}" http://ip-api.com/json/$v6?lang=zh-CN -k | awk -F "org" '{print $2}' | awk -F "as" '{print $1}' | sed "s/[,\":]//g"`
|
||||
isp6a=`curl -sm6 --user-agent "${UA_Browser}" http://ip-api.com/json/$v6?lang=zh-CN -k | cut -f13 -d":" | cut -f2 -d '"'`
|
||||
isp6b=`curl -sm6 --user-agent "${UA_Browser}" https://api.ip.sb/geoip/$v6 -k | awk -F "isp" '{print $2}' | awk -F "offset" '{print $1}' | sed "s/[,\":]//g"`
|
||||
[[ -n $isp6a ]] && isp6=$isp6a || isp6=$isp6b
|
||||
nonf=$(curl -sm6 --user-agent "${UA_Browser}" http://ip-api.com/json/$v6?lang=zh-CN -k | cut -f2 -d"," | cut -f4 -d '"')
|
||||
|
|
Loading…
Reference in New Issue