Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Commit

Permalink
更新依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
@tsosunchia
tsosunchia committed Jan 24, 2023
1 parent 35ab7ac commit 27e67d3
Show file tree
Hide file tree
Showing 25 changed files with 53 additions and 343 deletions.
24 changes: 12 additions & 12 deletions .cross_compile.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/printer.version=${BUILD_VERSION}' \
-X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
-ldflags "-X 'github.com/OwO-Network/nexttrace-enhanced/printer.version=${BUILD_VERSION}' \
-X 'github.com/OwO-Network/nexttrace-enhanced/printer.buildDate=${BUILD_DATE}' \
-X 'github.com/OwO-Network/nexttrace-enhanced/printer.commitID=${COMMIT_SHA1}'\
-w -s"
else
go build -trimpath -o ${TARGET} \
-ldflags "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
-ldflags "-X 'github.com/OwO-Network/nexttrace-enhanced/printer.version=${BUILD_VERSION}' \
-X 'github.com/OwO-Network/nexttrace-enhanced/printer.buildDate=${BUILD_DATE}' \
-X 'github.com/OwO-Network/nexttrace-enhanced/printer.commitID=${COMMIT_SHA1}'\
-w -s"
fi
done
Expand All @@ -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/printer.version=${BUILD_VERSION}' \
-X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
-ldflags "-X 'github.com/OwO-Network/nexttrace-enhanced/printer.version=${BUILD_VERSION}' \
-X 'github.com/OwO-Network/nexttrace-enhanced/printer.buildDate=${BUILD_DATE}' \
-X 'github.com/OwO-Network/nexttrace-enhanced/printer.commitID=${COMMIT_SHA1}'\
-w -s"
else
go build -trimpath -o ${TARGET} \
-ldflags "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
-X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
-X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
-ldflags "-X 'github.com/OwO-Network/nexttrace-enhanced/printer.version=${BUILD_VERSION}' \
-X 'github.com/OwO-Network/nexttrace-enhanced/printer.buildDate=${BUILD_DATE}' \
-X 'github.com/OwO-Network/nexttrace-enhanced/printer.commitID=${COMMIT_SHA1}'\
-w -s"
fi

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ copyright: [v2fly](https://github.com/v2fly)

<!--
除非特殊情况，请完整填写所有问题。不按模板发的 issue 将直接被关闭。
如果你遇到的问题不是 nexttrace 的 bug，比如你不清楚如何配置，请在 https://github.com/xgadget-lab/nexttrace/discussions 进行讨论。
如果你遇到的问题不是 nexttrace 的 bug，比如你不清楚如何配置，请在 https://github.com/OwO-Network/nexttrace-enhanced/discussions 进行讨论。
-->

## 你正在使用哪个版本的 nexttrace？
Expand Down
18 changes: 0 additions & 18 deletions config/config_test.go
View file

This file was deleted.

12 changes: 6 additions & 6 deletions fast_trace/fast_trace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"strings"
"time"

"github.com/xgadget-lab/nexttrace/config"
"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/wshandle"
"github.com/OwO-Network/nexttrace-enhanced/config"
"github.com/OwO-Network/nexttrace-enhanced/ipgeo"
"github.com/OwO-Network/nexttrace-enhanced/printer"
"github.com/OwO-Network/nexttrace-enhanced/reporter"
"github.com/OwO-Network/nexttrace-enhanced/trace"
"github.com/OwO-Network/nexttrace-enhanced/wshandle"
)

var specificDev, specificAddr string
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/xgadget-lab/nexttrace
module github.com/OwO-Network/nexttrace-enhanced

go 1.18

Expand Down
2 changes: 1 addition & 1 deletion ipgeo/fixipgeo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"time"

"github.com/xgadget-lab/nexttrace/config"
"github.com/OwO-Network/nexttrace-enhanced/config"
)

type FixData struct {
Expand Down
52 changes: 0 additions & 52 deletions ipgeo/ipgeo_test.go
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ipgeo/leo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/tidwall/gjson"
"github.com/xgadget-lab/nexttrace/wshandle"
"github.com/OwO-Network/nexttrace-enhanced/wshandle"
)

/***
Expand Down
2 changes: 1 addition & 1 deletion ipgeo/tokens.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ipgeo

import "github.com/xgadget-lab/nexttrace/config"
import "github.com/OwO-Network/nexttrace-enhanced/config"

type tokenData struct {
ipinsight string
Expand Down
20 changes: 10 additions & 10 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import (
"strings"
"time"

"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/tracemap"
"github.com/xgadget-lab/nexttrace/util"
"github.com/xgadget-lab/nexttrace/web"
"github.com/xgadget-lab/nexttrace/wshandle"
"github.com/OwO-Network/nexttrace-enhanced/config"
fastTrace "github.com/OwO-Network/nexttrace-enhanced/fast_trace"
"github.com/OwO-Network/nexttrace-enhanced/ipgeo"
"github.com/OwO-Network/nexttrace-enhanced/printer"
"github.com/OwO-Network/nexttrace-enhanced/reporter"
"github.com/OwO-Network/nexttrace-enhanced/trace"
"github.com/OwO-Network/nexttrace-enhanced/tracemap"
"github.com/OwO-Network/nexttrace-enhanced/util"
"github.com/OwO-Network/nexttrace-enhanced/web"
"github.com/OwO-Network/nexttrace-enhanced/wshandle"
)

var fSet = flag.NewFlagSet("", flag.ExitOnError)
Expand Down
2 changes: 1 addition & 1 deletion printer/classic_printer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package printer
import (
"fmt"

"github.com/xgadget-lab/nexttrace/trace"
"github.com/OwO-Network/nexttrace-enhanced/trace"
)

func ClassicPrinter(res *trace.Result, ttl int) {
Expand Down
2 changes: 1 addition & 1 deletion printer/json_printer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package printer
import (
"encoding/json"

"github.com/xgadget-lab/nexttrace/trace"
"github.com/OwO-Network/nexttrace-enhanced/trace"
)

func ParseJson(res *trace.Result) string {
Expand Down
2 changes: 1 addition & 1 deletion printer/modern_printer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/fatih/color"
"github.com/xgadget-lab/nexttrace/trace"
"github.com/OwO-Network/nexttrace-enhanced/trace"
)

func RealtimePrinter(res *trace.Result, ttl int) {
Expand Down
4 changes: 2 additions & 2 deletions printer/printer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/xgadget-lab/nexttrace/trace"
"github.com/OwO-Network/nexttrace-enhanced/trace"

"github.com/xgadget-lab/nexttrace/ipgeo"
"github.com/OwO-Network/nexttrace-enhanced/ipgeo"
)

var dataOrigin string
Expand Down
105 changes: 0 additions & 105 deletions printer/printer_test.go
View file

This file was deleted.

4 changes: 2 additions & 2 deletions printer/tableprinter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/xgadget-lab/nexttrace/ipgeo"
"github.com/OwO-Network/nexttrace-enhanced/ipgeo"

"github.com/xgadget-lab/nexttrace/trace"
"github.com/OwO-Network/nexttrace-enhanced/trace"

"github.com/fatih/color"
"github.com/rodaine/table"
Expand Down
4 changes: 2 additions & 2 deletions reporter/reporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"sync"

"github.com/xgadget-lab/nexttrace/ipgeo"
"github.com/xgadget-lab/nexttrace/trace"
"github.com/OwO-Network/nexttrace-enhanced/ipgeo"
"github.com/OwO-Network/nexttrace-enhanced/trace"
)

type Reporter interface {
Expand Down
Loading

0 comments on commit 27e67d3

Please sign in to comment.