From fed2afb964d2d0d4afa3f47a479bcb52e2db7b56 Mon Sep 17 00:00:00 2001 From: yincongcyincong <648588267@qq.com> Date: Thu, 3 May 2018 18:42:42 +0800 Subject: [PATCH 1/5] Update README.md --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ce410b8..435ca68 100644 --- a/README.md +++ b/README.md @@ -963,7 +963,14 @@ If you want to get a more detailed configuration and explanation of the KCP para ``` ### TODO -- Welcome joining group feedback... +- HTTP, socks proxy which has multi parents proxy load balancing? +- HTTP (s) proxy support PAC? +- Welcome joining group feedback... + +### How to contribute to the code? +First, you need to clone the project to your account, and then modify the code on the dev branch. +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.8.5, which does not guarantee that version >=1.9 can be used. From e6c56675caef94883ab2e58506b8bebadcff240f Mon Sep 17 00:00:00 2001 From: arraykeys Date: Fri, 4 May 2018 17:42:59 +0800 Subject: [PATCH 2/5] no message --- services/sps.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/sps.go b/services/sps.go index d41f72a..b10aabc 100644 --- a/services/sps.go +++ b/services/sps.go @@ -332,7 +332,7 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) { if c, ok := s.userConns.Get(inAddr); ok { (*c.(*net.Conn)).Close() } - s.userConns.Set(inAddr, &inConn) + s.userConns.Set(inAddr, inConn) return } func (s *SPS) InitBasicAuth() (err error) { From 6f47d1249894ff4ac4ff012a521fc24b39872623 Mon Sep 17 00:00:00 2001 From: arraykeys Date: Fri, 4 May 2018 17:49:56 +0800 Subject: [PATCH 3/5] no message --- services/tcp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/tcp.go b/services/tcp.go index 79240a8..52d436c 100644 --- a/services/tcp.go +++ b/services/tcp.go @@ -148,7 +148,7 @@ func (s *TCP) OutToTCP(inConn *net.Conn) (err error) { if c, ok := s.userConns.Get(inAddr); ok { (*c.(*net.Conn)).Close() } - s.userConns.Set(inAddr, &inConn) + s.userConns.Set(inAddr, inConn) return } func (s *TCP) OutToUDP(inConn *net.Conn) (err error) { From 1c46eeaf439bf42dfcb793f11fed7dd1c5e88676 Mon Sep 17 00:00:00 2001 From: arraykeys Date: Fri, 4 May 2018 18:10:09 +0800 Subject: [PATCH 4/5] no message --- sdk/android-ios/release_android.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sdk/android-ios/release_android.sh b/sdk/android-ios/release_android.sh index b78ebe3..d55e6fa 100755 --- a/sdk/android-ios/release_android.sh +++ b/sdk/android-ios/release_android.sh @@ -4,7 +4,16 @@ rm -rf sdk-android-*.tar.gz rm -rf android mkdir android -#android +#android ,android ndk & android sdk required, install gomobile go1.10 required +#export GOPATH="$HOME/go" +#export GOROOT="/usr/local/go" +#export PATH="$GOROOT/bin:$GOPATH/bin:$PATH" +#export ANDROID_HOME="$HOME/Android/Sdk" +#export NDK_ROOT="$HOME/Android/Sdk/ndk-bundle" +#export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$NDK_ROOT:$PATH" +#go get -v golang.org/x/mobile/cmd/gomobile +#gomobile init + gomobile bind -v -target=android -javapkg=snail007 -ldflags="-s -w" mv proxy.aar android/snail007.goproxy.sdk.aar mv proxy-sources.jar android/snail007.goproxy.sdk-sources.jar From 795d63879fccf09791f0515a7b5c0a1dcbbd3f3b Mon Sep 17 00:00:00 2001 From: arraykeys Date: Fri, 4 May 2018 18:24:52 +0800 Subject: [PATCH 5/5] no message --- sdk/android-ios/release_android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/android-ios/release_android.sh b/sdk/android-ios/release_android.sh index d55e6fa..9906fd3 100755 --- a/sdk/android-ios/release_android.sh +++ b/sdk/android-ios/release_android.sh @@ -4,7 +4,7 @@ rm -rf sdk-android-*.tar.gz rm -rf android mkdir android -#android ,android ndk & android sdk required, install gomobile go1.10 required +#android ; jdk,android ndk & android sdk required, install gomobile go1.10 required #export GOPATH="$HOME/go" #export GOROOT="/usr/local/go" #export PATH="$GOROOT/bin:$GOPATH/bin:$PATH"