From ddafdf79b899021d0b841c661cb80553ab3cf24f Mon Sep 17 00:00:00 2001 From: Yuzuki616 Date: Sat, 29 Jul 2023 19:27:15 +0800 Subject: [PATCH] update --- .github/workflows/release.yml | 4 ++-- README.md | 4 ++-- api/iprecoder/interface.go | 2 +- api/iprecoder/recorder.go | 7 ++++--- api/iprecoder/redis.go | 7 ++++--- api/iprecoder/redis_test.go | 5 +++-- api/panel/node.go | 2 +- api/panel/node_test.go | 2 +- api/panel/panel.go | 2 +- cmd/action_linux.go | 5 +++-- cmd/cmd.go | 2 +- cmd/common.go | 3 ++- cmd/install_linux.go | 7 ++++--- cmd/server.go | 11 ++++++----- cmd/synctime.go | 2 +- cmd/version.go | 2 +- cmd/x25519.go | 2 +- core/core.go | 2 +- core/hy/hy.go | 4 ++-- core/hy/node.go | 6 +++--- core/hy/server.go | 8 ++++---- core/hy/server_test.go | 6 +++--- core/hy/user.go | 4 ++-- core/imports/hy.go | 2 +- core/imports/sing.go | 2 +- core/imports/xray.go | 2 +- core/interface.go | 4 ++-- core/selector.go | 4 ++-- core/sing/hook.go | 6 +++--- core/sing/node.go | 4 ++-- core/sing/sing.go | 4 ++-- core/sing/user.go | 6 +++--- core/xray/app/dispatcher/config.proto | 2 +- core/xray/app/dispatcher/default.go | 4 ++-- core/xray/inbound.go | 4 ++-- core/xray/node.go | 4 ++-- core/xray/outbound.go | 2 +- core/xray/ss.go | 4 ++-- core/xray/trojan.go | 4 ++-- core/xray/user.go | 6 +++--- core/xray/vmess.go | 4 ++-- core/xray/xray.go | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- limiter/dynamic.go | 5 +++-- limiter/limiter.go | 6 +++--- limiter/rule.go | 2 +- main.go | 2 +- node/cert.go | 4 ++-- node/controller.go | 13 ++++++------- node/lego/lego.go | 9 +++++---- node/lego/lego_test.go | 3 ++- node/lego/user.go | 5 +++-- node/node.go | 6 +++--- node/task.go | 10 +++++----- node/user.go | 2 +- 56 files changed, 129 insertions(+), 119 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 229381d..e71eda3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,13 +126,13 @@ jobs: run: | echo "version: $version" mkdir -p build_assets - go build -v -o build_assets/V2bX -tags "xray hy" -trimpath -ldflags "-X 'github.com/Yuzuki616/V2bX/cmd.version=$version' -s -w -buildid=" + go build -v -o build_assets/V2bX -tags "xray hy" -trimpath -ldflags "-X 'github.com/InazumaV/V2bX/cmd.version=$version' -s -w -buildid=" - name: Build Mips softfloat V2bX if: matrix.goarch == 'mips' || matrix.goarch == 'mipsle' run: | echo "version: $version" - GOMIPS=softfloat go build -v -o build_assets/V2bX_softfloat -tags "xray hy" -trimpath -ldflags "-X 'github.com/Yuzuki616/V2bX/cmd.version=$version' -s -w -buildid=" + GOMIPS=softfloat go build -v -o build_assets/V2bX_softfloat -tags "xray hy" -trimpath -ldflags "-X 'github.com/InazumaV/V2bX/cmd.version=$version' -s -w -buildid=" - name: Rename Windows V2bX if: matrix.goos == 'windows' run: | diff --git a/README.md b/README.md index 1ef597e..46ab813 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ A V2board node server based on multi core, modified from XrayR. ### 一键安装 ``` -wget -N https://raw.githubusercontents.com/Yuzuki616/V2bX-script/master/install.sh && bash install.sh +wget -N https://raw.githubusercontents.com/InazumaV/V2bX-script/master/install.sh && bash install.sh ``` ### 手动安装 @@ -85,4 +85,4 @@ go build -o V2bX -ldflags '-s -w' -gcflags="all=-trimpath=${PWD}" -asmflags="all ## Stars 增长记录 -[![Stargazers over time](https://starchart.cc/Yuzuki616/V2bX.svg)](https://starchart.cc/Yuzuki616/V2bX) +[![Stargazers over time](https://starchart.cc/InazumaV/V2bX.svg)](https://starchart.cc/InazumaV/V2bX) diff --git a/api/iprecoder/interface.go b/api/iprecoder/interface.go index 6095b42..30808ff 100644 --- a/api/iprecoder/interface.go +++ b/api/iprecoder/interface.go @@ -1,7 +1,7 @@ package iprecoder import ( - "github.com/Yuzuki616/V2bX/limiter" + "github.com/InazumaV/V2bX/limiter" ) type IpRecorder interface { diff --git a/api/iprecoder/recorder.go b/api/iprecoder/recorder.go index c8204b8..cdf2476 100644 --- a/api/iprecoder/recorder.go +++ b/api/iprecoder/recorder.go @@ -2,11 +2,12 @@ package iprecoder import ( "errors" - "github.com/Yuzuki616/V2bX/conf" - "github.com/Yuzuki616/V2bX/limiter" + "time" + + "github.com/InazumaV/V2bX/conf" + "github.com/InazumaV/V2bX/limiter" "github.com/go-resty/resty/v2" "github.com/goccy/go-json" - "time" ) type Recorder struct { diff --git a/api/iprecoder/redis.go b/api/iprecoder/redis.go index 5222ce3..1371504 100644 --- a/api/iprecoder/redis.go +++ b/api/iprecoder/redis.go @@ -3,11 +3,12 @@ package iprecoder import ( "context" "fmt" - "github.com/Yuzuki616/V2bX/conf" - "github.com/Yuzuki616/V2bX/limiter" - "github.com/go-redis/redis/v8" "strconv" "time" + + "github.com/InazumaV/V2bX/conf" + "github.com/InazumaV/V2bX/limiter" + "github.com/go-redis/redis/v8" ) type Redis struct { diff --git a/api/iprecoder/redis_test.go b/api/iprecoder/redis_test.go index 3e013be..5a0caf6 100644 --- a/api/iprecoder/redis_test.go +++ b/api/iprecoder/redis_test.go @@ -1,10 +1,11 @@ package iprecoder import ( - "github.com/Yuzuki616/V2bX/conf" - "github.com/Yuzuki616/V2bX/limiter" "log" "testing" + + "github.com/InazumaV/V2bX/conf" + "github.com/InazumaV/V2bX/limiter" ) func TestRedis_SyncOnlineIp(t *testing.T) { diff --git a/api/panel/node.go b/api/panel/node.go index 4661b06..1d8fd0f 100644 --- a/api/panel/node.go +++ b/api/panel/node.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/Yuzuki616/V2bX/common/crypt" + "github.com/InazumaV/V2bX/common/crypt" "github.com/goccy/go-json" log "github.com/sirupsen/logrus" coreConf "github.com/xtls/xray-core/infra/conf" diff --git a/api/panel/node_test.go b/api/panel/node_test.go index e340fb0..dc4a9f6 100644 --- a/api/panel/node_test.go +++ b/api/panel/node_test.go @@ -4,7 +4,7 @@ import ( "log" "testing" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/conf" ) var client *Client diff --git a/api/panel/panel.go b/api/panel/panel.go index 29aca2b..566b235 100644 --- a/api/panel/panel.go +++ b/api/panel/panel.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/conf" "github.com/go-resty/resty/v2" ) diff --git a/cmd/action_linux.go b/cmd/action_linux.go index a032a5f..0f94454 100644 --- a/cmd/action_linux.go +++ b/cmd/action_linux.go @@ -2,9 +2,10 @@ package cmd import ( "fmt" - "github.com/Yuzuki616/V2bX/common/exec" - "github.com/spf13/cobra" "time" + + "github.com/InazumaV/V2bX/common/exec" + "github.com/spf13/cobra" ) var ( diff --git a/cmd/cmd.go b/cmd/cmd.go index 26f9130..d03b1a6 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -3,7 +3,7 @@ package cmd import ( log "github.com/sirupsen/logrus" - _ "github.com/Yuzuki616/V2bX/core/imports" + _ "github.com/InazumaV/V2bX/core/imports" "github.com/spf13/cobra" ) diff --git a/cmd/common.go b/cmd/common.go index 640accb..698dc65 100644 --- a/cmd/common.go +++ b/cmd/common.go @@ -2,8 +2,9 @@ package cmd import ( "fmt" - "github.com/Yuzuki616/V2bX/common/exec" "strings" + + "github.com/InazumaV/V2bX/common/exec" ) const ( diff --git a/cmd/install_linux.go b/cmd/install_linux.go index 1f1eada..857dd22 100644 --- a/cmd/install_linux.go +++ b/cmd/install_linux.go @@ -2,10 +2,11 @@ package cmd import ( "fmt" - "github.com/Yuzuki616/V2bX/common/exec" - "github.com/spf13/cobra" "os" "strings" + + "github.com/InazumaV/V2bX/common/exec" + "github.com/spf13/cobra" ) var targetVersion string @@ -16,7 +17,7 @@ var ( Short: "Update V2bX version", Run: func(_ *cobra.Command, _ []string) { exec.RunCommandStd("bash", - "<(curl -Ls https://raw.githubusercontents.com/Yuzuki616/V2bX-script/master/install.sh)", + "<(curl -Ls https://raw.githubusercontents.com/InazumaV/V2bX-script/master/install.sh)", targetVersion) }, Args: cobra.NoArgs, diff --git a/cmd/server.go b/cmd/server.go index e8b062d..16aec39 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -1,17 +1,18 @@ package cmd import ( - log "github.com/sirupsen/logrus" "os" "os/signal" "runtime" "syscall" - vCore "github.com/Yuzuki616/V2bX/core" + log "github.com/sirupsen/logrus" - "github.com/Yuzuki616/V2bX/conf" - "github.com/Yuzuki616/V2bX/limiter" - "github.com/Yuzuki616/V2bX/node" + vCore "github.com/InazumaV/V2bX/core" + + "github.com/InazumaV/V2bX/conf" + "github.com/InazumaV/V2bX/limiter" + "github.com/InazumaV/V2bX/node" "github.com/spf13/cobra" ) diff --git a/cmd/synctime.go b/cmd/synctime.go index ce1f0a7..b156a58 100644 --- a/cmd/synctime.go +++ b/cmd/synctime.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/Yuzuki616/V2bX/common/systime" + "github.com/InazumaV/V2bX/common/systime" "github.com/beevik/ntp" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index 6f4a695..0196a36 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - vCore "github.com/Yuzuki616/V2bX/core" + vCore "github.com/InazumaV/V2bX/core" "github.com/spf13/cobra" ) diff --git a/cmd/x25519.go b/cmd/x25519.go index d7ee9ce..09cdc7b 100644 --- a/cmd/x25519.go +++ b/cmd/x25519.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/Yuzuki616/V2bX/common/crypt" + "github.com/InazumaV/V2bX/common/crypt" "github.com/spf13/cobra" "golang.org/x/crypto/curve25519" diff --git a/core/core.go b/core/core.go index d3cc812..dbaabea 100644 --- a/core/core.go +++ b/core/core.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/conf" ) var ( diff --git a/core/hy/hy.go b/core/hy/hy.go index e261e10..b09b280 100644 --- a/core/hy/hy.go +++ b/core/hy/hy.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/Yuzuki616/V2bX/conf" - vCore "github.com/Yuzuki616/V2bX/core" + "github.com/InazumaV/V2bX/conf" + vCore "github.com/InazumaV/V2bX/core" "github.com/hashicorp/go-multierror" ) diff --git a/core/hy/node.go b/core/hy/node.go index 4a92020..47b6eb4 100644 --- a/core/hy/node.go +++ b/core/hy/node.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" - "github.com/Yuzuki616/V2bX/limiter" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" + "github.com/InazumaV/V2bX/limiter" ) func (h *Hy) AddNode(tag string, info *panel.NodeInfo, c *conf.Options) error { diff --git a/core/hy/server.go b/core/hy/server.go index ac4e4e8..7131d12 100644 --- a/core/hy/server.go +++ b/core/hy/server.go @@ -9,11 +9,11 @@ import ( "sync/atomic" "time" - "github.com/Yuzuki616/V2bX/common/counter" + "github.com/InazumaV/V2bX/common/counter" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" - "github.com/Yuzuki616/V2bX/limiter" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" + "github.com/InazumaV/V2bX/limiter" "github.com/Yuzuki616/hysteria/core/sockopt" "github.com/Yuzuki616/quic-go" diff --git a/core/hy/server_test.go b/core/hy/server_test.go index 18fb1c1..ec7e29e 100644 --- a/core/hy/server_test.go +++ b/core/hy/server_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" - "github.com/Yuzuki616/V2bX/limiter" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" + "github.com/InazumaV/V2bX/limiter" "github.com/sirupsen/logrus" ) diff --git a/core/hy/user.go b/core/hy/user.go index 84d058e..49b2b93 100644 --- a/core/hy/user.go +++ b/core/hy/user.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "errors" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/core" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/core" ) func (h *Hy) AddUsers(p *core.AddUsersParams) (int, error) { diff --git a/core/imports/hy.go b/core/imports/hy.go index 650042f..9cc3e82 100644 --- a/core/imports/hy.go +++ b/core/imports/hy.go @@ -3,4 +3,4 @@ package imports // not yet tested -import _ "github.com/Yuzuki616/V2bX/core/hy" +import _ "github.com/InazumaV/V2bX/core/hy" diff --git a/core/imports/sing.go b/core/imports/sing.go index f994c0b..a4ad763 100644 --- a/core/imports/sing.go +++ b/core/imports/sing.go @@ -2,4 +2,4 @@ package imports -import _ "github.com/Yuzuki616/V2bX/core/sing" +import _ "github.com/InazumaV/V2bX/core/sing" diff --git a/core/imports/xray.go b/core/imports/xray.go index 24c806d..fdbcd7c 100644 --- a/core/imports/xray.go +++ b/core/imports/xray.go @@ -2,4 +2,4 @@ package imports -import _ "github.com/Yuzuki616/V2bX/core/xray" +import _ "github.com/InazumaV/V2bX/core/xray" diff --git a/core/interface.go b/core/interface.go index 5f60c46..7d47148 100644 --- a/core/interface.go +++ b/core/interface.go @@ -1,8 +1,8 @@ package core import ( - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" ) type AddUsersParams struct { diff --git a/core/selector.go b/core/selector.go index dd224db..9c729cc 100644 --- a/core/selector.go +++ b/core/selector.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" "github.com/hashicorp/go-multierror" ) diff --git a/core/sing/hook.go b/core/sing/hook.go index 974bde5..afd4c70 100644 --- a/core/sing/hook.go +++ b/core/sing/hook.go @@ -5,11 +5,11 @@ import ( "strings" "sync" - "github.com/Yuzuki616/V2bX/common/rate" + "github.com/InazumaV/V2bX/common/rate" - "github.com/Yuzuki616/V2bX/limiter" + "github.com/InazumaV/V2bX/limiter" - "github.com/Yuzuki616/V2bX/common/counter" + "github.com/InazumaV/V2bX/common/counter" "github.com/inazumav/sing-box/adapter" "github.com/inazumav/sing-box/log" N "github.com/sagernet/sing/common/network" diff --git a/core/sing/node.go b/core/sing/node.go index 76a5f27..a11c282 100644 --- a/core/sing/node.go +++ b/core/sing/node.go @@ -14,8 +14,8 @@ import ( "github.com/inazumav/sing-box/inbound" F "github.com/sagernet/sing/common/format" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" "github.com/goccy/go-json" "github.com/inazumav/sing-box/option" ) diff --git a/core/sing/sing.go b/core/sing/sing.go index 245a1b4..1f5a814 100644 --- a/core/sing/sing.go +++ b/core/sing/sing.go @@ -8,8 +8,8 @@ import ( "runtime/debug" "time" - "github.com/Yuzuki616/V2bX/conf" - vCore "github.com/Yuzuki616/V2bX/core" + "github.com/InazumaV/V2bX/conf" + vCore "github.com/InazumaV/V2bX/core" "github.com/inazumav/sing-box/adapter" "github.com/inazumav/sing-box/inbound" diff --git a/core/sing/user.go b/core/sing/user.go index ac7af2b..076c855 100644 --- a/core/sing/user.go +++ b/core/sing/user.go @@ -3,9 +3,9 @@ package sing import ( "errors" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/counter" - "github.com/Yuzuki616/V2bX/core" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/counter" + "github.com/InazumaV/V2bX/core" "github.com/inazumav/sing-box/inbound" "github.com/inazumav/sing-box/option" ) diff --git a/core/xray/app/dispatcher/config.proto b/core/xray/app/dispatcher/config.proto index 5724233..7b8cb49 100644 --- a/core/xray/app/dispatcher/config.proto +++ b/core/xray/app/dispatcher/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package v2bx.core.app.dispatcher; option csharp_namespace = "V2bX.core.app.dispatcher"; -option go_package = "github.com/Yuzuki616/V2bX/core/xray/app/dispatcher"; +option go_package = "github.com/InazumaV/V2bX/core/xray/app/dispatcher"; option java_package = "com.v2bx.core.app.dispatcher"; option java_multiple_files = true; diff --git a/core/xray/app/dispatcher/default.go b/core/xray/app/dispatcher/default.go index d872b7f..aba145b 100644 --- a/core/xray/app/dispatcher/default.go +++ b/core/xray/app/dispatcher/default.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/Yuzuki616/V2bX/common/rate" - "github.com/Yuzuki616/V2bX/limiter" + "github.com/InazumaV/V2bX/common/rate" + "github.com/InazumaV/V2bX/limiter" routingSession "github.com/xtls/xray-core/features/routing/session" "github.com/xtls/xray-core/common" diff --git a/core/xray/inbound.go b/core/xray/inbound.go index c9b9f4a..fb2ae4d 100644 --- a/core/xray/inbound.go +++ b/core/xray/inbound.go @@ -8,8 +8,8 @@ import ( "fmt" "strconv" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" "github.com/goccy/go-json" "github.com/xtls/xray-core/common/net" "github.com/xtls/xray-core/core" diff --git a/core/xray/node.go b/core/xray/node.go index 70a52a0..df1b23c 100644 --- a/core/xray/node.go +++ b/core/xray/node.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" "github.com/xtls/xray-core/core" "github.com/xtls/xray-core/features/inbound" "github.com/xtls/xray-core/features/outbound" diff --git a/core/xray/outbound.go b/core/xray/outbound.go index b786505..9737a93 100644 --- a/core/xray/outbound.go +++ b/core/xray/outbound.go @@ -3,7 +3,7 @@ package xray import ( "fmt" - conf2 "github.com/Yuzuki616/V2bX/conf" + conf2 "github.com/InazumaV/V2bX/conf" "github.com/goccy/go-json" "github.com/xtls/xray-core/common/net" "github.com/xtls/xray-core/core" diff --git a/core/xray/ss.go b/core/xray/ss.go index 8ebadd9..490daea 100644 --- a/core/xray/ss.go +++ b/core/xray/ss.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "strings" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/format" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/format" "github.com/xtls/xray-core/common/protocol" "github.com/xtls/xray-core/common/serial" "github.com/xtls/xray-core/proxy/shadowsocks" diff --git a/core/xray/trojan.go b/core/xray/trojan.go index cea6762..b638a8d 100644 --- a/core/xray/trojan.go +++ b/core/xray/trojan.go @@ -1,8 +1,8 @@ package xray import ( - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/format" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/format" "github.com/xtls/xray-core/common/protocol" "github.com/xtls/xray-core/common/serial" "github.com/xtls/xray-core/proxy/trojan" diff --git a/core/xray/user.go b/core/xray/user.go index 86d1f36..2fc6351 100644 --- a/core/xray/user.go +++ b/core/xray/user.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/format" - vCore "github.com/Yuzuki616/V2bX/core" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/format" + vCore "github.com/InazumaV/V2bX/core" "github.com/xtls/xray-core/common/protocol" "github.com/xtls/xray-core/proxy" ) diff --git a/core/xray/vmess.go b/core/xray/vmess.go index 5929393..47553a9 100644 --- a/core/xray/vmess.go +++ b/core/xray/vmess.go @@ -1,8 +1,8 @@ package xray import ( - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/format" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/format" "github.com/xtls/xray-core/common/protocol" "github.com/xtls/xray-core/common/serial" "github.com/xtls/xray-core/infra/conf" diff --git a/core/xray/xray.go b/core/xray/xray.go index cd56604..96bb466 100644 --- a/core/xray/xray.go +++ b/core/xray/xray.go @@ -4,10 +4,10 @@ import ( "os" "sync" - "github.com/Yuzuki616/V2bX/conf" - vCore "github.com/Yuzuki616/V2bX/core" - "github.com/Yuzuki616/V2bX/core/xray/app/dispatcher" - _ "github.com/Yuzuki616/V2bX/core/xray/distro/all" + "github.com/InazumaV/V2bX/conf" + vCore "github.com/InazumaV/V2bX/core" + "github.com/InazumaV/V2bX/core/xray/app/dispatcher" + _ "github.com/InazumaV/V2bX/core/xray/distro/all" "github.com/goccy/go-json" log "github.com/sirupsen/logrus" "github.com/xtls/xray-core/app/proxyman" diff --git a/go.mod b/go.mod index b55f6b0..4375d66 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Yuzuki616/V2bX +module github.com/InazumaV/V2bX go 1.19 diff --git a/go.sum b/go.sum index 0bc7f31..7e3407b 100644 --- a/go.sum +++ b/go.sum @@ -204,8 +204,8 @@ github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-acme/lego/v4 v4.13.3 h1:aZ1S9FXIkCWG3Uw/rZKSD+MOuO8ZB1t6p9VCg6jJiNY= -github.com/go-acme/lego/v4 v4.13.3/go.mod h1:c/iodVGMeBXG/+KiQczoNkySo3YLWTVa0kiyeVd/FHc= +github.com/go-acme/lego/v4 v4.13.2 h1:liIHWM9Wr3bmQ5s8UukfPhC4HOOaue9jRkUyrd8Dk7Y= +github.com/go-acme/lego/v4 v4.13.2/go.mod h1:c/iodVGMeBXG/+KiQczoNkySo3YLWTVa0kiyeVd/FHc= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= diff --git a/limiter/dynamic.go b/limiter/dynamic.go index b68a19d..4abc7bc 100644 --- a/limiter/dynamic.go +++ b/limiter/dynamic.go @@ -1,9 +1,10 @@ package limiter import ( - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/format" "time" + + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/format" ) func (l *Limiter) AddDynamicSpeedLimit(tag string, userInfo *panel.UserInfo, limitNum int, expire int64) error { diff --git a/limiter/limiter.go b/limiter/limiter.go index 60973b0..082ea7d 100644 --- a/limiter/limiter.go +++ b/limiter/limiter.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/format" - "github.com/Yuzuki616/V2bX/conf" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/format" + "github.com/InazumaV/V2bX/conf" "github.com/juju/ratelimit" log "github.com/sirupsen/logrus" "github.com/xtls/xray-core/common/task" diff --git a/limiter/rule.go b/limiter/rule.go index 4f6e4c8..27ea46e 100644 --- a/limiter/rule.go +++ b/limiter/rule.go @@ -3,7 +3,7 @@ package limiter import ( "regexp" - "github.com/Yuzuki616/V2bX/api/panel" + "github.com/InazumaV/V2bX/api/panel" ) func (l *Limiter) CheckDomainRule(destination string) (reject bool) { diff --git a/main.go b/main.go index 1434239..1be45d6 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ package main -import "github.com/Yuzuki616/V2bX/cmd" +import "github.com/InazumaV/V2bX/cmd" func main() { cmd.Run() diff --git a/node/cert.go b/node/cert.go index 1d6d8d4..9f9f3df 100644 --- a/node/cert.go +++ b/node/cert.go @@ -3,8 +3,8 @@ package node import ( "fmt" - "github.com/Yuzuki616/V2bX/common/file" - "github.com/Yuzuki616/V2bX/node/lego" + "github.com/InazumaV/V2bX/common/file" + "github.com/InazumaV/V2bX/node/lego" log "github.com/sirupsen/logrus" ) diff --git a/node/controller.go b/node/controller.go index 379f8c7..84daebb 100644 --- a/node/controller.go +++ b/node/controller.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/Yuzuki616/V2bX/api/iprecoder" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/task" - "github.com/Yuzuki616/V2bX/conf" - vCore "github.com/Yuzuki616/V2bX/core" - "github.com/Yuzuki616/V2bX/limiter" + "github.com/InazumaV/V2bX/api/iprecoder" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/task" + "github.com/InazumaV/V2bX/conf" + vCore "github.com/InazumaV/V2bX/core" + "github.com/InazumaV/V2bX/limiter" log "github.com/sirupsen/logrus" ) @@ -88,7 +88,6 @@ func (c *Controller) Start() error { log.WithField("tag", c.tag).Infof("Added %d new users", added) c.info = node c.startTasks(node) - c.info = node return nil } diff --git a/node/lego/lego.go b/node/lego/lego.go index 4a29c9c..9a5c0d1 100644 --- a/node/lego/lego.go +++ b/node/lego/lego.go @@ -2,12 +2,13 @@ package lego import ( "fmt" - "github.com/Yuzuki616/V2bX/common/file" - "github.com/Yuzuki616/V2bX/conf" - "github.com/go-acme/lego/v4/certcrypto" - "github.com/go-acme/lego/v4/lego" "os" "path" + + "github.com/InazumaV/V2bX/common/file" + "github.com/InazumaV/V2bX/conf" + "github.com/go-acme/lego/v4/certcrypto" + "github.com/go-acme/lego/v4/lego" ) type Lego struct { diff --git a/node/lego/lego_test.go b/node/lego/lego_test.go index 3e44ec8..69b2eab 100644 --- a/node/lego/lego_test.go +++ b/node/lego/lego_test.go @@ -1,10 +1,11 @@ package lego import ( - "github.com/Yuzuki616/V2bX/conf" "log" "os" "testing" + + "github.com/InazumaV/V2bX/conf" ) var l *Lego diff --git a/node/lego/user.go b/node/lego/user.go index dde78d3..d2d3b18 100644 --- a/node/lego/user.go +++ b/node/lego/user.go @@ -8,11 +8,12 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "github.com/Yuzuki616/V2bX/common/file" + "os" + + "github.com/InazumaV/V2bX/common/file" "github.com/go-acme/lego/v4/lego" "github.com/go-acme/lego/v4/registration" "github.com/goccy/go-json" - "os" ) type User struct { diff --git a/node/node.go b/node/node.go index 2f8b847..ad3a58c 100644 --- a/node/node.go +++ b/node/node.go @@ -3,9 +3,9 @@ package node import ( "fmt" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/conf" - vCore "github.com/Yuzuki616/V2bX/core" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/conf" + vCore "github.com/InazumaV/V2bX/core" ) type Node struct { diff --git a/node/task.go b/node/task.go index c7856d0..86297bb 100644 --- a/node/task.go +++ b/node/task.go @@ -3,10 +3,10 @@ package node import ( "time" - "github.com/Yuzuki616/V2bX/api/panel" - "github.com/Yuzuki616/V2bX/common/task" - vCore "github.com/Yuzuki616/V2bX/core" - "github.com/Yuzuki616/V2bX/limiter" + "github.com/InazumaV/V2bX/api/panel" + "github.com/InazumaV/V2bX/common/task" + vCore "github.com/InazumaV/V2bX/core" + "github.com/InazumaV/V2bX/limiter" log "github.com/sirupsen/logrus" ) @@ -68,6 +68,7 @@ func (c *Controller) nodeInfoMonitor() (err error) { return nil } if newNodeInfo != nil { + c.info = newNodeInfo // nodeInfo changed if newUserInfo != nil { c.userList = newUserInfo @@ -144,7 +145,6 @@ func (c *Controller) nodeInfoMonitor() (err error) { _ = c.userReportPeriodic.Start(false) } log.WithField("tag", c.tag).Infof("Added %d new users", len(c.userList)) - c.info = newNodeInfo // exit return nil } diff --git a/node/user.go b/node/user.go index be17479..dcfd22e 100644 --- a/node/user.go +++ b/node/user.go @@ -4,7 +4,7 @@ import ( "runtime" "strconv" - "github.com/Yuzuki616/V2bX/api/panel" + "github.com/InazumaV/V2bX/api/panel" log "github.com/sirupsen/logrus" )