From 6b3f3014cebae365e2218f87b66eded14e9c2877 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 10 Oct 2023 15:16:56 +0800 Subject: [PATCH 1/2] 1 --- README.md | 4 ++++ server/adminserver/middleware/auth.go | 2 ++ server/adminserver/router/routermgr.go | 7 +++++-- server/adminserver/router/system/sys_user.go | 10 ++++++---- third_party/f5 | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6b80c151..845a5bb3 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,7 @@ node ../../tools/pbtools/app.js # go代码风格 main包里所有的函数、字段都小写开头 + +# 参考 + +https://gorm.io/zh_CN/docs/ diff --git a/server/adminserver/middleware/auth.go b/server/adminserver/middleware/auth.go index 444b1a0b..c339412c 100644 --- a/server/adminserver/middleware/auth.go +++ b/server/adminserver/middleware/auth.go @@ -1,12 +1,14 @@ package middleware import ( + "f5" "github.com/gin-gonic/gin" ) func Auth() gin.HandlerFunc { return func(c *gin.Context) { token := c.Request.Header.Get("Authorization") + f5.GetSysLog().Info("auth") if token == "" { /* response.FailWithDetailed(gin.H{"reload": true}, "未登录或非法访问", c)*/ diff --git a/server/adminserver/router/routermgr.go b/server/adminserver/router/routermgr.go index 307b6bff..37e48b92 100644 --- a/server/adminserver/router/routermgr.go +++ b/server/adminserver/router/routermgr.go @@ -4,6 +4,7 @@ import ( "f5" //. "main/global" "main/router/system" + "main/middleware" ) type routerMgr struct { @@ -12,8 +13,10 @@ type routerMgr struct { func (this* routerMgr) Init() { - router := f5.GetApp().GetGinEngine().Group("api/v1") - this.system.InitUserRouter(router) + priGroup := f5.GetApp().GetGinEngine().Group("api/v1") + pubGroup := f5.GetApp().GetGinEngine().Group("api/v1") + priGroup.Use(middleware.Auth()) + this.system.InitUserRouter(priGroup, pubGroup) f5.GetSysLog().Info("routerMgr.init") } diff --git a/server/adminserver/router/system/sys_user.go b/server/adminserver/router/system/sys_user.go index 8bd215f3..1409f4d2 100644 --- a/server/adminserver/router/system/sys_user.go +++ b/server/adminserver/router/system/sys_user.go @@ -7,13 +7,15 @@ import ( type UserRouter struct{} -func (this *UserRouter) InitUserRouter(Router *gin.RouterGroup) { - userRouter := Router.Group("user") +func (this *UserRouter) InitUserRouter(priRouter *gin.RouterGroup, + pubRouter *gin.RouterGroup) { + priUserRouter := priRouter.Group("user") + pubUserRouter := pubRouter.Group("user") userApi := v1.ApiGroupApp.SystemApiGroup.UserApi { - userRouter.POST("login", userApi.Login) + pubUserRouter.POST("login", userApi.Login) } { - userRouter.GET("info", userApi.Info) + priUserRouter.GET("info", userApi.Info) } } diff --git a/third_party/f5 b/third_party/f5 index d42efe49..6c73845a 160000 --- a/third_party/f5 +++ b/third_party/f5 @@ -1 +1 @@ -Subproject commit d42efe492e859605f238a5954be108742da2e6b2 +Subproject commit 6c73845a87c1d4c8dc9234abb4dd16e6b75b6582 From 5a853e2b95e3644a3550c4dd4a17339239beb2b4 Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Tue, 10 Oct 2023 15:27:33 +0800 Subject: [PATCH 2/2] 1 --- server/adminserver/api/v1/system/sys_user.go | 32 ++++++++++++++++++-- server/adminserver/model/system/sys_user.go | 9 ++---- server/adminserver/mtb/go.mod | 9 +++--- server/adminserver/mtb/go.sum | 4 +++ server/guildserver/go.mod | 4 +-- server/guildserver/go.sum | 4 +++ server/hallserver/cs/go.mod | 8 +++-- server/hallserver/cs/go.sum | 4 +++ server/hallserver/go.mod | 4 +-- server/hallserver/go.sum | 4 +++ server/hallserver/mtb/go.mod | 9 +++--- server/hallserver/mtb/go.sum | 4 +++ server/hallserver/ss/go.mod | 8 +++-- server/hallserver/ss/go.sum | 4 +++ server/imserver/cs/go.mod | 8 +++-- server/imserver/cs/go.sum | 4 +++ server/imserver/go.mod | 4 +-- server/imserver/go.sum | 4 +++ server/imserver/mtb/go.mod | 9 +++--- server/imserver/mtb/go.sum | 4 +++ server/imserver/ss/go.mod | 8 +++-- server/imserver/ss/go.sum | 4 +++ server/slgserver/go.mod | 4 +-- server/slgserver/go.sum | 4 +++ 24 files changed, 120 insertions(+), 40 deletions(-) diff --git a/server/adminserver/api/v1/system/sys_user.go b/server/adminserver/api/v1/system/sys_user.go index abb31c7c..c8564aa7 100644 --- a/server/adminserver/api/v1/system/sys_user.go +++ b/server/adminserver/api/v1/system/sys_user.go @@ -1,15 +1,43 @@ package system import ( + "adminsever/constant" + "adminsever/model/system" + "f5" "github.com/gin-gonic/gin" + "net/http" ) -type UserApi struct{ - +type UserApi struct { } func (this *UserApi) Login(c *gin.Context) { + username := c.PostForm("username") + password := c.PostForm("password") + if username == "" || password == "" { + c.JSON(http.StatusOK, gin.H{ + "errcode": 1, + "errmsg": "请求参数不正确", + }) + return + } + user := system.SysUser{} + err := f5.GetApp().GetOrmDb(constant.ADMIN_DB).Where("username = ?", username).Where("password = ?", password).First(&user) + if err != nil { + c.JSON(http.StatusOK, gin.H{ + "errcode": 1, + "errmsg": "用户名或密码错误", + }) + return + } + f5.GetSysLog().Info("%s %s", user) + c.JSON(http.StatusOK, gin.H{ + "errcode": 0, + "errmsg": "请求参数不正确", + "data": user, + }) } func (this *UserApi) Info(c *gin.Context) { + c.JSON(200, "hello") } diff --git a/server/adminserver/model/system/sys_user.go b/server/adminserver/model/system/sys_user.go index edd245f8..1ef558a1 100644 --- a/server/adminserver/model/system/sys_user.go +++ b/server/adminserver/model/system/sys_user.go @@ -1,13 +1,10 @@ package system -import ( -) - type SysUser struct { - Username string `gorm:"uniqueIndex;comment:用户登录名"` - Password string `gorm:"comment:用户登录密码"` + Username string `gorm:"uniqueIndex;comment:用户登录名" json:"username"` + Password string `gorm:"comment:用户登录密码" json:"password"` } func (SysUser) TableName() string { - return "t_sys_users" + return "t_user" } diff --git a/server/adminserver/mtb/go.mod b/server/adminserver/mtb/go.mod index 0e5eff86..5e8b3f91 100644 --- a/server/adminserver/mtb/go.mod +++ b/server/adminserver/mtb/go.mod @@ -3,13 +3,14 @@ module mtb go 1.20 require q5 v1.0.0 + require f5 v1.0.0 - require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 \ No newline at end of file + +replace f5 => ../../../third_party/f5 diff --git a/server/adminserver/mtb/go.sum b/server/adminserver/mtb/go.sum index 99386c17..88e5c542 100644 --- a/server/adminserver/mtb/go.sum +++ b/server/adminserver/mtb/go.sum @@ -5,10 +5,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -17,3 +19,5 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/guildserver/go.mod b/server/guildserver/go.mod index 2f811e58..8596b7d0 100644 --- a/server/guildserver/go.mod +++ b/server/guildserver/go.mod @@ -7,8 +7,8 @@ require q5 v1.0.0 require f5 v1.0.0 require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../third_party/q5 diff --git a/server/guildserver/go.sum b/server/guildserver/go.sum index e31bb169..1f815496 100644 --- a/server/guildserver/go.sum +++ b/server/guildserver/go.sum @@ -4,9 +4,11 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -14,3 +16,5 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/hallserver/cs/go.mod b/server/hallserver/cs/go.mod index 54a731da..5a7944f6 100644 --- a/server/hallserver/cs/go.mod +++ b/server/hallserver/cs/go.mod @@ -3,12 +3,14 @@ module cs go 1.20 require q5 v1.0.0 + require f5 v1.0.0 require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 \ No newline at end of file + +replace f5 => ../../../third_party/f5 diff --git a/server/hallserver/cs/go.sum b/server/hallserver/cs/go.sum index 99386c17..88e5c542 100644 --- a/server/hallserver/cs/go.sum +++ b/server/hallserver/cs/go.sum @@ -5,10 +5,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -17,3 +19,5 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/hallserver/go.mod b/server/hallserver/go.mod index d3418b28..b5fe9a57 100644 --- a/server/hallserver/go.mod +++ b/server/hallserver/go.mod @@ -16,13 +16,13 @@ require cs v1.0.0 require ss v1.0.0 -require github.com/golang/protobuf v1.4.2 +require github.com/golang/protobuf v1.5.0 require ( github.com/go-sql-driver/mysql v1.5.0 // indirect github.com/gomodule/redigo v1.8.3 // indirect golang.org/x/crypto v0.13.0 // indirect - google.golang.org/protobuf v1.23.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect ) replace q5 => ../../third_party/q5 diff --git a/server/hallserver/go.sum b/server/hallserver/go.sum index a5f04e7f..dd503774 100644 --- a/server/hallserver/go.sum +++ b/server/hallserver/go.sum @@ -9,12 +9,14 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/gomodule/redigo v1.8.3 h1:HR0kYDX2RJZvAup8CsiJwxB4dTCSC0AaUq6S4SiLwUc= github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -31,6 +33,8 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/server/hallserver/mtb/go.mod b/server/hallserver/mtb/go.mod index 0e5eff86..5e8b3f91 100644 --- a/server/hallserver/mtb/go.mod +++ b/server/hallserver/mtb/go.mod @@ -3,13 +3,14 @@ module mtb go 1.20 require q5 v1.0.0 + require f5 v1.0.0 - require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 \ No newline at end of file + +replace f5 => ../../../third_party/f5 diff --git a/server/hallserver/mtb/go.sum b/server/hallserver/mtb/go.sum index 99386c17..88e5c542 100644 --- a/server/hallserver/mtb/go.sum +++ b/server/hallserver/mtb/go.sum @@ -5,10 +5,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -17,3 +19,5 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/hallserver/ss/go.mod b/server/hallserver/ss/go.mod index 365d0fae..6d5dd305 100644 --- a/server/hallserver/ss/go.mod +++ b/server/hallserver/ss/go.mod @@ -3,12 +3,14 @@ module ss go 1.20 require q5 v1.0.0 + require f5 v1.0.0 require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 \ No newline at end of file + +replace f5 => ../../../third_party/f5 diff --git a/server/hallserver/ss/go.sum b/server/hallserver/ss/go.sum index 99386c17..88e5c542 100644 --- a/server/hallserver/ss/go.sum +++ b/server/hallserver/ss/go.sum @@ -5,10 +5,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -17,3 +19,5 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/imserver/cs/go.mod b/server/imserver/cs/go.mod index 54a731da..5a7944f6 100644 --- a/server/imserver/cs/go.mod +++ b/server/imserver/cs/go.mod @@ -3,12 +3,14 @@ module cs go 1.20 require q5 v1.0.0 + require f5 v1.0.0 require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 \ No newline at end of file + +replace f5 => ../../../third_party/f5 diff --git a/server/imserver/cs/go.sum b/server/imserver/cs/go.sum index 99386c17..88e5c542 100644 --- a/server/imserver/cs/go.sum +++ b/server/imserver/cs/go.sum @@ -5,10 +5,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -17,3 +19,5 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/imserver/go.mod b/server/imserver/go.mod index 39d3e904..2da07e4d 100644 --- a/server/imserver/go.mod +++ b/server/imserver/go.mod @@ -16,13 +16,13 @@ require ss v1.0.0 require main v1.0.0 // indirect -require github.com/golang/protobuf v1.4.2 +require github.com/golang/protobuf v1.5.0 require ( github.com/go-sql-driver/mysql v1.5.0 // indirect github.com/gomodule/redigo v1.8.3 // indirect golang.org/x/crypto v0.13.0 // indirect - google.golang.org/protobuf v1.23.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect ) replace q5 => ../../third_party/q5 diff --git a/server/imserver/go.sum b/server/imserver/go.sum index a5f04e7f..dd503774 100644 --- a/server/imserver/go.sum +++ b/server/imserver/go.sum @@ -9,12 +9,14 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/gomodule/redigo v1.8.3 h1:HR0kYDX2RJZvAup8CsiJwxB4dTCSC0AaUq6S4SiLwUc= github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -31,6 +33,8 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/server/imserver/mtb/go.mod b/server/imserver/mtb/go.mod index 0e5eff86..5e8b3f91 100644 --- a/server/imserver/mtb/go.mod +++ b/server/imserver/mtb/go.mod @@ -3,13 +3,14 @@ module mtb go 1.20 require q5 v1.0.0 + require f5 v1.0.0 - require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 \ No newline at end of file + +replace f5 => ../../../third_party/f5 diff --git a/server/imserver/mtb/go.sum b/server/imserver/mtb/go.sum index 99386c17..88e5c542 100644 --- a/server/imserver/mtb/go.sum +++ b/server/imserver/mtb/go.sum @@ -5,10 +5,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -17,3 +19,5 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/imserver/ss/go.mod b/server/imserver/ss/go.mod index 365d0fae..6d5dd305 100644 --- a/server/imserver/ss/go.mod +++ b/server/imserver/ss/go.mod @@ -3,12 +3,14 @@ module ss go 1.20 require q5 v1.0.0 + require f5 v1.0.0 require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 \ No newline at end of file + +replace f5 => ../../../third_party/f5 diff --git a/server/imserver/ss/go.sum b/server/imserver/ss/go.sum index 99386c17..88e5c542 100644 --- a/server/imserver/ss/go.sum +++ b/server/imserver/ss/go.sum @@ -5,10 +5,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -17,3 +19,5 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/slgserver/go.mod b/server/slgserver/go.mod index 21a4f1c5..96547b79 100644 --- a/server/slgserver/go.mod +++ b/server/slgserver/go.mod @@ -7,8 +7,8 @@ require q5 v1.0.0 require f5 v1.0.0 require ( - github.com/golang/protobuf v1.4.2 - google.golang.org/protobuf v1.23.0 + github.com/golang/protobuf v1.5.0 + google.golang.org/protobuf v1.31.0 ) replace q5 => ../../third_party/q5 diff --git a/server/slgserver/go.sum b/server/slgserver/go.sum index e31bb169..1f815496 100644 --- a/server/slgserver/go.sum +++ b/server/slgserver/go.sum @@ -4,9 +4,11 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -14,3 +16,5 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=