From 1bca883f4fbc8e998d648fdb00166b083b002da8 Mon Sep 17 00:00:00 2001 From: WindSpiritSR Date: Fri, 2 Jul 2021 11:11:28 +0800 Subject: [PATCH] fix: Move proxy address config to app.conf Signed-off-by: WindSpiritSR --- conf/app.conf | 2 +- controllers/util.go | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/conf/app.conf b/conf/app.conf index 6fab3b1d..8789c21a 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -7,5 +7,5 @@ driverName = mysql dataSourceName = root:123@tcp(localhost:3306)/ dbName = casdoor authState = "casdoor" -useProxy = false +httpProxy = "127.0.0.1:10808" verificationCodeTimeout = 10 \ No newline at end of file diff --git a/controllers/util.go b/controllers/util.go index 5ba21ffe..4c5c8688 100644 --- a/controllers/util.go +++ b/controllers/util.go @@ -24,18 +24,14 @@ import ( var httpClient *http.Client func InitHttpClient() { - useProxy, err := beego.AppConfig.Bool("useProxy") - if err != nil { - panic(err) - } - if !useProxy { + httpProxy := beego.AppConfig.String("httpProxy") + if httpProxy == "" { httpClient = &http.Client{} return } // https://stackoverflow.com/questions/33585587/creating-a-go-socks5-client - proxyAddress := "127.0.0.1:10808" - dialer, err := proxy.SOCKS5("tcp", proxyAddress, nil, proxy.Direct) + dialer, err := proxy.SOCKS5("tcp", httpProxy, nil, proxy.Direct) if err != nil { panic(err) }