Ver código fonte

:art: 调整网络请求超时为 30s Fix https://github.com/siyuan-note/siyuan/issues/6791
设置代理切换时不再需要重启 https://github.com/siyuan-note/siyuan/issues/6787

Liang Ding 2 anos atrás
pai
commit
7a3755daa1

+ 1 - 0
kernel/api/system.go

@@ -368,6 +368,7 @@ func setNetworkProxy(c *gin.Context) {
 
 	proxyURL := model.Conf.System.NetworkProxy.String()
 	util.SetNetworkProxy(proxyURL)
+	util.PushMsg(model.Conf.Language(102), 3000)
 }
 
 func addUIProcess(c *gin.Context) {

+ 7 - 0
kernel/util/net.go

@@ -17,6 +17,8 @@
 package util
 
 import (
+	"github.com/siyuan-note/httpclient"
+	"net/http"
 	"strings"
 
 	"github.com/88250/gulu"
@@ -48,3 +50,8 @@ func JsonArg(c *gin.Context, result *gulu.Result) (arg map[string]interface{}, o
 	ok = true
 	return
 }
+
+func initHttpClient() {
+	http.DefaultClient = httpclient.GetCloudFileClient2Min()
+	http.DefaultTransport = httpclient.NewTransport(false)
+}

+ 1 - 0
kernel/util/working.go

@@ -54,6 +54,7 @@ func Boot() {
 	IncBootProgress(3, "Booting...")
 	rand.Seed(time.Now().UTC().UnixNano())
 	initMime()
+	initHttpClient()
 
 	workspacePath := flag.String("workspace", "", "dir path of the workspace, default to ~/Documents/SiYuan/")
 	wdPath := flag.String("wd", WorkingDir, "working directory of SiYuan")

+ 1 - 0
kernel/util/working_mobile.go

@@ -32,6 +32,7 @@ func BootMobile(container, appDir, workspaceDir, nativeLibDir, privateDataDir, l
 	IncBootProgress(3, "Booting...")
 	rand.Seed(time.Now().UTC().UnixNano())
 	initMime()
+	initHttpClient()
 
 	HomeDir = filepath.Join(workspaceDir, "home")
 	userHomeConfDir := filepath.Join(HomeDir, ".config", "siyuan")