🎨 调整网络请求超时为 30s Fix https://github.com/siyuan-note/siyuan/issues/6791

设置代理切换时不再需要重启 https://github.com/siyuan-note/siyuan/issues/6787

kernel/util/net.go

@@ -17,12 +17,7 @@
 package util
 
 import (
-	"context"
-	"crypto/tls"
-	"net"
-	"net/http"
 	"strings"
-	"time"
 
 	"github.com/88250/gulu"
 	"github.com/gin-gonic/gin"
@@ -53,23 +48,3 @@ func JsonArg(c *gin.Context, result *gulu.Result) (arg map[string]interface{}, o
 	ok = true
 	return
 }
-
-func NewTransport(skipTlsVerify bool) *http.Transport {
-	return &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		DialContext: defaultTransportDialContext(&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-		}),
-		ForceAttemptHTTP2:     true,
-		MaxIdleConns:          100,
-		IdleConnTimeout:       90 * time.Second,
-		TLSHandshakeTimeout:   10 * time.Second,
-		ExpectContinueTimeout: 1 * time.Second,
-
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTlsVerify}}
-}
-
-func defaultTransportDialContext(dialer *net.Dialer) func(context.Context, string, string) (net.Conn, error) {
-	return dialer.DialContext
-}

kernel/util/rhy.go

@@ -37,7 +37,7 @@ func GetRhyResult(force bool) (map[string]interface{}, error) {
 		return cachedRhyResult, nil
 	}
 
-	request := httpclient.NewCloudRequest()
+	request := httpclient.NewCloudRequest30s()
 	_, err := request.SetResult(&cachedRhyResult).Get(AliyunServer + "/apis/siyuan/version?ver=" + Ver)
 	if nil != err {
 		logging.LogErrorf("get version info failed: %s", err)

kernel/util/runtime.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/88250/gulu"
 	"github.com/denisbrodbeck/machineid"
+	"github.com/siyuan-note/httpclient"
 	"github.com/siyuan-note/logging"
 )
 
@@ -87,6 +88,8 @@ func SetNetworkProxy(proxyURL string) {
 	} else {
 		logging.LogInfof("use network proxy [system]")
 	}
+
+	httpclient.CloseIdleConnections()
 }
 
 const (