diff --git a/.cross_compile.sh b/.cross_compile.sh index 63a152d..c16bb30 100644 --- a/.cross_compile.sh +++ b/.cross_compile.sh @@ -26,15 +26,15 @@ for pl in ${PLATFORMS}; do echo "build => ${TARGET}" if [ "${DEBUG_MODE}" == "debug" ]; then go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \ - -ldflags "-X 'github.com/xgadget-lab/nexttrace/config.Version=${BUILD_VERSION}' \ - -X 'github.com/xgadget-lab/nexttrace/config.BuildDate=${BUILD_DATE}' \ - -X 'github.com/xgadget-lab/nexttrace/config.CommitID=${COMMIT_SHA1}'\ + -ldflags "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \ + -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \ + -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\ -w -s" else go build -trimpath -o ${TARGET} \ - -ldflags "-X 'github.com/xgadget-lab/nexttrace/config.Version=${BUILD_VERSION}' \ - -X 'github.com/xgadget-lab/nexttrace/config.BuildDate=${BUILD_DATE}' \ - -X 'github.com/xgadget-lab/nexttrace/config.CommitID=${COMMIT_SHA1}'\ + -ldflags "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \ + -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \ + -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\ -w -s" fi done @@ -46,15 +46,15 @@ done echo "build => ${TARGET}" if [ "${DEBUG_MODE}" == "debug" ]; then go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \ - -ldflags "-X 'github.com/xgadget-lab/nexttrace/config.Version=${BUILD_VERSION}' \ - -X 'github.com/xgadget-lab/nexttrace/config.BuildDate=${BUILD_DATE}' \ - -X 'github.com/xgadget-lab/nexttrace/config.CommitID=${COMMIT_SHA1}'\ + -ldflags "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \ + -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \ + -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\ -w -s" else go build -trimpath -o ${TARGET} \ - -ldflags "-X 'github.com/xgadget-lab/nexttrace/config.Version=${BUILD_VERSION}' \ - -X 'github.com/xgadget-lab/nexttrace/config.BuildDate=${BUILD_DATE}' \ - -X 'github.com/xgadget-lab/nexttrace/config.CommitID=${COMMIT_SHA1}'\ + -ldflags "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \ + -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \ + -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\ -w -s" fi diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c282d88..7e76dad 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -15,7 +15,7 @@ copyright: [v2fly](https://github.com/v2fly) ## 你正在使用哪个版本的 nexttrace？ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4582a2d..cd72dd4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -131,9 +131,9 @@ jobs: - name: Build run: | go build -trimpath -o dist/${ASSET_NAME} \ - -ldflags "-X 'github.com/xgadget-lab/nexttrace/config.Version=${BUILD_VERSION}' \ - -X 'github.com/xgadget-lab/nexttrace/config.BuildDate=${BUILD_DATE}' \ - -X 'github.com/xgadget-lab/nexttrace/config.CommitID=${COMMIT_SHA1}'\ + -ldflags "-X 'github.com/nxtrace/NTrace-core/config.Version=${BUILD_VERSION}' \ + -X 'github.com/nxtrace/NTrace-core/config.BuildDate=${BUILD_DATE}' \ + -X 'github.com/nxtrace/NTrace-core/config.CommitID=${COMMIT_SHA1}'\ -w -s" - name: Upload files to Artifacts uses: actions/upload-artifact@v3 diff --git a/README.md b/README.md index 8571390..cc0700e 100644 --- a/README.md +++ b/README.md @@ -264,7 +264,7 @@ NextTrace `LeoMoeAPI` now utilizes the Proof of Work (POW) mechanism to prevent - [GitHub - tsosunchia/powclient: Proof of Work CLIENT for NextTrace](https://github.com/tsosunchia/powclient) - [GitHub - tsosunchia/powserver: Proof of Work SERVER for NextTrace](https://github.com/tsosunchia/powserver) -All NextTrace IP geolocation `API DEMO` can refer to [here](https://github.com/xgadget-lab/nexttrace/blob/main/ipgeo/) +All NextTrace IP geolocation `API DEMO` can refer to [here](https://github.com/nxtrace/NTrace-core/blob/main/ipgeo/) ### For full usage list, please refer to the usage menu diff --git a/cmd/cmd.go b/cmd/cmd.go index 68b2e86..2dfeed0 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -12,17 +12,17 @@ import ( "time" "github.com/akamensky/argparse" + "github.com/nxtrace/NTrace-core/config" + fastTrace "github.com/nxtrace/NTrace-core/fast_trace" + "github.com/nxtrace/NTrace-core/ipgeo" + "github.com/nxtrace/NTrace-core/printer" + "github.com/nxtrace/NTrace-core/reporter" + "github.com/nxtrace/NTrace-core/trace" + "github.com/nxtrace/NTrace-core/tracelog" + "github.com/nxtrace/NTrace-core/tracemap" + "github.com/nxtrace/NTrace-core/util" + "github.com/nxtrace/NTrace-core/wshandle" "github.com/syndtr/gocapability/capability" - "github.com/xgadget-lab/nexttrace/config" - fastTrace "github.com/xgadget-lab/nexttrace/fast_trace" - "github.com/xgadget-lab/nexttrace/ipgeo" - "github.com/xgadget-lab/nexttrace/printer" - "github.com/xgadget-lab/nexttrace/reporter" - "github.com/xgadget-lab/nexttrace/trace" - "github.com/xgadget-lab/nexttrace/tracelog" - "github.com/xgadget-lab/nexttrace/tracemap" - "github.com/xgadget-lab/nexttrace/util" - "github.com/xgadget-lab/nexttrace/wshandle" ) func Excute() { diff --git a/fast_trace/fast_trace ipv6.go b/fast_trace/fast_trace ipv6.go index 60ec945..93bef12 100644 --- a/fast_trace/fast_trace ipv6.go +++ b/fast_trace/fast_trace ipv6.go @@ -2,12 +2,12 @@ package fastTrace import ( "fmt" - "github.com/xgadget-lab/nexttrace/ipgeo" - "github.com/xgadget-lab/nexttrace/printer" - "github.com/xgadget-lab/nexttrace/trace" - "github.com/xgadget-lab/nexttrace/tracelog" - "github.com/xgadget-lab/nexttrace/util" - "github.com/xgadget-lab/nexttrace/wshandle" + "github.com/nxtrace/NTrace-core/ipgeo" + "github.com/nxtrace/NTrace-core/printer" + "github.com/nxtrace/NTrace-core/trace" + "github.com/nxtrace/NTrace-core/tracelog" + "github.com/nxtrace/NTrace-core/util" + "github.com/nxtrace/NTrace-core/wshandle" "log" "os" "os/signal" diff --git a/fast_trace/fast_trace.go b/fast_trace/fast_trace.go index e11afa0..bb449a9 100644 --- a/fast_trace/fast_trace.go +++ b/fast_trace/fast_trace.go @@ -2,12 +2,12 @@ package fastTrace import ( "fmt" - "github.com/xgadget-lab/nexttrace/ipgeo" - "github.com/xgadget-lab/nexttrace/printer" - "github.com/xgadget-lab/nexttrace/trace" - "github.com/xgadget-lab/nexttrace/tracelog" - "github.com/xgadget-lab/nexttrace/util" - "github.com/xgadget-lab/nexttrace/wshandle" + "github.com/nxtrace/NTrace-core/ipgeo" + "github.com/nxtrace/NTrace-core/printer" + "github.com/nxtrace/NTrace-core/trace" + "github.com/nxtrace/NTrace-core/tracelog" + "github.com/nxtrace/NTrace-core/util" + "github.com/nxtrace/NTrace-core/wshandle" "log" "net" "os" diff --git a/fast_trace/fast_trace_test.go b/fast_trace/fast_trace_test.go index bb55b11..e5fe70d 100644 --- a/fast_trace/fast_trace_test.go +++ b/fast_trace/fast_trace_test.go @@ -6,8 +6,8 @@ import ( "os/signal" "testing" - "github.com/xgadget-lab/nexttrace/trace" - "github.com/xgadget-lab/nexttrace/wshandle" + "github.com/nxtrace/NTrace-core/trace" + "github.com/nxtrace/NTrace-core/wshandle" ) func TestTrace(t *testing.T) { diff --git a/go.mod b/go.mod index c2a98d1..abcb111 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/xgadget-lab/nexttrace +module github.com/nxtrace/NTrace-core go 1.21 diff --git a/ipgeo/chunzhen.go b/ipgeo/chunzhen.go index 2e4a711..c7e7813 100644 --- a/ipgeo/chunzhen.go +++ b/ipgeo/chunzhen.go @@ -2,7 +2,7 @@ package ipgeo import ( "encoding/json" - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/util" "io" "log" "net/http" diff --git a/ipgeo/dn42.go b/ipgeo/dn42.go index 6c0355e..f691313 100644 --- a/ipgeo/dn42.go +++ b/ipgeo/dn42.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/xgadget-lab/nexttrace/dn42" + "github.com/nxtrace/NTrace-core/dn42" ) func LtdCodeToCountryOrAreaName(Code string) string { diff --git a/ipgeo/ipapicom.go b/ipgeo/ipapicom.go index 2285fed..270ca55 100644 --- a/ipgeo/ipapicom.go +++ b/ipgeo/ipapicom.go @@ -2,7 +2,7 @@ package ipgeo import ( "errors" - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/util" "io" "log" "net/http" diff --git a/ipgeo/ipinfo.go b/ipgeo/ipinfo.go index 954a78b..30749c7 100644 --- a/ipgeo/ipinfo.go +++ b/ipgeo/ipinfo.go @@ -1,7 +1,7 @@ package ipgeo import ( - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/util" "io" "net/http" "strconv" diff --git a/ipgeo/leo.go b/ipgeo/leo.go index 6d62649..ba09ca2 100644 --- a/ipgeo/leo.go +++ b/ipgeo/leo.go @@ -7,8 +7,8 @@ import ( "sync" "time" + "github.com/nxtrace/NTrace-core/wshandle" "github.com/tidwall/gjson" - "github.com/xgadget-lab/nexttrace/wshandle" ) /*** diff --git a/ipgeo/tokens.go b/ipgeo/tokens.go index 78a5bf9..84d6a02 100644 --- a/ipgeo/tokens.go +++ b/ipgeo/tokens.go @@ -1,6 +1,6 @@ package ipgeo -import "github.com/xgadget-lab/nexttrace/util" +import "github.com/nxtrace/NTrace-core/util" type tokenData struct { ipinsight string diff --git a/main.go b/main.go index e9f9195..9f23ba9 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/xgadget-lab/nexttrace/cmd" + "github.com/nxtrace/NTrace-core/cmd" ) func main() { diff --git a/pow/pow.go b/pow/pow.go index 3eee8ab..c539826 100644 --- a/pow/pow.go +++ b/pow/pow.go @@ -2,8 +2,8 @@ package pow import ( "fmt" + "github.com/nxtrace/NTrace-core/util" "github.com/tsosunchia/powclient" - "github.com/xgadget-lab/nexttrace/util" "net/url" "os" ) diff --git a/printer/basic.go b/printer/basic.go index 14e9808..c6ae53a 100644 --- a/printer/basic.go +++ b/printer/basic.go @@ -2,8 +2,8 @@ package printer import ( "fmt" - "github.com/xgadget-lab/nexttrace/config" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/config" + "github.com/nxtrace/NTrace-core/trace" "net" "github.com/fatih/color" diff --git a/printer/classic_printer.go b/printer/classic_printer.go index 1f206a9..c5330ab 100644 --- a/printer/classic_printer.go +++ b/printer/classic_printer.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/trace" ) type HopInfo int diff --git a/printer/easy.go b/printer/easy.go index dc3ace4..daf6648 100644 --- a/printer/easy.go +++ b/printer/easy.go @@ -3,7 +3,7 @@ package printer import ( "fmt" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/trace" ) func EasyPrinter(res *trace.Result, ttl int) { diff --git a/printer/printer.go b/printer/printer.go index 48d3ddd..ad32f0c 100644 --- a/printer/printer.go +++ b/printer/printer.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/trace" - "github.com/xgadget-lab/nexttrace/ipgeo" + "github.com/nxtrace/NTrace-core/ipgeo" ) // var dataOrigin string diff --git a/printer/realtime_printer.go b/printer/realtime_printer.go index ff0e334..ccc659f 100644 --- a/printer/realtime_printer.go +++ b/printer/realtime_printer.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/fatih/color" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/trace" ) func RealtimePrinter(res *trace.Result, ttl int) { diff --git a/printer/realtime_printer_router.go b/printer/realtime_printer_router.go index 18007bb..6369cbd 100644 --- a/printer/realtime_printer_router.go +++ b/printer/realtime_printer_router.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/fatih/color" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/trace" ) func RealtimePrinterWithRouter(res *trace.Result, ttl int) { diff --git a/printer/tableprinter.go b/printer/tableprinter.go index 4d6ad97..cd50057 100644 --- a/printer/tableprinter.go +++ b/printer/tableprinter.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/xgadget-lab/nexttrace/ipgeo" + "github.com/nxtrace/NTrace-core/ipgeo" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/trace" "github.com/fatih/color" "github.com/rodaine/table" diff --git a/reporter/reporter.go b/reporter/reporter.go index 2ea348b..1d084b6 100644 --- a/reporter/reporter.go +++ b/reporter/reporter.go @@ -6,8 +6,8 @@ import ( "strings" "sync" - "github.com/xgadget-lab/nexttrace/ipgeo" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/ipgeo" + "github.com/nxtrace/NTrace-core/trace" ) type Reporter interface { diff --git a/reporter/reporter_test.go b/reporter/reporter_test.go index c95acdc..2812297 100644 --- a/reporter/reporter_test.go +++ b/reporter/reporter_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/xgadget-lab/nexttrace/ipgeo" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/ipgeo" + "github.com/nxtrace/NTrace-core/trace" ) var testResult = &trace.Result{ diff --git a/trace/tcp_ipv4.go b/trace/tcp_ipv4.go index bea55b3..1de6ebb 100644 --- a/trace/tcp_ipv4.go +++ b/trace/tcp_ipv4.go @@ -10,7 +10,7 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/layers" - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/util" "golang.org/x/net/context" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" diff --git a/trace/tcp_ipv6.go b/trace/tcp_ipv6.go index 3574a35..75b6e0d 100644 --- a/trace/tcp_ipv6.go +++ b/trace/tcp_ipv6.go @@ -10,7 +10,7 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/layers" - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/util" "golang.org/x/net/context" "golang.org/x/net/icmp" "golang.org/x/net/ipv6" diff --git a/trace/temp_printer.go b/trace/temp_printer.go index 752b350..a88c5be 100644 --- a/trace/temp_printer.go +++ b/trace/temp_printer.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/xgadget-lab/nexttrace/ipgeo" + "github.com/nxtrace/NTrace-core/ipgeo" ) func HopPrinter(h Hop) { diff --git a/trace/trace.go b/trace/trace.go index 13303ea..2b552b3 100644 --- a/trace/trace.go +++ b/trace/trace.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/xgadget-lab/nexttrace/ipgeo" - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/ipgeo" + "github.com/nxtrace/NTrace-core/util" ) var ( diff --git a/trace/udp.go b/trace/udp.go index a8f7b1a..ace186e 100644 --- a/trace/udp.go +++ b/trace/udp.go @@ -8,7 +8,7 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/layers" - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/util" "golang.org/x/net/context" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" diff --git a/tracelog/log.go b/tracelog/log.go index 2008be3..e2f2569 100644 --- a/tracelog/log.go +++ b/tracelog/log.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/xgadget-lab/nexttrace/trace" + "github.com/nxtrace/NTrace-core/trace" ) func RealtimePrinter(res *trace.Result, ttl int) { diff --git a/tracemap/tracemap.go b/tracemap/tracemap.go index c11bed1..9488293 100644 --- a/tracemap/tracemap.go +++ b/tracemap/tracemap.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "github.com/fatih/color" - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/util" "io" "net" "net/http" diff --git a/util/util.go b/util/util.go index f61a2fb..31bbe7e 100644 --- a/util/util.go +++ b/util/util.go @@ -3,7 +3,7 @@ package util import ( "context" "fmt" - "github.com/xgadget-lab/nexttrace/config" + "github.com/nxtrace/NTrace-core/config" "log" "net" "net/url" diff --git a/wshandle/client.go b/wshandle/client.go index 52cb692..de7dc58 100644 --- a/wshandle/client.go +++ b/wshandle/client.go @@ -2,8 +2,8 @@ package wshandle import ( "crypto/tls" - "github.com/xgadget-lab/nexttrace/pow" - "github.com/xgadget-lab/nexttrace/util" + "github.com/nxtrace/NTrace-core/pow" + "github.com/nxtrace/NTrace-core/util" "log" "net" "net/http"