diff --git a/cmd/gost/cmd.go b/cmd/gost/cmd.go index 1d11429..6833ba6 100644 --- a/cmd/gost/cmd.go +++ b/cmd/gost/cmd.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/go-gost/config" "github.com/go-gost/core/metadata" "github.com/go-gost/core/registry" + "github.com/go-gost/x/config" ) var ( diff --git a/cmd/gost/config.go b/cmd/gost/config.go index 01d9ec9..e5be84d 100644 --- a/cmd/gost/config.go +++ b/cmd/gost/config.go @@ -4,13 +4,13 @@ import ( "io" "os" - "github.com/go-gost/api" - "github.com/go-gost/config" - "github.com/go-gost/config/parsing" "github.com/go-gost/core/logger" metrics "github.com/go-gost/core/metrics/service" "github.com/go-gost/core/registry" "github.com/go-gost/core/service" + "github.com/go-gost/x/api" + "github.com/go-gost/x/config" + "github.com/go-gost/x/config/parsing" ) func buildService(cfg *config.Config) (services []service.Service) { diff --git a/cmd/gost/main.go b/cmd/gost/main.go index a760bc9..4114265 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -8,9 +8,9 @@ import ( "os" "runtime" - "github.com/go-gost/config" "github.com/go-gost/core/logger" "github.com/go-gost/core/metrics" + "github.com/go-gost/x/config" ) var ( diff --git a/cmd/gost/tls.go b/cmd/gost/tls.go index 3fe7dff..c82e09b 100644 --- a/cmd/gost/tls.go +++ b/cmd/gost/tls.go @@ -10,8 +10,8 @@ import ( "math/big" "time" - "github.com/go-gost/config" tls_util "github.com/go-gost/core/common/util/tls" + "github.com/go-gost/x/config" ) func buildDefaultTLSConfig(cfg *config.TLSConfig) { diff --git a/cmd/gost/version.go b/cmd/gost/version.go index c41c65c..a7fc455 100644 --- a/cmd/gost/version.go +++ b/cmd/gost/version.go @@ -1,5 +1,5 @@ package main const ( - version = "3.0.0-alpha.4" + version = "3.0.0-beta.1" ) diff --git a/go.mod b/go.mod index 1b44a3f..235bfc5 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,8 @@ go 1.18 replace github.com/templexxx/cpu v0.0.7 => github.com/templexxx/cpu v0.0.10-0.20211111114238-98168dcec14a require ( - github.com/go-gost/api v0.0.0-20220316115521-ab4ad0f12488 - github.com/go-gost/config v0.0.0-20220316114445-04016a392b1e - github.com/go-gost/core v0.0.0-20220316132147-6b2ccaad38a4 - github.com/go-gost/x v0.0.0-20220316132524-2682c4d63ba5 + github.com/go-gost/core v0.0.0-20220317144108-bab2906aeb73 + github.com/go-gost/x v0.0.0-20220317145457-0f1f7790c52a ) require ( diff --git a/go.sum b/go.sum index 6373fa7..60a5dff 100644 --- a/go.sum +++ b/go.sum @@ -121,12 +121,8 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gost/api v0.0.0-20220316115521-ab4ad0f12488 h1:c1hthEceq5yiXwZEdX73e4dj4BRxNxFQfSXXDR1wL2Y= -github.com/go-gost/api v0.0.0-20220316115521-ab4ad0f12488/go.mod h1:TfLdWhO3b86fPiVOOtorOqhhZVSYwNS8C0BmarYaHtg= -github.com/go-gost/config v0.0.0-20220316114445-04016a392b1e h1:0tQmXLljIgBxA1ghQ80HoF6RGlzLdkOirHjAgvGU4NA= -github.com/go-gost/config v0.0.0-20220316114445-04016a392b1e/go.mod h1:TcXyaEcav8QK85dnpt+2piewCGLsUQ3W0D8SFTcRdAA= -github.com/go-gost/core v0.0.0-20220316132147-6b2ccaad38a4 h1:u2ryD5Csx21bvLFadzezwf5/TniK8YmMK1jmhfJmTLg= -github.com/go-gost/core v0.0.0-20220316132147-6b2ccaad38a4/go.mod h1:+Eqgm24sZ61yY9uPhRIPM79Ig+r2Rk5QIOcZWLL+5q0= +github.com/go-gost/core v0.0.0-20220317144108-bab2906aeb73 h1:N9iL7Jf+ahGBieyKu2iUqPVQFQzUjqGKl/lZM+YiSEo= +github.com/go-gost/core v0.0.0-20220317144108-bab2906aeb73/go.mod h1:+Eqgm24sZ61yY9uPhRIPM79Ig+r2Rk5QIOcZWLL+5q0= github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s= github.com/go-gost/gosocks4 v0.0.1/go.mod h1:3B6L47HbU/qugDg4JnoFPHgJXE43Inz8Bah1QaN9qCc= github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 h1:A95M6UWcfZgOuJkQ7QLfG0Hs5peWIUSysCDNz4pfe04= @@ -135,8 +131,8 @@ github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 h1:itaaJhQJ19kUXEB github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8= github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e h1:73NGqAs22ey3wJkIYVD/ACEoovuIuOlEzQTEoqrO5+U= github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs= -github.com/go-gost/x v0.0.0-20220316132524-2682c4d63ba5 h1:WczlUcBQPbmuwWgFTsAzmSeumMiiKjmmGlSmAbOsnhg= -github.com/go-gost/x v0.0.0-20220316132524-2682c4d63ba5/go.mod h1:1AM/tfLXeHJbQfV4MV6eeIfsIM72CvpAH7AaliVRqZ0= +github.com/go-gost/x v0.0.0-20220317145457-0f1f7790c52a h1:i2PGFgLyiFsOJICgYYAjeV+n9ce2yqOqfkuK0V3A5I8= +github.com/go-gost/x v0.0.0-20220317145457-0f1f7790c52a/go.mod h1:iJgHCWLZB5zA/0NNZWbRxzpUwk5YS1elHTGmACI84C0= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=