From 29e4cdf4e28f3af2bed91a00efc0db3cb51106b7 Mon Sep 17 00:00:00 2001 From: "arraykeys@gmail.com" Date: Mon, 9 Jul 2018 17:22:10 +0800 Subject: [PATCH] v5.2 --- CHANGELOG | 1 + README.md | 50 ++++++++++++++++++------------------------------ README_ZH.md | 19 ++++++++++-------- utils/structs.go | 2 +- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a87ca95..53d67bd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ proxy更新日志 v5.2 1.修复了HTTP(S)\SPS反向代理无法正常工作的问题. 2.优化了智能判断,减少不必要的DNS解析. +3.重构了SOCKS和SPS的UDP功能,基于UDP的游戏加速嗖嗖的. v5.1 1.优化了kcp默认mtu配置,调整为450. diff --git a/README.md b/README.md index 595f9bd..33648c0 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,24 @@ Proxy is a high performance HTTP, HTTPS, HTTPS, websocket, TCP, UDP, Socks5 prox [![stable](https://img.shields.io/badge/stable-stable-green.svg)](https://github.com/snail007/goproxy/) [![license](https://img.shields.io/github/license/snail007/goproxy.svg?style=plastic)]() [![download_count](https://img.shields.io/github/downloads/snail007/goproxy/total.svg?style=plastic)](https://github.com/snail007/goproxy/releases) [![download](https://img.shields.io/github/release/snail007/goproxy.svg?style=plastic)](https://github.com/snail007/goproxy/releases) -[中文手册](/README_ZH.md) **[全平台GUI版本](/gui/README.md)** **[全平台SDK](/sdk/README.md)** +**[中文手册](/README_ZH.md)** + +**[全平台图形界面版本](/gui/README.md)** + +**[全平台SDK](/sdk/README.md)** + + +### How to use the source code? + +Pull Request is welcomed. +Recommend go1.10.1. +`go get github.com/snail007/goproxy` +use command cd to enter your go SRC directory +then cd to enter `github.com/snail007/goproxy`. +Direct compilation:`go build -o proxy` +execution: `go run *.go` +`utils` is a toolkit, and `service` is a specific service class. + ### Features - chain-style proxy: the program itself can be a primary proxy, and if a parent proxy is set, it can be used as a second level proxy or even a N level proxy. @@ -37,27 +54,7 @@ Proxy is a high performance HTTP, HTTPS, HTTPS, websocket, TCP, UDP, Socks5 prox - ...   -This page is the v5.1 manual, and the other version of the manual can be checked by the following link. -- [v5.1 manual](https://github.com/snail007/goproxy/tree/v5.1) -- [v4.9 manual](https://github.com/snail007/goproxy/tree/v4.9) -- [v4.8 manual](https://github.com/snail007/goproxy/tree/v4.8) -- [v4.7 manual](https://github.com/snail007/goproxy/tree/v4.7) -- [v4.6 manual](https://github.com/snail007/goproxy/tree/v4.6) -- [v4.5 manual](https://github.com/snail007/goproxy/tree/v4.5) -- [v4.4 manual](https://github.com/snail007/goproxy/tree/v4.4) -- [v4.3 manual](https://github.com/snail007/goproxy/tree/v4.3) -- [v4.2 manual](https://github.com/snail007/goproxy/tree/v4.2) -- [v4.0-4.1 manual](https://github.com/snail007/goproxy/tree/v4.1) -- [v3.9 manual](https://github.com/snail007/goproxy/tree/v3.9) -- [v3.8 manual](https://github.com/snail007/goproxy/tree/v3.8) -- [v3.6-v3.7 manual](https://github.com/snail007/goproxy/tree/v3.6) -- [v3.5 manual](https://github.com/snail007/goproxy/tree/v3.5) -- [v3.4 manual](https://github.com/snail007/goproxy/tree/v3.4) -- [v3.3 manual](https://github.com/snail007/goproxy/tree/v3.3) -- [v3.2 manual](https://github.com/snail007/goproxy/tree/v3.2) -- [v3.1 manual](https://github.com/snail007/goproxy/tree/v3.1) -- [v3.0 manual](https://github.com/snail007/goproxy/tree/v3.0) -- [v2.x manual](https://github.com/snail007/goproxy/tree/v2.2) +This page is the v5.2 manual, and the other version of the manual can be checked by the following [link](docs/old-release.md). ### How to find the organization? [Click to join the proxy group of gitter](https://gitter.im/go-proxy/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)   @@ -1088,15 +1085,6 @@ First, you need to clone the project to your account, and then modify the code o Finally, Pull Request to dev branch of goproxy project, and contribute code for efficiency. PR needs to explain what changes have been made and why you change them. -### How to use the source code? -Recommend go1.10.1. -`go get github.com/snail007/goproxy` -use command cd to enter your go SRC directory -then cd to enter `github.com/snail007/goproxy`. -Direct compilation:`go build -o proxy` -execution: `go run *.go` -`utils` is a toolkit, and `service` is a specific service class. - ### License Proxy is licensed under GPLv3 license. ### Contact diff --git a/README_ZH.md b/README_ZH.md index d325b61..6860b20 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -7,7 +7,17 @@ Proxy是golang实现的高性能http,https,websocket,tcp,udp,socks5代理服务 [![stable](https://img.shields.io/badge/stable-stable-green.svg)](https://github.com/snail007/goproxy/) [![license](https://img.shields.io/github/license/snail007/goproxy.svg?style=plastic)]() [![download_count](https://img.shields.io/github/downloads/snail007/goproxy/total.svg?style=plastic)](https://github.com/snail007/goproxy/releases) [![download](https://img.shields.io/github/release/snail007/goproxy.svg?style=plastic)](https://github.com/snail007/goproxy/releases) -**[English Manual](/README.md)** **[全平台GUI版本](/gui/README.md)** **[全平台SDK](/sdk/README.md)** +**[English Manual](/README.md)** + +**[全平台图形界面版本](/gui/README.md)** + +**[全平台SDK](/sdk/README.md)** + +### 如何贡献代码(Pull Request)? + +欢迎加入一起发展壮大proxy.首先需要clone本项目到自己的帐号下面, +然后在dev分支上面修改代码,最后发Pull Request到goproxy项目的dev分支即可, +为了高效贡献代码,pr的时候需要说明做了什么变更,原因是什么. ### Features - 链式代理,程序本身可以作为一级代理,如果设置了上级代理那么可以作为二级代理,乃至N级代理. @@ -1116,11 +1126,6 @@ fast3：`--nodelay=1 --interval=10 --resend=2 --nc=1` - http(s)代理增加pac支持? - 欢迎加群反馈... -### 如何贡献代码(Pull Request)? -首先需要clone本项目到自己的帐号下面,然后在dev分支上面修改代码, -最后发Pull Request到goproxy项目的dev分支即可,为了高效贡献代码, -pr的时候需要说明做了什么变更,原因是什么. - ### 如何使用源码? 建议go1.10.1. `go get github.com/snail007/goproxy` @@ -1140,5 +1145,3 @@ QQ交流群:189618940 如果proxy帮助你解决了很多问题,你可以通过下面的捐赠更好的支持proxy. - - diff --git a/utils/structs.go b/utils/structs.go index 079c6d5..06a1ead 100644 --- a/utils/structs.go +++ b/utils/structs.go @@ -156,7 +156,7 @@ func (c *Checker) IsBlocked(domain string) (blocked, isInMap bool, failN, succes } item := _item.(CheckerItem) - return item.FailCount >= item.SuccessCount, true, item.FailCount, item.SuccessCount + return (item.FailCount >= item.SuccessCount) && (time.Now().Unix()-item.Lasttime < 1800), true, item.FailCount, item.SuccessCount } func (c *Checker) domainIsInMap(address string, blockedMap bool) bool { u, err := url.Parse("http://" + address)