Merge pull request #15 from rubinus/master

rubinus · web-flow · commit 272cff70e504 · 2022-03-31T11:34:39.000+08:00
feat: changed mongo and update to zgo v1.0.7
diff --git a/_init/all_db_local_back.json b/_init/all_db_local_back.json
@@ -178,12 +178,12 @@
       ]
     }
   ],
-  "mgo": [
+  "mongo": [
     {
-      "key": "mgo_label_bj",
+      "key": "mongo_label_bj",
       "values": [
         {
-          "c": "北京主库 mgo",
+          "c": "北京主库 mongo",
           "host": "localhost",
           "port": 27018,
           "username": "admin",
@@ -192,7 +192,7 @@
           "poolSize": 789
         },
         {
-          "c": "北京从库 mgo",
+          "c": "北京从库 mongo",
           "host": "localhost",
           "port": 27018,
           "username": "admin",
@@ -203,10 +203,10 @@
       ]
     },
     {
-      "key": "mgo_label_sh",
+      "key": "mongo_label_sh",
       "values": [
         {
-          "c": "上海主库 mgo",
+          "c": "上海主库 mongo",
           "host": "localhost",
           "port": 27017,
           "username": "",
@@ -215,7 +215,7 @@
           "poolSize": 789
         },
         {
-          "c": "上海从库 mgo",
+          "c": "上海从库 mongo",
           "host": "localhost",
           "port": 27017,
           "username": "",
diff --git a/_init/local.json b/_init/local.json
@@ -66,12 +66,12 @@
       ]
     }
   ],
-  "mgo": [
+  "mongo": [
     {
-      "key": "mgo_label_bj",
+      "key": "mongo_label_bj",
       "values": [
         {
-          "c": "北京主库 mgo",
+          "c": "北京主库 mongo",
           "host": "localhost",
           "port": 27018,
           "username": "admin",
@@ -80,7 +80,7 @@
           "poolSize": 789
         },
         {
-          "c": "北京从库 mgo",
+          "c": "北京从库 mongo",
           "host": "localhost",
           "port": 27018,
           "username": "admin",
diff --git a/_init/main.go b/_init/main.go
@@ -55,10 +55,10 @@ func main() {
     fmt.Println(res)
   }
 
-  for _, v := range config.Conf.Mgo {
+  for _, v := range config.Conf.Mongo {
     k := v.Key
     value := v.Values
-    key := "zgo/project/origin/mgo/" + k
+    key := "zgo/project/origin/mongo/" + k
     val, _ := json.Marshal(value)
     _, err := cli.KV.Put(context.TODO(), key, string(val))
     if err != nil {
diff --git a/go.mod b/go.mod
@@ -6,14 +6,13 @@ require (
 	github.com/0x19/goesl v0.0.0-20191107044804-3efcc2f41ccb
 	github.com/BurntSushi/toml v0.4.1 // indirect
 	github.com/fiorix/go-eventsocket v0.0.0-20180331081222-a4a0ee7bd315
-	github.com/gitcpu-io/zgo v1.0.6
+	github.com/gitcpu-io/zgo v1.0.7
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.2
 	github.com/kataras/iris/v12 v12.1.8
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
 	github.com/ryanuber/columnize v2.1.2+incompatible // indirect
 	github.com/spf13/pflag v1.0.5
-	go.etcd.io/etcd/client/v3 v3.5.2 // indirect
 	golang.org/x/net v0.0.0-20211209124913-491a49abca63
 	google.golang.org/grpc v1.45.0
 	google.golang.org/grpc/examples v0.0.0-20220329220628-b6873c006da7
diff --git a/go.sum b/go.sum
@@ -163,9 +163,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
 github.com/gavv/httpexpect v2.0.0+incompatible h1:1X9kcRshkSKEjNJJxX9Y9mQ5BRfbxU5kORdjhlA1yX8=
 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gitcpu-io/zgo v1.0.6 h1:mqdk8885jp6mIjzqTnr1xVD+CWrXmTXeXMF+ZOxO66A=
-github.com/gitcpu-io/zgo v1.0.6/go.mod h1:zgQMJfagDRbUnT8Rg+Am0P2LTWdc+cYzmOt25sV3WBA=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
+github.com/gitcpu-io/zgo v1.0.7 h1:fZI4cNRuJCLycrRhFmsB42gZvGhz/jrpoasjr9m4gJM=
+github.com/gitcpu-io/zgo v1.0.7/go.mod h1:zgQMJfagDRbUnT8Rg+Am0P2LTWdc+cYzmOt25sV3WBA=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127 h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
diff --git a/handlers/mongo.go b/handlers/mongo.go
@@ -108,7 +108,7 @@ func MongoList(ctx iris.Context) {
 }
 
 func FindOne(ctx context.Context, username string) (*User, error) {
-  var collection = zgo.Mgo.GetCollection("profile", "bj", "mgo_label_bj")
+  var collection = zgo.Mongo.GetCollection("profile", "bj", "mongo_label_bj")
 
   filter := make(map[string]interface{}) //查询username是且age >= 30的
   filter["username"] = username
@@ -135,7 +135,7 @@ func FindOne(ctx context.Context, username string) (*User, error) {
     Result: r,      //传入 &User{} ,结果
   }
 
-  _, err := zgo.Mgo.FindOne(ctx, collection, args)
+  _, err := zgo.Mongo.FindOne(ctx, collection, args)
   if err != nil {
     return nil, err
   }
@@ -144,7 +144,7 @@ func FindOne(ctx context.Context, username string) (*User, error) {
 }
 
 func Find(ctx context.Context, username string) ([]*User, error) {
-  var collection = zgo.Mgo.GetCollection("profile", "bj", "mgo_label_bj")
+  var collection = zgo.Mongo.GetCollection("profile", "bj", "mongo_label_bj")
 
   filter := make(map[string]interface{}) //查询username是且age >= 30的
   filter["username"] = username
@@ -170,7 +170,7 @@ func Find(ctx context.Context, username string) ([]*User, error) {
     Skip:   0,      //从哪一条开始跳过 开区间，不包括skip的值
   }
 
-  results, err := zgo.Mgo.Find(ctx, collection, args)
+  results, err := zgo.Mongo.Find(ctx, collection, args)
   if err != nil {
     return nil, err
   }
diff --git a/samples/demo_mgo/demo.go b/samples/demo_mgo/demo.go
diff --git a/samples/demo_mgo/demo_test.go b/samples/demo_mgo/demo_test.go

Original file line number	Diff line number	Diff line change
`@@ -178,12 +178,12 @@`
`178`	`178`	`]`
`179`	`179`	`}`
`180`	`180`	`],`
`181`		`- "mgo": [`
	`181`	`+ "mongo": [`
`182`	`182`	`{`
`183`		`- "key": "mgo_label_bj",`
	`183`	`+ "key": "mongo_label_bj",`
`184`	`184`	`"values": [`
`185`	`185`	`{`
`186`		`- "c": "北京主库 mgo",`
	`186`	`+ "c": "北京主库 mongo",`
`187`	`187`	`"host": "localhost",`
`188`	`188`	`"port": 27018,`
`189`	`189`	`"username": "admin",`
`@@ -192,7 +192,7 @@`
`192`	`192`	`"poolSize": 789`
`193`	`193`	`},`
`194`	`194`	`{`
`195`		`- "c": "北京从库 mgo",`
	`195`	`+ "c": "北京从库 mongo",`
`196`	`196`	`"host": "localhost",`
`197`	`197`	`"port": 27018,`
`198`	`198`	`"username": "admin",`
`@@ -203,10 +203,10 @@`
`203`	`203`	`]`
`204`	`204`	`},`
`205`	`205`	`{`
`206`		`- "key": "mgo_label_sh",`
	`206`	`+ "key": "mongo_label_sh",`
`207`	`207`	`"values": [`
`208`	`208`	`{`
`209`		`- "c": "上海主库 mgo",`
	`209`	`+ "c": "上海主库 mongo",`
`210`	`210`	`"host": "localhost",`
`211`	`211`	`"port": 27017,`
`212`	`212`	`"username": "",`
`@@ -215,7 +215,7 @@`
`215`	`215`	`"poolSize": 789`
`216`	`216`	`},`
`217`	`217`	`{`
`218`		`- "c": "上海从库 mgo",`
	`218`	`+ "c": "上海从库 mongo",`
`219`	`219`	`"host": "localhost",`
`220`	`220`	`"port": 27017,`
`221`	`221`	`"username": "",`
Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,12 @@`
`66`	`66`	`]`
`67`	`67`	`}`
`68`	`68`	`],`
`69`		`- "mgo": [`
	`69`	`+ "mongo": [`
`70`	`70`	`{`
`71`		`- "key": "mgo_label_bj",`
	`71`	`+ "key": "mongo_label_bj",`
`72`	`72`	`"values": [`
`73`	`73`	`{`
`74`		`- "c": "北京主库 mgo",`
	`74`	`+ "c": "北京主库 mongo",`
`75`	`75`	`"host": "localhost",`
`76`	`76`	`"port": 27018,`
`77`	`77`	`"username": "admin",`
`@@ -80,7 +80,7 @@`
`80`	`80`	`"poolSize": 789`
`81`	`81`	`},`
`82`	`82`	`{`
`83`		`- "c": "北京从库 mgo",`
	`83`	`+ "c": "北京从库 mongo",`
`84`	`84`	`"host": "localhost",`
`85`	`85`	`"port": 27018,`
`86`	`86`	`"username": "admin",`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func MongoList(ctx iris.Context) {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`func FindOne(ctx context.Context, username string) (*User, error) {`
`111`		`- var collection = zgo.Mgo.GetCollection("profile", "bj", "mgo_label_bj")`
	`111`	`+ var collection = zgo.Mongo.GetCollection("profile", "bj", "mongo_label_bj")`
`112`	`112`
`113`	`113`	`filter := make(map[string]interface{}) //查询username是且age >= 30的`
`114`	`114`	`filter["username"] = username`
`@@ -135,7 +135,7 @@ func FindOne(ctx context.Context, username string) (*User, error) {`
`135`	`135`	`Result: r, //传入 &User{} ,结果`
`136`	`136`	`}`
`137`	`137`
`138`		`- _, err := zgo.Mgo.FindOne(ctx, collection, args)`
	`138`	`+ _, err := zgo.Mongo.FindOne(ctx, collection, args)`
`139`	`139`	`if err != nil {`
`140`	`140`	`return nil, err`
`141`	`141`	`}`
`@@ -144,7 +144,7 @@ func FindOne(ctx context.Context, username string) (*User, error) {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`func Find(ctx context.Context, username string) ([]*User, error) {`
`147`		`- var collection = zgo.Mgo.GetCollection("profile", "bj", "mgo_label_bj")`
	`147`	`+ var collection = zgo.Mongo.GetCollection("profile", "bj", "mongo_label_bj")`
`148`	`148`
`149`	`149`	`filter := make(map[string]interface{}) //查询username是且age >= 30的`
`150`	`150`	`filter["username"] = username`
`@@ -170,7 +170,7 @@ func Find(ctx context.Context, username string) ([]*User, error) {`
`170`	`170`	`Skip: 0, //从哪一条开始跳过开区间，不包括skip的值`
`171`	`171`	`}`
`172`	`172`
`173`		`- results, err := zgo.Mgo.Find(ctx, collection, args)`
	`173`	`+ results, err := zgo.Mongo.Find(ctx, collection, args)`
`174`	`174`	`if err != nil {`
`175`	`175`	`return nil, err`
`176`	`176`	`}`