Ver Fonte

fit: 使用gt-common公用包

gaoyagang há 1 ano atrás
pai
commit
8bbe003909

+ 1 - 1
app/cmd/events/events.go

@@ -5,7 +5,7 @@ import (
 	"GtDataStore/app/cmd/events/internal/logic/job"
 	"flag"
 	"fmt"
-	"gtlib.local/gaoyagang/gt-common/envitem"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/envitem"
 
 	"GtDataStore/app/cmd/events/internal/config"
 	"GtDataStore/app/cmd/events/internal/svc"

+ 1 - 1
app/cmd/events/internal/logic/handler/event.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"github.com/go-redis/redis/v8"
 	"github.com/zeromicro/go-zero/core/logx"
-	"gtlib.local/gaoyagang/gt-common/rabbitMQ"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/rabbitMQ"
 	"time"
 )
 

+ 2 - 2
app/cmd/events/internal/logic/handler/single.go

@@ -8,8 +8,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
-	"gtlib.local/gaoyagang/gt-common/envitem"
-	"gtlib.local/gaoyagang/gt-common/identify"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/envitem"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/identify"
 	"sync"
 )
 

+ 1 - 1
app/cmd/events/internal/logic/handler/vars.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"GtDataStore/app/cmd/events/internal/logic/job"
 	"context"
-	"gtlib.local/gaoyagang/gt-common/rabbitMQ"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/rabbitMQ"
 	"time"
 )
 

+ 1 - 1
app/cmd/organization/organization.go

@@ -10,7 +10,7 @@ import (
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
-	"gtlib.local/gaoyagang/gt-common/envitem"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/envitem"
 
 	//"GtDataStore/app/cmd/organization/internal/server"
 	"GtDataStore/app/cmd/organization/internal/svc"

+ 1 - 1
app/model/dcDeviceBindModel_gen.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"gtlib.local/gaoyagang/gt-common/envitem"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/envitem"
 	"strings"
 
 	"github.com/zeromicro/go-zero/core/stores/builder"

+ 1 - 1
app/model/dcEventBindModel_gen.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"gtlib.local/gaoyagang/gt-common/identify"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/identify"
 	"strings"
 	"time"
 

+ 2 - 2
go.mod

@@ -6,11 +6,10 @@ require (
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/jinzhu/copier v0.4.0
 	github.com/pkg/errors v0.9.1
-	github.com/streadway/amqp v1.1.0
 	github.com/zeromicro/go-zero v1.6.0
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
-	gtlib.local/gaoyagang/gt-common v1.0.25
+	metawant.greentech.com.cn/gaoyagang/gt-common v1.1.0
 )
 
 require (
@@ -54,6 +53,7 @@ require (
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/streadway/amqp v1.1.0 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.10 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.10 // indirect

+ 2 - 2
go.sum

@@ -267,8 +267,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gtlib.local/gaoyagang/gt-common v1.0.25 h1:W+BF06A+Dtn/nFKSDPGgNJs9jIY1O8dEjs+YLv7VSJ8=
-gtlib.local/gaoyagang/gt-common v1.0.25/go.mod h1:iSkMOxsD4yBY3S3IXj1OZLVlN+FnWN+9Nxpt1PH6g3o=
 k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
 k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc=
 k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A=
@@ -281,6 +279,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+metawant.greentech.com.cn/gaoyagang/gt-common v1.1.0 h1:iqjiskz3GIOZQC4kTFL47I982W0ECQAwECEj49b4eS4=
+metawant.greentech.com.cn/gaoyagang/gt-common v1.1.0/go.mod h1:TiS/E+b6WFW/0Ei4H/djoguRTnfeBsiUnt5odj1C9n4=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

+ 6 - 6
vendor/modules.txt

@@ -506,12 +506,6 @@ gopkg.in/yaml.v2
 # gopkg.in/yaml.v3 v3.0.1
 ## explicit
 gopkg.in/yaml.v3
-# gtlib.local/gaoyagang/gt-common v1.0.25
-## explicit; go 1.17
-gtlib.local/gaoyagang/gt-common/envitem
-gtlib.local/gaoyagang/gt-common/httplib
-gtlib.local/gaoyagang/gt-common/identify
-gtlib.local/gaoyagang/gt-common/rabbitMQ
 # k8s.io/api v0.28.3
 ## explicit; go 1.20
 k8s.io/api/admissionregistration/v1
@@ -881,6 +875,12 @@ k8s.io/utils/pointer
 k8s.io/utils/ptr
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
+# metawant.greentech.com.cn/gaoyagang/gt-common v1.1.0
+## explicit; go 1.17
+metawant.greentech.com.cn/gaoyagang/gt-common/envitem
+metawant.greentech.com.cn/gaoyagang/gt-common/httplib
+metawant.greentech.com.cn/gaoyagang/gt-common/identify
+metawant.greentech.com.cn/gaoyagang/gt-common/rabbitMQ
 # sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
 ## explicit; go 1.18
 sigs.k8s.io/json