diff --git a/CHANGELOG b/CHANGELOG index 78104f4..df86b9e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ proxy更新日志 +v6.1 +1.黑白名单支持设置顶级域了,比如:com,匹配所有的.com域名 + v6.0 企业版开源啦 本次更新主要是把企业版开源,把企业版代码合并到现在的开源goproxy当中,继续遵循GPLv3,免费开源, 之所以直接跳过5.x,用6.0版本号是为了与现有开源版本做一个明显的区分,下面功能主要来自企业版. diff --git a/README_ZH.md b/README_ZH.md index c370d1f..867aae3 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -181,7 +181,7 @@ curl -L https://raw.githubusercontent.com/snail007/goproxy/master/install_auto.s 下载地址:https://github.com/snail007/goproxy/releases ```shell cd /root/proxy/ -wget https://github.com/snail007/goproxy/releases/download/v6.0/proxy-linux-amd64.tar.gz +wget https://github.com/snail007/goproxy/releases/download/v6.1/proxy-linux-amd64.tar.gz ``` #### **2.下载自动安装脚本** ```shell diff --git a/VERSION b/VERSION index 5049538..e8f1734 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0 \ No newline at end of file +6.1 \ No newline at end of file diff --git a/install_auto.sh b/install_auto.sh index 32bf059..5202b6b 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -5,7 +5,7 @@ if [ -e /tmp/proxy ]; then fi mkdir /tmp/proxy cd /tmp/proxy -wget https://github.com/snail007/goproxy/releases/download/v6.0/proxy-linux-amd64.tar.gz +wget https://github.com/snail007/goproxy/releases/download/v6.1/proxy-linux-amd64.tar.gz # #install proxy tar zxvf proxy-linux-amd64.tar.gz diff --git a/utils/structs.go b/utils/structs.go index 7d187f6..570a29d 100644 --- a/utils/structs.go +++ b/utils/structs.go @@ -179,6 +179,12 @@ func (c *Checker) domainIsInMap(address string, blockedMap bool) bool { subSlice := domainSlice[:len(domainSlice)-1] topDomain := strings.Join(domainSlice[len(domainSlice)-1:], ".") checkDomain := topDomain + if !blockedMap && c.directMap.Has(checkDomain) { + return true + } + if blockedMap && c.blockedMap.Has(checkDomain) { + return true + } for i := len(subSlice) - 1; i >= 0; i-- { checkDomain = subSlice[i] + "." + checkDomain if !blockedMap && c.directMap.Has(checkDomain) {