代理问题

Makefile

@@ -12,7 +12,7 @@ PID = .pid
 HUB_ADDR =
 DOCKER_USER = hub.docker.com
 DOCKER_PWD =
-TAG = v0.2.8
+TAG = v0.2.9
 NAMESPACE = kplcloud
 PWD = $(shell pwd)
 

src/pkg/auth/service.go

@@ -108,6 +108,24 @@ func (c *service) AuthLoginGithubCallback(w http.ResponseWriter, r *http.Request
 
 	ctx := context.Background()
 	// state := r.URL.Query().Get("state") // todo 它需要验证一下可以考虑使用jwt生成  先用cookie 简单处理一下吧...
+	if httpProxy := c.config.GetString(config.SectionServer, "http_proxy"); httpProxy != "" {
+		_ = level.Debug(c.logger).Log("use-proxy", httpProxy)
+		dialer := &net.Dialer{
+			Timeout:   time.Duration(5 * int64(time.Second)),
+			KeepAlive: time.Duration(5 * int64(time.Second)),
+		}
+		ctx = context.WithValue(ctx, oauth2.HTTPClient, &http.Client{
+			Transport: &http.Transport{
+				Proxy: func(_ *http.Request) (*url.URL, error) {
+					return url.Parse(httpProxy)
+				},
+				DialContext: dialer.DialContext,
+				TLSClientConfig: &tls.Config{
+					InsecureSkipVerify: false,
+				},
+			},
+		})
+	}
 
 	githubOauthConfig := c.auth2Config()
 
@@ -135,25 +153,6 @@ func (c *service) AuthLoginGithubCallback(w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	if httpProxy := c.config.GetString(config.SectionServer, "http_proxy"); httpProxy != "" {
-		_ = level.Debug(c.logger).Log("use-proxy", httpProxy)
-		dialer := &net.Dialer{
-			Timeout:   time.Duration(5 * int64(time.Second)),
-			KeepAlive: time.Duration(5 * int64(time.Second)),
-		}
-		ctx = context.WithValue(ctx, oauth2.HTTPClient, &http.Client{
-			Transport: &http.Transport{
-				Proxy: func(_ *http.Request) (*url.URL, error) {
-					return url.Parse(httpProxy)
-				},
-				DialContext: dialer.DialContext,
-				TLSClientConfig: &tls.Config{
-					InsecureSkipVerify: false,
-				},
-			},
-		})
-	}
-
 	client := github.NewClient(githubOauthConfig.Client(ctx, token))
 	user, _, err := client.Users.Get(context.Background(), "")
 	if err != nil {