5 Commits
v4.13 ... v4.16

Author SHA1 Message Date
233boy
61cdfc5bbe fix typo 2023-10-26 21:27:35 +08:00
233boy
51ff04fa02 Merge pull request #1226 from clark233/master
Update README.md
2023-10-26 21:24:26 +08:00
Clark Fan
cad75208d0 Update README.md
Fix typo
2023-10-26 17:53:06 +08:00
233boy
25c14b8520 fix openai block 2023-10-25 21:49:20 +08:00
233boy
463ff482ea fix get ip err 2023-08-08 15:12:44 +08:00
5 changed files with 11 additions and 10 deletions

View File

@@ -102,7 +102,7 @@ Usage: v2ray [options]... [args]...
reinstall 重装脚本
测试:
client, genc [name] 显示用于客户端 JOSN, 仅供参考
client, genc [name] 显示用于客户端 JSON, 仅供参考
debug [name] 显示一些 debug 信息, 仅供参考
gen [...] 同等于 add, 但只显示 JSON 内容, 不创建文件, 测试使用
no-auto-tls [...] 同等于 add, 但禁止自动配置 TLS, 可用于 *TLS 相关协议

View File

@@ -189,8 +189,8 @@ download() {
# get server ip
get_ip() {
export "$(_wget -4 -qO- https://cloudflare-dns.com/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ -z $ip ]] && export "$(_wget -6 -qO- https://cloudflare-dns.com/cdn-cgi/trace | grep ip=)" &>/dev/null
export "$(_wget -4 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ -z $ip ]] && export "$(_wget -6 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
}
# check background tasks status

View File

@@ -125,8 +125,8 @@ get_uuid() {
get_ip() {
[[ $ip || $is_no_auto_tls || $is_gen ]] && return
export "$(_wget -4 -qO- https://cloudflare-dns.com/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ ! $ip ]] && export "$(_wget -6 -qO- https://cloudflare-dns.com/cdn-cgi/trace | grep ip=)" &>/dev/null
export "$(_wget -4 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ ! $ip ]] && export "$(_wget -6 -qO- https://one.one.one.one/cdn-cgi/trace | grep ip=)" &>/dev/null
[[ ! $ip ]] && {
err "获取服务器 IP 失败.."
}
@@ -409,7 +409,8 @@ create() {
is_ban_ad='{type:"field",domain:["geosite:category-ads-all"],marktag:"ban_ad",outboundTag:"block"}'
is_ban_bt='{type:"field",protocol:["bittorrent"],marktag:"ban_bt",outboundTag:"block"}'
is_ban_cn='{type:"field",ip:["geoip:cn"],marktag:"ban_geoip_cn",outboundTag:"block"}'
is_routing='routing:{domainStrategy:"IPIfNonMatch",rules:[{type:"field",inboundTag:["api"],outboundTag:"api"},'"$is_ban_bt"','"$is_ban_cn"',{type:"field",ip:["geoip:private"],outboundTag:"block"}]}'
is_openai='{type:"field",domain:["geosite:openai"],marktag:"fix_openai",outboundTag:"direct"}'
is_routing='routing:{domainStrategy:"IPIfNonMatch",rules:[{type:"field",inboundTag:["api"],outboundTag:"api"},'"$is_ban_bt"','"$is_ban_cn"','"$is_openai"',{type:"field",ip:["geoip:private"],outboundTag:"block"}]}'
is_inbounds='inbounds:[{tag:"api",port:'"$tmp_port"',listen:"127.0.0.1",protocol:"dokodemo-door",settings:{address:"127.0.0.1"}}]'
is_outbounds='outbounds:[{tag:"direct",protocol:"freedom"},{tag:"block",protocol:"blackhole"}]'
is_server_config_json=$(jq '{'"$is_log"','"$is_dns"','"$is_api"','"$is_stats"','"$is_policy"','"$is_routing"','"$is_inbounds"','"$is_outbounds"'}' <<<{})
@@ -1388,7 +1389,7 @@ get() {
# is_host_dns=$(ping $host $is_ip_type -c 1 -W 2 | head -1)
is_dns_type="a"
[[ $(grep ":" <<<$ip) ]] && is_dns_type="aaaa"
is_host_dns=$(_wget -qO- --header="accept: application/dns-json" "https://cloudflare-dns.com/dns-query?name=$host&type=$is_dns_type")
is_host_dns=$(_wget -qO- --header="accept: application/dns-json" "https://one.one.one.one/dns-query?name=$host&type=$is_dns_type")
;;
log | logerr)
msg "\n 提醒: 按 $(_green Ctrl + C) 退出\n"

View File

@@ -54,7 +54,7 @@ show_help() {
" t, test 测试运行"
" reinstall 重装脚本\n"
"测试:"
" client, genc [name] 显示用于客户端 JOSN, 仅供参考"
" client, genc [name] 显示用于客户端 JSON, 仅供参考"
" debug [name] 显示一些 debug 信息, 仅供参考"
" gen [...] 同等于 add, 但只显示 JSON 内容, 不创建文件, 测试使用"
" no-auto-tls [...] 同等于 add, 但禁止自动配置 TLS, 可用于 *TLS 相关协议"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
args=$@
is_sh_ver=v4.13
is_sh_ver=v4.16
. /etc/v2ray/sh/src/init.sh