feat: 重构配置层,添加 json 支持

This commit is contained in:
Mmx233
2023-08-28 22:03:03 +08:00
parent 2a098e00dd
commit 6f283a93f5
19 changed files with 318 additions and 272 deletions

View File

@@ -1,7 +1,7 @@
package tools
import (
"github.com/Mmx233/BitSrunLoginGo/internal/global"
"github.com/Mmx233/BitSrunLoginGo/internal/config"
"net/http"
)
@@ -14,10 +14,10 @@ var HttpPack *Http
var httpTools map[string]*Http
func init() {
if global.Config.Settings.Basic.Interfaces == "" {
if config.Settings.Basic.Interfaces == "" {
HttpPack = genHttpPack(nil)
} else {
httpTools = make(map[string]*Http, 0)
httpTools = make(map[string]*Http)
}
}

View File

@@ -3,7 +3,7 @@
package tools
import (
"github.com/Mmx233/BitSrunLoginGo/internal/global"
"github.com/Mmx233/BitSrunLoginGo/internal/config"
"github.com/Mmx233/tool"
"net"
"net/http"
@@ -15,15 +15,15 @@ func genHttpPack(eth *Eth) *Http {
addr = eth.Addr
}
tr := tool.GenHttpTransport(&tool.HttpTransportOptions{
Timeout: global.Timeout,
Timeout: config.Timeout,
LocalAddr: addr,
SkipSslCertVerify: global.Config.Settings.Basic.SkipCertVerify,
SkipSslCertVerify: config.Settings.Basic.SkipCertVerify,
})
tr.Proxy = http.ProxyFromEnvironment
return &Http{
Client: tool.GenHttpClient(&tool.HttpClientOptions{
Transport: tr,
Timeout: global.Timeout,
Timeout: config.Timeout,
}),
}
}

View File

@@ -35,7 +35,7 @@ func genHttpPack(eth *Eth) *Http {
DialContext: dialer.DialContext,
TLSHandshakeTimeout: global.Timeout,
IdleConnTimeout: global.Timeout,
TLSClientConfig: &tls.Config{InsecureSkipVerify: global.Config.Settings.Basic.SkipCertVerify},
TLSClientConfig: &tls.Config{InsecureSkipVerify: config.Settings.Basic.SkipCertVerify},
}
tr.Proxy = http.ProxyFromEnvironment
return &Http{