apps/basics
1
0
Fork 0
mirror of https://github.com/oneclickvirt/basics.git synced 2025-10-19 15:04:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v0.0.3 - 增加日志记录

Browse Source
This commit is contained in:
spiritlhl
2024-06-25 07:11:32 +00:00
parent 2d98af47bc
commit f9fbd60c7c
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View File

@@ -24,7 +24,7 @@ jobs:
run: | run: |
git config --global user.name 'github-actions' git config --global user.name 'github-actions'
git config --global user.email 'github-actions@github.com' git config --global user.email 'github-actions@github.com'
TAG="v0.0.2-$(date +'%Y%m%d%H%M%S')" TAG="v0.0.3-$(date +'%Y%m%d%H%M%S')"
git tag $TAG git tag $TAG
git push origin $TAG git push origin $TAG
env: env:

2
model/model.go
View File

@@ -1,6 +1,6 @@
package model package model
const BasicsVersion = "v0.0.2" const BasicsVersion = "v0.0.3"
var EnableLoger bool var EnableLoger bool

24
network/baseinfo/baseinfo.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/oneclickvirt/basics/model" "github.com/oneclickvirt/basics/model"
"github.com/oneclickvirt/basics/network/utils" "github.com/oneclickvirt/basics/network/utils"
. "github.com/oneclickvirt/defaultset"
) )
// FetchIPInfoIo 从 ipinfo.io 获取 IP 信息 // FetchIPInfoIo 从 ipinfo.io 获取 IP 信息
@@ -160,6 +161,10 @@ func executeFunctions(checkType string, fetchFunc func(string) (*model.IpInfo, *
// RunIpCheck 并发请求获取信息 // RunIpCheck 并发请求获取信息
func RunIpCheck(checkType string) (*model.IpInfo, *model.SecurityInfo, *model.IpInfo, *model.SecurityInfo, error) { func RunIpCheck(checkType string) (*model.IpInfo, *model.SecurityInfo, *model.IpInfo, *model.SecurityInfo, error) {
if model.EnableLoger {
InitLogger()
defer Logger.Sync()
}
// 定义函数名数组 // 定义函数名数组
functions := []func(string) (*model.IpInfo, *model.SecurityInfo, error){ functions := []func(string) (*model.IpInfo, *model.SecurityInfo, error){
FetchIPInfoIo, FetchIPInfoIo,
@@ -193,6 +198,9 @@ func RunIpCheck(checkType string) (*model.IpInfo, *model.SecurityInfo, *model.Ip
go executeFunctions("ipv6", f, ipInfoIPv6, securityInfoIPv6, &wg) go executeFunctions("ipv6", f, ipInfoIPv6, securityInfoIPv6, &wg)
} }
} else { } else {
if model.EnableLoger {
Logger.Info("RunIpCheck: wrong checkType")
}
return nil, nil, nil, nil, fmt.Errorf("wrong checkType") return nil, nil, nil, nil, fmt.Errorf("wrong checkType")
} }
go func() { go func() {
@@ -215,6 +223,10 @@ func RunIpCheck(checkType string) (*model.IpInfo, *model.SecurityInfo, *model.Ip
ipInfoV4TempResult, err := utils.CompareAndMergeIpInfo(ipInfoV4Result, ipInfo) ipInfoV4TempResult, err := utils.CompareAndMergeIpInfo(ipInfoV4Result, ipInfo)
if err == nil { if err == nil {
ipInfoV4Result = ipInfoV4TempResult ipInfoV4Result = ipInfoV4TempResult
} else {
if model.EnableLoger {
Logger.Info(fmt.Sprintf("utils.CompareAndMergeIpInfo(ipInfoV4Result, ipInfo): %s", err.Error()))
}
} }
} }
} }
@@ -226,6 +238,10 @@ func RunIpCheck(checkType string) (*model.IpInfo, *model.SecurityInfo, *model.Ip
ipInfoV6TempResult, err := utils.CompareAndMergeIpInfo(ipInfoV6Result, ipInfo) ipInfoV6TempResult, err := utils.CompareAndMergeIpInfo(ipInfoV6Result, ipInfo)
if err == nil { if err == nil {
ipInfoV6Result = ipInfoV6TempResult ipInfoV6Result = ipInfoV6TempResult
} else {
if model.EnableLoger {
Logger.Info(fmt.Sprintf("utils.CompareAndMergeIpInfo(ipInfoV6Result, ipInfo): %s", err.Error()))
}
} }
} }
} }
@@ -237,6 +253,10 @@ func RunIpCheck(checkType string) (*model.IpInfo, *model.SecurityInfo, *model.Ip
securityInfoV4TempResult, err := utils.CompareAndMergeSecurityInfo(securityInfoV4Result, securityInfo) securityInfoV4TempResult, err := utils.CompareAndMergeSecurityInfo(securityInfoV4Result, securityInfo)
if err == nil { if err == nil {
securityInfoV4Result = securityInfoV4TempResult securityInfoV4Result = securityInfoV4TempResult
} else {
if model.EnableLoger {
Logger.Info(fmt.Sprintf("utils.CompareAndMergeSecurityInfo(securityInfoV4Result, securityInfo): %s", err.Error()))
}
} }
} }
} }
@@ -248,6 +268,10 @@ func RunIpCheck(checkType string) (*model.IpInfo, *model.SecurityInfo, *model.Ip
securityInfoV6TempResult, err := utils.CompareAndMergeSecurityInfo(securityInfoV6Result, securityInfo) securityInfoV6TempResult, err := utils.CompareAndMergeSecurityInfo(securityInfoV6Result, securityInfo)
if err == nil { if err == nil {
securityInfoV6Result = securityInfoV6TempResult securityInfoV6Result = securityInfoV6TempResult
} else {
if model.EnableLoger {
Logger.Info(fmt.Sprintf("utils.CompareAndMergeSecurityInfo(securityInfoV6Result, securityInfo): %s", err.Error()))
}
} }
} }
} }