diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index 588c9bb77..6fc6be9eb 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit 588c9bb77b9bd89a9261964006568b8655233cb6 +Subproject commit 6fc6be9eb996aec24781a3905aeb2c9550a5a041 diff --git a/cmd/open_im_api/docs/docs.go b/cmd/open_im_api/docs/docs.go new file mode 100644 index 000000000..b98043991 --- /dev/null +++ b/cmd/open_im_api/docs/docs.go @@ -0,0 +1,85 @@ +// Package docs GENERATED BY SWAG; DO NOT EDIT +// This file was generated by swaggo/swag +package docs + +import "github.com/swaggo/swag" + +const docTemplate = `{ + "schemes": {{ marshal .Schemes }}, + "swagger": "2.0", + "info": { + "description": "{{escape .Description}}", + "title": "{{.Title}}", + "termsOfService": "http://swagger.io/terms/", + "contact": { + "name": "API Support", + "url": "http://www.swagger.io/support", + "email": "support@swagger.io" + }, + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.html" + }, + "version": "{{.Version}}" + }, + "host": "{{.Host}}", + "basePath": "{{.BasePath}}", + "paths": { + "/hello": { + "get": { + "description": "向你说Hello", + "consumes": [ + "application/json" + ], + "tags": [ + "测试" + ], + "summary": "测试SayHello", + "parameters": [ + { + "type": "string", + "description": "人名", + "name": "who", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"msg\": \"hello Razeen\"}", + "schema": { + "type": "string" + } + }, + "400": { + "description": "{\"msg\": \"who are you\"}", + "schema": { + "type": "string" + } + } + } + } + } + }, + "securityDefinitions": { + "BasicAuth": { + "type": "basic" + } + } +}` + +// SwaggerInfo holds exported Swagger Info so clients can modify it +var SwaggerInfo = &swag.Spec{ + Version: "1.0", + Host: "localhost:8080", + BasePath: "/api/v1", + Schemes: []string{}, + Title: "Swagger Example API", + Description: "This is a sample server celler server.", + InfoInstanceName: "swagger", + SwaggerTemplate: docTemplate, +} + +func init() { + swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo) +} diff --git a/cmd/open_im_api/docs/swagger.json b/cmd/open_im_api/docs/swagger.json new file mode 100644 index 000000000..732efb5a6 --- /dev/null +++ b/cmd/open_im_api/docs/swagger.json @@ -0,0 +1,62 @@ +{ + "swagger": "2.0", + "info": { + "description": "This is a sample server celler server.", + "title": "Swagger Example API", + "termsOfService": "http://swagger.io/terms/", + "contact": { + "name": "API Support", + "url": "http://www.swagger.io/support", + "email": "support@swagger.io" + }, + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.html" + }, + "version": "1.0" + }, + "host": "localhost:8080", + "basePath": "/api/v1", + "paths": { + "/hello": { + "get": { + "description": "向你说Hello", + "consumes": [ + "application/json" + ], + "tags": [ + "测试" + ], + "summary": "测试SayHello", + "parameters": [ + { + "type": "string", + "description": "人名", + "name": "who", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"msg\": \"hello Razeen\"}", + "schema": { + "type": "string" + } + }, + "400": { + "description": "{\"msg\": \"who are you\"}", + "schema": { + "type": "string" + } + } + } + } + } + }, + "securityDefinitions": { + "BasicAuth": { + "type": "basic" + } + } +} \ No newline at end of file diff --git a/cmd/open_im_api/docs/swagger.yaml b/cmd/open_im_api/docs/swagger.yaml new file mode 100644 index 000000000..3ce9f7598 --- /dev/null +++ b/cmd/open_im_api/docs/swagger.yaml @@ -0,0 +1,42 @@ +basePath: /api/v1 +host: localhost:8080 +info: + contact: + email: support@swagger.io + name: API Support + url: http://www.swagger.io/support + description: This is a sample server celler server. + license: + name: Apache 2.0 + url: http://www.apache.org/licenses/LICENSE-2.0.html + termsOfService: http://swagger.io/terms/ + title: Swagger Example API + version: "1.0" +paths: + /hello: + get: + consumes: + - application/json + description: 向你说Hello + parameters: + - description: 人名 + in: query + name: who + required: true + type: string + responses: + "200": + description: '{"msg": "hello Razeen"}' + schema: + type: string + "400": + description: '{"msg": "who are you"}' + schema: + type: string + summary: 测试SayHello + tags: + - 测试 +securityDefinitions: + BasicAuth: + type: basic +swagger: "2.0" diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 8b3818aa8..8a78a2eda 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -1,6 +1,7 @@ package main import ( + _ "Open_IM/cmd/open_im_api/docs" apiAuth "Open_IM/internal/api/auth" apiChat "Open_IM/internal/api/chat" "Open_IM/internal/api/conversation" @@ -16,6 +17,9 @@ import ( "Open_IM/pkg/utils" "flag" "fmt" + //_ "github.com/razeencheng/demo-go/swaggo-gin/docs" + swaggerFiles "github.com/swaggo/files" + ginSwagger "github.com/swaggo/gin-swagger" "io" "os" "strconv" @@ -35,6 +39,7 @@ func main() { r.Use(utils.CorsHandler()) log.Info("load config: ", config.Config) + r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) // user routing group, which handles user registration and login services userRouterGroup := r.Group("/user") { diff --git a/go.mod b/go.mod index dc695a9bb..8f76f27d1 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( github.com/antonfisher/nested-logrus-formatter v1.3.0 github.com/bwmarrin/snowflake v0.3.0 github.com/fatih/structs v1.1.0 - github.com/gin-gonic/gin v1.7.0 - github.com/go-playground/validator/v10 v10.4.1 + github.com/gin-gonic/gin v1.8.1 + github.com/go-playground/validator/v10 v10.11.0 github.com/go-redis/redis/v8 v8.11.5 github.com/go-sql-driver/mysql v1.6.0 // indirect github.com/gogo/protobuf v1.3.2 @@ -32,24 +32,28 @@ require ( github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/olivere/elastic/v7 v7.0.23 github.com/pkg/errors v0.9.1 + github.com/razeencheng/demo-go/swaggo-gin v0.0.0-20220621231537-0a4e9bb56373 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/sirupsen/logrus v1.8.1 - github.com/stretchr/testify v1.7.0 + github.com/stretchr/testify v1.7.2 + github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe + github.com/swaggo/gin-swagger v1.5.0 + github.com/swaggo/swag v1.8.3 github.com/tencentyun/qcloud-cos-sts-sdk v0.0.0-20210325043845-84a0811633ca go.etcd.io/etcd/api/v3 v3.5.4 go.etcd.io/etcd/client/v3 v3.5.4 go.mongodb.org/mongo-driver v1.8.3 golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + golang.org/x/net v0.0.0-20220622184535-263ec571b305 + golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 // indirect google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect google.golang.org/grpc v1.45.0 - google.golang.org/protobuf v1.27.1 + google.golang.org/protobuf v1.28.0 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect - gopkg.in/errgo.v2 v2.1.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b + gopkg.in/yaml.v3 v3.0.1 ) replace github.com/Shopify/sarama => github.com/Shopify/sarama v1.29.0 diff --git a/go.sum b/go.sum index 7b996f80d..4ade64fa9 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,17 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= +github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/sarama v1.29.0 h1:ARid8o8oieau9XrHI55f/L3EoRAhm9px6sonbD7yuUE= github.com/Shopify/sarama v1.29.0/go.mod h1:2QpgD79wpdAESqNQMxNc0KYMkycd4slxGdV3TWSVqrU= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/agiledragon/gomonkey/v2 v2.3.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -47,6 +52,7 @@ github.com/aws/aws-sdk-go v1.38.3/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zK github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw= github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0= github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -70,6 +76,7 @@ github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmf github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -106,24 +113,46 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/gzip v0.0.5 h1:mhnVU32YnnBh2LPH2iqRqsA/eR7SAqRaD388jL2s/j0= +github.com/gin-contrib/gzip v0.0.5/go.mod h1:OPIK6HR0Um2vNmBUTlayD7qle4yVVRZT0PyhdUigrKk= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU= -github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= +github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19/go.mod h1:iqneQ2Df3omzIVTkIfn7c1acsVnMGiSLn4XF5Blh3Yg= +github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= +github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U= +github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= +github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= +github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= +github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= +github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= +github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ= +github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU= +github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= +github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw= +github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= @@ -132,6 +161,8 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= +github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -161,6 +192,7 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= 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= @@ -178,8 +210,10 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.1.1/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= @@ -221,8 +255,9 @@ github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= @@ -239,14 +274,16 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is= github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4= @@ -256,10 +293,14 @@ github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR7 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= @@ -278,8 +319,9 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -304,8 +346,17 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U= +github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= +github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= +github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= +github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= +github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= +github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -327,13 +378,20 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/razeencheng/demo-go/swaggo-gin v0.0.0-20220621231537-0a4e9bb56373 h1:GYc9bfYcmMu/AGU5SltIcp3RBwlH6ulrVgfgaJxk7YE= +github.com/razeencheng/demo-go/swaggo-gin v0.0.0-20220621231537-0a4e9bb56373/go.mod h1:qHoO4lIChpZ5hj7O9KWRbRyUzzIQdlxLHF6v3l/yDig= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= @@ -354,18 +412,31 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe h1:K8pHPVoTgxFJt1lXuIzzOX7zZhZFldJQK/CgKx9BFIc= +github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w= +github.com/swaggo/gin-swagger v1.5.0 h1:hlLbxPj6qvbtX2wpbsZuOIlcnPRCUDGccA0zMKVNpME= +github.com/swaggo/gin-swagger v1.5.0/go.mod h1:3mKpZClKx7mnUGsiwJeEkNhnr1VHMkMaTAXIoFYUXrA= +github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ= +github.com/swaggo/swag v1.8.2/go.mod h1:jMLeXOOmYyjk8PvHTsXBdrubsNd9gUJTTCzL5iBnseg= +github.com/swaggo/swag v1.8.3 h1:3pZSSCQ//gAH88lfmxM3Cd1+JCsxV8Md6f36b9hrZ5s= +github.com/swaggo/swag v1.8.3/go.mod h1:jMLeXOOmYyjk8PvHTsXBdrubsNd9gUJTTCzL5iBnseg= github.com/tencentyun/qcloud-cos-sts-sdk v0.0.0-20210325043845-84a0811633ca h1:G/aIr3WiUesWHL2YGYgEqjM5tCAJ43Ml+0C18wDkWWs= github.com/tencentyun/qcloud-cos-sts-sdk v0.0.0-20210325043845-84a0811633ca/go.mod h1:b18KQa4IxHbxeseW1GcZox53d7J0z39VNONTxvvlkXw= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM= github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= -github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= +github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= +github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= +github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w= @@ -380,6 +451,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/etcd/api/v3 v3.5.4 h1:OHVyt3TopwtUQ2GKdd5wu3PmmipR4FTwCqoEjSyRdIc= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4 h1:lrneYvz923dvC14R54XcA7FXoZ3mlGZAgmwhfm7HqOg= @@ -406,8 +479,12 @@ golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk= golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -419,6 +496,9 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -443,10 +523,16 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220615171555-694bf12d69de/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220622184535-263ec571b305 h1:dAgbJ2SP4jD6XYfMNLVj0BF21jo2PjChrtGaAvF5M3I= +golang.org/x/net v0.0.0-20220622184535-263ec571b305/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -484,12 +570,20 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU= +golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -515,6 +609,10 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= +golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -551,8 +649,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= @@ -562,7 +661,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= @@ -585,8 +683,10 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= 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.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/internal/api/group/group.go b/internal/api/group/group.go index d9b1bf9ff..d8bf2f5aa 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -606,6 +606,10 @@ func SetGroupInfo(c *gin.Context) { utils.CopyStructFields(req.GroupInfo, ¶ms) req.OperationID = params.OperationID + if params.NeedVerification != nil { + req.GroupInfo.NeedVerification = &wrappers.Int32Value{Value: *params.NeedVerification} + } + var ok bool var errInfo string ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID) diff --git a/internal/api/user/user.go b/internal/api/user/user.go index ac40059d3..19acb90cb 100644 --- a/internal/api/user/user.go +++ b/internal/api/user/user.go @@ -195,6 +195,14 @@ func GetUsersInfo(c *gin.Context) { c.JSON(http.StatusOK, resp) } +// @Summary 修改用户信息 +// @Description 修改用户信息 +// @Tags 修改用户信息 +// @Accept json +// @Param who query string true "人名" +// @Success 200 {string} string "{"msg": "hello Razeen"}" +// @Failure 400 {string} string "{"msg": "who are you"}" +// @Router /update_user_info [post] func UpdateUserInfo(c *gin.Context) { params := api.UpdateSelfUserInfoReq{} if err := c.BindJSON(¶ms); err != nil { @@ -233,6 +241,7 @@ func UpdateUserInfo(c *gin.Context) { log.NewInfo(req.OperationID, "UpdateUserInfo api return ", resp) c.JSON(http.StatusOK, resp) } + func SetGlobalRecvMessageOpt(c *gin.Context) { params := api.SetGlobalRecvMessageOptReq{} if err := c.BindJSON(¶ms); err != nil { diff --git a/internal/demo/register/login.go b/internal/demo/register/login.go index 4f0ea5cbd..4c475f57d 100644 --- a/internal/demo/register/login.go +++ b/internal/demo/register/login.go @@ -20,6 +20,7 @@ type ParamsLogin struct { Password string `json:"password"` Platform int32 `json:"platform"` OperationID string `json:"operationID" binding:"required"` + AreaCode string `json:"areaCode"` } func Login(c *gin.Context) { @@ -35,7 +36,7 @@ func Login(c *gin.Context) { account = params.PhoneNumber } - r, err := im_mysql_model.GetRegister(account) + r, err := im_mysql_model.GetRegister(account, params.AreaCode) if err != nil { log.NewError(params.OperationID, "user have not register", params.Password, account, err.Error()) c.JSON(http.StatusOK, gin.H{"errCode": constant.NotRegistered, "errMsg": "Mobile phone number is not registered"}) diff --git a/internal/demo/register/onboarding_process.go b/internal/demo/register/onboarding_process.go index f96312b37..38a0d44e9 100644 --- a/internal/demo/register/onboarding_process.go +++ b/internal/demo/register/onboarding_process.go @@ -21,9 +21,9 @@ import ( "time" ) -func onboardingProcess(operationID, userID, userName, faceURL string) { +func onboardingProcess(operationID, userID, userName, faceURL, phoneNumber, email string) { log.NewInfo(operationID, utils.GetSelfFuncName(), userName, userID, faceURL) - if err := createOrganizationUser(operationID, userID, userName); err != nil { + if err := createOrganizationUser(operationID, userID, userName, phoneNumber, email); err != nil { log.NewError(operationID, utils.GetSelfFuncName(), "createOrganizationUser failed", err.Error()) } departmentID, err := imdb.GetRandomDepartmentID() @@ -45,7 +45,7 @@ func onboardingProcess(operationID, userID, userName, faceURL string) { oaNotification(operationID, userID) } -func createOrganizationUser(operationID, userID, userName string) error { +func createOrganizationUser(operationID, userID, userName, phoneNumber, email string) error { defer func() { log.NewInfo(operationID, utils.GetSelfFuncName(), userID) }() @@ -64,16 +64,15 @@ func createOrganizationUser(operationID, userID, userName string) error { EnglishName: randomEnglishName(), Gender: constant.Male, CreateTime: uint32(time.Now().Unix()), + Telephone: phoneNumber, + Mobile: phoneNumber, + Email: email, }, OperationID: operationID, OpUserID: config.Config.Manager.AppManagerUid[0], IsRegister: false, } - if strings.Contains("@", userID) { - req.OrganizationUser.Email = userID - } else { - req.OrganizationUser.Telephone = userID - } + resp, err := client.CreateOrganizationUser(context.Background(), req) if err != nil { log.NewError(operationID, utils.GetSelfFuncName(), err.Error()) diff --git a/internal/demo/register/reset_password.go b/internal/demo/register/reset_password.go index aee1a7cf5..dc5f9a6ca 100644 --- a/internal/demo/register/reset_password.go +++ b/internal/demo/register/reset_password.go @@ -16,6 +16,7 @@ type resetPasswordRequest struct { Email string `json:"email"` PhoneNumber string `json:"phoneNumber"` NewPassword string `json:"newPassword" binding:"required"` + AreaCode string `json:"areaCode"` OperationID string `json:"operationID"` } @@ -34,7 +35,7 @@ func ResetPassword(c *gin.Context) { account = req.PhoneNumber } if req.VerificationCode != config.Config.Demo.SuperCode { - accountKey := account + "_" + constant.VerificationCodeForResetSuffix + accountKey := req.AreaCode + account + "_" + constant.VerificationCodeForResetSuffix v, err := db.DB.GetAccountCode(accountKey) if err != nil || v != req.VerificationCode { log.NewError(req.OperationID, "password Verification code error", account, req.VerificationCode, v) @@ -42,7 +43,7 @@ func ResetPassword(c *gin.Context) { return } } - user, err := im_mysql_model.GetRegister(account) + user, err := im_mysql_model.GetRegister(account, req.AreaCode) if err != nil || user.Account == "" { if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "get register error", err.Error()) diff --git a/internal/demo/register/send_code.go b/internal/demo/register/send_code.go index fc24e9bdd..ac52aaded 100644 --- a/internal/demo/register/send_code.go +++ b/internal/demo/register/send_code.go @@ -27,6 +27,7 @@ type paramsVerificationCode struct { PhoneNumber string `json:"phoneNumber"` OperationID string `json:"operationID" binding:"required"` UsedFor int `json:"usedFor"` + AreaCode string `json:"areaCode"` } func SendVerificationCode(c *gin.Context) { @@ -42,28 +43,28 @@ func SendVerificationCode(c *gin.Context) { } else { account = params.PhoneNumber } - var accountKey string + var accountKey = params.AreaCode + account if params.UsedFor == 0 { params.UsedFor = constant.VerificationCodeForRegister } switch params.UsedFor { case constant.VerificationCodeForRegister: - _, err := im_mysql_model.GetRegister(account) + _, err := im_mysql_model.GetRegister(account, params.AreaCode) if err == nil { log.NewError(params.OperationID, "The phone number has been registered", params) c.JSON(http.StatusOK, gin.H{"errCode": constant.HasRegistered, "errMsg": "The phone number has been registered"}) return } - ok, err := db.DB.JudgeAccountEXISTS(account) + ok, err := db.DB.JudgeAccountEXISTS(accountKey) if ok || err != nil { log.NewError(params.OperationID, "The phone number has been registered", params) c.JSON(http.StatusOK, gin.H{"errCode": constant.RepeatSendCode, "errMsg": "The phone number has been registered"}) return } - accountKey = account + "_" + constant.VerificationCodeForRegisterSuffix + accountKey += "_" + constant.VerificationCodeForRegisterSuffix case constant.VerificationCodeForReset: - accountKey = account + "_" + constant.VerificationCodeForResetSuffix + accountKey += "_" + constant.VerificationCodeForResetSuffix } rand.Seed(time.Now().UnixNano()) code := 100000 + rand.Intn(900000) @@ -95,7 +96,7 @@ func SendVerificationCode(c *gin.Context) { } sendSmsRequest := &dysmsapi20170525.SendSmsRequest{ - PhoneNumbers: tea.String(account), + PhoneNumbers: tea.String(accountKey), SignName: tea.String(config.Config.Demo.AliSMSVerify.SignName), TemplateCode: tea.String(config.Config.Demo.AliSMSVerify.VerificationCodeTemplateCode), TemplateParam: tea.String(fmt.Sprintf("{\"code\":\"%d\"}", code)), diff --git a/internal/demo/register/set_password.go b/internal/demo/register/set_password.go index 9e954f63a..45538bcaf 100644 --- a/internal/demo/register/set_password.go +++ b/internal/demo/register/set_password.go @@ -27,6 +27,7 @@ type ParamsSetPassword struct { Ex string `json:"ex"` FaceURL string `json:"faceURL"` OperationID string `json:"operationID" binding:"required"` + AreaCode string `json:"areaCode"` } func SetPassword(c *gin.Context) { @@ -88,7 +89,7 @@ func SetPassword(c *gin.Context) { return } log.Info(params.OperationID, "begin store mysql", account, params.Password, "info", params.FaceURL, params.Nickname) - err = im_mysql_model.SetPassword(account, params.Password, params.Ex, userID) + err = im_mysql_model.SetPassword(account, params.Password, params.Ex, userID, params.AreaCode) if err != nil { log.NewError(params.OperationID, "set phone number password error", account, "err", err.Error()) c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": err.Error()}) @@ -96,7 +97,7 @@ func SetPassword(c *gin.Context) { } log.Info(params.OperationID, "end setPassword", account, params.Password) // demo onboarding - onboardingProcess(params.OperationID, userID, params.Nickname, params.FaceURL) + onboardingProcess(params.OperationID, userID, params.Nickname, params.FaceURL, params.AreaCode+params.PhoneNumber, params.Email) c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "", "data": openIMRegisterResp.UserToken}) return } diff --git a/internal/demo/register/verify.go b/internal/demo/register/verify.go index fd16223e0..6fae4a84f 100644 --- a/internal/demo/register/verify.go +++ b/internal/demo/register/verify.go @@ -16,6 +16,7 @@ type paramsCertification struct { VerificationCode string `json:"verificationCode"` OperationID string `json:"operationID" binding:"required"` UsedFor int `json:"usedFor"` + AreaCode string `json:"areaCode"` } func Verify(c *gin.Context) { @@ -31,7 +32,7 @@ func Verify(c *gin.Context) { if params.Email != "" { account = params.Email } else { - account = params.PhoneNumber + account = params.AreaCode + params.PhoneNumber } if params.VerificationCode == config.Config.Demo.SuperCode { diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 63fc077d1..eec4a71b4 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -258,7 +258,6 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.InviteUserToGroupReq) (*pbGroup.InviteUserToGroupResp, error) { log.NewInfo(req.OperationID, "InviteUserToGroup args ", req.String()) - if !imdb.IsExistGroupMember(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { log.NewError(req.OperationID, "no permission InviteUserToGroup ", req.GroupID, req.OpUserID) return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil @@ -273,12 +272,45 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite errMsg := " group status is dismissed " return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrStatus.ErrCode, ErrMsg: errMsg}, nil } + var resp pbGroup.InviteUserToGroupResp + if groupInfo.NeedVerification == constant.AllNeedVerification && + !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { + var resp pbGroup.InviteUserToGroupResp + joinReq := pbGroup.JoinGroupReq{} + for _, v := range req.InvitedUserIDList { + var groupRequest db.GroupRequest + groupRequest.UserID = v + groupRequest.GroupID = req.GroupID + err = imdb.InsertIntoGroupRequest(groupRequest) + if err != nil { + var resultNode pbGroup.Id2Result + resultNode.Result = -1 + resultNode.UserID = v + resp.Id2ResultList = append(resp.Id2ResultList, &resultNode) + + continue + log.NewError(req.OperationID, "InsertIntoGroupRequest failed ", err.Error(), groupRequest) + // return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } else { + var resultNode pbGroup.Id2Result + resultNode.Result = 0 + resultNode.UserID = v + resp.Id2ResultList = append(resp.Id2ResultList, &resultNode) + joinReq.GroupID = req.GroupID + joinReq.OperationID = req.OperationID + joinReq.OpUserID = v + resp.Id2ResultList = append(resp.Id2ResultList, &resultNode) + chat.JoinGroupApplicationNotification(&joinReq) + } + } + log.NewInfo(req.OperationID, "InviteUserToGroup rpc return ", resp) + return &resp, nil + } // //from User: invite: applicant //to user: invite: invited var okUserIDList []string if groupInfo.GroupType != constant.SuperGroup { - var resp pbGroup.InviteUserToGroupResp for _, v := range req.InvitedUserIDList { var resultNode pbGroup.Id2Result resultNode.UserID = v @@ -416,8 +448,8 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite }() } - log.NewInfo(req.OperationID, "InviteUserToGroup rpc return ") - return &pbGroup.InviteUserToGroupResp{}, nil + log.NewInfo(req.OperationID, "InviteUserToGroup rpc return ", resp) + return &resp, nil } func (s *groupServer) GetGroupAllMember(ctx context.Context, req *pbGroup.GetGroupAllMemberReq) (*pbGroup.GetGroupAllMemberResp, error) { @@ -836,26 +868,70 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrStatus.ErrCode, ErrMsg: errMsg}}, nil } + if groupInfo.NeedVerification == constant.Directly { + us, err := imdb.GetUserByUserID(req.OpUserID) + if err != nil { + log.NewError(req.OperationID, "GetUserByUserID failed ", err.Error(), req.OpUserID) + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } + //to group member + groupMember := db.GroupMember{GroupID: req.GroupID, RoleLevel: constant.GroupOwner, OperatorUserID: req.OpUserID} + utils.CopyStructFields(&groupMember, us) + err = imdb.InsertIntoGroupMember(groupMember) + if err != nil { + log.NewError(req.OperationID, "InsertIntoGroupMember failed ", err.Error(), groupMember) + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } + if groupInfo.GroupType != constant.SuperGroup { + addGroupMemberToCacheReq := &pbCache.AddGroupMemberToCacheReq{ + UserIDList: []string{req.OpUserID}, + GroupID: req.GroupID, + OperationID: req.OperationID, + } + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID) + if etcdConn == nil { + errMsg := req.OperationID + "getcdv3.GetConn == nil" + log.NewError(req.OperationID, errMsg) + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrInternal.ErrCode, ErrMsg: constant.ErrInternal.ErrMsg}}, nil + } + cacheClient := pbCache.NewCacheClient(etcdConn) + cacheResp, err := cacheClient.AddGroupMemberToCache(context.Background(), addGroupMemberToCacheReq) + if err != nil { + log.NewError(req.OperationID, "AddGroupMemberToCache rpc call failed ", err.Error()) + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } + if cacheResp.CommonResp.ErrCode != 0 { + log.NewError(req.OperationID, "AddGroupMemberToCache rpc logic call failed ", cacheResp.String()) + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } + chat.MemberEnterDirectlyNotification(req.GroupID, req.OpUserID, req.OperationID) + log.NewInfo(req.OperationID, "JoinGroup rpc return ") + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil + } else { + log.Error(req.OperationID, "JoinGroup rpc failed, group type: ", groupInfo.GroupType) + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}}, nil + } + } + var groupRequest db.GroupRequest groupRequest.UserID = req.OpUserID groupRequest.ReqMsg = req.ReqMessage groupRequest.GroupID = req.GroupID - err = imdb.InsertIntoGroupRequest(groupRequest) if err != nil { - log.NewError(req.OperationID, "UpdateGroupRequest ", err.Error(), groupRequest) + log.NewError(req.OperationID, "InsertIntoGroupRequest failed ", err.Error(), groupRequest) return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil } - _, err = imdb.GetGroupMemberListByGroupIDAndRoleLevel(req.GroupID, constant.GroupOwner) - if err != nil { - log.NewError(req.OperationID, "GetGroupMemberListByGroupIDAndRoleLevel failed ", err.Error(), req.GroupID, constant.GroupOwner) - return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil - } + // + //_, err = imdb.GetGroupMemberListByGroupIDAndRoleLevel(req.GroupID, constant.GroupOwner) + //if err != nil { + // log.NewError(req.OperationID, "GetGroupMemberListByGroupIDAndRoleLevel failed ", err.Error(), req.GroupID, constant.GroupOwner) + // return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil + //} chat.JoinGroupApplicationNotification(req) - - log.NewInfo(req.OperationID, "ReceiveJoinApplicationNotification rpc return ") + log.NewInfo(req.OperationID, "JoinGroup rpc return ") return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil } @@ -1003,6 +1079,21 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf changedType = changedType | (1 << 3) faceURL = req.GroupInfo.FaceURL } + + if req.GroupInfo.NeedVerification != nil { + changedType = changedType | (1 << 4) + m := make(map[string]interface{}) + m["need_verification"] = req.GroupInfo.NeedVerification.Value + if err := imdb.UpdateGroupInfoDefaultZero(req.GroupInfo.GroupID, m); err != nil { + log.NewError(req.OperationID, "UpdateGroupInfoDefaultZero failed ", err.Error(), m) + return &pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, http.WrapError(constant.ErrDB) + } + } + + // + //if req.RoleLevel != nil { + // + //} //only administrators can set group information var groupInfo db.Group utils.CopyStructFields(&groupInfo, req.GroupInfo) @@ -1013,7 +1104,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf } log.NewInfo(req.OperationID, "SetGroupInfo rpc return ", pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{}}) if changedType != 0 { - chat.GroupInfoSetNotification(req.OperationID, req.OpUserID, req.GroupInfo.GroupID, groupName, notification, introduction, faceURL) + chat.GroupInfoSetNotification(req.OperationID, req.OpUserID, req.GroupInfo.GroupID, groupName, notification, introduction, faceURL, req.GroupInfo.NeedVerification) } if req.GroupInfo.Notification != "" { //get group member user id diff --git a/internal/rpc/msg/group_notification.go b/internal/rpc/msg/group_notification.go index 258764485..002c17db9 100644 --- a/internal/rpc/msg/group_notification.go +++ b/internal/rpc/msg/group_notification.go @@ -12,6 +12,7 @@ import ( "Open_IM/pkg/utils" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/types/known/wrapperspb" ) //message GroupCreatedTips{ @@ -231,7 +232,7 @@ func GroupCreatedNotification(operationID, opUserID, groupID string, initMemberL // notification := "" // introduction := "" // faceURL := "" -func GroupInfoSetNotification(operationID, opUserID, groupID string, groupName, notification, introduction, faceURL string) { +func GroupInfoSetNotification(operationID, opUserID, groupID string, groupName, notification, introduction, faceURL string, needVerification *wrapperspb.Int32Value) { GroupInfoChangedTips := open_im_sdk.GroupInfoSetTips{Group: &open_im_sdk.GroupInfo{}, OpUser: &open_im_sdk.GroupMemberFullInfo{}} if err := setGroupInfo(groupID, GroupInfoChangedTips.Group); err != nil { log.Error(operationID, "setGroupInfo failed ", err.Error(), groupID) @@ -241,6 +242,8 @@ func GroupInfoSetNotification(operationID, opUserID, groupID string, groupName, GroupInfoChangedTips.Group.Notification = notification GroupInfoChangedTips.Group.Introduction = introduction GroupInfoChangedTips.Group.FaceURL = faceURL + GroupInfoChangedTips.Group.NeedVerification = needVerification + if err := setOpUserInfo(opUserID, groupID, GroupInfoChangedTips.OpUser); err != nil { log.Error(operationID, "setOpUserInfo failed ", err.Error(), opUserID, groupID) return @@ -553,9 +556,21 @@ func MemberEnterNotification(req *pbGroup.GroupApplicationResponseReq) { return } if err := setGroupMemberInfo(req.GroupID, req.FromUserID, MemberEnterTips.EntrantUser); err != nil { - log.Error(req.OperationID, "setOpUserInfo failed ", err.Error(), req.OpUserID, req.GroupID, MemberEnterTips.EntrantUser) + log.Error(req.OperationID, "setGroupMemberInfo failed ", err.Error(), req.OpUserID, req.GroupID, MemberEnterTips.EntrantUser) return } groupNotification(constant.MemberEnterNotification, &MemberEnterTips, req.OpUserID, req.GroupID, "", req.OperationID) +} +func MemberEnterDirectlyNotification(groupID string, entrantUserID string, operationID string) { + MemberEnterTips := open_im_sdk.MemberEnterTips{Group: &open_im_sdk.GroupInfo{}, EntrantUser: &open_im_sdk.GroupMemberFullInfo{}} + if err := setGroupInfo(groupID, MemberEnterTips.Group); err != nil { + log.Error(operationID, "setGroupInfo failed ", err.Error(), groupID, MemberEnterTips.Group) + return + } + if err := setGroupMemberInfo(groupID, entrantUserID, MemberEnterTips.EntrantUser); err != nil { + log.Error(operationID, "setGroupMemberInfo failed ", err.Error(), groupID, entrantUserID, MemberEnterTips.EntrantUser) + return + } + groupNotification(constant.MemberEnterNotification, &MemberEnterTips, entrantUserID, groupID, "", operationID) } diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index e00f6daf0..20017ef57 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -157,14 +157,16 @@ type QuitGroupResp struct { } type SetGroupInfoReq struct { - GroupID string `json:"groupID" binding:"required"` - GroupName string `json:"groupName"` - Notification string `json:"notification"` - Introduction string `json:"introduction"` - FaceURL string `json:"faceURL"` - Ex string `json:"ex"` - OperationID string `json:"operationID" binding:"required"` + GroupID string `json:"groupID" binding:"required"` + GroupName string `json:"groupName"` + Notification string `json:"notification"` + Introduction string `json:"introduction"` + FaceURL string `json:"faceURL"` + Ex string `json:"ex"` + OperationID string `json:"operationID" binding:"required"` + NeedVerification *int32 `json:"needVerification" binding "oneof=0 1 2"` } + type SetGroupInfoResp struct { CommResp } diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 4fb8a9276..d092727ec 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -1,6 +1,7 @@ package config import ( + "fmt" "io/ioutil" "os" "path/filepath" @@ -496,6 +497,8 @@ type PDefaultTips struct { func init() { cfgName := os.Getenv("CONFIG_NAME") + fmt.Println(Root, cfgName) + if len(cfgName) == 0 { cfgName = Root + "/config/config.yaml" } diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 5f95063a9..fdb1dcb83 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -267,6 +267,12 @@ const ( ReliableNotificationMsg = 3 ) +const ( + ApplyNeedVerificationInviteDirectly = 0 // 申请需要同意 邀请直接进 + AllNeedVerification = 1 //所有人进群需要验证，除了群主管理员邀请进群 + Directly = 2 //直接进群 +) + const FriendAcceptTip = "You have successfully become friends, so start chatting" func GroupIsBanChat(status int32) bool { diff --git a/pkg/common/db/model_struct.go b/pkg/common/db/model_struct.go index 7bb337775..b256a2161 100644 --- a/pkg/common/db/model_struct.go +++ b/pkg/common/db/model_struct.go @@ -7,6 +7,7 @@ type Register struct { Password string `gorm:"column:password;type:varchar(255)" json:"password"` Ex string `gorm:"column:ex;size:1024" json:"ex"` UserID string `gorm:"column:user_id;type:varchar(255)" json:"userID"` + AreaCode string `gorm:"column:area_code;type:varchar(255)"` } // @@ -76,16 +77,17 @@ func (FriendRequest) TableName() string { type Group struct { //`json:"operationID" binding:"required"` //`protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` `json:"operationID" binding:"required"` - GroupID string `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"` - GroupName string `gorm:"column:name;size:255" json:"groupName"` - Notification string `gorm:"column:notification;size:255" json:"notification"` - Introduction string `gorm:"column:introduction;size:255" json:"introduction"` - FaceURL string `gorm:"column:face_url;size:255" json:"faceURL"` - CreateTime time.Time `gorm:"column:create_time"` - Ex string `gorm:"column:ex" json:"ex;size:1024" json:"ex"` - Status int32 `gorm:"column:status"` - CreatorUserID string `gorm:"column:creator_user_id;size:64"` - GroupType int32 `gorm:"column:group_type"` + GroupID string `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"` + GroupName string `gorm:"column:name;size:255" json:"groupName"` + Notification string `gorm:"column:notification;size:255" json:"notification"` + Introduction string `gorm:"column:introduction;size:255" json:"introduction"` + FaceURL string `gorm:"column:face_url;size:255" json:"faceURL"` + CreateTime time.Time `gorm:"column:create_time"` + Ex string `gorm:"column:ex" json:"ex;size:1024" json:"ex"` + Status int32 `gorm:"column:status"` + CreatorUserID string `gorm:"column:creator_user_id;size:64"` + GroupType int32 `gorm:"column:group_type"` + NeedVerification int32 `gorm:"column:need_verification"` } //message GroupMemberFullInfo { diff --git a/pkg/common/db/mysql_model/im_mysql_model/demo_model.go b/pkg/common/db/mysql_model/im_mysql_model/demo_model.go index 278e8bd7f..09d04b46d 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/demo_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/demo_model.go @@ -5,22 +5,23 @@ import ( _ "github.com/jinzhu/gorm" ) -func GetRegister(account string) (*db.Register, error) { +func GetRegister(account, areaCode string) (*db.Register, error) { dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { return nil, err } var r db.Register - return &r, dbConn.Table("registers").Where("account = ?", - account).Take(&r).Error + return &r, dbConn.Table("registers").Where("account = ? or account =? and area_code=?", + account, account, areaCode).Take(&r).Error } -func SetPassword(account, password, ex, userID string) error { +func SetPassword(account, password, ex, userID, areaCode string) error { r := db.Register{ Account: account, Password: password, Ex: ex, UserID: userID, + AreaCode: areaCode, } dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index f508ee69b..bd8209463 100644 --- a/pkg/proto/sdk_ws/ws.pb.go +++ b/pkg/proto/sdk_ws/ws.pb.go @@ -6,6 +6,7 @@ package server_api_params // import "Open_IM/pkg/proto/sdk_ws" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" +import wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -19,28 +20,29 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type GroupInfo struct { - GroupID string `protobuf:"bytes,1,opt,name=groupID" json:"groupID,omitempty"` - GroupName string `protobuf:"bytes,2,opt,name=groupName" json:"groupName,omitempty"` - Notification string `protobuf:"bytes,3,opt,name=notification" json:"notification,omitempty"` - Introduction string `protobuf:"bytes,4,opt,name=introduction" json:"introduction,omitempty"` - FaceURL string `protobuf:"bytes,5,opt,name=faceURL" json:"faceURL,omitempty"` - OwnerUserID string `protobuf:"bytes,6,opt,name=ownerUserID" json:"ownerUserID,omitempty"` - CreateTime uint32 `protobuf:"varint,7,opt,name=createTime" json:"createTime,omitempty"` - MemberCount uint32 `protobuf:"varint,8,opt,name=memberCount" json:"memberCount,omitempty"` - Ex string `protobuf:"bytes,9,opt,name=ex" json:"ex,omitempty"` - Status int32 `protobuf:"varint,10,opt,name=status" json:"status,omitempty"` - CreatorUserID string `protobuf:"bytes,11,opt,name=creatorUserID" json:"creatorUserID,omitempty"` - GroupType int32 `protobuf:"varint,12,opt,name=groupType" json:"groupType,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + GroupID string `protobuf:"bytes,1,opt,name=groupID" json:"groupID,omitempty"` + GroupName string `protobuf:"bytes,2,opt,name=groupName" json:"groupName,omitempty"` + Notification string `protobuf:"bytes,3,opt,name=notification" json:"notification,omitempty"` + Introduction string `protobuf:"bytes,4,opt,name=introduction" json:"introduction,omitempty"` + FaceURL string `protobuf:"bytes,5,opt,name=faceURL" json:"faceURL,omitempty"` + OwnerUserID string `protobuf:"bytes,6,opt,name=ownerUserID" json:"ownerUserID,omitempty"` + CreateTime uint32 `protobuf:"varint,7,opt,name=createTime" json:"createTime,omitempty"` + MemberCount uint32 `protobuf:"varint,8,opt,name=memberCount" json:"memberCount,omitempty"` + Ex string `protobuf:"bytes,9,opt,name=ex" json:"ex,omitempty"` + Status int32 `protobuf:"varint,10,opt,name=status" json:"status,omitempty"` + CreatorUserID string `protobuf:"bytes,11,opt,name=creatorUserID" json:"creatorUserID,omitempty"` + GroupType int32 `protobuf:"varint,12,opt,name=groupType" json:"groupType,omitempty"` + NeedVerification *wrapperspb.Int32Value `protobuf:"bytes,13,opt,name=needVerification" json:"needVerification,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GroupInfo) Reset() { *m = GroupInfo{} } func (m *GroupInfo) String() string { return proto.CompactTextString(m) } func (*GroupInfo) ProtoMessage() {} func (*GroupInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{0} + return fileDescriptor_ws_b2c8e6212334433f, []int{0} } func (m *GroupInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfo.Unmarshal(m, b) @@ -144,6 +146,13 @@ func (m *GroupInfo) GetGroupType() int32 { return 0 } +func (m *GroupInfo) GetNeedVerification() *wrapperspb.Int32Value { + if m != nil { + return m.NeedVerification + } + return nil +} + type GroupMemberFullInfo struct { GroupID string `protobuf:"bytes,1,opt,name=groupID" json:"groupID,omitempty"` UserID string `protobuf:"bytes,2,opt,name=userID" json:"userID,omitempty"` @@ -165,7 +174,7 @@ func (m *GroupMemberFullInfo) Reset() { *m = GroupMemberFullInfo{} } func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) } func (*GroupMemberFullInfo) ProtoMessage() {} func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{1} + return fileDescriptor_ws_b2c8e6212334433f, []int{1} } func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b) @@ -277,7 +286,7 @@ func (m *PublicUserInfo) Reset() { *m = PublicUserInfo{} } func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) } func (*PublicUserInfo) ProtoMessage() {} func (*PublicUserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{2} + return fileDescriptor_ws_b2c8e6212334433f, []int{2} } func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b) @@ -353,7 +362,7 @@ func (m *UserInfo) Reset() { *m = UserInfo{} } func (m *UserInfo) String() string { return proto.CompactTextString(m) } func (*UserInfo) ProtoMessage() {} func (*UserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{3} + return fileDescriptor_ws_b2c8e6212334433f, []int{3} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -467,7 +476,7 @@ func (m *FriendInfo) Reset() { *m = FriendInfo{} } func (m *FriendInfo) String() string { return proto.CompactTextString(m) } func (*FriendInfo) ProtoMessage() {} func (*FriendInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{4} + return fileDescriptor_ws_b2c8e6212334433f, []int{4} } func (m *FriendInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfo.Unmarshal(m, b) @@ -552,7 +561,7 @@ func (m *BlackInfo) Reset() { *m = BlackInfo{} } func (m *BlackInfo) String() string { return proto.CompactTextString(m) } func (*BlackInfo) ProtoMessage() {} func (*BlackInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{5} + return fileDescriptor_ws_b2c8e6212334433f, []int{5} } func (m *BlackInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackInfo.Unmarshal(m, b) @@ -633,7 +642,7 @@ func (m *GroupRequest) Reset() { *m = GroupRequest{} } func (m *GroupRequest) String() string { return proto.CompactTextString(m) } func (*GroupRequest) ProtoMessage() {} func (*GroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{6} + return fileDescriptor_ws_b2c8e6212334433f, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -741,7 +750,7 @@ func (m *FriendRequest) Reset() { *m = FriendRequest{} } func (m *FriendRequest) String() string { return proto.CompactTextString(m) } func (*FriendRequest) ProtoMessage() {} func (*FriendRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{7} + return fileDescriptor_ws_b2c8e6212334433f, []int{7} } func (m *FriendRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendRequest.Unmarshal(m, b) @@ -886,7 +895,7 @@ func (m *Department) Reset() { *m = Department{} } func (m *Department) String() string { return proto.CompactTextString(m) } func (*Department) ProtoMessage() {} func (*Department) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{8} + return fileDescriptor_ws_b2c8e6212334433f, []int{8} } func (m *Department) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Department.Unmarshal(m, b) @@ -997,7 +1006,7 @@ func (m *OrganizationUser) Reset() { *m = OrganizationUser{} } func (m *OrganizationUser) String() string { return proto.CompactTextString(m) } func (*OrganizationUser) ProtoMessage() {} func (*OrganizationUser) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{9} + return fileDescriptor_ws_b2c8e6212334433f, []int{9} } func (m *OrganizationUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OrganizationUser.Unmarshal(m, b) @@ -1111,7 +1120,7 @@ func (m *DepartmentMember) Reset() { *m = DepartmentMember{} } func (m *DepartmentMember) String() string { return proto.CompactTextString(m) } func (*DepartmentMember) ProtoMessage() {} func (*DepartmentMember) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{10} + return fileDescriptor_ws_b2c8e6212334433f, []int{10} } func (m *DepartmentMember) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DepartmentMember.Unmarshal(m, b) @@ -1192,7 +1201,7 @@ func (m *UserDepartmentMember) Reset() { *m = UserDepartmentMember{} } func (m *UserDepartmentMember) String() string { return proto.CompactTextString(m) } func (*UserDepartmentMember) ProtoMessage() {} func (*UserDepartmentMember) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{11} + return fileDescriptor_ws_b2c8e6212334433f, []int{11} } func (m *UserDepartmentMember) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserDepartmentMember.Unmarshal(m, b) @@ -1238,7 +1247,7 @@ func (m *UserInDepartment) Reset() { *m = UserInDepartment{} } func (m *UserInDepartment) String() string { return proto.CompactTextString(m) } func (*UserInDepartment) ProtoMessage() {} func (*UserInDepartment) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{12} + return fileDescriptor_ws_b2c8e6212334433f, []int{12} } func (m *UserInDepartment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInDepartment.Unmarshal(m, b) @@ -1287,7 +1296,7 @@ func (m *PullMessageBySeqListReq) Reset() { *m = PullMessageBySeqListReq func (m *PullMessageBySeqListReq) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListReq) ProtoMessage() {} func (*PullMessageBySeqListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{13} + return fileDescriptor_ws_b2c8e6212334433f, []int{13} } func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b) @@ -1346,7 +1355,7 @@ func (m *SeqList) Reset() { *m = SeqList{} } func (m *SeqList) String() string { return proto.CompactTextString(m) } func (*SeqList) ProtoMessage() {} func (*SeqList) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{14} + return fileDescriptor_ws_b2c8e6212334433f, []int{14} } func (m *SeqList) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SeqList.Unmarshal(m, b) @@ -1384,7 +1393,7 @@ func (m *MsgDataList) Reset() { *m = MsgDataList{} } func (m *MsgDataList) String() string { return proto.CompactTextString(m) } func (*MsgDataList) ProtoMessage() {} func (*MsgDataList) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{15} + return fileDescriptor_ws_b2c8e6212334433f, []int{15} } func (m *MsgDataList) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgDataList.Unmarshal(m, b) @@ -1425,7 +1434,7 @@ func (m *PullMessageBySeqListResp) Reset() { *m = PullMessageBySeqListRe func (m *PullMessageBySeqListResp) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListResp) ProtoMessage() {} func (*PullMessageBySeqListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{16} + return fileDescriptor_ws_b2c8e6212334433f, []int{16} } func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b) @@ -1486,7 +1495,7 @@ func (m *GetMaxAndMinSeqReq) Reset() { *m = GetMaxAndMinSeqReq{} } func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqReq) ProtoMessage() {} func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{17} + return fileDescriptor_ws_b2c8e6212334433f, []int{17} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -1539,7 +1548,7 @@ func (m *MaxAndMinSeq) Reset() { *m = MaxAndMinSeq{} } func (m *MaxAndMinSeq) String() string { return proto.CompactTextString(m) } func (*MaxAndMinSeq) ProtoMessage() {} func (*MaxAndMinSeq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{18} + return fileDescriptor_ws_b2c8e6212334433f, []int{18} } func (m *MaxAndMinSeq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MaxAndMinSeq.Unmarshal(m, b) @@ -1588,7 +1597,7 @@ func (m *GetMaxAndMinSeqResp) Reset() { *m = GetMaxAndMinSeqResp{} } func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqResp) ProtoMessage() {} func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{19} + return fileDescriptor_ws_b2c8e6212334433f, []int{19} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -1656,7 +1665,7 @@ func (m *UserSendMsgResp) Reset() { *m = UserSendMsgResp{} } func (m *UserSendMsgResp) String() string { return proto.CompactTextString(m) } func (*UserSendMsgResp) ProtoMessage() {} func (*UserSendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{20} + return fileDescriptor_ws_b2c8e6212334433f, []int{20} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -1727,7 +1736,7 @@ func (m *MsgData) Reset() { *m = MsgData{} } func (m *MsgData) String() string { return proto.CompactTextString(m) } func (*MsgData) ProtoMessage() {} func (*MsgData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{21} + return fileDescriptor_ws_b2c8e6212334433f, []int{21} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -1902,7 +1911,7 @@ func (m *OfflinePushInfo) Reset() { *m = OfflinePushInfo{} } func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) } func (*OfflinePushInfo) ProtoMessage() {} func (*OfflinePushInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{22} + return fileDescriptor_ws_b2c8e6212334433f, []int{22} } func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b) @@ -1970,7 +1979,7 @@ func (m *TipsComm) Reset() { *m = TipsComm{} } func (m *TipsComm) String() string { return proto.CompactTextString(m) } func (*TipsComm) ProtoMessage() {} func (*TipsComm) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{23} + return fileDescriptor_ws_b2c8e6212334433f, []int{23} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -2027,7 +2036,7 @@ func (m *GroupCreatedTips) Reset() { *m = GroupCreatedTips{} } func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) } func (*GroupCreatedTips) ProtoMessage() {} func (*GroupCreatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{24} + return fileDescriptor_ws_b2c8e6212334433f, []int{24} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -2096,7 +2105,7 @@ func (m *GroupInfoSetTips) Reset() { *m = GroupInfoSetTips{} } func (m *GroupInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoSetTips) ProtoMessage() {} func (*GroupInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{25} + return fileDescriptor_ws_b2c8e6212334433f, []int{25} } func (m *GroupInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoSetTips.Unmarshal(m, b) @@ -2151,7 +2160,7 @@ func (m *JoinGroupApplicationTips) Reset() { *m = JoinGroupApplicationTi func (m *JoinGroupApplicationTips) String() string { return proto.CompactTextString(m) } func (*JoinGroupApplicationTips) ProtoMessage() {} func (*JoinGroupApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{26} + return fileDescriptor_ws_b2c8e6212334433f, []int{26} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -2207,7 +2216,7 @@ func (m *MemberQuitTips) Reset() { *m = MemberQuitTips{} } func (m *MemberQuitTips) String() string { return proto.CompactTextString(m) } func (*MemberQuitTips) ProtoMessage() {} func (*MemberQuitTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{27} + return fileDescriptor_ws_b2c8e6212334433f, []int{27} } func (m *MemberQuitTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberQuitTips.Unmarshal(m, b) @@ -2262,7 +2271,7 @@ func (m *GroupApplicationAcceptedTips) Reset() { *m = GroupApplicationAc func (m *GroupApplicationAcceptedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationAcceptedTips) ProtoMessage() {} func (*GroupApplicationAcceptedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{28} + return fileDescriptor_ws_b2c8e6212334433f, []int{28} } func (m *GroupApplicationAcceptedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationAcceptedTips.Unmarshal(m, b) @@ -2317,7 +2326,7 @@ func (m *GroupApplicationRejectedTips) Reset() { *m = GroupApplicationRe func (m *GroupApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationRejectedTips) ProtoMessage() {} func (*GroupApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{29} + return fileDescriptor_ws_b2c8e6212334433f, []int{29} } func (m *GroupApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationRejectedTips.Unmarshal(m, b) @@ -2373,7 +2382,7 @@ func (m *GroupOwnerTransferredTips) Reset() { *m = GroupOwnerTransferred func (m *GroupOwnerTransferredTips) String() string { return proto.CompactTextString(m) } func (*GroupOwnerTransferredTips) ProtoMessage() {} func (*GroupOwnerTransferredTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{30} + return fileDescriptor_ws_b2c8e6212334433f, []int{30} } func (m *GroupOwnerTransferredTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupOwnerTransferredTips.Unmarshal(m, b) @@ -2436,7 +2445,7 @@ func (m *MemberKickedTips) Reset() { *m = MemberKickedTips{} } func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) } func (*MemberKickedTips) ProtoMessage() {} func (*MemberKickedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{31} + return fileDescriptor_ws_b2c8e6212334433f, []int{31} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -2499,7 +2508,7 @@ func (m *MemberInvitedTips) Reset() { *m = MemberInvitedTips{} } func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) } func (*MemberInvitedTips) ProtoMessage() {} func (*MemberInvitedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{32} + return fileDescriptor_ws_b2c8e6212334433f, []int{32} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -2561,7 +2570,7 @@ func (m *MemberEnterTips) Reset() { *m = MemberEnterTips{} } func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) } func (*MemberEnterTips) ProtoMessage() {} func (*MemberEnterTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{33} + return fileDescriptor_ws_b2c8e6212334433f, []int{33} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -2615,7 +2624,7 @@ func (m *GroupDismissedTips) Reset() { *m = GroupDismissedTips{} } func (m *GroupDismissedTips) String() string { return proto.CompactTextString(m) } func (*GroupDismissedTips) ProtoMessage() {} func (*GroupDismissedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{34} + return fileDescriptor_ws_b2c8e6212334433f, []int{34} } func (m *GroupDismissedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupDismissedTips.Unmarshal(m, b) @@ -2671,7 +2680,7 @@ func (m *GroupMemberMutedTips) Reset() { *m = GroupMemberMutedTips{} } func (m *GroupMemberMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberMutedTips) ProtoMessage() {} func (*GroupMemberMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{35} + return fileDescriptor_ws_b2c8e6212334433f, []int{35} } func (m *GroupMemberMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberMutedTips.Unmarshal(m, b) @@ -2740,7 +2749,7 @@ func (m *GroupMemberCancelMutedTips) Reset() { *m = GroupMemberCancelMut func (m *GroupMemberCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberCancelMutedTips) ProtoMessage() {} func (*GroupMemberCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{36} + return fileDescriptor_ws_b2c8e6212334433f, []int{36} } func (m *GroupMemberCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberCancelMutedTips.Unmarshal(m, b) @@ -2801,7 +2810,7 @@ func (m *GroupMutedTips) Reset() { *m = GroupMutedTips{} } func (m *GroupMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMutedTips) ProtoMessage() {} func (*GroupMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{37} + return fileDescriptor_ws_b2c8e6212334433f, []int{37} } func (m *GroupMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMutedTips.Unmarshal(m, b) @@ -2855,7 +2864,7 @@ func (m *GroupCancelMutedTips) Reset() { *m = GroupCancelMutedTips{} } func (m *GroupCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupCancelMutedTips) ProtoMessage() {} func (*GroupCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{38} + return fileDescriptor_ws_b2c8e6212334433f, []int{38} } func (m *GroupCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCancelMutedTips.Unmarshal(m, b) @@ -2910,7 +2919,7 @@ func (m *GroupMemberInfoSetTips) Reset() { *m = GroupMemberInfoSetTips{} func (m *GroupMemberInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberInfoSetTips) ProtoMessage() {} func (*GroupMemberInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{39} + return fileDescriptor_ws_b2c8e6212334433f, []int{39} } func (m *GroupMemberInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberInfoSetTips.Unmarshal(m, b) @@ -2970,7 +2979,7 @@ func (m *OrganizationChangedTips) Reset() { *m = OrganizationChangedTips func (m *OrganizationChangedTips) String() string { return proto.CompactTextString(m) } func (*OrganizationChangedTips) ProtoMessage() {} func (*OrganizationChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{40} + return fileDescriptor_ws_b2c8e6212334433f, []int{40} } func (m *OrganizationChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OrganizationChangedTips.Unmarshal(m, b) @@ -3017,7 +3026,7 @@ func (m *FriendApplication) Reset() { *m = FriendApplication{} } func (m *FriendApplication) String() string { return proto.CompactTextString(m) } func (*FriendApplication) ProtoMessage() {} func (*FriendApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{41} + return fileDescriptor_ws_b2c8e6212334433f, []int{41} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -3070,7 +3079,7 @@ func (m *FromToUserID) Reset() { *m = FromToUserID{} } func (m *FromToUserID) String() string { return proto.CompactTextString(m) } func (*FromToUserID) ProtoMessage() {} func (*FromToUserID) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{42} + return fileDescriptor_ws_b2c8e6212334433f, []int{42} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -3116,7 +3125,7 @@ func (m *FriendApplicationTips) Reset() { *m = FriendApplicationTips{} } func (m *FriendApplicationTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationTips) ProtoMessage() {} func (*FriendApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{43} + return fileDescriptor_ws_b2c8e6212334433f, []int{43} } func (m *FriendApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationTips.Unmarshal(m, b) @@ -3156,7 +3165,7 @@ func (m *FriendApplicationApprovedTips) Reset() { *m = FriendApplication func (m *FriendApplicationApprovedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationApprovedTips) ProtoMessage() {} func (*FriendApplicationApprovedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{44} + return fileDescriptor_ws_b2c8e6212334433f, []int{44} } func (m *FriendApplicationApprovedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationApprovedTips.Unmarshal(m, b) @@ -3203,7 +3212,7 @@ func (m *FriendApplicationRejectedTips) Reset() { *m = FriendApplication func (m *FriendApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationRejectedTips) ProtoMessage() {} func (*FriendApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{45} + return fileDescriptor_ws_b2c8e6212334433f, []int{45} } func (m *FriendApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationRejectedTips.Unmarshal(m, b) @@ -3251,7 +3260,7 @@ func (m *FriendAddedTips) Reset() { *m = FriendAddedTips{} } func (m *FriendAddedTips) String() string { return proto.CompactTextString(m) } func (*FriendAddedTips) ProtoMessage() {} func (*FriendAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{46} + return fileDescriptor_ws_b2c8e6212334433f, []int{46} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -3304,7 +3313,7 @@ func (m *FriendDeletedTips) Reset() { *m = FriendDeletedTips{} } func (m *FriendDeletedTips) String() string { return proto.CompactTextString(m) } func (*FriendDeletedTips) ProtoMessage() {} func (*FriendDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{47} + return fileDescriptor_ws_b2c8e6212334433f, []int{47} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -3342,7 +3351,7 @@ func (m *BlackAddedTips) Reset() { *m = BlackAddedTips{} } func (m *BlackAddedTips) String() string { return proto.CompactTextString(m) } func (*BlackAddedTips) ProtoMessage() {} func (*BlackAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{48} + return fileDescriptor_ws_b2c8e6212334433f, []int{48} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -3380,7 +3389,7 @@ func (m *BlackDeletedTips) Reset() { *m = BlackDeletedTips{} } func (m *BlackDeletedTips) String() string { return proto.CompactTextString(m) } func (*BlackDeletedTips) ProtoMessage() {} func (*BlackDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{49} + return fileDescriptor_ws_b2c8e6212334433f, []int{49} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -3418,7 +3427,7 @@ func (m *FriendInfoChangedTips) Reset() { *m = FriendInfoChangedTips{} } func (m *FriendInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*FriendInfoChangedTips) ProtoMessage() {} func (*FriendInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{50} + return fileDescriptor_ws_b2c8e6212334433f, []int{50} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -3457,7 +3466,7 @@ func (m *UserInfoUpdatedTips) Reset() { *m = UserInfoUpdatedTips{} } func (m *UserInfoUpdatedTips) String() string { return proto.CompactTextString(m) } func (*UserInfoUpdatedTips) ProtoMessage() {} func (*UserInfoUpdatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{51} + return fileDescriptor_ws_b2c8e6212334433f, []int{51} } func (m *UserInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfoUpdatedTips.Unmarshal(m, b) @@ -3496,7 +3505,7 @@ func (m *ConversationUpdateTips) Reset() { *m = ConversationUpdateTips{} func (m *ConversationUpdateTips) String() string { return proto.CompactTextString(m) } func (*ConversationUpdateTips) ProtoMessage() {} func (*ConversationUpdateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{52} + return fileDescriptor_ws_b2c8e6212334433f, []int{52} } func (m *ConversationUpdateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationUpdateTips.Unmarshal(m, b) @@ -3536,7 +3545,7 @@ func (m *ConversationSetPrivateTips) Reset() { *m = ConversationSetPriva func (m *ConversationSetPrivateTips) String() string { return proto.CompactTextString(m) } func (*ConversationSetPrivateTips) ProtoMessage() {} func (*ConversationSetPrivateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{53} + return fileDescriptor_ws_b2c8e6212334433f, []int{53} } func (m *ConversationSetPrivateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationSetPrivateTips.Unmarshal(m, b) @@ -3591,7 +3600,7 @@ func (m *DeleteMessageTips) Reset() { *m = DeleteMessageTips{} } func (m *DeleteMessageTips) String() string { return proto.CompactTextString(m) } func (*DeleteMessageTips) ProtoMessage() {} func (*DeleteMessageTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{54} + return fileDescriptor_ws_b2c8e6212334433f, []int{54} } func (m *DeleteMessageTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteMessageTips.Unmarshal(m, b) @@ -3645,7 +3654,7 @@ func (m *RequestPagination) Reset() { *m = RequestPagination{} } func (m *RequestPagination) String() string { return proto.CompactTextString(m) } func (*RequestPagination) ProtoMessage() {} func (*RequestPagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{55} + return fileDescriptor_ws_b2c8e6212334433f, []int{55} } func (m *RequestPagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RequestPagination.Unmarshal(m, b) @@ -3691,7 +3700,7 @@ func (m *ResponsePagination) Reset() { *m = ResponsePagination{} } func (m *ResponsePagination) String() string { return proto.CompactTextString(m) } func (*ResponsePagination) ProtoMessage() {} func (*ResponsePagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{56} + return fileDescriptor_ws_b2c8e6212334433f, []int{56} } func (m *ResponsePagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResponsePagination.Unmarshal(m, b) @@ -3744,7 +3753,7 @@ func (m *SignalReq) Reset() { *m = SignalReq{} } func (m *SignalReq) String() string { return proto.CompactTextString(m) } func (*SignalReq) ProtoMessage() {} func (*SignalReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{57} + return fileDescriptor_ws_b2c8e6212334433f, []int{57} } func (m *SignalReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalReq.Unmarshal(m, b) @@ -4011,7 +4020,7 @@ func (m *SignalResp) Reset() { *m = SignalResp{} } func (m *SignalResp) String() string { return proto.CompactTextString(m) } func (*SignalResp) ProtoMessage() {} func (*SignalResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{58} + return fileDescriptor_ws_b2c8e6212334433f, []int{58} } func (m *SignalResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalResp.Unmarshal(m, b) @@ -4280,7 +4289,7 @@ func (m *InvitationInfo) Reset() { *m = InvitationInfo{} } func (m *InvitationInfo) String() string { return proto.CompactTextString(m) } func (*InvitationInfo) ProtoMessage() {} func (*InvitationInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{59} + return fileDescriptor_ws_b2c8e6212334433f, []int{59} } func (m *InvitationInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InvitationInfo.Unmarshal(m, b) @@ -4383,7 +4392,7 @@ func (m *ParticipantMetaData) Reset() { *m = ParticipantMetaData{} } func (m *ParticipantMetaData) String() string { return proto.CompactTextString(m) } func (*ParticipantMetaData) ProtoMessage() {} func (*ParticipantMetaData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{60} + return fileDescriptor_ws_b2c8e6212334433f, []int{60} } func (m *ParticipantMetaData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ParticipantMetaData.Unmarshal(m, b) @@ -4438,7 +4447,7 @@ func (m *SignalInviteReq) Reset() { *m = SignalInviteReq{} } func (m *SignalInviteReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteReq) ProtoMessage() {} func (*SignalInviteReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{61} + return fileDescriptor_ws_b2c8e6212334433f, []int{61} } func (m *SignalInviteReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReq.Unmarshal(m, b) @@ -4499,7 +4508,7 @@ func (m *SignalInviteReply) Reset() { *m = SignalInviteReply{} } func (m *SignalInviteReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteReply) ProtoMessage() {} func (*SignalInviteReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{62} + return fileDescriptor_ws_b2c8e6212334433f, []int{62} } func (m *SignalInviteReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReply.Unmarshal(m, b) @@ -4554,7 +4563,7 @@ func (m *SignalInviteInGroupReq) Reset() { *m = SignalInviteInGroupReq{} func (m *SignalInviteInGroupReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReq) ProtoMessage() {} func (*SignalInviteInGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{63} + return fileDescriptor_ws_b2c8e6212334433f, []int{63} } func (m *SignalInviteInGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReq.Unmarshal(m, b) @@ -4615,7 +4624,7 @@ func (m *SignalInviteInGroupReply) Reset() { *m = SignalInviteInGroupRep func (m *SignalInviteInGroupReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReply) ProtoMessage() {} func (*SignalInviteInGroupReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{64} + return fileDescriptor_ws_b2c8e6212334433f, []int{64} } func (m *SignalInviteInGroupReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReply.Unmarshal(m, b) @@ -4670,7 +4679,7 @@ func (m *SignalCancelReq) Reset() { *m = SignalCancelReq{} } func (m *SignalCancelReq) String() string { return proto.CompactTextString(m) } func (*SignalCancelReq) ProtoMessage() {} func (*SignalCancelReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{65} + return fileDescriptor_ws_b2c8e6212334433f, []int{65} } func (m *SignalCancelReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReq.Unmarshal(m, b) @@ -4728,7 +4737,7 @@ func (m *SignalCancelReply) Reset() { *m = SignalCancelReply{} } func (m *SignalCancelReply) String() string { return proto.CompactTextString(m) } func (*SignalCancelReply) ProtoMessage() {} func (*SignalCancelReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{66} + return fileDescriptor_ws_b2c8e6212334433f, []int{66} } func (m *SignalCancelReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReply.Unmarshal(m, b) @@ -4763,7 +4772,7 @@ func (m *SignalAcceptReq) Reset() { *m = SignalAcceptReq{} } func (m *SignalAcceptReq) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReq) ProtoMessage() {} func (*SignalAcceptReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{67} + return fileDescriptor_ws_b2c8e6212334433f, []int{67} } func (m *SignalAcceptReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReq.Unmarshal(m, b) @@ -4831,7 +4840,7 @@ func (m *SignalAcceptReply) Reset() { *m = SignalAcceptReply{} } func (m *SignalAcceptReply) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReply) ProtoMessage() {} func (*SignalAcceptReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{68} + return fileDescriptor_ws_b2c8e6212334433f, []int{68} } func (m *SignalAcceptReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReply.Unmarshal(m, b) @@ -4885,7 +4894,7 @@ func (m *SignalHungUpReq) Reset() { *m = SignalHungUpReq{} } func (m *SignalHungUpReq) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReq) ProtoMessage() {} func (*SignalHungUpReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{69} + return fileDescriptor_ws_b2c8e6212334433f, []int{69} } func (m *SignalHungUpReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReq.Unmarshal(m, b) @@ -4936,7 +4945,7 @@ func (m *SignalHungUpReply) Reset() { *m = SignalHungUpReply{} } func (m *SignalHungUpReply) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReply) ProtoMessage() {} func (*SignalHungUpReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{70} + return fileDescriptor_ws_b2c8e6212334433f, []int{70} } func (m *SignalHungUpReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReply.Unmarshal(m, b) @@ -4971,7 +4980,7 @@ func (m *SignalRejectReq) Reset() { *m = SignalRejectReq{} } func (m *SignalRejectReq) String() string { return proto.CompactTextString(m) } func (*SignalRejectReq) ProtoMessage() {} func (*SignalRejectReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{71} + return fileDescriptor_ws_b2c8e6212334433f, []int{71} } func (m *SignalRejectReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReq.Unmarshal(m, b) @@ -5036,7 +5045,7 @@ func (m *SignalRejectReply) Reset() { *m = SignalRejectReply{} } func (m *SignalRejectReply) String() string { return proto.CompactTextString(m) } func (*SignalRejectReply) ProtoMessage() {} func (*SignalRejectReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{72} + return fileDescriptor_ws_b2c8e6212334433f, []int{72} } func (m *SignalRejectReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReply.Unmarshal(m, b) @@ -5070,7 +5079,7 @@ func (m *DelMsgListReq) Reset() { *m = DelMsgListReq{} } func (m *DelMsgListReq) String() string { return proto.CompactTextString(m) } func (*DelMsgListReq) ProtoMessage() {} func (*DelMsgListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{73} + return fileDescriptor_ws_b2c8e6212334433f, []int{73} } func (m *DelMsgListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListReq.Unmarshal(m, b) @@ -5130,7 +5139,7 @@ func (m *DelMsgListResp) Reset() { *m = DelMsgListResp{} } func (m *DelMsgListResp) String() string { return proto.CompactTextString(m) } func (*DelMsgListResp) ProtoMessage() {} func (*DelMsgListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_3940a0d922f4ad30, []int{74} + return fileDescriptor_ws_b2c8e6212334433f, []int{74} } func (m *DelMsgListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListResp.Unmarshal(m, b) @@ -5246,215 +5255,218 @@ func init() { proto.RegisterType((*DelMsgListResp)(nil), "server_api_params.DelMsgListResp") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_3940a0d922f4ad30) } - -var fileDescriptor_ws_3940a0d922f4ad30 = []byte{ - // 3298 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0x4d, 0x6c, 0x24, 0x57, - 0xf1, 0xff, 0x77, 0x8f, 0x67, 0xec, 0xa9, 0xf1, 0x67, 0xef, 0xc6, 0x99, 0xbf, 0xff, 0x9b, 0xfd, - 0x9b, 0x8e, 0x15, 0x42, 0x80, 0x4d, 0x94, 0x10, 0x09, 0xf2, 0xb1, 0xc8, 0x1f, 0xd9, 0x8f, 0x64, - 0xc7, 0x76, 0x7a, 0x76, 0x09, 0x22, 0x48, 0xa1, 0x3d, 0xfd, 0x3c, 0xee, 0xb8, 0xa7, 0xbb, 0xdd, - 0x1f, 0xde, 0x5d, 0x2e, 0x48, 0x41, 0x42, 0xdc, 0x38, 0x71, 0xe1, 0x82, 0xc4, 0x05, 0x81, 0xa2, - 0x08, 0x21, 0x90, 0x38, 0x20, 0x84, 0x10, 0x37, 0x2e, 0x20, 0x71, 0x41, 0xdc, 0x38, 0x73, 0xe5, - 0x80, 0x84, 0x04, 0x7a, 0x55, 0xaf, 0xbb, 0xdf, 0xeb, 0xee, 0xb1, 0x67, 0x2d, 0x2b, 0xbb, 0xd1, - 0x72, 0x9b, 0xaa, 0x7e, 0x55, 0xaf, 0x5e, 0xfd, 0xea, 0xbd, 0xaa, 0xf7, 0x31, 0xb0, 0x10, 0x3b, - 0x87, 0xef, 0xdd, 0x8d, 0x9f, 0xbf, 0x1b, 0x5f, 0x09, 0xa3, 0x20, 0x09, 0x8c, 0xa5, 0x98, 0x45, - 0xc7, 0x2c, 0x7a, 0xcf, 0x0e, 0xdd, 0xf7, 0x42, 0x3b, 0xb2, 0x47, 0xb1, 0xf9, 0x0f, 0x1d, 0xda, - 0xd7, 0xa3, 0x20, 0x0d, 0x6f, 0xfa, 0xfb, 0x81, 0xd1, 0x85, 0xe9, 0x21, 0x12, 0x5b, 0x5d, 0x6d, - 0x55, 0x7b, 0xb6, 0x6d, 0x65, 0xa4, 0x71, 0x09, 0xda, 0xf8, 0x73, 0xdb, 0x1e, 0xb1, 0xae, 0x8e, - 0xdf, 0x0a, 0x86, 0x61, 0xc2, 0xac, 0x1f, 0x24, 0xee, 0xbe, 0x3b, 0xb0, 0x13, 0x37, 0xf0, 0xbb, - 0x0d, 0x6c, 0xa0, 0xf0, 0x78, 0x1b, 0xd7, 0x4f, 0xa2, 0xc0, 0x49, 0x07, 0xd8, 0x66, 0x8a, 0xda, - 0xc8, 0x3c, 0xde, 0xff, 0xbe, 0x3d, 0x60, 0x77, 0xac, 0x5b, 0xdd, 0x26, 0xf5, 0x2f, 0x48, 0x63, - 0x15, 0x3a, 0xc1, 0x5d, 0x9f, 0x45, 0x77, 0x62, 0x16, 0xdd, 0xdc, 0xea, 0xb6, 0xf0, 0xab, 0xcc, - 0x32, 0x2e, 0x03, 0x0c, 0x22, 0x66, 0x27, 0xec, 0xb6, 0x3b, 0x62, 0xdd, 0xe9, 0x55, 0xed, 0xd9, - 0x39, 0x4b, 0xe2, 0x70, 0x0d, 0x23, 0x36, 0xda, 0x63, 0xd1, 0x66, 0x90, 0xfa, 0x49, 0x77, 0x06, - 0x1b, 0xc8, 0x2c, 0x63, 0x1e, 0x74, 0x76, 0xaf, 0xdb, 0x46, 0xd5, 0x3a, 0xbb, 0x67, 0x2c, 0x43, - 0x2b, 0x4e, 0xec, 0x24, 0x8d, 0xbb, 0xb0, 0xaa, 0x3d, 0xdb, 0xb4, 0x04, 0x65, 0xac, 0xc1, 0x1c, - 0xea, 0x0d, 0x32, 0x6b, 0x3a, 0x28, 0xa2, 0x32, 0x73, 0x8f, 0xdd, 0xbe, 0x1f, 0xb2, 0xee, 0x2c, - 0x2a, 0x28, 0x18, 0xe6, 0x5f, 0x74, 0xb8, 0x80, 0x7e, 0xef, 0xa1, 0x01, 0xd7, 0x52, 0xcf, 0x3b, - 0x05, 0x81, 0x65, 0x68, 0xa5, 0xd4, 0x1d, 0xb9, 0x5f, 0x50, 0xbc, 0x9f, 0x28, 0xf0, 0xd8, 0x2d, - 0x76, 0xcc, 0x3c, 0x74, 0x7c, 0xd3, 0x2a, 0x18, 0xc6, 0x0a, 0xcc, 0xbc, 0x1f, 0xb8, 0x3e, 0xfa, - 0x64, 0x0a, 0x3f, 0xe6, 0x34, 0xff, 0xe6, 0xbb, 0x83, 0x43, 0x9f, 0x43, 0x4a, 0xee, 0xce, 0x69, - 0x19, 0x89, 0x96, 0x8a, 0xc4, 0x33, 0x30, 0x6f, 0x87, 0x61, 0xcf, 0xf6, 0x87, 0x2c, 0xa2, 0x4e, - 0xa7, 0x51, 0x6f, 0x89, 0xcb, 0xf1, 0xe0, 0x3d, 0xf5, 0x83, 0x34, 0x1a, 0x30, 0x74, 0x77, 0xd3, - 0x92, 0x38, 0x5c, 0x4f, 0x10, 0xb2, 0x48, 0x72, 0x23, 0x79, 0xbe, 0xc4, 0x15, 0xa8, 0x40, 0x8e, - 0x0a, 0xc7, 0x31, 0x4d, 0xd8, 0x1b, 0xbe, 0x83, 0x83, 0xea, 0x08, 0x1c, 0x0b, 0x96, 0xf9, 0x1d, - 0x0d, 0xe6, 0x77, 0xd3, 0x3d, 0xcf, 0x1d, 0xa0, 0x0a, 0xee, 0xd6, 0xc2, 0x79, 0x9a, 0xe2, 0x3c, - 0xd9, 0x05, 0xfa, 0x78, 0x17, 0x34, 0x54, 0x17, 0x2c, 0x43, 0x6b, 0xc8, 0x7c, 0x87, 0x45, 0xc2, - 0xa5, 0x82, 0x12, 0xa6, 0x36, 0x33, 0x53, 0xcd, 0xdf, 0xe9, 0x30, 0xf3, 0x31, 0x9b, 0xb0, 0x0a, - 0x9d, 0xf0, 0x20, 0xf0, 0xd9, 0x76, 0xca, 0xc3, 0x4a, 0xd8, 0x22, 0xb3, 0x8c, 0x8b, 0xd0, 0xdc, - 0x73, 0xa3, 0xe4, 0x00, 0x71, 0x9d, 0xb3, 0x88, 0xe0, 0x5c, 0x36, 0xb2, 0x5d, 0x02, 0xb3, 0x6d, - 0x11, 0x21, 0x06, 0x34, 0x93, 0xfb, 0x5e, 0x9d, 0x63, 0xed, 0xca, 0x1c, 0xab, 0xc6, 0x06, 0xd4, - 0xc6, 0xc6, 0x73, 0xb0, 0x38, 0xf4, 0x82, 0x3d, 0xdb, 0xb3, 0xd8, 0xe0, 0xb8, 0x17, 0x0f, 0x77, - 0xc2, 0x04, 0x81, 0x6c, 0x5a, 0x15, 0xbe, 0xf9, 0x4f, 0x0d, 0xe0, 0x5a, 0xe4, 0x32, 0xdf, 0x41, - 0x37, 0x96, 0x16, 0x02, 0xad, 0xba, 0x10, 0x2c, 0x43, 0x2b, 0x62, 0x23, 0x3b, 0x3a, 0xcc, 0x26, - 0x0a, 0x51, 0x25, 0xe3, 0x1b, 0x15, 0xe3, 0x5f, 0x05, 0xd8, 0xc7, 0x7e, 0xb8, 0x1e, 0x74, 0x6b, - 0xe7, 0xc5, 0xff, 0xbb, 0x52, 0x59, 0x32, 0xaf, 0x64, 0x88, 0x5a, 0x52, 0x73, 0x3e, 0x0b, 0x6d, - 0xc7, 0x11, 0xc1, 0xde, 0xa4, 0x59, 0x98, 0x33, 0x6a, 0x62, 0xbd, 0x75, 0x42, 0xac, 0x4f, 0xe7, - 0x01, 0xf4, 0x77, 0x0d, 0xda, 0x1b, 0x9e, 0x3d, 0x38, 0x9c, 0x70, 0xe8, 0xea, 0x10, 0xf5, 0xca, - 0x10, 0xaf, 0xc3, 0xdc, 0x1e, 0x57, 0x97, 0x0d, 0x01, 0xbd, 0xd0, 0x79, 0xf1, 0x53, 0x35, 0xa3, - 0x54, 0x27, 0x90, 0xa5, 0xca, 0xa9, 0xc3, 0x9d, 0x3a, 0x7d, 0xb8, 0xcd, 0x13, 0x86, 0xdb, 0xca, - 0x87, 0xfb, 0x27, 0x1d, 0x66, 0x71, 0x51, 0xb4, 0xd8, 0x51, 0xca, 0xe2, 0xc4, 0x78, 0x1d, 0x66, - 0xd2, 0xcc, 0x54, 0x6d, 0x52, 0x53, 0x73, 0x11, 0xe3, 0x15, 0xb1, 0x04, 0xa3, 0xbc, 0x8e, 0xf2, - 0x97, 0x6a, 0xe4, 0xf3, 0xfc, 0x67, 0x15, 0xcd, 0x79, 0xba, 0x3a, 0xb0, 0x7d, 0xc7, 0x63, 0x16, - 0x8b, 0x53, 0x2f, 0x11, 0x2b, 0xab, 0xc2, 0xa3, 0x48, 0x3b, 0xea, 0xc5, 0x43, 0x91, 0xcc, 0x04, - 0xc5, 0xbd, 0x43, 0xed, 0xf8, 0x27, 0x1a, 0x7a, 0xc1, 0xe0, 0x93, 0x3a, 0x62, 0x47, 0x88, 0x10, - 0x4d, 0xc1, 0x8c, 0x2c, 0xfa, 0x14, 0x5e, 0xa3, 0x40, 0x50, 0x78, 0x1c, 0x62, 0xa2, 0x51, 0x01, - 0x65, 0x31, 0x89, 0x53, 0x4e, 0x62, 0xe6, 0x5f, 0x1b, 0x30, 0x47, 0xd3, 0x27, 0x73, 0xea, 0x65, - 0x1e, 0xe7, 0xc1, 0x48, 0x89, 0x22, 0x89, 0xc3, 0xad, 0xe0, 0xd4, 0xb6, 0xba, 0x28, 0x29, 0x3c, - 0x1e, 0x8a, 0x9c, 0xbe, 0xa6, 0x2c, 0x4e, 0x32, 0x2b, 0xeb, 0xe5, 0xba, 0xbc, 0x48, 0x49, 0x1c, - 0xbe, 0xec, 0x25, 0x81, 0x12, 0x1d, 0x39, 0xcd, 0x65, 0x93, 0x20, 0xef, 0x9f, 0xe2, 0x43, 0xe2, - 0x70, 0xff, 0x26, 0x41, 0xd6, 0x37, 0x39, 0xa9, 0x60, 0x90, 0x66, 0xd1, 0x2f, 0xa5, 0x9d, 0x9c, - 0xae, 0xa0, 0xda, 0x3e, 0x11, 0x55, 0x50, 0x50, 0x55, 0x27, 0x57, 0xa7, 0x32, 0xb9, 0xd6, 0x60, - 0x8e, 0xf4, 0x64, 0x41, 0x3f, 0x4b, 0x65, 0x81, 0xc2, 0x54, 0x63, 0x63, 0xae, 0x1c, 0x1b, 0x2a, - 0xba, 0xf3, 0x63, 0xd0, 0x5d, 0xc8, 0xd1, 0xfd, 0xb9, 0x0e, 0xb0, 0xc5, 0x42, 0x3b, 0x4a, 0x46, - 0xcc, 0x4f, 0xf8, 0xf0, 0x9c, 0x9c, 0xca, 0xc1, 0x55, 0x78, 0x72, 0x4e, 0xd1, 0xd5, 0x9c, 0x62, - 0xc0, 0x14, 0x3a, 0x9c, 0xd0, 0xc4, 0xdf, 0xdc, 0x99, 0xa1, 0x1d, 0x91, 0x36, 0x0a, 0xf2, 0x9c, - 0xe6, 0x39, 0x23, 0x88, 0x1c, 0x91, 0x65, 0x9a, 0x16, 0x11, 0x7c, 0xf2, 0x17, 0xfd, 0x61, 0xf1, - 0xd3, 0xa2, 0x1c, 0xa0, 0x72, 0x4f, 0xad, 0xd7, 0x9e, 0x83, 0xc5, 0x38, 0xdd, 0x2b, 0x06, 0xb7, - 0x9d, 0x8e, 0x44, 0xb8, 0x57, 0xf8, 0xdc, 0xa9, 0x54, 0xc8, 0xf1, 0x46, 0x94, 0x96, 0x0a, 0x46, - 0xb9, 0x82, 0x30, 0x3f, 0xd4, 0x61, 0x71, 0x27, 0x1a, 0xda, 0xbe, 0xfb, 0x4d, 0x2c, 0x4d, 0x71, - 0x01, 0x3f, 0x4b, 0x7a, 0x5e, 0x85, 0x0e, 0xf3, 0x87, 0x9e, 0x1b, 0x1f, 0x6c, 0x17, 0x7e, 0x93, - 0x59, 0xb2, 0xb3, 0xa7, 0xc6, 0x25, 0xf0, 0xa6, 0x92, 0xc0, 0x97, 0xa1, 0x35, 0x0a, 0xf6, 0x5c, - 0x2f, 0x8b, 0x7b, 0x41, 0x61, 0xcc, 0x33, 0x8f, 0x61, 0x26, 0xcf, 0x63, 0x3e, 0x63, 0x14, 0x49, - 0x7d, 0xa6, 0x36, 0xa9, 0xb7, 0xe5, 0xa4, 0xae, 0x3a, 0x1e, 0x2a, 0x8e, 0x27, 0x77, 0x75, 0x72, - 0x77, 0xfd, 0x56, 0x83, 0xc5, 0xc2, 0xdd, 0x54, 0xaf, 0x8e, 0x75, 0x57, 0x39, 0x02, 0xf5, 0x9a, - 0x08, 0xcc, 0xe3, 0xa6, 0x21, 0xc7, 0x0d, 0x8f, 0xb4, 0x20, 0x76, 0xa5, 0xbd, 0x41, 0x4e, 0xf3, - 0xde, 0x3c, 0x66, 0x4b, 0xce, 0x22, 0x4a, 0xaa, 0xd0, 0x5b, 0x4a, 0x85, 0x5e, 0xce, 0xa3, 0xbf, - 0xd2, 0xe0, 0x22, 0x47, 0xb9, 0x32, 0x8c, 0x1d, 0x58, 0x0c, 0x4a, 0x91, 0x20, 0x12, 0xcd, 0xd3, - 0x35, 0x89, 0xa2, 0x1c, 0x34, 0x56, 0x45, 0x98, 0x2b, 0x74, 0x4a, 0x9d, 0x88, 0xcc, 0x53, 0xa7, - 0xb0, 0x6c, 0x8f, 0x55, 0x11, 0x36, 0x7f, 0xad, 0xc1, 0x22, 0xa5, 0x36, 0x69, 0x9e, 0x9f, 0xbb, - 0xd9, 0xef, 0xc0, 0xc5, 0x72, 0xcf, 0xb7, 0xdc, 0x38, 0xe9, 0xea, 0xab, 0x8d, 0x49, 0x4d, 0xaf, - 0x55, 0xc0, 0xe7, 0xda, 0x93, 0xbb, 0xa9, 0xe7, 0xf5, 0x58, 0x1c, 0xdb, 0x43, 0xb6, 0x71, 0xbf, - 0xcf, 0x8e, 0xf8, 0x07, 0x8b, 0x1d, 0x8d, 0x8d, 0x21, 0x5e, 0xe7, 0x60, 0xa1, 0xe0, 0x06, 0x7e, - 0x1e, 0x42, 0x32, 0x8b, 0x4f, 0xab, 0x98, 0xf4, 0x74, 0x1b, 0xab, 0x0d, 0x9e, 0x42, 0x05, 0x69, - 0x7c, 0x03, 0x66, 0x31, 0x87, 0x8b, 0x6e, 0xba, 0x53, 0x38, 0x80, 0xd7, 0x6a, 0xab, 0x86, 0x5a, - 0xab, 0xa8, 0x1a, 0x10, 0xf4, 0x1b, 0x7e, 0x12, 0xdd, 0xb7, 0x14, 0x8d, 0x2b, 0xef, 0xc2, 0x52, - 0xa5, 0x89, 0xb1, 0x08, 0x8d, 0x43, 0x76, 0x5f, 0x8c, 0x83, 0xff, 0x34, 0x5e, 0x80, 0xe6, 0xb1, - 0xed, 0xa5, 0x4c, 0xa0, 0xbf, 0x52, 0x63, 0x81, 0xb0, 0xd9, 0xa2, 0x86, 0xaf, 0xe8, 0x5f, 0xd4, - 0xcc, 0xa7, 0xf3, 0x81, 0xc9, 0x63, 0xd4, 0x94, 0x31, 0x9a, 0x6f, 0x41, 0xa7, 0x17, 0x0f, 0xb7, - 0xec, 0xc4, 0xc6, 0x86, 0xaf, 0x41, 0x67, 0x54, 0x90, 0xd8, 0xb8, 0xbe, 0x3f, 0x21, 0x64, 0xc9, - 0xcd, 0xcd, 0x3f, 0xea, 0xd0, 0xad, 0x77, 0x45, 0x1c, 0x72, 0x1b, 0x58, 0x14, 0x6d, 0x06, 0x0e, - 0xc3, 0xa1, 0x35, 0xad, 0x8c, 0xe4, 0xd8, 0xb1, 0x28, 0xe2, 0x39, 0x4c, 0x14, 0xd9, 0x44, 0x19, - 0x57, 0x60, 0xca, 0xcb, 0x60, 0x39, 0xd9, 0x0a, 0x6c, 0x67, 0x8c, 0x60, 0x11, 0xbd, 0x2b, 0x0d, - 0x48, 0x60, 0xb6, 0x3e, 0x31, 0x66, 0x71, 0x48, 0xa0, 0x49, 0x3a, 0x08, 0xb8, 0x8a, 0xea, 0x95, - 0x01, 0x3c, 0x51, 0xdb, 0xb4, 0x06, 0xc0, 0x2f, 0xa8, 0x00, 0x5e, 0x1e, 0x3f, 0x94, 0x32, 0x88, - 0x21, 0x18, 0xd7, 0x59, 0xd2, 0xb3, 0xef, 0xad, 0xfb, 0x4e, 0xcf, 0xf5, 0xfb, 0xec, 0x88, 0x47, - 0xfb, 0x2a, 0x74, 0xc4, 0x56, 0x3e, 0x87, 0xa9, 0x6d, 0xc9, 0xac, 0xb1, 0x3b, 0xfc, 0xd2, 0x7c, - 0x68, 0x54, 0xe6, 0x83, 0x79, 0x15, 0x66, 0xe5, 0xee, 0x30, 0x89, 0xd8, 0xf7, 0xfa, 0xec, 0x08, - 0x07, 0x34, 0x67, 0x09, 0x0a, 0xf9, 0xd8, 0x42, 0xec, 0x0d, 0x04, 0x65, 0xfe, 0x41, 0x87, 0x0b, - 0x15, 0x93, 0xe3, 0xf0, 0x41, 0xf5, 0xc8, 0xf1, 0xd2, 0x18, 0x17, 0x2f, 0x53, 0x4a, 0xbc, 0x1c, - 0xc2, 0x12, 0x81, 0x24, 0x75, 0xdd, 0x6d, 0x62, 0x00, 0xbc, 0x5e, 0x57, 0xaa, 0x57, 0x8d, 0x14, - 0xd8, 0x4b, 0x5c, 0x02, 0xbf, 0xaa, 0x77, 0x85, 0xc1, 0x72, 0x7d, 0xe3, 0x1a, 0xf8, 0x5f, 0x56, - 0xe1, 0xff, 0xff, 0x3a, 0xf8, 0x65, 0x4b, 0x24, 0xfc, 0x8f, 0x60, 0x81, 0x2f, 0xaa, 0x7d, 0xe6, - 0x3b, 0xbd, 0x78, 0x88, 0x8e, 0x5c, 0x85, 0x0e, 0xc9, 0xf7, 0xe2, 0x61, 0xb1, 0x75, 0x93, 0x58, - 0xbc, 0xc5, 0xc0, 0x73, 0xf9, 0xe2, 0x89, 0x2d, 0xc4, 0xa2, 0x27, 0xb1, 0x78, 0x82, 0x8c, 0x99, - 0x38, 0xf5, 0xe0, 0xde, 0x6d, 0x58, 0x39, 0x6d, 0x7e, 0xd0, 0x82, 0x69, 0x11, 0x8d, 0x98, 0x14, - 0xf9, 0x6e, 0x39, 0x5f, 0x56, 0x89, 0xa2, 0xba, 0x76, 0x70, 0x5c, 0x84, 0x17, 0x51, 0xf2, 0x91, - 0x53, 0x43, 0x3d, 0x72, 0x2a, 0xd9, 0x34, 0x55, 0xb5, 0xa9, 0x34, 0xae, 0x66, 0x75, 0x5c, 0xbc, - 0x8c, 0xc3, 0xca, 0x66, 0xd7, 0xb3, 0x93, 0xfd, 0x20, 0x1a, 0x89, 0xcd, 0x6f, 0xd3, 0xaa, 0xf0, - 0x79, 0xe9, 0x48, 0xbc, 0xbc, 0xf6, 0xa7, 0x14, 0x5e, 0xe2, 0xf2, 0x4a, 0x9b, 0x38, 0xd9, 0x1e, - 0x80, 0x4e, 0x28, 0x54, 0x26, 0xd9, 0x16, 0xc7, 0x6e, 0xe0, 0x63, 0x15, 0x4a, 0xa5, 0xbe, 0xcc, - 0xe2, 0x23, 0x1f, 0xc5, 0xc3, 0x6b, 0x51, 0x30, 0x12, 0xe7, 0x14, 0x19, 0x89, 0x23, 0x0f, 0xfc, - 0x24, 0xab, 0x60, 0xe9, 0x6c, 0x42, 0x66, 0x71, 0x59, 0x41, 0x62, 0x9d, 0x3f, 0x6b, 0x65, 0x24, - 0x8f, 0xa5, 0x98, 0x1d, 0x89, 0xe2, 0x9d, 0xff, 0x54, 0x90, 0x5b, 0x50, 0x91, 0x2b, 0x55, 0x63, - 0x8b, 0xf8, 0x55, 0xae, 0xc6, 0x8a, 0x12, 0x67, 0x49, 0x29, 0x71, 0xd6, 0x61, 0x3a, 0x08, 0xf9, - 0xf4, 0x8f, 0xbb, 0x06, 0x4e, 0x97, 0x4f, 0x8f, 0x5f, 0xa0, 0xae, 0xec, 0x50, 0x4b, 0x9a, 0x18, - 0x99, 0x9c, 0x71, 0x0b, 0x16, 0x82, 0xfd, 0x7d, 0xcf, 0xf5, 0xd9, 0x6e, 0x1a, 0x1f, 0xe0, 0x26, - 0xf9, 0x02, 0x06, 0xbb, 0x59, 0x57, 0x44, 0xa8, 0x2d, 0xad, 0xb2, 0x28, 0xaf, 0xfc, 0xec, 0x84, - 0x36, 0x39, 0xb8, 0xc0, 0x5d, 0xc4, 0x05, 0x4e, 0xe1, 0xe1, 0xd9, 0x9d, 0xb4, 0xd0, 0x3f, 0x81, - 0x8e, 0x93, 0x59, 0x2b, 0xaf, 0xc0, 0xac, 0x6c, 0x6c, 0xcd, 0xc4, 0xbc, 0x28, 0x4f, 0xcc, 0x19, - 0x79, 0xde, 0x7d, 0x5f, 0x83, 0x85, 0x92, 0x99, 0xbc, 0x75, 0xe2, 0x26, 0x1e, 0x13, 0x1a, 0x88, - 0xe0, 0x3b, 0x1d, 0x87, 0xc5, 0x03, 0x31, 0x11, 0xf0, 0xb7, 0xa8, 0x19, 0x1b, 0xf9, 0x59, 0x97, - 0x09, 0xb3, 0xee, 0x4e, 0x9f, 0x2b, 0xea, 0x07, 0xa9, 0xef, 0xe4, 0xe7, 0xd5, 0x12, 0x8f, 0x07, - 0xa2, 0xbb, 0xd3, 0xdf, 0xb0, 0x9d, 0x21, 0xa3, 0x53, 0xe5, 0x26, 0xda, 0xa4, 0x32, 0x4d, 0x07, - 0x66, 0x6e, 0xbb, 0x61, 0xbc, 0x19, 0x8c, 0x46, 0x1c, 0x4e, 0x87, 0x25, 0xbc, 0x26, 0xd7, 0x70, - 0xf0, 0x82, 0xe2, 0x9e, 0x71, 0xd8, 0xbe, 0x9d, 0x7a, 0x09, 0x6f, 0x9a, 0x4d, 0x7f, 0x89, 0x85, - 0xe7, 0xa9, 0x71, 0xe0, 0x6f, 0x91, 0x34, 0xd9, 0x29, 0x71, 0xcc, 0xdf, 0xeb, 0xb0, 0x88, 0xab, - 0xdb, 0x26, 0x06, 0x8f, 0x83, 0x42, 0x2f, 0x42, 0x13, 0x27, 0xb3, 0xa8, 0x0e, 0x4f, 0x3e, 0xfd, - 0xa0, 0xa6, 0xc6, 0x55, 0x68, 0x05, 0x21, 0x96, 0x94, 0xb4, 0xf4, 0x3d, 0x33, 0x4e, 0x48, 0x3d, - 0xba, 0xb6, 0x84, 0x94, 0x71, 0x0d, 0x60, 0x54, 0x54, 0x90, 0x54, 0x08, 0x4c, 0xaa, 0x43, 0x92, - 0xe4, 0xce, 0xcd, 0x73, 0x5c, 0x7e, 0x7e, 0xdd, 0xb0, 0x54, 0xa6, 0xb1, 0x0d, 0xf3, 0x68, 0xf6, - 0x4e, 0x76, 0x0c, 0x86, 0x18, 0x4c, 0xde, 0x63, 0x49, 0xda, 0xfc, 0x91, 0x26, 0xdc, 0xc8, 0xbf, - 0xf6, 0x19, 0xf9, 0xbe, 0x70, 0x89, 0x76, 0x26, 0x97, 0xac, 0xc0, 0xcc, 0x28, 0x95, 0x4e, 0xe5, - 0x1a, 0x56, 0x4e, 0x17, 0x10, 0x35, 0x26, 0x86, 0xc8, 0xfc, 0xb1, 0x06, 0xdd, 0x37, 0x03, 0xd7, - 0xc7, 0x0f, 0xeb, 0x61, 0xe8, 0x89, 0x4b, 0x96, 0x33, 0x63, 0xfe, 0x65, 0x68, 0xdb, 0xa4, 0xc6, - 0x4f, 0x04, 0xec, 0x13, 0x9c, 0xb4, 0x15, 0x32, 0xd2, 0xa1, 0x49, 0x43, 0x3e, 0x34, 0x31, 0x3f, - 0xd2, 0x60, 0x9e, 0x9c, 0xf2, 0x76, 0xea, 0x26, 0x67, 0xb6, 0x6f, 0x03, 0x66, 0x8e, 0x52, 0x37, - 0x39, 0x43, 0x54, 0xe6, 0x72, 0xd5, 0x78, 0x6a, 0xd4, 0xc4, 0x93, 0xf9, 0x33, 0x0d, 0x2e, 0x95, - 0xdd, 0xba, 0x3e, 0x18, 0xb0, 0xf0, 0x61, 0x4e, 0x29, 0xe5, 0xd0, 0x68, 0xaa, 0x74, 0x68, 0x54, - 0x6b, 0xb2, 0xc5, 0xde, 0x67, 0x83, 0x47, 0xd7, 0xe4, 0x6f, 0xeb, 0xf0, 0xbf, 0xd7, 0xf3, 0x89, - 0x77, 0x3b, 0xb2, 0xfd, 0x78, 0x9f, 0x45, 0xd1, 0x43, 0xb4, 0xf7, 0x16, 0xcc, 0xf9, 0xec, 0x6e, - 0x61, 0x93, 0x98, 0x8e, 0x93, 0xaa, 0x51, 0x85, 0x27, 0x5b, 0xbb, 0xcc, 0x7f, 0x69, 0xb0, 0x48, - 0x7a, 0xde, 0x72, 0x07, 0x87, 0x0f, 0x71, 0xf0, 0xdb, 0x30, 0x7f, 0x88, 0x16, 0x70, 0xea, 0x0c, - 0xcb, 0x76, 0x49, 0x7a, 0xc2, 0xe1, 0xff, 0x5b, 0x83, 0x25, 0x52, 0x74, 0xd3, 0x3f, 0x76, 0x1f, - 0x66, 0xb0, 0xee, 0xc2, 0x82, 0x4b, 0x26, 0x9c, 0xd1, 0x01, 0x65, 0xf1, 0x09, 0x3d, 0xf0, 0x4b, - 0x0d, 0x16, 0x48, 0xd3, 0x1b, 0x7e, 0xc2, 0xa2, 0x33, 0x8f, 0xff, 0x06, 0x74, 0x98, 0x9f, 0x44, - 0xb6, 0x7f, 0x96, 0x15, 0x52, 0x16, 0x9d, 0x70, 0x91, 0xfc, 0x48, 0x03, 0x03, 0x55, 0x6d, 0xb9, - 0xf1, 0xc8, 0x8d, 0xe3, 0x87, 0x08, 0xdd, 0x64, 0x06, 0xff, 0x40, 0x87, 0x8b, 0x92, 0x96, 0x5e, - 0x9a, 0x3c, 0xea, 0x26, 0x1b, 0x5b, 0xd0, 0xe6, 0x35, 0x82, 0x7c, 0x1b, 0x39, 0x69, 0x47, 0x85, - 0x20, 0xaf, 0x62, 0x91, 0xe8, 0xb3, 0x41, 0xe0, 0x3b, 0x31, 0x16, 0x47, 0x73, 0x96, 0xc2, 0xe3, - 0xcb, 0xd0, 0x8a, 0xa4, 0x66, 0xd3, 0xf6, 0x07, 0xcc, 0x7b, 0x6c, 0x5c, 0x64, 0xfe, 0x54, 0x83, - 0x79, 0x6a, 0xf2, 0xe8, 0x0f, 0x99, 0xe7, 0x7a, 0x0a, 0xe4, 0x4f, 0x0c, 0x4a, 0x3c, 0xbc, 0x96, - 0x25, 0x2d, 0x72, 0x5d, 0xfd, 0xe8, 0x86, 0xd6, 0x0d, 0xe8, 0x0c, 0x0e, 0x6c, 0x7f, 0x78, 0xa6, - 0xe0, 0x92, 0x45, 0xcd, 0x04, 0x9e, 0x94, 0x0f, 0xe0, 0x37, 0xe9, 0x13, 0x0e, 0xff, 0xa5, 0xd2, - 0x50, 0x4e, 0x7c, 0x6d, 0xf0, 0x60, 0x4e, 0x3f, 0x84, 0x25, 0xba, 0xf5, 0x95, 0x6a, 0x42, 0xa3, - 0x0b, 0xd3, 0xb6, 0x43, 0xc7, 0x10, 0x1a, 0x0a, 0x65, 0xa4, 0x7a, 0x9f, 0x2f, 0x9e, 0x77, 0x15, - 0xf7, 0xf9, 0x97, 0x01, 0x6c, 0xc7, 0x79, 0x27, 0x88, 0x1c, 0xd7, 0xcf, 0x0a, 0x7c, 0x89, 0x63, - 0xbe, 0x09, 0xb3, 0xd7, 0xa2, 0x60, 0x74, 0x5b, 0xba, 0xbf, 0x3d, 0xf1, 0x86, 0x59, 0xbe, 0xfb, - 0xd5, 0xd5, 0xbb, 0x5f, 0xf3, 0xeb, 0xf0, 0x44, 0xc5, 0x70, 0x74, 0xd6, 0x26, 0x5d, 0x4b, 0x67, - 0x9d, 0x88, 0x90, 0xa9, 0x3b, 0x97, 0x93, 0x6d, 0xb1, 0x14, 0x21, 0xf3, 0x03, 0x0d, 0x9e, 0xaa, - 0xa8, 0x5f, 0x0f, 0xc3, 0x28, 0x38, 0x16, 0x98, 0x9c, 0x47, 0x37, 0x6a, 0xf1, 0xab, 0x97, 0x8b, - 0xdf, 0x5a, 0x23, 0x94, 0x82, 0xfd, 0x63, 0x30, 0xe2, 0x27, 0x1a, 0x2c, 0x08, 0x23, 0x1c, 0x47, - 0x74, 0xfb, 0x32, 0xb4, 0xe8, 0x49, 0x8b, 0xe8, 0xf0, 0xa9, 0xda, 0x0e, 0xb3, 0xa7, 0x38, 0x96, - 0x68, 0x5c, 0x8d, 0x48, 0xbd, 0x6e, 0x46, 0x7d, 0x29, 0x0f, 0xf6, 0x89, 0x1f, 0x9d, 0x08, 0x01, - 0xf3, 0xab, 0x59, 0x30, 0x6f, 0x31, 0x8f, 0x9d, 0xa7, 0x8f, 0xcc, 0x3b, 0x30, 0x8f, 0xef, 0x6b, - 0x0a, 0x1f, 0x9c, 0x8b, 0xda, 0x77, 0x60, 0x11, 0xd5, 0x9e, 0xbb, 0xbd, 0xf9, 0xec, 0xe0, 0xfe, - 0x91, 0x97, 0x92, 0x73, 0xd1, 0xfe, 0x79, 0xb8, 0x90, 0xf9, 0xfe, 0x4e, 0xe8, 0xe4, 0x87, 0x48, - 0x63, 0xee, 0xe9, 0xcc, 0x17, 0x60, 0x79, 0x33, 0xf0, 0x8f, 0x59, 0x14, 0xd3, 0x45, 0x22, 0x8a, - 0x64, 0x12, 0xca, 0xe4, 0x17, 0x94, 0xf9, 0x3e, 0xac, 0xc8, 0x12, 0x7d, 0x96, 0xec, 0x46, 0xee, - 0xb1, 0x24, 0x25, 0x0e, 0xa8, 0x35, 0xe5, 0x80, 0xba, 0x38, 0xd0, 0xd6, 0x95, 0x03, 0xed, 0x4b, - 0xd0, 0x76, 0x63, 0xa1, 0x00, 0x83, 0x6a, 0xc6, 0x2a, 0x18, 0xa6, 0x0d, 0x4b, 0xe4, 0x7e, 0x71, - 0x61, 0x84, 0x5d, 0xac, 0xc0, 0x0c, 0xc5, 0x54, 0xde, 0x49, 0x4e, 0x8f, 0xbd, 0x7e, 0x19, 0x7b, - 0xd9, 0x68, 0xf6, 0x61, 0x49, 0x3c, 0xaa, 0xd9, 0xb5, 0x87, 0xae, 0x4f, 0x8b, 0xec, 0x65, 0x80, - 0xd0, 0x1e, 0x66, 0x0f, 0xf0, 0xe8, 0xda, 0x4c, 0xe2, 0xf0, 0xef, 0xf1, 0x41, 0x70, 0x57, 0x7c, - 0xd7, 0xe9, 0x7b, 0xc1, 0x31, 0xbf, 0x02, 0x86, 0xc5, 0xe2, 0x30, 0xf0, 0x63, 0x26, 0x69, 0x5d, - 0x85, 0xce, 0x66, 0x1a, 0x45, 0xcc, 0xe7, 0x5d, 0x65, 0x2f, 0xcc, 0x64, 0x16, 0xd7, 0xdb, 0x2f, - 0xf4, 0xd2, 0x11, 0xbb, 0xc4, 0x31, 0x7f, 0xd8, 0x80, 0x76, 0xdf, 0x1d, 0xfa, 0xb6, 0x67, 0xb1, - 0x23, 0xe3, 0x35, 0x68, 0xd1, 0x96, 0x45, 0x44, 0x4a, 0xdd, 0x91, 0x2f, 0xb5, 0xa6, 0xbd, 0x99, - 0xc5, 0x8e, 0x6e, 0xfc, 0x8f, 0x25, 0x64, 0x8c, 0xb7, 0x61, 0x8e, 0x7e, 0xdd, 0xa4, 0x23, 0x28, - 0x91, 0xbf, 0x3e, 0x73, 0x8a, 0x12, 0xd1, 0x9a, 0x74, 0xa9, 0x1a, 0xb8, 0x41, 0x03, 0x2c, 0x69, - 0xc4, 0xf2, 0x30, 0xde, 0x20, 0xaa, 0x7c, 0x84, 0x41, 0x24, 0xc3, 0xa5, 0x6d, 0x3c, 0xa4, 0x11, - 0x99, 0x7a, 0xbc, 0x34, 0x9d, 0xe5, 0x08, 0x69, 0x92, 0xe1, 0xd2, 0x07, 0xa9, 0x3f, 0xbc, 0x13, - 0x8a, 0xb3, 0xc3, 0xf1, 0xd2, 0x37, 0xb0, 0x99, 0x90, 0x26, 0x19, 0x2e, 0x1d, 0xe1, 0xe2, 0x8d, - 0x4e, 0x3f, 0x49, 0x9a, 0xd6, 0x78, 0x21, 0x4d, 0x32, 0x1b, 0x6d, 0x98, 0x0e, 0xed, 0xfb, 0x5e, - 0x60, 0x3b, 0xe6, 0x87, 0x0d, 0x80, 0xac, 0x61, 0x8c, 0x85, 0x8e, 0x02, 0xd1, 0xda, 0xa9, 0x10, - 0x85, 0xde, 0x7d, 0x09, 0xa4, 0x7e, 0x3d, 0x48, 0x9f, 0x9d, 0x14, 0x24, 0xd2, 0x56, 0x82, 0xe9, - 0x6a, 0x09, 0xa6, 0xb5, 0x53, 0x61, 0x12, 0x46, 0x09, 0xa0, 0xae, 0x96, 0x80, 0x5a, 0x3b, 0x15, - 0x28, 0x21, 0x2f, 0xa0, 0xba, 0x5a, 0x82, 0x6a, 0xed, 0x54, 0xa8, 0x84, 0xbc, 0x00, 0xeb, 0x6a, - 0x09, 0xac, 0xb5, 0x53, 0xc1, 0x12, 0xf2, 0x55, 0xb8, 0xfe, 0xac, 0xc3, 0x3c, 0xba, 0x8c, 0x6e, - 0x61, 0xfd, 0xfd, 0x00, 0xef, 0x03, 0xd0, 0x5d, 0xea, 0x1b, 0x4d, 0x95, 0x69, 0x7c, 0x0e, 0x96, - 0x88, 0xc1, 0xa4, 0xeb, 0x12, 0x1d, 0xaf, 0x4b, 0xaa, 0x1f, 0xf0, 0x82, 0x28, 0x8d, 0x93, 0x60, - 0xb4, 0x65, 0x27, 0x76, 0x56, 0x7c, 0x15, 0x1c, 0xf9, 0xfa, 0x6e, 0xaa, 0xf2, 0x62, 0x3c, 0x0a, - 0x82, 0x51, 0x7e, 0x2f, 0x27, 0x28, 0x2e, 0x91, 0xb8, 0x23, 0x16, 0xa4, 0x89, 0x58, 0x26, 0x32, - 0x92, 0xde, 0x51, 0x39, 0xae, 0x8d, 0x97, 0x5e, 0xe2, 0x91, 0x51, 0xce, 0xc0, 0x95, 0xad, 0xb8, - 0xc4, 0x13, 0x2f, 0xba, 0x0b, 0xce, 0x04, 0x17, 0x6e, 0xf8, 0x1f, 0x00, 0x37, 0x71, 0xe5, 0xc7, - 0x47, 0x4d, 0x4b, 0xe1, 0x99, 0x7f, 0xd3, 0xe0, 0xc2, 0xae, 0x1d, 0x25, 0xee, 0xc0, 0x0d, 0x6d, - 0x3f, 0xe9, 0xb1, 0xc4, 0xc6, 0x71, 0x2a, 0x8f, 0x39, 0xb5, 0x07, 0x7b, 0xcc, 0xb9, 0x0b, 0x0b, - 0x43, 0x75, 0x07, 0xf2, 0x80, 0x9b, 0x87, 0xb2, 0xb8, 0xf2, 0x32, 0xb5, 0xf1, 0xc0, 0x2f, 0x53, - 0xcd, 0xef, 0xea, 0xb0, 0x50, 0x5a, 0x5e, 0x4f, 0xcc, 0x4d, 0xeb, 0x00, 0x6e, 0x1e, 0x6a, 0x27, - 0x1c, 0xd0, 0xab, 0xf1, 0x68, 0x49, 0x42, 0x75, 0xb7, 0x7d, 0x8d, 0xb3, 0xdf, 0xf6, 0xdd, 0x80, - 0x4e, 0x58, 0x80, 0x74, 0xc2, 0xfe, 0xa8, 0x06, 0x4a, 0x4b, 0x16, 0x35, 0xdf, 0x85, 0xa5, 0xca, - 0x2a, 0x86, 0xd7, 0x76, 0xc1, 0x21, 0xf3, 0xf3, 0x6b, 0x3b, 0x4e, 0x48, 0x01, 0xad, 0x97, 0x03, - 0xda, 0x73, 0x8f, 0xe5, 0x67, 0xf2, 0x82, 0x34, 0xbf, 0xa7, 0xc3, 0x72, 0x7d, 0x06, 0x7a, 0x5c, - 0xdd, 0xbd, 0x07, 0xdd, 0x71, 0xab, 0xfd, 0xb9, 0x79, 0xbd, 0x88, 0xee, 0x3c, 0x57, 0x3f, 0xae, - 0xee, 0xbe, 0x90, 0x45, 0xb7, 0x94, 0x0e, 0xcd, 0x5f, 0xe4, 0xfe, 0xc9, 0xab, 0x91, 0xc7, 0xd4, - 0x3f, 0xc6, 0x73, 0xb0, 0x48, 0xc3, 0x94, 0x9e, 0x87, 0x50, 0x71, 0x5b, 0xe1, 0x17, 0x2b, 0x85, - 0x54, 0x1a, 0x9c, 0x5b, 0xcc, 0xfe, 0x46, 0xcb, 0x30, 0xc9, 0x6b, 0xbc, 0x4f, 0x14, 0x26, 0x45, - 0xa4, 0x49, 0x85, 0x8f, 0x14, 0x69, 0x79, 0xed, 0xf9, 0xdf, 0x48, 0x3b, 0x3d, 0xd2, 0x72, 0x5f, - 0x4a, 0x45, 0xa0, 0xf9, 0x2d, 0x98, 0xdb, 0x62, 0x5e, 0x2f, 0x1e, 0x66, 0xef, 0x57, 0xcf, 0x75, - 0x33, 0x59, 0x7e, 0xe5, 0x37, 0x55, 0x7d, 0xe5, 0xb7, 0x01, 0xf3, 0xb2, 0x01, 0x67, 0x79, 0x9f, - 0xb9, 0x71, 0xe9, 0x6b, 0x2b, 0x57, 0x9e, 0xa7, 0xff, 0x85, 0xbe, 0x5a, 0x71, 0xe2, 0x5e, 0x0b, - 0xff, 0x27, 0xfa, 0xd2, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xce, 0x12, 0x67, 0xe3, 0x3a, 0x3a, - 0x00, 0x00, +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_b2c8e6212334433f) } + +var fileDescriptor_ws_b2c8e6212334433f = []byte{ + // 3359 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcd, 0x6f, 0x24, 0x47, + 0x15, 0xa7, 0x7b, 0x3c, 0x63, 0xcf, 0x1b, 0x8f, 0x3d, 0xee, 0xdd, 0x38, 0x83, 0xd9, 0x2c, 0xa6, + 0x63, 0x25, 0x4b, 0x00, 0x6f, 0xb4, 0x21, 0x12, 0xe4, 0x63, 0x91, 0x3f, 0xb2, 0x1f, 0xc9, 0x8e, + 0xed, 0xf4, 0xec, 0x26, 0x88, 0x20, 0x2d, 0xed, 0xe9, 0xf2, 0xb8, 0xe3, 0x9e, 0xae, 0x76, 0x7f, + 0x78, 0x77, 0xb9, 0x20, 0x05, 0x09, 0x71, 0xe3, 0xc4, 0x85, 0x0b, 0x12, 0x17, 0x04, 0x8a, 0x22, + 0x84, 0x40, 0xe2, 0x80, 0x22, 0x84, 0xb8, 0x71, 0x01, 0x89, 0x0b, 0xe2, 0xc6, 0x99, 0x7f, 0x00, + 0x09, 0x09, 0x54, 0xaf, 0xaa, 0xbb, 0xab, 0xba, 0x7b, 0xec, 0x59, 0xcb, 0xca, 0x6e, 0xb4, 0xdc, + 0xe6, 0xbd, 0xae, 0xf7, 0xea, 0xd5, 0xfb, 0xbd, 0xaa, 0xf7, 0xea, 0x63, 0x60, 0x3e, 0x72, 0x0e, + 0xee, 0xde, 0x8b, 0x2e, 0xdf, 0x8b, 0x56, 0x83, 0x90, 0xc6, 0xd4, 0x58, 0x88, 0x48, 0x78, 0x44, + 0xc2, 0xbb, 0x76, 0xe0, 0xde, 0x0d, 0xec, 0xd0, 0x1e, 0x45, 0x4b, 0xcf, 0x6f, 0x07, 0xc4, 0xbf, + 0x7b, 0xb3, 0x77, 0x39, 0x38, 0x18, 0x5e, 0xc6, 0x56, 0x97, 0x53, 0xa9, 0xd0, 0x0e, 0x02, 0x12, + 0x0a, 0x59, 0xf3, 0xe3, 0x1a, 0x34, 0xaf, 0x87, 0x34, 0x09, 0x6e, 0xfa, 0x7b, 0xd4, 0xe8, 0xc2, + 0xf4, 0x10, 0x89, 0xcd, 0xae, 0xb6, 0xac, 0x5d, 0x6a, 0x5a, 0x29, 0x69, 0x5c, 0x80, 0x26, 0xfe, + 0xdc, 0xb2, 0x47, 0xa4, 0xab, 0xe3, 0xb7, 0x9c, 0x61, 0x98, 0x30, 0xeb, 0xd3, 0xd8, 0xdd, 0x73, + 0x07, 0x76, 0xec, 0x52, 0xbf, 0x5b, 0xc3, 0x06, 0x0a, 0x8f, 0xb5, 0x71, 0xfd, 0x38, 0xa4, 0x4e, + 0x32, 0xc0, 0x36, 0x53, 0xbc, 0x8d, 0xcc, 0x63, 0xfd, 0xef, 0xd9, 0x03, 0x72, 0xc7, 0xba, 0xd5, + 0xad, 0xf3, 0xfe, 0x05, 0x69, 0x2c, 0x43, 0x8b, 0xde, 0xf3, 0x49, 0x78, 0x27, 0x22, 0xe1, 0xcd, + 0xcd, 0x6e, 0x03, 0xbf, 0xca, 0x2c, 0xe3, 0x22, 0xc0, 0x20, 0x24, 0x76, 0x4c, 0x6e, 0xbb, 0x23, + 0xd2, 0x9d, 0x5e, 0xd6, 0x2e, 0xb5, 0x2d, 0x89, 0xc3, 0x34, 0x8c, 0xc8, 0x68, 0x97, 0x84, 0x1b, + 0x34, 0xf1, 0xe3, 0xee, 0x0c, 0x36, 0x90, 0x59, 0xc6, 0x1c, 0xe8, 0xe4, 0x7e, 0xb7, 0x89, 0xaa, + 0x75, 0x72, 0xdf, 0x58, 0x84, 0x46, 0x14, 0xdb, 0x71, 0x12, 0x75, 0x61, 0x59, 0xbb, 0x54, 0xb7, + 0x04, 0x65, 0xac, 0x40, 0x1b, 0xf5, 0xd2, 0xd4, 0x9a, 0x16, 0x8a, 0xa8, 0xcc, 0xcc, 0x63, 0xb7, + 0x1f, 0x04, 0xa4, 0x3b, 0x8b, 0x0a, 0x72, 0x86, 0x71, 0x1d, 0x3a, 0x3e, 0x21, 0xce, 0x3b, 0x24, + 0xcc, 0xbd, 0xd6, 0x5e, 0xd6, 0x2e, 0xb5, 0xae, 0x7c, 0x6e, 0x75, 0x48, 0xe9, 0xd0, 0x23, 0x1c, + 0xa0, 0xdd, 0x64, 0x6f, 0xf5, 0xa6, 0x1f, 0xbf, 0x74, 0xe5, 0x1d, 0xdb, 0x4b, 0x88, 0x55, 0x12, + 0x32, 0xff, 0xae, 0xc3, 0x39, 0x04, 0xb0, 0x87, 0x23, 0xb9, 0x96, 0x78, 0xde, 0x09, 0x50, 0x2e, + 0x42, 0x23, 0xe1, 0x76, 0x73, 0x1c, 0x05, 0xc5, 0x0c, 0x0e, 0xa9, 0x47, 0x6e, 0x91, 0x23, 0xe2, + 0x21, 0x82, 0x75, 0x2b, 0x67, 0x18, 0x4b, 0x30, 0xf3, 0x3e, 0x75, 0x7d, 0x74, 0xee, 0x14, 0x7e, + 0xcc, 0x68, 0xf6, 0xcd, 0x77, 0x07, 0x07, 0x3e, 0x8b, 0x0d, 0x8e, 0x5b, 0x46, 0xcb, 0x90, 0x36, + 0x54, 0x48, 0x9f, 0x83, 0x39, 0x3b, 0x08, 0x7a, 0xb6, 0x3f, 0x24, 0x21, 0xef, 0x74, 0x1a, 0xf5, + 0x16, 0xb8, 0x0c, 0x58, 0xd6, 0x53, 0x9f, 0x26, 0xe1, 0x80, 0x20, 0x6e, 0x75, 0x4b, 0xe2, 0x30, + 0x3d, 0x34, 0x20, 0xa1, 0x84, 0x07, 0x87, 0xb0, 0xc0, 0x15, 0xf0, 0x42, 0x06, 0x2f, 0x0b, 0x88, + 0x24, 0x26, 0x6f, 0xf8, 0x0e, 0x0e, 0xaa, 0x25, 0x02, 0x22, 0x67, 0x99, 0x3f, 0xd0, 0x60, 0x6e, + 0x27, 0xd9, 0xf5, 0xdc, 0x01, 0xaa, 0x60, 0x6e, 0xcd, 0x9d, 0xa7, 0x29, 0xce, 0x93, 0x5d, 0xa0, + 0x8f, 0x77, 0x41, 0x4d, 0x75, 0xc1, 0x22, 0x34, 0x86, 0xc4, 0x77, 0x48, 0x28, 0x5c, 0x2a, 0x28, + 0x61, 0x6a, 0x3d, 0x35, 0xd5, 0xfc, 0xa3, 0x0e, 0x33, 0x9f, 0xb0, 0x09, 0xcb, 0xd0, 0x0a, 0xf6, + 0xa9, 0x4f, 0xb6, 0x12, 0x16, 0x56, 0xc2, 0x16, 0x99, 0x65, 0x9c, 0x87, 0xfa, 0xae, 0x1b, 0xc6, + 0xfb, 0x88, 0x6b, 0xdb, 0xe2, 0x04, 0xe3, 0x92, 0x91, 0xed, 0x72, 0x30, 0x9b, 0x16, 0x27, 0xc4, + 0x80, 0x66, 0x32, 0xdf, 0xab, 0x93, 0xb5, 0x59, 0x9a, 0xac, 0xe5, 0xd8, 0x80, 0xca, 0xd8, 0x78, + 0x01, 0x3a, 0x43, 0x8f, 0xee, 0xda, 0x9e, 0x45, 0x06, 0x47, 0xbd, 0x68, 0xb8, 0x1d, 0xc4, 0x08, + 0x64, 0xdd, 0x2a, 0xf1, 0xcd, 0x7f, 0x6b, 0x00, 0xd7, 0x42, 0x97, 0xf8, 0x0e, 0xba, 0xb1, 0xb0, + 0xa2, 0x68, 0xe5, 0x15, 0x65, 0x11, 0x1a, 0x21, 0x19, 0xd9, 0xe1, 0x41, 0x3a, 0x51, 0x38, 0x55, + 0x30, 0xbe, 0x56, 0x32, 0xfe, 0x55, 0x80, 0x3d, 0xec, 0x87, 0xe9, 0x41, 0xb7, 0xb2, 0x59, 0x5d, + 0x5a, 0xa4, 0x57, 0x53, 0x44, 0x2d, 0xa9, 0x39, 0x9b, 0x85, 0xb6, 0xe3, 0x88, 0x60, 0xaf, 0xf3, + 0x59, 0x98, 0x31, 0x2a, 0x62, 0xbd, 0x71, 0x4c, 0xac, 0x4f, 0x67, 0x01, 0xf4, 0x2f, 0x0d, 0x9a, + 0xeb, 0x9e, 0x3d, 0x38, 0x98, 0x70, 0xe8, 0xea, 0x10, 0xf5, 0xd2, 0x10, 0xaf, 0x43, 0x7b, 0x97, + 0xa9, 0x4b, 0x87, 0x80, 0x5e, 0x68, 0x5d, 0xf9, 0x42, 0xc5, 0x28, 0xd5, 0x09, 0x64, 0xa9, 0x72, + 0xea, 0x70, 0xa7, 0x4e, 0x1e, 0x6e, 0xfd, 0x98, 0xe1, 0x36, 0xb2, 0xe1, 0xfe, 0x55, 0x87, 0x59, + 0x5c, 0x14, 0x2d, 0x72, 0x98, 0x90, 0x28, 0x36, 0x5e, 0x87, 0x99, 0x24, 0x35, 0x55, 0x9b, 0xd4, + 0xd4, 0x4c, 0xc4, 0x78, 0x45, 0xac, 0xe5, 0x28, 0xaf, 0xa3, 0xfc, 0x85, 0x0a, 0xf9, 0x2c, 0x91, + 0x5a, 0x79, 0x73, 0x96, 0xf7, 0xf6, 0x6d, 0xdf, 0xf1, 0x88, 0x45, 0xa2, 0xc4, 0x8b, 0xc5, 0xca, + 0xaa, 0xf0, 0x78, 0xa4, 0x1d, 0xf6, 0xa2, 0xa1, 0xc8, 0x8a, 0x82, 0x62, 0xde, 0xe1, 0xed, 0xd8, + 0x27, 0x3e, 0xf4, 0x9c, 0xc1, 0x26, 0x75, 0x48, 0x0e, 0x11, 0x21, 0x3e, 0x05, 0x53, 0x32, 0xef, + 0x53, 0x78, 0x8d, 0x07, 0x82, 0xc2, 0x63, 0x10, 0x73, 0x1a, 0x15, 0xf0, 0x74, 0x28, 0x71, 0x8a, + 0xd9, 0xd0, 0xfc, 0x47, 0x0d, 0xda, 0x7c, 0xfa, 0xa4, 0x4e, 0xbd, 0xc8, 0xe2, 0x9c, 0x8e, 0x94, + 0x28, 0x92, 0x38, 0xcc, 0x0a, 0x46, 0x6d, 0xa9, 0x8b, 0x92, 0xc2, 0x63, 0xa1, 0xc8, 0xe8, 0x6b, + 0xca, 0xe2, 0x24, 0xb3, 0xd2, 0x5e, 0xae, 0xcb, 0x8b, 0x94, 0xc4, 0x61, 0xcb, 0x5e, 0x4c, 0x95, + 0xe8, 0xc8, 0x68, 0x26, 0x1b, 0xd3, 0xac, 0x7f, 0x1e, 0x1f, 0x12, 0x87, 0xf9, 0x37, 0xa6, 0x69, + 0xdf, 0xdc, 0x49, 0x39, 0x83, 0x6b, 0x16, 0xfd, 0xf2, 0xb4, 0x93, 0xd1, 0x25, 0x54, 0x9b, 0xc7, + 0xa2, 0x0a, 0x0a, 0xaa, 0xea, 0xe4, 0x6a, 0x95, 0x26, 0xd7, 0x0a, 0xb4, 0xb9, 0x9e, 0x34, 0xe8, + 0x67, 0x79, 0x7d, 0xa1, 0x30, 0xd5, 0xd8, 0x68, 0x17, 0x63, 0x43, 0x45, 0x77, 0x6e, 0x0c, 0xba, + 0xf3, 0x19, 0xba, 0xbf, 0xd6, 0x01, 0x36, 0x49, 0x60, 0x87, 0xf1, 0x88, 0xf8, 0x31, 0x1b, 0x9e, + 0x93, 0x51, 0x19, 0xb8, 0x0a, 0x4f, 0xce, 0x29, 0xba, 0x9a, 0x53, 0x0c, 0x98, 0x42, 0x87, 0x73, + 0x34, 0xf1, 0x37, 0x73, 0x66, 0x60, 0x87, 0x5c, 0x1b, 0x0f, 0xf2, 0x8c, 0x66, 0x39, 0x83, 0x86, + 0x8e, 0xc8, 0x32, 0x75, 0x8b, 0x13, 0x6c, 0xf2, 0xe7, 0xfd, 0x61, 0x15, 0xd5, 0xe0, 0x39, 0x40, + 0xe5, 0x9e, 0x58, 0xf8, 0xbd, 0x00, 0x9d, 0x28, 0xd9, 0xcd, 0x07, 0xb7, 0x95, 0x8c, 0x44, 0xb8, + 0x97, 0xf8, 0xcc, 0xa9, 0xbc, 0x22, 0x64, 0x8d, 0x78, 0x5a, 0xca, 0x19, 0xc5, 0x0a, 0xc2, 0xfc, + 0x50, 0x87, 0xce, 0x76, 0x38, 0xb4, 0x7d, 0xf7, 0xbb, 0x58, 0x8c, 0xe1, 0x02, 0x7e, 0x9a, 0xf4, + 0xbc, 0x0c, 0x2d, 0xe2, 0x0f, 0x3d, 0x37, 0xda, 0xdf, 0xca, 0xfd, 0x26, 0xb3, 0x64, 0x67, 0x4f, + 0x8d, 0x4b, 0xe0, 0x75, 0x25, 0x81, 0x2f, 0x42, 0x63, 0x44, 0x77, 0x5d, 0x2f, 0x8d, 0x7b, 0x41, + 0x61, 0xcc, 0x13, 0x8f, 0x60, 0x26, 0xcf, 0x62, 0x3e, 0x65, 0xe4, 0x49, 0x7d, 0xa6, 0x32, 0xa9, + 0x37, 0xe5, 0xa4, 0xae, 0x3a, 0x1e, 0x4a, 0x8e, 0xe7, 0xee, 0x6a, 0x65, 0xee, 0xfa, 0x83, 0x06, + 0x9d, 0xdc, 0xdd, 0xbc, 0x5e, 0x1d, 0xeb, 0xae, 0x62, 0x04, 0xea, 0x15, 0x11, 0x98, 0xc5, 0x4d, + 0x4d, 0x8e, 0x1b, 0x16, 0x69, 0x34, 0x72, 0xa5, 0x4d, 0x46, 0x46, 0xb3, 0xde, 0x3c, 0x62, 0x4b, + 0xce, 0xe2, 0x94, 0x54, 0xea, 0x37, 0x94, 0x52, 0xbf, 0x98, 0x47, 0x7f, 0xa7, 0xc1, 0x79, 0x86, + 0x72, 0x69, 0x18, 0xdb, 0xd0, 0xa1, 0x85, 0x48, 0x10, 0x89, 0xe6, 0xd9, 0x8a, 0x44, 0x51, 0x0c, + 0x1a, 0xab, 0x24, 0xcc, 0x14, 0x3a, 0x85, 0x4e, 0x44, 0xe6, 0xa9, 0x52, 0x58, 0xb4, 0xc7, 0x2a, + 0x09, 0x9b, 0xbf, 0xd7, 0xa0, 0xc3, 0x53, 0x9b, 0x34, 0xcf, 0xcf, 0xdc, 0xec, 0x77, 0xe1, 0x7c, + 0xb1, 0xe7, 0x5b, 0x6e, 0x14, 0x77, 0xf5, 0xe5, 0xda, 0xa4, 0xa6, 0x57, 0x2a, 0x60, 0x73, 0xed, + 0xe9, 0x9d, 0xc4, 0xf3, 0x7a, 0x24, 0x8a, 0xec, 0x21, 0x59, 0x7f, 0xd0, 0x27, 0x87, 0xec, 0x83, + 0x45, 0x0e, 0xc7, 0xc6, 0x10, 0xab, 0x73, 0xb0, 0x50, 0x70, 0xa9, 0x9f, 0x85, 0x90, 0xcc, 0x62, + 0xd3, 0x2a, 0xe2, 0x7a, 0xba, 0xb5, 0xe5, 0x1a, 0x4b, 0xa1, 0x82, 0x34, 0xbe, 0x03, 0xb3, 0x98, + 0xc3, 0x45, 0x37, 0xdd, 0x29, 0x1c, 0xc0, 0x6b, 0x95, 0x55, 0x43, 0xa5, 0x55, 0xbc, 0x1a, 0x10, + 0xf4, 0x1b, 0x7e, 0x1c, 0x3e, 0xb0, 0x14, 0x8d, 0x4b, 0xef, 0xc1, 0x42, 0xa9, 0x89, 0xd1, 0x81, + 0xda, 0x01, 0x79, 0x20, 0xc6, 0xc1, 0x7e, 0x1a, 0x2f, 0x42, 0xfd, 0x88, 0xed, 0xfd, 0x04, 0xfa, + 0x4b, 0x15, 0x16, 0x08, 0x9b, 0x2d, 0xde, 0xf0, 0x15, 0xfd, 0x6b, 0x9a, 0xf9, 0x6c, 0x36, 0x30, + 0x79, 0x8c, 0x9a, 0x32, 0x46, 0xf3, 0x2d, 0x68, 0xf5, 0xa2, 0xe1, 0xa6, 0x1d, 0xdb, 0xd8, 0xf0, + 0x35, 0x68, 0x8d, 0x72, 0x12, 0x1b, 0x57, 0xf7, 0x27, 0x84, 0x2c, 0xb9, 0xb9, 0xf9, 0x17, 0x1d, + 0xba, 0xd5, 0xae, 0x88, 0x02, 0x66, 0x03, 0x09, 0xc3, 0x0d, 0xea, 0x10, 0x1c, 0x5a, 0xdd, 0x4a, + 0x49, 0x86, 0x1d, 0x09, 0x43, 0x96, 0xc3, 0x44, 0x91, 0xcd, 0x29, 0x63, 0x15, 0xa6, 0xbc, 0x14, + 0x96, 0xe3, 0xad, 0xc0, 0x76, 0xc6, 0x08, 0x3a, 0xe8, 0x5d, 0x69, 0x40, 0x02, 0xb3, 0xb5, 0x89, + 0x31, 0x8b, 0x02, 0x0e, 0x9a, 0xa4, 0x83, 0x03, 0x57, 0x52, 0xbd, 0x34, 0x80, 0xa7, 0x2a, 0x9b, + 0x56, 0x00, 0xf8, 0x55, 0x15, 0xc0, 0x8b, 0xe3, 0x87, 0x52, 0x04, 0x31, 0x00, 0xe3, 0x3a, 0x89, + 0x7b, 0xf6, 0xfd, 0x35, 0xdf, 0xe9, 0xb9, 0x7e, 0x9f, 0x1c, 0xb2, 0x68, 0x5f, 0x86, 0x96, 0xd8, + 0xca, 0x67, 0x30, 0x35, 0x2d, 0x99, 0x35, 0x76, 0x87, 0x5f, 0x98, 0x0f, 0xb5, 0xd2, 0x7c, 0x30, + 0xaf, 0xc2, 0xac, 0xdc, 0x1d, 0x26, 0x11, 0xfb, 0x7e, 0x9f, 0x1c, 0xe2, 0x80, 0xda, 0x96, 0xa0, + 0x90, 0x8f, 0x2d, 0xc4, 0xde, 0x40, 0x50, 0xe6, 0x9f, 0x75, 0x38, 0x57, 0x32, 0x39, 0x0a, 0x1e, + 0x56, 0x8f, 0x1c, 0x2f, 0xb5, 0x71, 0xf1, 0x32, 0xa5, 0xc4, 0xcb, 0x01, 0x2c, 0x70, 0x90, 0xa4, + 0xae, 0xbb, 0x75, 0x0c, 0x80, 0xd7, 0xab, 0x4a, 0xf5, 0xb2, 0x91, 0x02, 0x7b, 0x89, 0xcb, 0xc1, + 0x2f, 0xeb, 0x5d, 0x22, 0xb0, 0x58, 0xdd, 0xb8, 0x02, 0xfe, 0x97, 0x55, 0xf8, 0x3f, 0x5f, 0x05, + 0xbf, 0x6c, 0x89, 0x84, 0xff, 0x21, 0xcc, 0xb3, 0x45, 0xb5, 0x4f, 0x7c, 0xa7, 0x17, 0x0d, 0xd1, + 0x91, 0xcb, 0xd0, 0xe2, 0xf2, 0xbd, 0x68, 0x98, 0x6f, 0xdd, 0x24, 0x16, 0x6b, 0x31, 0xf0, 0x5c, + 0xb6, 0x78, 0x62, 0x0b, 0xb1, 0xe8, 0x49, 0x2c, 0x96, 0x20, 0x23, 0x22, 0x4e, 0x3d, 0x98, 0x77, + 0x6b, 0x56, 0x46, 0x9b, 0x1f, 0x34, 0x60, 0x5a, 0x44, 0x23, 0x26, 0x45, 0xb6, 0x5b, 0xce, 0x96, + 0x55, 0x4e, 0xf1, 0xba, 0x76, 0x70, 0x94, 0x87, 0x17, 0xa7, 0xe4, 0x23, 0xa7, 0x9a, 0x7a, 0xe4, + 0x54, 0xb0, 0x69, 0xaa, 0x6c, 0x53, 0x61, 0x5c, 0xf5, 0xf2, 0xb8, 0x58, 0x19, 0x87, 0x95, 0xcd, + 0x8e, 0x67, 0xc7, 0x7b, 0x34, 0x1c, 0x89, 0xcd, 0x6f, 0xdd, 0x2a, 0xf1, 0x59, 0xe9, 0xc8, 0x79, + 0x59, 0xed, 0xcf, 0x53, 0x78, 0x81, 0xcb, 0x2a, 0x6d, 0xce, 0x49, 0xf7, 0x00, 0xfc, 0x84, 0x42, + 0x65, 0x72, 0xdb, 0xa2, 0xc8, 0xa5, 0x3e, 0x56, 0xa1, 0xbc, 0xd4, 0x97, 0x59, 0x6c, 0xe4, 0xa3, + 0x68, 0x78, 0x2d, 0xa4, 0x23, 0x71, 0x4e, 0x91, 0x92, 0x38, 0x72, 0xea, 0xc7, 0x69, 0x05, 0xcb, + 0xcf, 0x26, 0x64, 0x16, 0x93, 0x15, 0x24, 0xd6, 0xf9, 0xb3, 0x56, 0x4a, 0xb2, 0x58, 0x8a, 0xc8, + 0xa1, 0x28, 0xde, 0xd9, 0x4f, 0x05, 0xb9, 0x79, 0x15, 0xb9, 0x42, 0x35, 0xd6, 0xc1, 0xaf, 0x72, + 0x35, 0x96, 0x97, 0x38, 0x0b, 0x4a, 0x89, 0xb3, 0x06, 0xd3, 0x34, 0x60, 0xd3, 0x3f, 0xea, 0x1a, + 0x38, 0x5d, 0x9e, 0x1f, 0xbf, 0x40, 0xad, 0x6e, 0xf3, 0x96, 0x7c, 0x62, 0xa4, 0x72, 0xc6, 0x2d, + 0x98, 0xa7, 0x7b, 0x7b, 0x9e, 0xeb, 0x93, 0x9d, 0x24, 0xda, 0xc7, 0x4d, 0xf2, 0x39, 0x0c, 0x76, + 0xb3, 0xaa, 0x88, 0x50, 0x5b, 0x5a, 0x45, 0x51, 0x56, 0xf9, 0xd9, 0x31, 0xdf, 0xe4, 0xe0, 0x02, + 0x77, 0x1e, 0x17, 0x38, 0x85, 0x87, 0x67, 0x77, 0xd2, 0x42, 0xff, 0x14, 0x3a, 0x4e, 0x66, 0x2d, + 0xbd, 0x02, 0xb3, 0xb2, 0xb1, 0x15, 0x13, 0xf3, 0xbc, 0x3c, 0x31, 0x67, 0xe4, 0x79, 0xf7, 0x63, + 0x0d, 0xe6, 0x0b, 0x66, 0xb2, 0xd6, 0xb1, 0x1b, 0x7b, 0x44, 0x68, 0xe0, 0x04, 0xdb, 0xe9, 0x38, + 0x24, 0x1a, 0x88, 0x89, 0x80, 0xbf, 0x45, 0xcd, 0x58, 0xcb, 0xce, 0xba, 0x4c, 0x98, 0x75, 0xb7, + 0xfb, 0x4c, 0x51, 0x9f, 0x26, 0xbe, 0x93, 0x1d, 0x7c, 0x4b, 0x3c, 0x16, 0x88, 0xee, 0x76, 0x7f, + 0xdd, 0x76, 0x86, 0x84, 0x1f, 0x4f, 0xd7, 0xd1, 0x26, 0x95, 0x69, 0x3a, 0x30, 0x73, 0xdb, 0x0d, + 0xa2, 0x0d, 0x3a, 0x1a, 0x31, 0x38, 0x1d, 0x12, 0xb3, 0x9a, 0x5c, 0xc3, 0xc1, 0x0b, 0x8a, 0x79, + 0xc6, 0x21, 0x7b, 0x76, 0xe2, 0xc5, 0xac, 0x69, 0x3a, 0xfd, 0x25, 0x16, 0x9e, 0xa7, 0x46, 0xd4, + 0xdf, 0xe4, 0xd2, 0xdc, 0x4e, 0x89, 0x63, 0xfe, 0x49, 0x87, 0x0e, 0xae, 0x6e, 0x1b, 0x18, 0x3c, + 0x0e, 0x0a, 0x5d, 0x81, 0x3a, 0x4e, 0x66, 0x51, 0x1d, 0x1e, 0x7f, 0xfa, 0xc1, 0x9b, 0x1a, 0x57, + 0xa1, 0x41, 0x03, 0x2c, 0x29, 0xf9, 0xd2, 0xf7, 0xdc, 0x38, 0x21, 0xf5, 0xe8, 0xda, 0x12, 0x52, + 0xc6, 0x35, 0x80, 0x51, 0x5e, 0x41, 0xf2, 0x42, 0x60, 0x52, 0x1d, 0x92, 0x24, 0x73, 0x6e, 0x96, + 0xe3, 0xb2, 0xf3, 0xeb, 0x9a, 0xa5, 0x32, 0x8d, 0x2d, 0x98, 0x43, 0xb3, 0xb7, 0xd3, 0x63, 0x30, + 0xc4, 0x60, 0xf2, 0x1e, 0x0b, 0xd2, 0xe6, 0xcf, 0x34, 0xe1, 0x46, 0xf6, 0xb5, 0x4f, 0xb8, 0xef, + 0x73, 0x97, 0x68, 0xa7, 0x72, 0xc9, 0x12, 0xcc, 0x8c, 0x12, 0xe9, 0x54, 0xae, 0x66, 0x65, 0x74, + 0x0e, 0x51, 0x6d, 0x62, 0x88, 0xcc, 0x9f, 0x6b, 0xd0, 0x7d, 0x93, 0xba, 0x3e, 0x7e, 0x58, 0x0b, + 0x02, 0x4f, 0x5c, 0x2b, 0x9c, 0x1a, 0xf3, 0x6f, 0x40, 0xd3, 0xe6, 0x6a, 0xfc, 0x58, 0xc0, 0x3e, + 0xc1, 0x49, 0x5b, 0x2e, 0x23, 0x1d, 0x9a, 0xd4, 0xe4, 0x43, 0x13, 0xf3, 0x23, 0x0d, 0xe6, 0xb8, + 0x53, 0xde, 0x4e, 0xdc, 0xf8, 0xd4, 0xf6, 0xad, 0xc3, 0xcc, 0x61, 0xe2, 0xc6, 0xa7, 0x88, 0xca, + 0x4c, 0xae, 0x1c, 0x4f, 0xb5, 0x8a, 0x78, 0x32, 0x7f, 0xa5, 0xc1, 0x85, 0xa2, 0x5b, 0xd7, 0x06, + 0x03, 0x12, 0x3c, 0xca, 0x29, 0xa5, 0x1c, 0x1a, 0x4d, 0x15, 0x0e, 0x8d, 0x2a, 0x4d, 0xb6, 0xc8, + 0xfb, 0x64, 0xf0, 0xf8, 0x9a, 0xfc, 0x7d, 0x1d, 0x3e, 0x7b, 0x3d, 0x9b, 0x78, 0xb7, 0x43, 0xdb, + 0x8f, 0xf6, 0x48, 0x18, 0x3e, 0x42, 0x7b, 0x6f, 0x41, 0xdb, 0x27, 0xf7, 0x72, 0x9b, 0xc4, 0x74, + 0x9c, 0x54, 0x8d, 0x2a, 0x3c, 0xd9, 0xda, 0x65, 0xfe, 0x47, 0x83, 0x0e, 0xd7, 0xf3, 0x96, 0x3b, + 0x38, 0x78, 0x84, 0x83, 0xdf, 0x82, 0xb9, 0x03, 0xb4, 0x80, 0x51, 0xa7, 0x58, 0xb6, 0x0b, 0xd2, + 0x13, 0x0e, 0xff, 0xbf, 0x1a, 0x2c, 0x70, 0x45, 0x37, 0xfd, 0x23, 0xf7, 0x51, 0x06, 0xeb, 0x0e, + 0xcc, 0xbb, 0xdc, 0x84, 0x53, 0x3a, 0xa0, 0x28, 0x3e, 0xa1, 0x07, 0x7e, 0xab, 0xc1, 0x3c, 0xd7, + 0xf4, 0x86, 0x1f, 0x93, 0xf0, 0xd4, 0xe3, 0xbf, 0x01, 0x2d, 0xe2, 0xc7, 0xa1, 0xed, 0x9f, 0x66, + 0x85, 0x94, 0x45, 0x27, 0x5c, 0x24, 0x3f, 0xd2, 0xc0, 0x40, 0x55, 0x9b, 0x6e, 0x34, 0x72, 0xa3, + 0xe8, 0x11, 0x42, 0x37, 0x99, 0xc1, 0x3f, 0xd1, 0xe1, 0xbc, 0xa4, 0xa5, 0x97, 0xc4, 0x8f, 0xbb, + 0xc9, 0xc6, 0x26, 0x34, 0x59, 0x8d, 0x20, 0xdf, 0x46, 0x4e, 0xda, 0x51, 0x2e, 0xc8, 0xaa, 0x58, + 0x24, 0xfa, 0x64, 0x40, 0x7d, 0x27, 0xc2, 0xe2, 0xa8, 0x6d, 0x29, 0x3c, 0xb6, 0x0c, 0x2d, 0x49, + 0x6a, 0x36, 0x6c, 0x7f, 0x40, 0xbc, 0x27, 0xc6, 0x45, 0xe6, 0x2f, 0x35, 0x98, 0xe3, 0x4d, 0x1e, + 0xff, 0x21, 0xb3, 0x5c, 0xcf, 0x03, 0xf9, 0x53, 0x83, 0x12, 0x0b, 0xaf, 0x45, 0x49, 0x8b, 0x5c, + 0x57, 0x3f, 0xbe, 0xa1, 0x75, 0x03, 0x5a, 0x83, 0x7d, 0xdb, 0x1f, 0x9e, 0x2a, 0xb8, 0x64, 0x51, + 0x33, 0x86, 0xa7, 0xe5, 0x03, 0xf8, 0x0d, 0xfe, 0x09, 0x87, 0xff, 0x52, 0x61, 0x28, 0xc7, 0xbe, + 0x36, 0x78, 0x38, 0xa7, 0x1f, 0xc0, 0x02, 0xbf, 0xf5, 0x95, 0x6a, 0x42, 0xa3, 0x0b, 0xd3, 0xb6, + 0xc3, 0x8f, 0x21, 0x34, 0x14, 0x4a, 0x49, 0xf5, 0x3e, 0x5f, 0xbc, 0x13, 0xcb, 0xef, 0xf3, 0x2f, + 0x02, 0xd8, 0x8e, 0xf3, 0x2e, 0x0d, 0x1d, 0xd7, 0x4f, 0x0b, 0x7c, 0x89, 0x63, 0xbe, 0x09, 0xb3, + 0xd7, 0x42, 0x3a, 0xba, 0x2d, 0xdd, 0xdf, 0x1e, 0x7b, 0xc3, 0x2c, 0xdf, 0xfd, 0xea, 0xea, 0xdd, + 0xaf, 0xf9, 0x6d, 0x78, 0xaa, 0x64, 0x38, 0x3a, 0x6b, 0x83, 0x5f, 0x4b, 0xa7, 0x9d, 0x88, 0x90, + 0xa9, 0x3a, 0x97, 0x93, 0x6d, 0xb1, 0x14, 0x21, 0xf3, 0x03, 0x0d, 0x9e, 0x29, 0xa9, 0x5f, 0x0b, + 0x82, 0x90, 0x1e, 0x09, 0x4c, 0xce, 0xa2, 0x1b, 0xb5, 0xf8, 0xd5, 0x8b, 0xc5, 0x6f, 0xa5, 0x11, + 0x4a, 0xc1, 0xfe, 0x09, 0x18, 0xf1, 0x0b, 0x0d, 0xe6, 0x85, 0x11, 0x8e, 0x23, 0xba, 0x7d, 0x19, + 0x1a, 0xfc, 0x49, 0x8b, 0xe8, 0xf0, 0x99, 0xca, 0x0e, 0xd3, 0xa7, 0x38, 0x96, 0x68, 0x5c, 0x8e, + 0x48, 0xbd, 0x6a, 0x46, 0x7d, 0x3d, 0x0b, 0xf6, 0x89, 0x1f, 0x9d, 0x08, 0x01, 0xf3, 0x9b, 0x69, + 0x30, 0x6f, 0x12, 0x8f, 0x9c, 0xa5, 0x8f, 0xcc, 0x3b, 0x30, 0x87, 0xef, 0x6b, 0x72, 0x1f, 0x9c, + 0x89, 0xda, 0x77, 0xa1, 0x83, 0x6a, 0xcf, 0xdc, 0xde, 0x6c, 0x76, 0x30, 0xff, 0xc8, 0x4b, 0xc9, + 0x99, 0x68, 0xff, 0x0a, 0x9c, 0x4b, 0x7d, 0x7f, 0x27, 0x70, 0xb2, 0x43, 0xa4, 0x31, 0xf7, 0x74, + 0xe6, 0x8b, 0xb0, 0xb8, 0x41, 0xfd, 0x23, 0x12, 0x46, 0xfc, 0x22, 0x11, 0x45, 0x52, 0x09, 0x65, + 0xf2, 0x0b, 0xca, 0x7c, 0x1f, 0x96, 0x64, 0x89, 0x3e, 0x89, 0x77, 0x42, 0xf7, 0x48, 0x92, 0x12, + 0x07, 0xd4, 0x9a, 0x72, 0x40, 0x9d, 0x1f, 0x68, 0xeb, 0xca, 0x81, 0xf6, 0x05, 0x68, 0xba, 0x91, + 0x50, 0x80, 0x41, 0x35, 0x63, 0xe5, 0x0c, 0xd3, 0x86, 0x05, 0xee, 0x7e, 0x71, 0x61, 0x84, 0x5d, + 0x2c, 0xc1, 0x0c, 0x8f, 0xa9, 0xac, 0x93, 0x8c, 0x1e, 0x7b, 0xfd, 0x32, 0xf6, 0xb2, 0xd1, 0xec, + 0xc3, 0x82, 0x78, 0x54, 0xb3, 0x63, 0x0f, 0x5d, 0x9f, 0x2f, 0xb2, 0x17, 0x01, 0x02, 0x7b, 0x98, + 0x3e, 0xc0, 0xe3, 0xd7, 0x66, 0x12, 0x87, 0x7d, 0x8f, 0xf6, 0xe9, 0x3d, 0xf1, 0x5d, 0xe7, 0xdf, + 0x73, 0x8e, 0xf9, 0x0e, 0x18, 0x16, 0x89, 0x02, 0xea, 0x47, 0x44, 0xd2, 0xba, 0x0c, 0xad, 0x8d, + 0x24, 0x0c, 0x89, 0xcf, 0xba, 0x4a, 0x5f, 0x98, 0xc9, 0x2c, 0xa6, 0xb7, 0x9f, 0xeb, 0xe5, 0x47, + 0xec, 0x12, 0xc7, 0xfc, 0x69, 0x0d, 0x9a, 0x7d, 0x77, 0xe8, 0xdb, 0x9e, 0x45, 0x0e, 0x8d, 0xd7, + 0xa0, 0xc1, 0xb7, 0x2c, 0x22, 0x52, 0xaa, 0x8e, 0x7c, 0x79, 0x6b, 0xbe, 0x37, 0xb3, 0xc8, 0xe1, + 0x8d, 0xcf, 0x58, 0x42, 0xc6, 0x78, 0x1b, 0xda, 0xfc, 0xd7, 0x4d, 0x7e, 0x04, 0x25, 0xf2, 0xd7, + 0x17, 0x4f, 0x50, 0x22, 0x5a, 0x73, 0x5d, 0xaa, 0x06, 0x66, 0xd0, 0x00, 0x4b, 0x1a, 0xb1, 0x3c, + 0x8c, 0x37, 0x88, 0x57, 0x3e, 0xc2, 0x20, 0x2e, 0xc3, 0xa4, 0x6d, 0x3c, 0xa4, 0x11, 0x99, 0x7a, + 0xbc, 0x34, 0x3f, 0xcb, 0x11, 0xd2, 0x5c, 0x86, 0x49, 0xef, 0x27, 0xfe, 0xf0, 0x4e, 0x20, 0xce, + 0x0e, 0xc7, 0x4b, 0xdf, 0xc0, 0x66, 0x42, 0x9a, 0xcb, 0x30, 0xe9, 0x10, 0x17, 0x6f, 0x74, 0xfa, + 0x71, 0xd2, 0x7c, 0x8d, 0x17, 0xd2, 0x5c, 0x66, 0xbd, 0x09, 0xd3, 0x81, 0xfd, 0xc0, 0xa3, 0xb6, + 0x63, 0x7e, 0x58, 0x03, 0x48, 0x1b, 0x46, 0x58, 0xe8, 0x28, 0x10, 0xad, 0x9c, 0x08, 0x51, 0xe0, + 0x3d, 0x90, 0x40, 0xea, 0x57, 0x83, 0xf4, 0xa5, 0x49, 0x41, 0xe2, 0xda, 0x0a, 0x30, 0x5d, 0x2d, + 0xc0, 0xb4, 0x72, 0x22, 0x4c, 0xc2, 0x28, 0x01, 0xd4, 0xd5, 0x02, 0x50, 0x2b, 0x27, 0x02, 0x25, + 0xe4, 0x05, 0x54, 0x57, 0x0b, 0x50, 0xad, 0x9c, 0x08, 0x95, 0x90, 0x17, 0x60, 0x5d, 0x2d, 0x80, + 0xb5, 0x72, 0x22, 0x58, 0x42, 0xbe, 0x0c, 0xd7, 0xdf, 0x74, 0x98, 0x43, 0x97, 0xf1, 0x5b, 0x58, + 0x7f, 0x8f, 0xe2, 0x7d, 0x00, 0xba, 0x4b, 0x7d, 0xa3, 0xa9, 0x32, 0x8d, 0x2f, 0xc3, 0x02, 0x67, + 0x10, 0xe9, 0xba, 0x44, 0xc7, 0xeb, 0x92, 0xf2, 0x07, 0xbc, 0x20, 0x4a, 0xa2, 0x98, 0x8e, 0x36, + 0xed, 0xd8, 0x4e, 0x8b, 0xaf, 0x9c, 0x23, 0x5f, 0xdf, 0x4d, 0x95, 0x5e, 0x8c, 0x87, 0x94, 0x8e, + 0xb2, 0x7b, 0x39, 0x41, 0x31, 0x89, 0xd8, 0x1d, 0x11, 0x9a, 0xc4, 0x62, 0x99, 0x48, 0x49, 0xfe, + 0x8e, 0xca, 0x71, 0x6d, 0xbc, 0xf4, 0x12, 0x8f, 0x8c, 0x32, 0x06, 0xae, 0x6c, 0xf9, 0x25, 0x9e, + 0x78, 0xd1, 0x9d, 0x73, 0x26, 0xb8, 0x70, 0xc3, 0x3f, 0x13, 0xb8, 0xb1, 0x2b, 0x3f, 0x3e, 0xaa, + 0x5b, 0x0a, 0xcf, 0xfc, 0xa7, 0x06, 0xe7, 0x76, 0xec, 0x30, 0x76, 0x07, 0x6e, 0x60, 0xfb, 0x71, + 0x8f, 0xc4, 0x36, 0x8e, 0x53, 0x79, 0xcc, 0xa9, 0x3d, 0xdc, 0x63, 0xce, 0x1d, 0x98, 0x1f, 0xaa, + 0x3b, 0x90, 0x87, 0xdc, 0x3c, 0x14, 0xc5, 0x95, 0x97, 0xa9, 0xb5, 0x87, 0x7e, 0x99, 0x6a, 0xfe, + 0x50, 0x87, 0xf9, 0xc2, 0xf2, 0x7a, 0x6c, 0x6e, 0x5a, 0x03, 0x70, 0xb3, 0x50, 0x3b, 0xe6, 0x80, + 0x5e, 0x8d, 0x47, 0x4b, 0x12, 0xaa, 0xba, 0xed, 0xab, 0x9d, 0xfe, 0xb6, 0xef, 0x06, 0xb4, 0x82, + 0x1c, 0xa4, 0x63, 0xf6, 0x47, 0x15, 0x50, 0x5a, 0xb2, 0xa8, 0xf9, 0x1e, 0x2c, 0x94, 0x56, 0x31, + 0xbc, 0xb6, 0xa3, 0x07, 0xc4, 0xcf, 0xae, 0xed, 0x18, 0x21, 0x05, 0xb4, 0x5e, 0x0c, 0x68, 0xcf, + 0x3d, 0x92, 0x9f, 0xc9, 0x0b, 0xd2, 0xfc, 0x91, 0x0e, 0x8b, 0xd5, 0x19, 0xe8, 0x49, 0x75, 0xf7, + 0x2e, 0x74, 0xc7, 0xad, 0xf6, 0x67, 0xe6, 0xf5, 0x3c, 0xba, 0xb3, 0x5c, 0xfd, 0xa4, 0xba, 0xfb, + 0x5c, 0x1a, 0xdd, 0x52, 0x3a, 0x34, 0x7f, 0x93, 0xf9, 0x27, 0xab, 0x46, 0x9e, 0x50, 0xff, 0x18, + 0x2f, 0x40, 0x87, 0x0f, 0x53, 0x7a, 0x1e, 0xc2, 0x8b, 0xdb, 0x12, 0x3f, 0x5f, 0x29, 0xa4, 0xd2, + 0xe0, 0xcc, 0x62, 0xf6, 0x63, 0x2d, 0xc5, 0x24, 0xab, 0xf1, 0x3e, 0x55, 0x98, 0xe4, 0x91, 0x26, + 0x15, 0x3e, 0x52, 0xa4, 0x65, 0xb5, 0xe7, 0xff, 0x23, 0xed, 0xe4, 0x48, 0xcb, 0x7c, 0x29, 0x15, + 0x81, 0xe6, 0xf7, 0xa0, 0xbd, 0x49, 0xbc, 0x5e, 0x34, 0x4c, 0xdf, 0xaf, 0x9e, 0xe9, 0x66, 0xb2, + 0xf8, 0xca, 0x6f, 0xaa, 0xfc, 0xca, 0x6f, 0x1d, 0xe6, 0x64, 0x03, 0x4e, 0xf3, 0x3e, 0x73, 0xfd, + 0xc2, 0xb7, 0x96, 0x56, 0xc5, 0x7f, 0x4a, 0x5f, 0x2d, 0x39, 0x71, 0xb7, 0x81, 0x7f, 0x5e, 0x7c, + 0xe9, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x71, 0xaf, 0x27, 0xac, 0x3a, 0x00, 0x00, } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index c82785aac..22e5ea01b 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -1,7 +1,9 @@ syntax = "proto3"; +import "Open_IM/pkg/proto/sdk_ws/wrappers.proto"; option go_package = "./sdk_ws;server_api_params"; package server_api_params; + ////////////////////////////////base/////////////////////////////// @@ -18,6 +20,7 @@ message GroupInfo{ int32 status = 10; string creatorUserID = 11; int32 groupType = 12; + google.protobuf.Int32Value needVerification = 13; }