修复引用

douyu · Oct 24, 2022 · cdd159e · cdd159e
1 parent f05dbf4
commit cdd159e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 434 deletions.
diff --git a/go.mod b/go.mod
@@ -62,7 +62,6 @@ require (
 )
 
 require (
-	git.dz11.com/vega/minerva v1.10.4
 	github.com/coocood/freecache v1.2.2
 	github.com/go-redis/redis/v8 v8.11.5
 	google.golang.org/protobuf v1.28.1

diff --git a/go.sum b/go.sum
diff --git a/pkg/client/redisgo/client.go b/pkg/client/redisgo/client.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"math/rand"
 
-	"github.com/douyu/jupiter/pkg/constant"
-	"github.com/douyu/jupiter/pkg/singleton"
+	"github.com/douyu/jupiter/pkg/core/constant"
+	"github.com/douyu/jupiter/pkg/core/singleton"
 
 	"github.com/douyu/jupiter/pkg/xlog"
 	"github.com/go-redis/redis/v8"

diff --git a/pkg/client/redisgo/init.go b/pkg/client/redisgo/init.go
@@ -5,8 +5,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/douyu/jupiter/pkg/governor"
-	prome "github.com/douyu/jupiter/pkg/metric"
+	prome "github.com/douyu/jupiter/pkg/core/metric"
+
+	"github.com/douyu/jupiter/pkg/server/governor"
 	jsoniter "github.com/json-iterator/go"
 
 	"github.com/go-redis/redis/v8"

diff --git a/pkg/client/redisgo/interceptor.go b/pkg/client/redisgo/interceptor.go
@@ -7,25 +7,19 @@ import (
 	"strings"
 	"time"
 
-	"github.com/douyu/jupiter/pkg/util/xstring"
+	prome "github.com/douyu/jupiter/pkg/core/metric"
 
+	"github.com/douyu/jupiter/pkg/core/xtrace"
+	"github.com/douyu/jupiter/pkg/util/xstring"
+	"github.com/douyu/jupiter/pkg/xlog"
 	"github.com/fatih/color"
-
-	"go.opentelemetry.io/otel"
-
+	"github.com/go-redis/redis/v8"
 	"github.com/spf13/cast"
-
-	"github.com/douyu/jupiter/pkg/xtrace"
-
+	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
 	"go.opentelemetry.io/otel/trace"
-
-	prome "github.com/douyu/jupiter/pkg/metric"
-
-	"github.com/douyu/jupiter/pkg/xlog"
-	"github.com/go-redis/redis/v8"
 )
 
 type redigoContextKeyType struct{}

diff --git a/pkg/client/redisgo/interceptor_test.go b/pkg/client/redisgo/interceptor_test.go
@@ -8,10 +8,9 @@ import (
 
 	"go.opentelemetry.io/otel/trace"
 
-	"github.com/douyu/jupiter/pkg/xtrace"
-	"github.com/douyu/jupiter/pkg/xtrace/jaeger"
-
 	"github.com/douyu/jupiter/pkg/conf"
+	"github.com/douyu/jupiter/pkg/core/xtrace"
+	"github.com/douyu/jupiter/pkg/core/xtrace/jaeger"
 
 	"github.com/go-redis/redis/v8"
 )