libf 2 anos atrás
pai
commit
4b2455d8d3

+ 5 - 4
go.mod

@@ -3,7 +3,7 @@ module test
 go 1.19
 
 require (
-	git.wecise.com/wecise/common v0.0.0-20221210133957-12acc5754f5b
+	git.wecise.com/wecise/common v0.0.0-20230207111410-ac703eb0b4b0
 	github.com/alphadose/haxmap v1.0.0
 	github.com/atrox/homedir v1.0.0
 	github.com/cornelk/hashmap v1.0.8
@@ -42,6 +42,7 @@ require (
 )
 
 require (
+	git.wecise.com/wecise/odbserver v0.0.0-20230216034558-f264479d26d8
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/fatih/color v1.9.0 // indirect
@@ -50,9 +51,9 @@ require (
 	github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.6 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.6 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.17.0 // indirect

+ 10 - 0
go.sum

@@ -11,6 +11,8 @@ git.wecise.com/wecise/common v0.0.0-20221210133957-12acc5754f5b h1:+4wu4/MRz/KgJ
 git.wecise.com/wecise/common v0.0.0-20221210133957-12acc5754f5b/go.mod h1:KhkuF5pRD2nwL9WpIU57nhmiXwlQuyoFuwScqiMDr4g=
 git.wecise.com/wecise/common v0.0.0-20230118063853-7221c086e1e6 h1:boC8K7bGiVNOuwMx44qWGgz668fsfK5S16lu8YiqvLk=
 git.wecise.com/wecise/common v0.0.0-20230118063853-7221c086e1e6/go.mod h1:KhkuF5pRD2nwL9WpIU57nhmiXwlQuyoFuwScqiMDr4g=
+git.wecise.com/wecise/common v0.0.0-20230207111410-ac703eb0b4b0 h1:bCtZwL2CiUTfVzSQca6Gudqm9FLzGNhRGAFfo0vOFM4=
+git.wecise.com/wecise/common v0.0.0-20230207111410-ac703eb0b4b0/go.mod h1:NDLngVA6v473gwL+wnIn9gAOV6ajhJVY3jHvYvXQWQY=
 git.wecise.com/wecise/odb-go v0.0.0-20211124085409-0d3e38018145/go.mod h1:RUaugeb49Q7CKD1szlFvoVmw657wrVGnt0QMMZrhMTg=
 git.wecise.com/wecise/odb-go v0.0.0-20220825070427-e443cba6de6d/go.mod h1:RUaugeb49Q7CKD1szlFvoVmw657wrVGnt0QMMZrhMTg=
 git.wecise.com/wecise/odbserver v0.0.0-20221017135833-5936b510aa0f h1:C5nR+6yqciHqL1ZHdvRut2Gxp+/HfO79jX2lWkU9di0=
@@ -21,6 +23,8 @@ git.wecise.com/wecise/odbserver v0.0.0-20221211103945-2ca1f096b0a0 h1:FENVhNmdhl
 git.wecise.com/wecise/odbserver v0.0.0-20221211103945-2ca1f096b0a0/go.mod h1:5v/fNzE+0+8m81/zD40weTrFfP07AJEmyco+xtCKnwA=
 git.wecise.com/wecise/odbserver v0.0.0-20230205114513-b2d67a9e2b75 h1:3Aq9tvJfQmSyl6lsNRtIHTveeuog4cOlQeOnuWxpZ6s=
 git.wecise.com/wecise/odbserver v0.0.0-20230205114513-b2d67a9e2b75/go.mod h1:bfYmGaCYuEWPTFuKfLW/9El5go0sXeA6EHnMfoO3Sf4=
+git.wecise.com/wecise/odbserver v0.0.0-20230216034558-f264479d26d8 h1:9TAp8SE2Ge38XjxZb6zU23zjJrXo8vKbrnaUYsK+Wro=
+git.wecise.com/wecise/odbserver v0.0.0-20230216034558-f264479d26d8/go.mod h1:F8AUG9SwcTKzs7UU45jJbKs1llSyiB1WUcu+nERTPV0=
 git.wecise.com/wecise/platform v0.0.0-20220218084958-57446e70d9ea/go.mod h1:9AJEeYzbrNe7vIl7v/3MArD6cJDCc37WX9S1hfot8XA=
 github.com/360EntSecGroup-Skylar/excelize/v2 v2.1.0/go.mod h1:NRW1nxuHjsv3AUisgUneVjItiDPsxKSBBypDwX46bf4=
 github.com/AlekSi/pointer v1.0.0/go.mod h1:1kjywbfcPFCmncIxtk6fIEub6LKrfMz3gc5QKVOSOA8=
@@ -521,14 +525,20 @@ go.etcd.io/etcd/api/v3 v3.5.1 h1:v28cktvBq+7vGyJXF8G+rWJmj+1XUmMtqcLnH8hDocM=
 go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/api/v3 v3.5.6 h1:Cy2qx3npLcYqTKqGJzMypnMv2tiRyifZJ17BlWIWA7A=
 go.etcd.io/etcd/api/v3 v3.5.6/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8=
+go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
+go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
 go.etcd.io/etcd/client/pkg/v3 v3.5.1 h1:XIQcHCFSG53bJETYeRJtIxdLv2EWRGxcfzR8lSnTH4E=
 go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/pkg/v3 v3.5.6 h1:TXQWYceBKqLp4sa87rcPs11SXxUA/mHwH975v+BDvLU=
 go.etcd.io/etcd/client/pkg/v3 v3.5.6/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ=
+go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg=
+go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY=
 go.etcd.io/etcd/client/v3 v3.5.1 h1:oImGuV5LGKjCqXdjkMHCyWa5OO1gYKCnC/1sgdfj1Uk=
 go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q=
 go.etcd.io/etcd/client/v3 v3.5.6 h1:coLs69PWCXE9G4FKquzNaSHrRyMCAXwF+IX1tAPVO8E=
 go.etcd.io/etcd/client/v3 v3.5.6/go.mod h1:f6GRinRMCsFVv9Ht42EyY7nfsVGwrNO0WEoS2pRKzQk=
+go.etcd.io/etcd/client/v3 v3.5.7 h1:u/OhpiuCgYY8awOHlhIhmGIGpxfBU/GZBUP3m/3/Iz4=
+go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw=
 go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=

+ 1 - 1
grpc-odbserver/grpc/test/test.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"test/grpc-odbserver/grpc/api"
 	"time"
 
-	"git.wecise.com/wecise/odbserver/trial/grpc/api"
 	"google.golang.org/grpc"
 	"gopkg.in/yaml.v3"
 )

+ 2 - 2
grpc-odbserver/main.go

@@ -4,12 +4,12 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"test/grpc-odbserver/mnode"
+	"test/grpc-odbserver/msn"
 
 	"git.wecise.com/wecise/common/matrix/logger"
 	"git.wecise.com/wecise/common/matrix/util"
 	z "git.wecise.com/wecise/odbserver/mring/z/m"
-	"git.wecise.com/wecise/odbserver/trial/mnode"
-	"git.wecise.com/wecise/odbserver/trial/msn"
 )
 
 var _ = z.RunShadowCount(5, 0, 0, -1)

+ 1 - 1
grpc-odbserver/matrix/topo.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"test/grpc-odbserver/grpc/api"
 	"time"
 
-	"git.wecise.com/wecise/odbserver/trial/grpc/api"
 	"google.golang.org/grpc"
 	"gopkg.in/yaml.v3"
 )

+ 1 - 1
grpc-odbserver/mnode/mnode.go

@@ -2,10 +2,10 @@ package mnode
 
 import (
 	"sync"
+	"test/grpc-odbserver/api"
 
 	"git.wecise.com/wecise/odbserver/mring/matrix"
 	"git.wecise.com/wecise/odbserver/mring/mnet"
-	"git.wecise.com/wecise/odbserver/trial/api"
 )
 
 const UNKOWN = 0

+ 1 - 1
grpc-odbserver/mnode/topo.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"test/grpc-odbserver/grpc/api"
 	"time"
 
-	"git.wecise.com/wecise/odbserver/trial/grpc/api"
 	"google.golang.org/grpc"
 	"gopkg.in/yaml.v3"
 )