fix: 携程溢出、优化若干
This commit is contained in:
@@ -2,8 +2,7 @@ package util
|
||||
|
||||
import (
|
||||
"github.com/Mmx233/tool"
|
||||
"net"
|
||||
"time"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
type checker struct{}
|
||||
@@ -11,12 +10,12 @@ type checker struct{}
|
||||
var Checker checker
|
||||
|
||||
// NetOk 网络状况检查
|
||||
func (checker) NetOk(timeout uint, localAddr net.Addr) bool {
|
||||
func (a *checker) NetOk(transport *http.Transport) bool {
|
||||
|
||||
h, i, e := tool.HTTP.GetReader(&tool.GetRequest{
|
||||
Url: "https://www.baidu.com/",
|
||||
Redirect: false,
|
||||
Timeout: time.Duration(timeout) * time.Second,
|
||||
LocalAddr: localAddr,
|
||||
Transport: transport,
|
||||
})
|
||||
if e != nil {
|
||||
return false
|
||||
|
||||
15
util/eth.go
15
util/eth.go
@@ -26,14 +26,17 @@ func GetInterfaceAddr() ([]srunModels.Eth, error) {
|
||||
if e != nil {
|
||||
Log.Println(eth.Name + " 地址获取失败")
|
||||
}
|
||||
for _, ip := range addrs {
|
||||
if strings.Contains(ip.String(), ".") {
|
||||
for _, addr := range addrs {
|
||||
if strings.Contains(addr.String(), ".") {
|
||||
var ip *net.TCPAddr
|
||||
ip, e = net.ResolveTCPAddr("tcp", strings.Split(addr.String(), "/")[0]+":0")
|
||||
if e != nil {
|
||||
Log.Println(eth.Name+" ip解析失败:", e)
|
||||
continue
|
||||
}
|
||||
result = append(result, srunModels.Eth{
|
||||
Name: eth.Name,
|
||||
Addr: func() *net.TCPAddr {
|
||||
n, _ := net.ResolveTCPAddr("tcp", ip.String())
|
||||
return n
|
||||
}(),
|
||||
Addr: ip,
|
||||
})
|
||||
break
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user