diff --git a/backtrace/asn.go b/backtrace/asn.go index 654f546..5d47045 100644 --- a/backtrace/asn.go +++ b/backtrace/asn.go @@ -5,7 +5,7 @@ import ( "net" "strings" - . "github.com/oneclickvirt/basics/defaultset" + . "github.com/oneclickvirt/defaultset" ) type Result struct { @@ -143,8 +143,8 @@ func ipAsn(ip string) string { return "AS9929" case strings.HasPrefix(ip, "219.158"): return "AS4837" - case strings.HasPrefix(ip, "223.120.19") || strings.HasPrefix(ip, "223.120.17") || strings.HasPrefix(ip, "223.120.16") || - strings.HasPrefix(ip, "223.120.140") || strings.HasPrefix(ip, "223.120.130") || strings.HasPrefix(ip, "223.120.131") || + case strings.HasPrefix(ip, "223.120.19") || strings.HasPrefix(ip, "223.120.17") || strings.HasPrefix(ip, "223.120.16") || + strings.HasPrefix(ip, "223.120.140") || strings.HasPrefix(ip, "223.120.130") || strings.HasPrefix(ip, "223.120.131") || strings.HasPrefix(ip, "223.120.141"): return "AS58807" case strings.HasPrefix(ip, "223.118") || strings.HasPrefix(ip, "223.119") || strings.HasPrefix(ip, "223.120") || strings.HasPrefix(ip, "223.121"): diff --git a/backtrace/version.go b/backtrace/version.go index 5f9d460..b6469b9 100644 --- a/backtrace/version.go +++ b/backtrace/version.go @@ -1,3 +1,3 @@ package backtrace -const Version = "0.0.1" +const BackTraceVersion = "0.0.1" \ No newline at end of file diff --git a/cmd/main.go b/cmd/main.go index 1285317..f2332ae 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -2,11 +2,12 @@ package main import ( "encoding/json" + "flag" "fmt" "net/http" "github.com/oneclickvirt/backtrace/backtrace" - . "github.com/oneclickvirt/basics/defaultset" + . "github.com/oneclickvirt/defaultset" ) type IpInfo struct { @@ -22,6 +23,13 @@ func main() { http.Get("https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Foneclickvirt%2Fbacktrace&count_bg=%2323E01C&title_bg=%23555555&icon=sonarcloud.svg&icon_color=%23E7E7E7&title=hits&edge_flat=false") }() fmt.Println(Green("项目地址:"), Yellow("https://github.com/oneclickvirt/backtrace")) + var showVersion bool + flag.BoolVar(&showVersion, "v", false, "show version") + flag.Parse() + if showVersion { + fmt.Println(backtrace.BackTraceVersion) + return + } rsp, err := http.Get("http://ipinfo.io") if err != nil { fmt.Errorf("Get ip info err %v \n", err.Error()) diff --git a/go.mod b/go.mod index 52737c2..36a9136 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/oneclickvirt/backtrace -go 1.21.5 +go 1.22.4 require ( go.uber.org/zap v1.27.0 @@ -10,6 +10,7 @@ require ( require ( github.com/oneclickvirt/basics v0.0.0-20240524033341-86198d11d5f0 // indirect + github.com/oneclickvirt/defaultset v0.0.0-20240624051018-30a50859e1b5 // indirect github.com/stretchr/testify v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect ) diff --git a/go.sum b/go.sum index b2173e5..797e78e 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/oneclickvirt/basics v0.0.0-20240524033341-86198d11d5f0 h1:ve6vWhPr+nN0msYTPLzjaMp2Mch/vc5bsV0OKmLt8Nc= github.com/oneclickvirt/basics v0.0.0-20240524033341-86198d11d5f0/go.mod h1:WJP9pAByPMKujLhCtFMp+7ljd31jjLCQkIRPRSukEZA= +github.com/oneclickvirt/defaultset v0.0.0-20240624051018-30a50859e1b5 h1:TUM6XzOB7Z7OxyXi3fwlZY9KfuVbvUBusYiNbSfX208= +github.com/oneclickvirt/defaultset v0.0.0-20240624051018-30a50859e1b5/go.mod h1:e9Jt4tf2sbemCtc84/XgKcHy9EZ2jkc5x2sW1NiJS+E= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=