style:修改包名

goodsfinder · Oct 12, 2023 · 5fb4f9e · 5fb4f9e
1 parent 71e9159
commit 5fb4f9e
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 722 deletions.
diff --git a/client/config.go b/client/config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/richkeyu/gocommons/config"
+	"github.com/goodsfinder/common/config"
 )
 
 const (

diff --git a/client/request.go b/client/request.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/richkeyu/gocommons/plog"
+	"github.com/goodsfinder/common/plog"
 
 	"github.com/sirupsen/logrus"
 )

diff --git a/client/resp.go b/client/resp.go
@@ -1,6 +1,6 @@
 package client
 
-import "github.com/richkeyu/gocommons/perrors"
+import "github.com/goodsfinder/common/perrors"
 
 const (
 	SuccessCode = 1

diff --git a/db/mysql.go b/db/mysql.go
@@ -8,7 +8,7 @@ import (
 
 	"gorm.io/gorm/utils"
 
-	"github.com/richkeyu/gocommons/plog"
+	"github.com/goodsfinder/common/plog"
 
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"

diff --git a/db/mysql_test.go b/db/mysql_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/richkeyu/gocommons/plog"
+	"github.com/goodsfinder/common/plog"
 )
 
 func TestConn(t *testing.T) {

diff --git a/dispatch/application.go b/dispatch/application.go
@@ -10,7 +10,7 @@ import (
 	"sync/atomic"
 	"syscall"
 
-	"github.com/richkeyu/gocommons/plog"
+	"github.com/goodsfinder/common/plog"
 )
 
 var exitHandlers []func()

diff --git a/go.mod b/go.mod
@@ -1,9 +1,8 @@
-module github.com/richkeyu/gocommons
+module github.com/goodsfinder/common
 
-go 1.21
+go 1.20
 
 require (
-	cloud.google.com/go/pubsub v1.25.1
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/getsentry/sentry-go v0.17.0
 	github.com/gin-gonic/gin v1.9.1
@@ -14,56 +13,39 @@ require (
 	github.com/ip2location/ip2location-go/v9 v9.5.0
 	github.com/json-iterator/go v1.1.12
 	github.com/sirupsen/logrus v1.9.0
-	github.com/urfave/cli/v2 v2.16.3
-	google.golang.org/api v0.95.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/mysql v1.3.6
 	gorm.io/gorm v1.23.8
 )
 
 require (
-	cloud.google.com/go v0.104.0 // indirect
-	cloud.google.com/go/compute v1.9.0 // indirect
-	cloud.google.com/go/iam v0.4.0 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.5.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	go.opencensus.io v0.23.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/crypto v0.9.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
-	golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220909194730-69f6226f97e5 // indirect
-	google.golang.org/grpc v1.49.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/ip/ip.go b/ip/ip.go
@@ -9,9 +9,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/richkeyu/gocommons/plog"
-	"github.com/richkeyu/gocommons/server"
-	"github.com/richkeyu/gocommons/util"
+	"github.com/goodsfinder/common/plog"
+	"github.com/goodsfinder/common/server"
+	"github.com/goodsfinder/common/util"
 
 	"github.com/gin-gonic/gin"
 	"github.com/ip2location/ip2location-go/v9"

diff --git a/middleware/gin_log.go b/middleware/gin_log.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/richkeyu/gocommons/plog"
-	"github.com/richkeyu/gocommons/server"
+	"github.com/goodsfinder/common/plog"
+	"github.com/goodsfinder/common/server"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/middleware/gin_recovery.go b/middleware/gin_recovery.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/richkeyu/gocommons/plog"
 	"github.com/gin-gonic/gin"
+	"github.com/goodsfinder/common/plog"
 )
 
 func Recovery() gin.HandlerFunc {

diff --git a/middleware/gin_trace.go b/middleware/gin_trace.go
@@ -1,8 +1,8 @@
 package middleware
 
 import (
-	"github.com/richkeyu/gocommons/trace"
 	"github.com/gin-gonic/gin"
+	"github.com/goodsfinder/common/trace"
 )
 
 // InitTrace http请求初始化traceID

diff --git a/plog/log.go b/plog/log.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/richkeyu/gocommons/trace"
-	"github.com/richkeyu/gocommons/util"
+	"github.com/goodsfinder/common/trace"
+	"github.com/goodsfinder/common/util"
 
 	"github.com/sirupsen/logrus"
 )

diff --git a/plog/log_test.go b/plog/log_test.go
@@ -2,10 +2,11 @@ package plog
 
 import (
 	"context"
-	"github.com/richkeyu/gocommons/server"
-	"github.com/gin-gonic/gin"
 	"testing"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/goodsfinder/common/server"
 )
 
 func TestLog(t *testing.T) {

diff --git a/plog/server.go b/plog/server.go
@@ -4,10 +4,11 @@ package plog
 
 import (
 	"context"
-	"github.com/richkeyu/gocommons/server"
-	"github.com/richkeyu/gocommons/trace"
-	"github.com/gin-gonic/gin"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/goodsfinder/common/server"
+	"github.com/goodsfinder/common/trace"
 )
 
 const (

diff --git a/redis/conn.go b/redis/conn.go
@@ -2,10 +2,11 @@ package redis
 
 import (
 	"context"
-	"github.com/richkeyu/gocommons/plog"
-	"github.com/go-redis/redis/v8"
 	"sync"
 	"time"
+
+	"github.com/go-redis/redis/v8"
+	"github.com/goodsfinder/common/plog"
 )
 
 type Client struct {

diff --git a/redis/logger.go b/redis/logger.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/richkeyu/gocommons/plog"
+	"github.com/goodsfinder/common/plog"
 
 	"github.com/go-redis/redis/v8"
 )

diff --git a/sentry/sentry.go b/sentry/sentry.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/richkeyu/gocommons/config"
 	"github.com/getsentry/sentry-go"
+	"github.com/goodsfinder/common/config"
 )
 
 const (

diff --git a/server/server.go b/server/server.go
@@ -11,7 +11,7 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/richkeyu/gocommons/config"
+	"github.com/goodsfinder/common/config"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/trace/trace.go b/trace/trace.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/richkeyu/gocommons/server"
+	"github.com/goodsfinder/common/server"
 )
 
 const (

diff --git a/util/app/response.go b/util/app/response.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/richkeyu/gocommons/perrors"
-	"github.com/richkeyu/gocommons/plog"
+	"github.com/goodsfinder/common/perrors"
+	"github.com/goodsfinder/common/plog"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"

diff --git a/util/app/validator.go b/util/app/validator.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/richkeyu/gocommons/util"
+	"github.com/goodsfinder/common/util"
 )
 
 const OmitRequiredFlag = "OmitRequired"

diff --git a/util/app/validator_test.go b/util/app/validator_test.go
@@ -2,8 +2,9 @@ package app
 
 import (
 	"fmt"
-	"github.com/richkeyu/gocommons/util/assert"
 	"testing"
+
+	"github.com/goodsfinder/common/util/assert"
 )
 
 type FormReq struct {

diff --git a/wrapper/http_client_trace.go b/wrapper/http_client_trace.go
@@ -3,9 +3,9 @@ package wrapper
 import (
 	"context"
 
-	"github.com/richkeyu/gocommons/client"
-	"github.com/richkeyu/gocommons/server"
-	"github.com/richkeyu/gocommons/trace"
+	"github.com/goodsfinder/common/client"
+	"github.com/goodsfinder/common/server"
+	"github.com/goodsfinder/common/trace"
 )
 
 func HttpClientTrace(next client.Wrapper) client.Wrapper {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/richkeyu/gocommons/config"
+    	"github.com/goodsfinder/common/config"
     )
     const (
@@ Expand Down @@