diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index af2bab6dc..e8cf2e799 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -89,7 +89,7 @@ func main() { groupRouterGroup.POST("/mute_group", group.MuteGroup) groupRouterGroup.POST("/cancel_mute_group", group.CancelMuteGroup) groupRouterGroup.POST("/set_group_member_nickname", group.SetGroupMemberNickname) - + groupRouterGroup.POST("/set_group_member_info", group.SetGroupMemberInfo) } superGroupRouterGroup := r.Group("/super_group") { @@ -113,6 +113,8 @@ func main() { thirdGroup.POST("/minio_upload", apiThird.MinioUploadFile) thirdGroup.POST("/upload_update_app", apiThird.UploadUpdateApp) thirdGroup.POST("/get_download_url", apiThird.GetDownloadURL) + thirdGroup.POST("/get_rtc_invitation_info", apiThird.GetRTCInvitationInfo) + thirdGroup.POST("/get_rtc_invitation_start_app", apiThird.GetRTCInvitationInfoStartApp) } //Message chatGroup := r.Group("/msg") diff --git a/config/config.yaml b/config/config.yaml index 481bbc103..e11407c5c 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -1,4 +1,5 @@ # The class cannot be named by Pascal or camel case. +# The class cannot be named by Pascal or camel case. # If it is not used, the corresponding structure will not be set, # and it will not be read naturally. serverversion: 2.0.0 @@ -670,7 +671,6 @@ notification: defaultTips: tips: "welcome user join department" - #---------------demo configuration---------------------# #The following configuration items are applied to openIM Demo configuration #是否启动demo，如果自身没有账号体系，设置为true @@ -697,5 +697,4 @@ demo: imAPIURL: http://127.0.0.1:10002 rtc: - port: 11300 - address: 127.0.0.1 + signalTimeout: 3000 diff --git a/deploy_k8s/admin_cms/admin_cms.Dockerfile b/deploy_k8s/admin_cms/admin_cms.Dockerfile index bf310981c..1144ef09d 100644 --- a/deploy_k8s/admin_cms/admin_cms.Dockerfile +++ b/deploy_k8s/admin_cms/admin_cms.Dockerfile @@ -4,15 +4,16 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml + # 将可执行文件复制到目标目录 -ADD ./open_im_admin_cms $WORKDIR/main +ADD ./open_im_admin_cms $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config", "/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 437b1ffc5..39ad73a06 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: admin-cms - image: openim/admin_cms:v2.0.10 + image: openim/admin_cms:v2.0.10k + # imagePullPolicy: Always #每次启动都重新拉取镜像 ports: - containerPort: 10200 volumeMounts: diff --git a/deploy_k8s/api/api.Dockerfile b/deploy_k8s/api/api.Dockerfile index 346045b7c..f1dd4c748 100644 --- a/deploy_k8s/api/api.Dockerfile +++ b/deploy_k8s/api/api.Dockerfile @@ -5,14 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_api $WORKDIR/main +ADD ./open_im_api $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index 870423066..52990ca2f 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: api - image: openim/api:v2.0.10 + image: openim/api:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10002 volumeMounts: diff --git a/deploy_k8s/auth/auth.Dockerfile b/deploy_k8s/auth/auth.Dockerfile index f757d5801..04fbdf32a 100644 --- a/deploy_k8s/auth/auth.Dockerfile +++ b/deploy_k8s/auth/auth.Dockerfile @@ -5,14 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_auth $WORKDIR/main +ADD ./open_im_auth $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 89428d08c..d6b2e91d8 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: auth - image: openim/auth:v2.0.10 + image: openim/auth:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10160 volumeMounts: diff --git a/deploy_k8s/build_push_all_images.sh b/deploy_k8s/build_push_all_images.sh index 4d083e241..b6333a8bd 100644 --- a/deploy_k8s/build_push_all_images.sh +++ b/deploy_k8s/build_push_all_images.sh @@ -2,8 +2,8 @@ source ./path_info.cfg # images version -version=v2.0.10 - +version=v2.0.10k +git pull cd ../script/; ./build_all_service.sh cd ../deploy_k8s/ diff --git a/deploy_k8s/cache/cache.Dockerfile b/deploy_k8s/cache/cache.Dockerfile index c040f622a..e69d131ab 100644 --- a/deploy_k8s/cache/cache.Dockerfile +++ b/deploy_k8s/cache/cache.Dockerfile @@ -4,14 +4,15 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml + # 将可执行文件复制到目标目录 -ADD ./open_im_cache $WORKDIR/main +ADD ./open_im_cache $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index f957a8ef5..5de56fcf0 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: cache - image: openim/cache:v2.0.10 + image: openim/cache:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10240 volumeMounts: diff --git a/deploy_k8s/cms_api/cms_api.Dockerfile b/deploy_k8s/cms_api/cms_api.Dockerfile index 1fcc67afc..64c4ae25a 100644 --- a/deploy_k8s/cms_api/cms_api.Dockerfile +++ b/deploy_k8s/cms_api/cms_api.Dockerfile @@ -5,14 +5,13 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_cms_api $WORKDIR/main +ADD ./open_im_cms_api $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main - -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index 7cffa4c2b..4dd0626ac 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: cms-api - image: openim/cms_api:v2.0.10 + image: openim/cms_api:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10006 volumeMounts: diff --git a/deploy_k8s/conversation/conversation.Dockerfile b/deploy_k8s/conversation/conversation.Dockerfile index 443734175..4518627d3 100644 --- a/deploy_k8s/conversation/conversation.Dockerfile +++ b/deploy_k8s/conversation/conversation.Dockerfile @@ -5,14 +5,13 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_conversation $WORKDIR/main +ADD ./open_im_conversation $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main - -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index 1e14e794a..7da7aad7a 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: conversation - image: openim/conversation:v2.0.10 + image: openim/conversation:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10230 volumeMounts: diff --git a/deploy_k8s/demo/demo.Dockerfile b/deploy_k8s/demo/demo.Dockerfile index 61ffbe566..05b532fd4 100644 --- a/deploy_k8s/demo/demo.Dockerfile +++ b/deploy_k8s/demo/demo.Dockerfile @@ -5,14 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_demo $WORKDIR/main +ADD ./open_im_demo $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index edaaf1d03..d12f902b9 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: demo - image: openim/demo:v2.0.10 + image: openim/demo:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10004 volumeMounts: diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index 79070b768..a03ca12c7 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: friend - image: openim/friend:v2.0.10 + image: openim/friend:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10120 volumeMounts: diff --git a/deploy_k8s/friend/friend.Dockerfile b/deploy_k8s/friend/friend.Dockerfile index 80a3580b3..3741a7c89 100644 --- a/deploy_k8s/friend/friend.Dockerfile +++ b/deploy_k8s/friend/friend.Dockerfile @@ -4,15 +4,15 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml + # 将可执行文件复制到目标目录 -ADD ./open_im_friend $WORKDIR/main +ADD ./open_im_friend $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main - -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 47acea4a8..74aaa0d5a 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: group - image: openim/group:v2.0.10 + image: openim/group:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10150 volumeMounts: diff --git a/deploy_k8s/group/group.Dockerfile b/deploy_k8s/group/group.Dockerfile index 159db839f..7b902ee67 100644 --- a/deploy_k8s/group/group.Dockerfile +++ b/deploy_k8s/group/group.Dockerfile @@ -5,14 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_group $WORKDIR/main +ADD ./open_im_group $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 4b3a81aa9..f2d247d0f 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -7,13 +7,10 @@ metadata: nginx.ingress.kubernetes.io/proxy-http-version: "1.1" nginx.ingress.kubernetes.io/proxy-read-timeout: "3600" nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" - # 使用重写后的路径进行路由 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: sdk-server-ingress spec: rules: - - host: k8s.open-im-test.rentsoft.cn + - host: sdk-server.openim.xxx.com http: paths: - backend: @@ -21,7 +18,7 @@ spec: name: sdk-server port: number: 10003 - path: /sdk-server/(.*) + path: / pathType: Prefix --- apiVersion: networking.k8s.io/v1 @@ -32,13 +29,10 @@ metadata: nginx.ingress.kubernetes.io/proxy-http-version: "1.1" nginx.ingress.kubernetes.io/proxy-read-timeout: "3600" nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" - # 使用重写后的路径进行路由 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: msg-gateway-ingress spec: rules: - - host: k8s.open-im-test.rentsoft.cn + - host: msg-gateway.openim.xxx.com http: paths: - backend: @@ -46,7 +40,7 @@ spec: name: msg-gateway port: number: 10001 - path: /msg-gateway/(.*) + path: / pathType: Prefix --- apiVersion: networking.k8s.io/v1 @@ -54,13 +48,10 @@ kind: Ingress metadata: annotations: kubernetes.io/ingress.class: "nginx" - # 使用重写后的路径进行路由 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: api-ingress spec: rules: - - host: k8s.open-im-test.rentsoft.cn + - host: api.openim.xxx.com http: paths: - backend: @@ -68,7 +59,7 @@ spec: name: api port: number: 10002 - path: /api/(.*) + path: / pathType: Prefix --- apiVersion: networking.k8s.io/v1 @@ -76,13 +67,10 @@ kind: Ingress metadata: annotations: kubernetes.io/ingress.class: "nginx" - # 使用重写后的路径进行路由 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: demo-ingress spec: rules: - - host: k8s.open-im-test.rentsoft.cn + - host: demo.openim.xxx.com http: paths: - backend: @@ -90,7 +78,7 @@ spec: name: demo port: number: 10004 - path: /demo/(.*) + path: / pathType: Prefix --- apiVersion: networking.k8s.io/v1 @@ -98,13 +86,10 @@ kind: Ingress metadata: annotations: kubernetes.io/ingress.class: "nginx" - # 使用重写后的路径进行路由 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: cms-api-ingress spec: rules: - - host: k8s.open-im-test.rentsoft.cn + - host: cms-api.openim.xxx.com http: paths: - backend: @@ -112,5 +97,5 @@ spec: name: cms-api port: number: 10006 - path: /cms-api/(.*) - pathType: Prefix + path: / + pathType: Prefix \ No newline at end of file diff --git a/deploy_k8s/k8s_openim_deploy.md b/deploy_k8s/k8s_openim_deploy.md index 017fb0e85..010a8d09e 100644 --- a/deploy_k8s/k8s_openim_deploy.md +++ b/deploy_k8s/k8s_openim_deploy.md @@ -1,6 +1,7 @@ #### openIM k8s部署文档 ### 1. 修改配置文件 在Open-IM-SERVER目录下修改config/config.yaml配置文件, 将MySQL, Kafka, MongoDB等配置修改。 +使用demo需要修改demo/imAPIURL地址 让demo能请求到im的api ### 2. 项目根目录创建im configMap到k8s openim namespace kubectl create namespace openim diff --git a/deploy_k8s/kubectl_start_all.sh b/deploy_k8s/kubectl_start_all.sh index ddb7743f1..b1c11b0bd 100755 --- a/deploy_k8s/kubectl_start_all.sh +++ b/deploy_k8s/kubectl_start_all.sh @@ -2,7 +2,7 @@ source ./path_info.cfg -mkdir -p /db/sdk #path for jssdk sqlite +#mkdir -p /db/sdk #path for jssdk sqlite for i in ${service[*]} do diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index 3792e4da4..148316e5b 100644 --- a/deploy_k8s/message_cms/deployment.yaml +++ b/deploy_k8s/message_cms/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: message-cms - image: openim/message_cms:v2.0.10 + image: openim/message_cms:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10190 volumeMounts: diff --git a/deploy_k8s/message_cms/message_cms.Dockerfile b/deploy_k8s/message_cms/message_cms.Dockerfile index 0ae1a6abf..f77ebc3c2 100644 --- a/deploy_k8s/message_cms/message_cms.Dockerfile +++ b/deploy_k8s/message_cms/message_cms.Dockerfile @@ -5,14 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_message_cms $WORKDIR/main +ADD ./open_im_message_cms $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index 4ab52e999..a4697c631 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: msg - image: openim/msg:v2.0.10 + image: openim/msg:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10130 volumeMounts: diff --git a/deploy_k8s/msg/msg.Dockerfile b/deploy_k8s/msg/msg.Dockerfile index 32f094ed9..50299b41d 100644 --- a/deploy_k8s/msg/msg.Dockerfile +++ b/deploy_k8s/msg/msg.Dockerfile @@ -4,15 +4,16 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml + # 将可执行文件复制到目标目录 -ADD ./open_im_msg $WORKDIR/main +ADD ./open_im_msg $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index b927717c9..0eec0f5f5 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -15,10 +15,13 @@ spec: spec: containers: - name: msg-gateway - image: openim/msg_gateway:v2.0.10 + image: openim/msg_gateway:v2.0.10k + # imagePullPolicy: Always ports: - - containerPort: 10140 - - containerPort: 10001 + - name: rpc-port + containerPort: 10140 + - name: ws-port + containerPort: 10001 volumeMounts: - name: config mountPath: /Open-IM-Server/config @@ -39,7 +42,7 @@ spec: - name: msg-gateway-port protocol: TCP port: 10001 - targetPort: 10001 + targetPort: ws-port selector: app: msg-gateway diff --git a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile index 552ee3b1e..48441eb56 100644 --- a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile +++ b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile @@ -5,14 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_msg_gateway $WORKDIR/main +ADD ./open_im_msg_gateway $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index 24ff62289..cbb44717e 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: msg-transfer - image: openim/msg_transfer:v2.0.10 + image: openim/msg_transfer:v2.0.10k + # imagePullPolicy: Always volumeMounts: - name: config mountPath: /Open-IM-Server/config diff --git a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile index 9ff56c71a..68c3f3819 100644 --- a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile +++ b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile @@ -5,13 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_msg_transfer $WORKDIR/main +ADD ./open_im_msg_transfer $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index 5fec3450a..333a11aba 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: office - image: openim/office:v2.0.10 + image: openim/office:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10210 volumeMounts: diff --git a/deploy_k8s/office/office.Dockerfile b/deploy_k8s/office/office.Dockerfile index bdb509abc..c6db928fa 100644 --- a/deploy_k8s/office/office.Dockerfile +++ b/deploy_k8s/office/office.Dockerfile @@ -5,13 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_office $WORKDIR/main +ADD ./open_im_office $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index 7d5318c64..a32488d44 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: organization - image: openim/organization:v2.0.10 + image: openim/organization:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10220 volumeMounts: diff --git a/deploy_k8s/organization/organization.Dockerfile b/deploy_k8s/organization/organization.Dockerfile index 0fccb1c47..345ee9692 100644 --- a/deploy_k8s/organization/organization.Dockerfile +++ b/deploy_k8s/organization/organization.Dockerfile @@ -5,13 +5,15 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_organization $WORKDIR/main +ADD ./open_im_organization $WORKDIR/cmd/main + # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 61c9929fc..c1a8d0299 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: push - image: openim/push:v2.0.10 + image: openim/push:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10170 volumeMounts: diff --git a/deploy_k8s/push/push.Dockerfile b/deploy_k8s/push/push.Dockerfile index 6b12925d8..2904ce56f 100644 --- a/deploy_k8s/push/push.Dockerfile +++ b/deploy_k8s/push/push.Dockerfile @@ -4,14 +4,16 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml + # 将可执行文件复制到目标目录 -ADD ./open_im_push $WORKDIR/main +ADD ./open_im_push $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 7bec639b5..57cb0c412 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: sdk-server - image: openim/sdk_server:v2.0.10 + image: openim/sdk_server:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10003 volumeMounts: diff --git a/deploy_k8s/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index 6e8ec93cc..e38369bcb 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -14,4 +14,4 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] WORKDIR $WORKDIR -CMD ./main +CMD ./main \ No newline at end of file diff --git a/deploy_k8s/statistics/deployment.yaml b/deploy_k8s/statistics/deployment.yaml index a517caf7d..3743d7e6b 100644 --- a/deploy_k8s/statistics/deployment.yaml +++ b/deploy_k8s/statistics/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: statistics - image: openim/statistics:v2.0.10 + image: openim/statistics:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10180 volumeMounts: diff --git a/deploy_k8s/statistics/statistics.Dockerfile b/deploy_k8s/statistics/statistics.Dockerfile index 1b33f1732..44e8f2fe1 100644 --- a/deploy_k8s/statistics/statistics.Dockerfile +++ b/deploy_k8s/statistics/statistics.Dockerfile @@ -5,13 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_statistics $WORKDIR/main +ADD ./open_im_statistics $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 8ad91a526..1ad605d14 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -15,7 +15,8 @@ spec: spec: containers: - name: user - image: openim/user:v2.0.10 + image: openim/user:v2.0.10k + # imagePullPolicy: Always volumeMounts: - name: config mountPath: /Open-IM-Server/config diff --git a/deploy_k8s/user/user.Dockerfile b/deploy_k8s/user/user.Dockerfile index bafd9215f..3218949d4 100644 --- a/deploy_k8s/user/user.Dockerfile +++ b/deploy_k8s/user/user.Dockerfile @@ -5,13 +5,14 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_user $WORKDIR/main +ADD ./open_im_user $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 -RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ + chmod +x $WORKDIR/cmd/main + +VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] -VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] WORKDIR $WORKDIR -CMD ./main +CMD ./cmd/main \ No newline at end of file diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 08ee1f274..7d8a89564 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -10,6 +10,7 @@ import ( open_im_sdk "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" + "github.com/golang/protobuf/ptypes/wrappers" "github.com/gin-gonic/gin" @@ -806,6 +807,56 @@ func SetGroupMemberNickname(c *gin.Context) { c.JSON(http.StatusOK, resp) } -func GetGroupMemberIDListFromCache(c *gin.Context) { +func SetGroupMemberInfo(c *gin.Context) { + var ( + req api.SetGroupMemberInfoReq + resp api.SetGroupMemberInfoResp + ) + if err := c.BindJSON(&req); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req) + var opUserID string + ok, opUserID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID) + if !ok { + errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + reqPb := &rpc.SetGroupMemberInfoReq{ + GroupID: req.GroupID, + UserID: req.UserID, + OperationID: req.OperationID, + OpUserID: opUserID, + } + if req.Nickname != nil { + reqPb.Nickname = &wrappers.StringValue{Value: *req.Nickname} + } + if req.FaceURL != nil { + reqPb.FaceURL = &wrappers.StringValue{Value: *req.FaceURL} + } + if req.Ex != nil { + reqPb.Ex = &wrappers.StringValue{Value: *req.Ex} + } + if req.RoleLevel != nil { + reqPb.RoleLevel = &wrappers.Int32Value{Value: *req.RoleLevel} + } + + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewGroupClient(etcdConn) + respPb, err := client.SetGroupMemberInfo(context.Background(), reqPb) + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), " failed ", err.Error()) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) + return + } + resp.ErrMsg = respPb.CommonResp.ErrMsg + resp.ErrCode = respPb.CommonResp.ErrCode + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", resp) + c.JSON(http.StatusInternalServerError, resp) } diff --git a/internal/api/third/rtc.go b/internal/api/third/rtc.go new file mode 100644 index 000000000..4986558d7 --- /dev/null +++ b/internal/api/third/rtc.go @@ -0,0 +1,88 @@ +package apiThird + +import ( + api "Open_IM/pkg/base_info" + "Open_IM/pkg/common/db" + "Open_IM/pkg/common/log" + "Open_IM/pkg/common/token_verify" + "Open_IM/pkg/utils" + "github.com/gin-gonic/gin" + "net/http" +) + +func GetRTCInvitationInfo(c *gin.Context) { + var ( + req api.GetRTCInvitationInfoReq + resp api.GetRTCInvitationInfoResp + ) + if err := c.Bind(&req); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req) + var ok bool + var errInfo string + ok, _, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID) + if !ok { + errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + var err error + invitationInfo, err := db.DB.GetSignalInfoFromCacheByClientMsgID(req.ClientMsgID) + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSignalInfoFromCache", err.Error(), req) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) + return + } + resp.Data.OpUserID = invitationInfo.OpUserID + resp.Data.Invitation.RoomID = invitationInfo.Invitation.RoomID + resp.Data.Invitation.SessionType = invitationInfo.Invitation.SessionType + resp.Data.Invitation.GroupID = invitationInfo.Invitation.GroupID + resp.Data.Invitation.InviterUserID = invitationInfo.Invitation.InviterUserID + resp.Data.Invitation.InviteeUserIDList = invitationInfo.Invitation.InviteeUserIDList + resp.Data.Invitation.MediaType = invitationInfo.Invitation.MediaType + resp.Data.Invitation.Timeout = invitationInfo.Invitation.Timeout + c.JSON(http.StatusOK, resp) +} + +func GetRTCInvitationInfoStartApp(c *gin.Context) { + var ( + req api.GetRTCInvitationInfoStartAppReq + resp api.GetRTCInvitationInfoStartAppResp + ) + if err := c.Bind(&req); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req) + var ok bool + var errInfo string + ok, userID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID) + if !ok { + errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + invitationInfo, err := db.DB.GetAvailableSignalInvitationInfo(userID) + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSignalInfoFromCache", err.Error(), req) + c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": err.Error(), "data": struct{}{}}) + return + } + resp.Data.OpUserID = invitationInfo.OpUserID + resp.Data.Invitation.RoomID = invitationInfo.Invitation.RoomID + resp.Data.Invitation.SessionType = invitationInfo.Invitation.SessionType + resp.Data.Invitation.GroupID = invitationInfo.Invitation.GroupID + resp.Data.Invitation.InviterUserID = invitationInfo.Invitation.InviterUserID + resp.Data.Invitation.InviteeUserIDList = invitationInfo.Invitation.InviteeUserIDList + resp.Data.Invitation.MediaType = invitationInfo.Invitation.MediaType + resp.Data.Invitation.Timeout = invitationInfo.Invitation.Timeout + c.JSON(http.StatusOK, resp) + +} diff --git a/internal/demo/register/onboarding_process.go b/internal/demo/register/onboarding_process.go index 28d4d9140..8c43bc221 100644 --- a/internal/demo/register/onboarding_process.go +++ b/internal/demo/register/onboarding_process.go @@ -161,6 +161,7 @@ func onboardingProcessNotification(operationID, userID, groupID string) { }() var tips commonPb.TipsComm tips.DefaultTips = config.Config.Notification.JoinDepartmentNotification.DefaultTips.Tips + tips.JsonDetail = "" content, err := proto.Marshal(&tips) if err != nil { log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), "proto marshal failed") diff --git a/internal/msg_gateway/gate/callback.go b/internal/msg_gateway/gate/callback.go index f005f26a2..9840e3513 100644 --- a/internal/msg_gateway/gate/callback.go +++ b/internal/msg_gateway/gate/callback.go @@ -6,6 +6,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/http" http2 "net/http" + "time" ) func callbackUserOnline(operationID, userID string, platformID int, token string) cbApi.CommonCallbackResp { @@ -21,7 +22,9 @@ func callbackUserOnline(operationID, userID string, platformID int, token string UserID: userID, PlatformID: int32(platformID), Platform: constant.PlatformIDToName(platformID), - }} + }, + Seq: time.Now().Nanosecond() / 1e6, + } callbackUserOnlineResp := &cbApi.CallbackUserOnlineResp{CommonCallbackResp: callbackResp} if err := http.PostReturn(config.Config.Callback.CallbackUrl, callbackUserOnlineReq, callbackUserOnlineResp, config.Config.Callback.CallbackUserOnline.CallbackTimeOut); err != nil { callbackResp.ErrCode = http2.StatusInternalServerError @@ -35,13 +38,16 @@ func callbackUserOffline(operationID, userID string, platformID int) cbApi.Commo if !config.Config.Callback.CallbackUserOffline.Enable { return callbackResp } - callbackOfflineReq := cbApi.CallbackUserOfflineReq{UserStatusCallbackReq: cbApi.UserStatusCallbackReq{ - CallbackCommand: constant.CallbackUserOfflineCommand, - OperationID: operationID, - UserID: userID, - PlatformID: int32(platformID), - Platform: constant.PlatformIDToName(platformID), - }} + callbackOfflineReq := cbApi.CallbackUserOfflineReq{ + UserStatusCallbackReq: cbApi.UserStatusCallbackReq{ + CallbackCommand: constant.CallbackUserOfflineCommand, + OperationID: operationID, + UserID: userID, + PlatformID: int32(platformID), + Platform: constant.PlatformIDToName(platformID), + }, + Seq: time.Now().Nanosecond() / 1e6, + } callbackUserOfflineResp := &cbApi.CallbackUserOfflineResp{CommonCallbackResp: callbackResp} if err := http.PostReturn(config.Config.Callback.CallbackUrl, callbackOfflineReq, callbackUserOfflineResp, config.Config.Callback.CallbackUserOffline.CallbackTimeOut); err != nil { callbackResp.ErrCode = http2.StatusInternalServerError diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index 5a2b26fae..7ce2d65ba 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -3,6 +3,7 @@ package gate import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" + "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/grpc-etcdv3/getcdv3" pbChat "Open_IM/pkg/proto/chat" @@ -248,7 +249,13 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) { ws.sendSignalMsgResp(conn, 200, err.Error(), m, &signalResp) } else { log.NewInfo(pbData.OperationID, "rpc call success to sendMsgReq", reply.String()) - ws.sendSignalMsgResp(conn, 0, "", m, &signalResp) + // save invitation info for offline push + if err := db.DB.NewCacheSignalInfo(pbData.MsgData); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), m, &signalResp) + ws.sendSignalMsgResp(conn, 200, err.Error(), m, &signalResp) + } else { + ws.sendSignalMsgResp(conn, 0, "", m, &signalResp) + } } } else { log.NewError(m.OperationID, utils.GetSelfFuncName(), respPb.IsPass, respPb.CommonResp.ErrCode, respPb.CommonResp.ErrMsg) diff --git a/internal/push/getui/push.go b/internal/push/getui/push.go index b91b51fc2..03d3346ce 100644 --- a/internal/push/getui/push.go +++ b/internal/push/getui/push.go @@ -1,6 +1,7 @@ package getui import ( + "Open_IM/internal/push" "Open_IM/pkg/common/config" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" @@ -98,7 +99,7 @@ func newGetuiClient() *Getui { return &Getui{} } -func (g *Getui) Push(userIDList []string, alert, detailContent, operationID string) (resp string, err error) { +func (g *Getui) Push(userIDList []string, alert, detailContent, operationID string, opts push.PushOpts) (resp string, err error) { token, err := db.DB.GetGetuiToken() log.NewDebug(operationID, utils.GetSelfFuncName(), "token：", token) if err != nil { diff --git a/internal/push/jpush/push.go b/internal/push/jpush/push.go index aaaee306d..833174de5 100644 --- a/internal/push/jpush/push.go +++ b/internal/push/jpush/push.go @@ -1,6 +1,7 @@ package push import ( + "Open_IM/internal/push" "Open_IM/internal/push/jpush/common" "Open_IM/internal/push/jpush/requestBody" "Open_IM/pkg/common/config" @@ -32,12 +33,20 @@ func (j *JPush) SetAlias(cid, alias string) (resp string, err error) { return resp, nil } -func (j *JPush) Push(accounts []string, alert, detailContent, operationID string) (string, error) { +func (j *JPush) Push(accounts []string, alert, detailContent, operationID string, opts push.PushOpts) (string, error) { + var pf requestBody.Platform pf.SetAll() var au requestBody.Audience au.SetAlias(accounts) var no requestBody.Notification + + var extras requestBody.Extras + if opts.Signal.ClientMsgID != "" { + extras.ClientMsgID = opts.Signal.ClientMsgID + } + no.IOSEnableMutableContent() + no.SetExtras(extras) no.SetAlert(alert) var me requestBody.Message me.SetMsgContent(detailContent) diff --git a/internal/push/jpush/requestBody/notification.go b/internal/push/jpush/requestBody/notification.go index 9ff49a439..56ada1551 100644 --- a/internal/push/jpush/requestBody/notification.go +++ b/internal/push/jpush/requestBody/notification.go @@ -15,11 +15,18 @@ type Android struct { Intent struct { URL string `json:"url,omitempty"` } `json:"intent,omitempty"` + Extras Extras `json:"extras"` } type Ios struct { - Alert string `json:"alert,omitempty"` - Sound string `json:"sound,omitempty"` - Badge string `json:"badge,omitempty"` + Alert string `json:"alert,omitempty"` + Sound string `json:"sound,omitempty"` + Badge string `json:"badge,omitempty"` + Extras Extras `json:"extras"` + MutableContent bool `json:"mutable-content"` +} + +type Extras struct { + ClientMsgID string `json:"clientMsgID"` } func (n *Notification) SetAlert(alert string) { @@ -29,8 +36,17 @@ func (n *Notification) SetAlert(alert string) { n.IOS.Alert = alert n.IOS.Sound = "default" n.IOS.Badge = "+1" +} +func (n *Notification) SetExtras(extras Extras) { + n.IOS.Extras = extras + n.Android.Extras = extras } + func (n *Notification) SetAndroidIntent() { n.Android.Intent.URL = config.Config.Push.Jpns.PushIntent } + +func (n *Notification) IOSEnableMutableContent() { + n.IOS.MutableContent = true +} diff --git a/internal/push/logic/callback.go b/internal/push/logic/callback.go index 2d445e666..e8fd576a5 100644 --- a/internal/push/logic/callback.go +++ b/internal/push/logic/callback.go @@ -9,7 +9,7 @@ import ( http2 "net/http" ) -func callbackOfflinePush(operationID, userID string, info *commonPb.OfflinePushInfo, platformID int32) cbApi.CommonCallbackResp { +func callbackOfflinePush(operationID, userID string, msg *commonPb.MsgData) cbApi.CommonCallbackResp { callbackResp := cbApi.CommonCallbackResp{OperationID: operationID} if !config.Config.Callback.CallbackOfflinePush.Enable { return callbackResp @@ -19,10 +19,16 @@ func callbackOfflinePush(operationID, userID string, info *commonPb.OfflinePushI CallbackCommand: constant.CallbackOfflinePushCommand, OperationID: operationID, UserID: userID, - PlatformID: platformID, - Platform: constant.PlatformIDToName(int(platformID)), + PlatformID: msg.SenderPlatformID, + Platform: constant.PlatformIDToName(int(msg.SenderPlatformID)), }, - OfflinePushInfo: info, + OfflinePushInfo: msg.OfflinePushInfo, + SendID: msg.SendID, + GroupID: msg.GroupID, + ContentType: msg.ContentType, + SessionType: msg.SessionType, + AtUserIDList: msg.AtUserIDList, + Content: string(msg.Content), } callbackOfflinePushResp := &cbApi.CallbackOfflinePushResp{CommonCallbackResp: &callbackResp} if err := http.PostReturn(config.Config.Callback.CallbackUrl, callbackOfflinePushReq, callbackOfflinePushResp, config.Config.Callback.CallbackOfflinePush.CallbackTimeOut); err != nil { diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 589605e02..271bb4792 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -7,16 +7,18 @@ package logic import ( - jpush "Open_IM/internal/push/jpush" + "Open_IM/internal/push" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/grpc-etcdv3/getcdv3" pbPush "Open_IM/pkg/proto/push" pbRelay "Open_IM/pkg/proto/relay" + pbRtc "Open_IM/pkg/proto/rtc" "Open_IM/pkg/utils" "context" "encoding/json" + "github.com/golang/protobuf/proto" "google.golang.org/grpc" "strings" ) @@ -99,11 +101,15 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { } else { content = constant.ContentType2PushContent[constant.GroupMsg] } + case constant.SignalingNotification: + content = constant.ContentType2PushContent[constant.SignalMsg] default: content = constant.ContentType2PushContent[constant.Common] + } } - callbackResp := callbackOfflinePush(pushMsg.OperationID, UIDList[0], pushMsg.MsgData.OfflinePushInfo, constant.AndroidPlatformID) + + callbackResp := callbackOfflinePush(pushMsg.OperationID, UIDList[0], pushMsg.MsgData) log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offline callback Resp") if callbackResp.ErrCode != 0 { log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "callbackOfflinePush result: ", callbackResp) @@ -113,9 +119,14 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { return } if offlinePusher == nil { - offlinePusher = jpush.JPushClient + return } - pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID) + opts, err := GetOfflinePushOpts(pushMsg) + if err != nil { + log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error()) + } + log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), UIDList, content, jsonCustomContent, "opts:", opts) + pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID, opts) if err != nil { log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error()) } else { @@ -225,6 +236,23 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) { //} } +func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err error) { + if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotificationBegin { + req := &pbRtc.SignalReq{} + if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil { + return opts, utils.Wrap(err, "") + } + log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "SignalReq: ", req.String()) + switch req.Payload.(type) { + case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup: + opts.Signal.ClientMsgID = pushMsg.MsgData.ClientMsgID + log.NewDebug(pushMsg.OperationID, opts) + } + + } + return opts, nil +} + //func SendMsgByWS(m *pbChat.WSToMsgSvrChatMsg) { // m.MsgID = rpcChat.GetMsgID(m.SendID) // m.ClientMsgID = m.MsgID diff --git a/internal/push/push_interface.go b/internal/push/push_interface.go index 59b4764b4..a1d45d7b7 100644 --- a/internal/push/push_interface.go +++ b/internal/push/push_interface.go @@ -1,5 +1,13 @@ package push type OfflinePusher interface { - Push(userIDList []string, alert, detailContent, operationID string) (resp string, err error) + Push(userIDList []string, alert, detailContent, operationID string, opts PushOpts) (resp string, err error) +} + +type PushOpts struct { + Signal Signal +} + +type Signal struct { + ClientMsgID string } diff --git a/internal/rpc/admin_cms/admin_cms.go b/internal/rpc/admin_cms/admin_cms.go index e8084836f..ed744b312 100644 --- a/internal/rpc/admin_cms/admin_cms.go +++ b/internal/rpc/admin_cms/admin_cms.go @@ -10,10 +10,11 @@ import ( pbAdminCMS "Open_IM/pkg/proto/admin_cms" "Open_IM/pkg/utils" "context" - "google.golang.org/grpc" "net" "strconv" "strings" + + "google.golang.org/grpc" ) type adminCMSServer struct { @@ -62,6 +63,7 @@ func (s *adminCMSServer) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10) if err != nil { log.NewError("0", "RegisterEtcd failed ", err.Error()) diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index 768cf980a..38a27dfcf 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -141,7 +141,7 @@ func (rpc *rpcAuth) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } - + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(rpc.etcdSchema, strings.Join(rpc.etcdAddr, ","), rpcRegisterIP, rpc.rpcPort, rpc.rpcRegisterName, 10) if err != nil { log.NewError(operationID, "RegisterEtcd failed ", err.Error(), diff --git a/internal/rpc/cache/cache.go b/internal/rpc/cache/cache.go index e42ab22e7..2d58d190a 100644 --- a/internal/rpc/cache/cache.go +++ b/internal/rpc/cache/cache.go @@ -11,11 +11,12 @@ import ( commonPb "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" - "google.golang.org/grpc" "net" "strconv" "strings" "sync" + + "google.golang.org/grpc" ) type cacheServer struct { @@ -71,7 +72,7 @@ func (s *cacheServer) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } - + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10) if err != nil { log.NewError("0", "RegisterEtcd failed ", err.Error()) diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 84e0b302a..3c68e5c46 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -164,6 +164,7 @@ func (rpc *rpcConversation) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(rpc.etcdSchema, strings.Join(rpc.etcdAddr, ","), rpcRegisterIP, rpc.rpcPort, rpc.rpcRegisterName, 10) if err != nil { log.NewError("0", "RegisterEtcd failed ", err.Error(), diff --git a/internal/rpc/friend/firend.go b/internal/rpc/friend/firend.go index d85ccbc55..313b2becf 100644 --- a/internal/rpc/friend/firend.go +++ b/internal/rpc/friend/firend.go @@ -15,11 +15,12 @@ import ( sdkws "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" - "google.golang.org/grpc" "net" "strconv" "strings" "time" + + "google.golang.org/grpc" ) type friendServer struct { @@ -69,7 +70,7 @@ func (s *friendServer) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } - + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10) if err != nil { log.NewError("0", "RegisterEtcd failed ", err.Error(), s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index c2b2d27ca..cbb4afe44 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -71,6 +71,7 @@ func (s *groupServer) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10) if err != nil { log.NewError("", "RegisterEtcd failed ", err.Error()) @@ -1582,3 +1583,35 @@ func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.S log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}) return &pbGroup.SetGroupMemberNicknameResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil } + +func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGroupMemberInfoReq) (resp *pbGroup.SetGroupMemberInfoResp, err error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) + resp = &pbGroup.SetGroupMemberInfoResp{CommonResp: &pbGroup.CommonResp{}} + groupMember := db.GroupMember{ + GroupID: req.GroupID, + UserID: req.UserID, + } + m := make(map[string]interface{}) + if req.RoleLevel != nil { + m["role_level"] = req.RoleLevel.Value + } + if req.FaceURL != nil { + m["user_group_face_url"] = req.FaceURL.Value + } + if req.Nickname != nil { + m["nickname"] = req.Nickname.Value + } + if req.Ex != nil { + m["ex"] = req.Ex.Value + } + err = imdb.UpdateGroupMemberInfoByMap(groupMember, m) + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "SetGroupMemberInfo failed", err.Error()) + resp.CommonResp.ErrCode = constant.ErrDB.ErrCode + resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg + ":" + err.Error() + return resp, nil + } + chat.GroupMemberInfoSetNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) + return resp, nil +} diff --git a/internal/rpc/message_cms/message_cms.go b/internal/rpc/message_cms/message_cms.go index e35755ef2..4f983e787 100644 --- a/internal/rpc/message_cms/message_cms.go +++ b/internal/rpc/message_cms/message_cms.go @@ -70,6 +70,7 @@ func (s *messageCMSServer) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10) if err != nil { log.NewError("0", "RegisterEtcd failed ", err.Error()) diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index 00a20ae13..b38e573e2 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -231,7 +231,7 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S return returnMsg(&replay, pb, 201, "GetGroupMemberIDListFromCache logic failed", "", 0) } memberUserIDList := cacheResp.UserIDList - log.Debug(pb.OperationID, "GetGroupAllMember userID list", cacheResp.UserIDList) + log.Debug(pb.OperationID, "GetGroupAllMember userID list", cacheResp.UserIDList, "len: ", len(cacheResp.UserIDList)) var addUidList []string switch pb.MsgData.ContentType { case constant.MemberKickedNotification: @@ -861,6 +861,10 @@ func (rpc *rpcChat) sendMsgToGroupOptimization(list []string, groupPB *pbChat.Se groupPB.MsgData.RecvID = v isSend := modifyMessageByUserMessageReceiveOpt(v, groupPB.MsgData.GroupID, constant.GroupChatType, groupPB) if isSend { + if v == "" || groupPB.MsgData.SendID == "" { + log.Error(msgToMQGroup.OperationID, "sendMsgToGroupOptimization userID nil ", msgToMQGroup.String()) + continue + } err := rpc.sendMsgToKafka(&msgToMQGroup, v, status) if err != nil { log.NewError(msgToMQGroup.OperationID, "kafka send msg err:UserId", v, msgToMQGroup.String()) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 753fca492..b75c97edd 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -14,13 +14,14 @@ import ( pbCommon "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" - "google.golang.org/grpc" "net" "strconv" "strings" "sync" "time" "unsafe" + + "google.golang.org/grpc" ) type officeServer struct { @@ -77,7 +78,7 @@ func (s *officeServer) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } - + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10) if err != nil { log.NewError("0", "RegisterEtcd failed ", err.Error()) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 35a67b04c..02523c35e 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -9,17 +9,18 @@ import ( "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" "Open_IM/pkg/grpc-etcdv3/getcdv3" - "Open_IM/pkg/proto/auth" + pbAuth "Open_IM/pkg/proto/auth" groupRpc "Open_IM/pkg/proto/group" rpc "Open_IM/pkg/proto/organization" open_im_sdk "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" - "google.golang.org/grpc" "net" "strconv" "strings" "time" + + "google.golang.org/grpc" ) type organizationServer struct { @@ -67,6 +68,7 @@ func (s *organizationServer) Run() { log.Error("", "GetLocalIP failed ", err.Error()) } } + log.NewInfo("", "rpcRegisterIP", rpcRegisterIP) err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10) if err != nil { log.NewError("", "RegisterEtcd failed ", err.Error()) @@ -152,7 +154,6 @@ func (s *organizationServer) UpdateDepartment(ctx context.Context, req *rpc.Upda department := db.Department{} utils.CopyStructFields(&department, req.DepartmentInfo) - log.Debug(req.OperationID, "dst ", department, "src ", req.DepartmentInfo) if err := imdb.UpdateDepartment(&department, nil); err != nil { errMsg := req.OperationID + " " + "UpdateDepartment failed " + err.Error() @@ -341,6 +342,7 @@ func (s *organizationServer) GetDepartmentParentIDList(_ context.Context, req *r resp = &rpc.GetDepartmentParentIDListResp{} resp.ParentIDList, err = imdb.GetDepartmentParentIDList(req.DepartmentID) if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetDepartmentParentIDList failed", err.Error()) resp.ErrMsg = constant.ErrDB.ErrMsg + ": " + err.Error() resp.ErrCode = constant.ErrDB.ErrCode return resp, nil diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index 169cb0b6e..e00f6daf0 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -232,3 +232,17 @@ type SetGroupMemberNicknameReq struct { type SetGroupMemberNicknameResp struct { CommResp } + +type SetGroupMemberInfoReq struct { + OperationID string `json:"operationID" binding:"required"` + GroupID string `json:"groupID" binding:"required"` + UserID string `json:"userID" binding:"required"` + Nickname *string `json:"nickname"` + FaceURL *string `json:"userGroupFaceUrl"` + RoleLevel *int32 `json:"roleLevel" validate:"gte=1,lte=3"` + Ex *string `json:"ex"` +} + +type SetGroupMemberInfoResp struct { + CommResp +} diff --git a/pkg/base_info/minio_api_struct.go b/pkg/base_info/third_api_struct.go similarity index 67% rename from pkg/base_info/minio_api_struct.go rename to pkg/base_info/third_api_struct.go index b553e22c7..758c3494c 100644 --- a/pkg/base_info/minio_api_struct.go +++ b/pkg/base_info/third_api_struct.go @@ -57,3 +57,33 @@ type GetDownloadURLResp struct { UpdateLog string `json:"update_log"` } `json:"data"` } + +type GetRTCInvitationInfoReq struct { + OperationID string `json:"operationID" binding:"required"` + ClientMsgID string `json:"clientMsgID" binding:"required"` +} + +type GetRTCInvitationInfoResp struct { + CommResp + Data struct { + OpUserID string `json:"opUserID"` + Invitation struct { + InviterUserID string `json:"inviterUserID"` + InviteeUserIDList []string `json:"inviteeUserIDList"` + GroupID string `json:"groupID"` + RoomID string `json:"roomID"` + Timeout int32 `json:"timeout"` + MediaType string `json:"mediaType"` + SessionType int32 `json:"sessionType"` + } `json:"invitation"` + OfflinePushInfo struct{} `json:"offlinePushInfo"` + } `json:"data"` +} + +type GetRTCInvitationInfoStartAppReq struct { + OperationID string `json:"operationID" binding:"required"` +} + +type GetRTCInvitationInfoStartAppResp struct { + GetRTCInvitationInfoResp +} diff --git a/pkg/call_back_struct/msg_gateway.go b/pkg/call_back_struct/msg_gateway.go index e6c3ec389..2fba45114 100644 --- a/pkg/call_back_struct/msg_gateway.go +++ b/pkg/call_back_struct/msg_gateway.go @@ -3,6 +3,7 @@ package call_back_struct type CallbackUserOnlineReq struct { UserStatusCallbackReq Token string `json:"token"` + Seq int `json:"seq"` } type CallbackUserOnlineResp struct { @@ -11,6 +12,7 @@ type CallbackUserOnlineResp struct { type CallbackUserOfflineReq struct { UserStatusCallbackReq + Seq int `json:"seq"` } type CallbackUserOfflineResp struct { diff --git a/pkg/call_back_struct/push.go b/pkg/call_back_struct/push.go index af7e38d79..271803679 100644 --- a/pkg/call_back_struct/push.go +++ b/pkg/call_back_struct/push.go @@ -5,6 +5,13 @@ import commonPb "Open_IM/pkg/proto/sdk_ws" type CallbackOfflinePushReq struct { UserStatusCallbackReq *commonPb.OfflinePushInfo + CommonCallbackReq + SendID string `json:"sendID"` + GroupID string `json:"groupID"` + ContentType int32 `json:"contentType"` + SessionType int32 `json:"sessionType"` + AtUserIDList []string `json:"atUserIDList"` + Content string `json` } type CallbackOfflinePushResp struct { diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 53ac8023e..2b9a4d891 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -419,6 +419,11 @@ type config struct { OfflinePush POfflinePush `yaml:"offlinePush"` DefaultTips PDefaultTips `yaml:"defaultTips"` } `yaml:"joinDepartmentNotification"` + Signal struct { + OfflinePush struct { + Title string `yaml:"title"` + } `yaml:"offlinePush"` + } `yaml:"signal"` } Demo struct { Port []int `yaml:"openImDemoPort"` @@ -442,8 +447,7 @@ type config struct { ImAPIURL string `yaml:"imAPIURL"` } Rtc struct { - Port int `yaml:"port"` - Address string `yaml:"address"` + SignalTimeout string `yaml:"signalTimeout"` } `yaml:"rtc"` } type PConversation struct { diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 7be774b2f..1e23ebefa 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -44,6 +44,7 @@ const ( Quote = 114 Common = 200 GroupMsg = 201 + SignalMsg = 202 //SysRelated NotificationBegin = 1000 @@ -218,14 +219,15 @@ const ( ) var ContentType2PushContent = map[int64]string{ - Picture: "[图片]", - Voice: "[语音]", - Video: "[视频]", - File: "[文件]", - Text: "你收到了一条文本消息", - AtText: "[有人@你]", - GroupMsg: "你收到一条群聊消息", - Common: "你收到一条新消息", + Picture: "[图片]", + Voice: "[语音]", + Video: "[视频]", + File: "[文件]", + Text: "你收到了一条文本消息", + AtText: "[有人@你]", + GroupMsg: "你收到一条群聊消息", + Common: "你收到一条新消息", + SignalMsg: "音視頻通話邀請", } const ( diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go index b0cd34ef1..83a59e6d9 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_member_model.go @@ -142,6 +142,18 @@ func UpdateGroupMemberInfo(groupMemberInfo db.GroupMember) error { return nil } +func UpdateGroupMemberInfoByMap(groupMemberInfo db.GroupMember, m map[string]interface{}) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + err = dbConn.Table("group_members").Where("group_id=? and user_id=?", groupMemberInfo.GroupID, groupMemberInfo.UserID).Updates(m).Error + if err != nil { + return err + } + return nil +} + func GetOwnerManagerByGroupID(groupID string) ([]db.GroupMember, error) { dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index be06f7f38..17a6c938f 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -249,26 +249,27 @@ func GetDepartmentRelatedGroupIDList(departmentIDList []string) ([]string, error func getDepartmentParent(departmentID string, dbConn *gorm.DB) (*db.Department, error) { var department db.Department - var parentID string + //var parentID string dbConn.LogMode(true) // select * from departments where department_id = (select parent_id from departments where department_id= zx234fd); - err := dbConn.Table("departments").Where("department_id=?", dbConn.Table("departments").Where("department_id=?", departmentID).Pluck("parent_id", parentID)).Find(&department).Error + //dbConn.Table("departments").Where("department_id=?", departmentID).Pluck("parent_id", parentID).Error + err := dbConn.Table("departments").Where("department_id=?").Find(&department).Error return &department, err } -func GetDepartmentParent(departmentID string, dbConn *gorm.DB, parentIDList []string) (*db.Department, error) { +func GetDepartmentParent(departmentID string, dbConn *gorm.DB, parentIDList *[]string) error { department, err := getDepartmentParent(departmentID, dbConn) if err != nil { - return nil, err + return err } if department.ParentID != "" { - parentIDList = append(parentIDList, department.ParentID) - _, err = GetDepartmentParent(departmentID, dbConn, parentIDList) + *parentIDList = append(*parentIDList, department.ParentID) + err = GetDepartmentParent(departmentID, dbConn, parentIDList) if err != nil { - return nil, nil + return err } } - return nil, nil + return nil } func GetDepartmentParentIDList(departmentID string) ([]string, error) { @@ -277,6 +278,6 @@ func GetDepartmentParentIDList(departmentID string) ([]string, error) { return nil, err } var parentIDList []string - _, err = GetDepartmentParent(departmentID, dbConn, parentIDList) + err = GetDepartmentParent(departmentID, dbConn, &parentIDList) return parentIDList, err } diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index 763409228..ab7a28d8c 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -4,15 +4,21 @@ import ( "Open_IM/pkg/common/config" log2 "Open_IM/pkg/common/log" pbChat "Open_IM/pkg/proto/chat" + pbRtc "Open_IM/pkg/proto/rtc" pbCommon "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" "errors" "fmt" + "github.com/garyburd/redigo/redis" - "github.com/mitchellh/mapstructure" + + //goRedis "github.com/go-redis/redis/v8" "strconv" "time" + + "github.com/golang/protobuf/proto" + "github.com/mitchellh/mapstructure" ) //func (d * DataBases)pubMessage(channel, msg string) { @@ -101,3 +107,91 @@ func (d *DataBases) CleanUpOneUserAllMsgFromRedis(userID string, operationID str } return nil } + +func (d *DataBases) NewCacheSignalInfo(msg *pbCommon.MsgData) error { + req := &pbRtc.SignalReq{} + if err := proto.Unmarshal(msg.Content, req); err != nil { + return err + } + //log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "SignalReq: ", req.String()) + var inviteeUserIDList []string + switch invitationInfo := req.Payload.(type) { + case *pbRtc.SignalReq_Invite: + inviteeUserIDList = invitationInfo.Invite.Invitation.InviteeUserIDList + case *pbRtc.SignalReq_InviteInGroup: + inviteeUserIDList = invitationInfo.InviteInGroup.Invitation.InviteeUserIDList + default: + log2.NewDebug("", utils.GetSelfFuncName(), "req type not invite", string(msg.Content)) + return nil + } + for _, userID := range inviteeUserIDList { + timeout, err := strconv.Atoi(config.Config.Rtc.SignalTimeout) + if err != nil { + return err + } + keyList := SignalListCache + userID + err = d.rdb.LPush(context.Background(), keyList, msg.ClientMsgID).Err() + if err != nil { + return err + } + err = d.rdb.Expire(context.Background(), keyList, time.Duration(timeout)*time.Second).Err() + if err != nil { + return err + } + key := SignalCache + msg.ClientMsgID + err = d.rdb.Set(context.Background(), key, msg.Content, time.Duration(timeout)*time.Second).Err() + if err != nil { + return err + } + return err + } + return nil +} + +func (d *DataBases) GetSignalInfoFromCacheByClientMsgID(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) { + key := SignalCache + clientMsgID + invitationInfo = &pbRtc.SignalInviteReq{} + bytes, err := d.rdb.Get(context.Background(), key).Bytes() + if err != nil { + return nil, err + } + req := &pbRtc.SignalReq{} + if err = proto.Unmarshal(bytes, req); err != nil { + return nil, err + } + switch req2 := req.Payload.(type) { + case *pbRtc.SignalReq_Invite: + invitationInfo.Invitation = req2.Invite.Invitation + case *pbRtc.SignalReq_InviteInGroup: + invitationInfo.Invitation = req2.InviteInGroup.Invitation + } + return invitationInfo, err +} + +func (d *DataBases) GetAvailableSignalInvitationInfo(userID string) (invitationInfo *pbRtc.SignalInviteReq, err error) { + keyList := SignalListCache + userID + result := d.rdb.RPop(context.Background(), keyList) + if err = result.Err(); err != nil { + return nil, utils.Wrap(err, "GetAvailableSignalInvitationInfo failed") + } + key, err := result.Result() + if err != nil { + return nil, utils.Wrap(err, "GetAvailableSignalInvitationInfo failed") + } + log2.NewDebug("", utils.GetSelfFuncName(), result, result.String()) + invitationInfo, err = d.GetSignalInfoFromCacheByClientMsgID(key) + if err != nil { + return nil, utils.Wrap(err, "GetSignalInfoFromCacheByClientMsgID") + } + err = d.delUserSingalList(userID) + if err != nil { + return nil, utils.Wrap(err, "GetSignalInfoFromCacheByClientMsgID") + } + return invitationInfo, nil +} + +func (d *DataBases) delUserSingalList(userID string) error { + keyList := SignalListCache + userID + err := d.rdb.Del(context.Background(), keyList).Err() + return err +} diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 8f978dc3e..68747e0e3 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -5,13 +5,18 @@ import ( "Open_IM/pkg/common/constant" log2 "Open_IM/pkg/common/log" pbChat "Open_IM/pkg/proto/chat" + pbRtc "Open_IM/pkg/proto/rtc" pbCommon "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "encoding/json" "errors" "fmt" + "github.com/garyburd/redigo/redis" "github.com/golang/protobuf/jsonpb" + "github.com/golang/protobuf/proto" + + //osconfig "google.golang.org/genproto/googleapis/cloud/osconfig/v1alpha" "strconv" ) @@ -29,6 +34,8 @@ const ( blackListCache = "BLACK_LIST_CACHE:" groupCache = "GROUP_CACHE:" messageCache = "MESSAGE_CACHE:" + SignalCache = "SIGNAL_CACHE:" + SignalListCache = "SIGNAL_LIST_CACHE:" ) func (d *DataBases) Exec(cmd string, key interface{}, args ...interface{}) (interface{}, error) { @@ -342,3 +349,25 @@ func (d *DataBases) DelMsgFromCache(uid string, seqList []uint32, operationID st } } } + +func (d *DataBases) CacheSignalInfo(msg *pbCommon.MsgData) error { + key := SignalCache + msg.ClientMsgID + _, err := d.Exec("SET", key, msg.Content, "ex", config.Config.Rtc.SignalTimeout) + return err +} + +func (d *DataBases) GetSignalInfoFromCache(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) { + key := SignalCache + clientMsgID + result, err := redis.Bytes(d.Exec("GET", key)) + log2.NewDebug("", utils.GetSelfFuncName(), clientMsgID, result, string(result)) + if err != nil { + return nil, err + } + req := &pbRtc.SignalReq{} + if err = proto.Unmarshal(result, req); err != nil { + return nil, err + } + req2 := req.Payload.(*pbRtc.SignalReq_Invite) + invitationInfo = req2.Invite + return invitationInfo, err +} diff --git a/pkg/proto/group/group.pb.go b/pkg/proto/group/group.pb.go index 4dcf62098..e7bdc47c5 100644 --- a/pkg/proto/group/group.pb.go +++ b/pkg/proto/group/group.pb.go @@ -7,6 +7,7 @@ import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" import sdk_ws "Open_IM/pkg/proto/sdk_ws" +import wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" import ( context "golang.org/x/net/context" @@ -36,7 +37,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} } func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (*CommonResp) ProtoMessage() {} func (*CommonResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{0} + return fileDescriptor_group_f05abf5eae29d157, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -82,7 +83,7 @@ func (m *GroupAddMemberInfo) Reset() { *m = GroupAddMemberInfo{} } func (m *GroupAddMemberInfo) String() string { return proto.CompactTextString(m) } func (*GroupAddMemberInfo) ProtoMessage() {} func (*GroupAddMemberInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{1} + return fileDescriptor_group_f05abf5eae29d157, []int{1} } func (m *GroupAddMemberInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupAddMemberInfo.Unmarshal(m, b) @@ -131,7 +132,7 @@ func (m *CreateGroupReq) Reset() { *m = CreateGroupReq{} } func (m *CreateGroupReq) String() string { return proto.CompactTextString(m) } func (*CreateGroupReq) ProtoMessage() {} func (*CreateGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{2} + return fileDescriptor_group_f05abf5eae29d157, []int{2} } func (m *CreateGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupReq.Unmarshal(m, b) @@ -199,7 +200,7 @@ func (m *CreateGroupResp) Reset() { *m = CreateGroupResp{} } func (m *CreateGroupResp) String() string { return proto.CompactTextString(m) } func (*CreateGroupResp) ProtoMessage() {} func (*CreateGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{3} + return fileDescriptor_group_f05abf5eae29d157, []int{3} } func (m *CreateGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupResp.Unmarshal(m, b) @@ -253,7 +254,7 @@ func (m *GetGroupsInfoReq) Reset() { *m = GetGroupsInfoReq{} } func (m *GetGroupsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupsInfoReq) ProtoMessage() {} func (*GetGroupsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{4} + return fileDescriptor_group_f05abf5eae29d157, []int{4} } func (m *GetGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoReq.Unmarshal(m, b) @@ -307,7 +308,7 @@ func (m *GetGroupsInfoResp) Reset() { *m = GetGroupsInfoResp{} } func (m *GetGroupsInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupsInfoResp) ProtoMessage() {} func (*GetGroupsInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{5} + return fileDescriptor_group_f05abf5eae29d157, []int{5} } func (m *GetGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoResp.Unmarshal(m, b) @@ -361,7 +362,7 @@ func (m *SetGroupInfoReq) Reset() { *m = SetGroupInfoReq{} } func (m *SetGroupInfoReq) String() string { return proto.CompactTextString(m) } func (*SetGroupInfoReq) ProtoMessage() {} func (*SetGroupInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{6} + return fileDescriptor_group_f05abf5eae29d157, []int{6} } func (m *SetGroupInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoReq.Unmarshal(m, b) @@ -413,7 +414,7 @@ func (m *SetGroupInfoResp) Reset() { *m = SetGroupInfoResp{} } func (m *SetGroupInfoResp) String() string { return proto.CompactTextString(m) } func (*SetGroupInfoResp) ProtoMessage() {} func (*SetGroupInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{7} + return fileDescriptor_group_f05abf5eae29d157, []int{7} } func (m *SetGroupInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoResp.Unmarshal(m, b) @@ -453,7 +454,7 @@ func (m *GetGroupApplicationListReq) Reset() { *m = GetGroupApplicationL func (m *GetGroupApplicationListReq) String() string { return proto.CompactTextString(m) } func (*GetGroupApplicationListReq) ProtoMessage() {} func (*GetGroupApplicationListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{8} + return fileDescriptor_group_f05abf5eae29d157, []int{8} } func (m *GetGroupApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListReq.Unmarshal(m, b) @@ -507,7 +508,7 @@ func (m *GetGroupApplicationListResp) Reset() { *m = GetGroupApplication func (m *GetGroupApplicationListResp) String() string { return proto.CompactTextString(m) } func (*GetGroupApplicationListResp) ProtoMessage() {} func (*GetGroupApplicationListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{9} + return fileDescriptor_group_f05abf5eae29d157, []int{9} } func (m *GetGroupApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListResp.Unmarshal(m, b) @@ -561,7 +562,7 @@ func (m *GetUserReqApplicationListReq) Reset() { *m = GetUserReqApplicat func (m *GetUserReqApplicationListReq) String() string { return proto.CompactTextString(m) } func (*GetUserReqApplicationListReq) ProtoMessage() {} func (*GetUserReqApplicationListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{10} + return fileDescriptor_group_f05abf5eae29d157, []int{10} } func (m *GetUserReqApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListReq.Unmarshal(m, b) @@ -614,7 +615,7 @@ func (m *GetUserReqApplicationListResp) Reset() { *m = GetUserReqApplica func (m *GetUserReqApplicationListResp) String() string { return proto.CompactTextString(m) } func (*GetUserReqApplicationListResp) ProtoMessage() {} func (*GetUserReqApplicationListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{11} + return fileDescriptor_group_f05abf5eae29d157, []int{11} } func (m *GetUserReqApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListResp.Unmarshal(m, b) @@ -663,7 +664,7 @@ func (m *TransferGroupOwnerReq) Reset() { *m = TransferGroupOwnerReq{} } func (m *TransferGroupOwnerReq) String() string { return proto.CompactTextString(m) } func (*TransferGroupOwnerReq) ProtoMessage() {} func (*TransferGroupOwnerReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{12} + return fileDescriptor_group_f05abf5eae29d157, []int{12} } func (m *TransferGroupOwnerReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerReq.Unmarshal(m, b) @@ -729,7 +730,7 @@ func (m *TransferGroupOwnerResp) Reset() { *m = TransferGroupOwnerResp{} func (m *TransferGroupOwnerResp) String() string { return proto.CompactTextString(m) } func (*TransferGroupOwnerResp) ProtoMessage() {} func (*TransferGroupOwnerResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{13} + return fileDescriptor_group_f05abf5eae29d157, []int{13} } func (m *TransferGroupOwnerResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerResp.Unmarshal(m, b) @@ -770,7 +771,7 @@ func (m *JoinGroupReq) Reset() { *m = JoinGroupReq{} } func (m *JoinGroupReq) String() string { return proto.CompactTextString(m) } func (*JoinGroupReq) ProtoMessage() {} func (*JoinGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{14} + return fileDescriptor_group_f05abf5eae29d157, []int{14} } func (m *JoinGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupReq.Unmarshal(m, b) @@ -829,7 +830,7 @@ func (m *JoinGroupResp) Reset() { *m = JoinGroupResp{} } func (m *JoinGroupResp) String() string { return proto.CompactTextString(m) } func (*JoinGroupResp) ProtoMessage() {} func (*JoinGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{15} + return fileDescriptor_group_f05abf5eae29d157, []int{15} } func (m *JoinGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupResp.Unmarshal(m, b) @@ -872,7 +873,7 @@ func (m *GroupApplicationResponseReq) Reset() { *m = GroupApplicationRes func (m *GroupApplicationResponseReq) String() string { return proto.CompactTextString(m) } func (*GroupApplicationResponseReq) ProtoMessage() {} func (*GroupApplicationResponseReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{16} + return fileDescriptor_group_f05abf5eae29d157, []int{16} } func (m *GroupApplicationResponseReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseReq.Unmarshal(m, b) @@ -945,7 +946,7 @@ func (m *GroupApplicationResponseResp) Reset() { *m = GroupApplicationRe func (m *GroupApplicationResponseResp) String() string { return proto.CompactTextString(m) } func (*GroupApplicationResponseResp) ProtoMessage() {} func (*GroupApplicationResponseResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{17} + return fileDescriptor_group_f05abf5eae29d157, []int{17} } func (m *GroupApplicationResponseResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseResp.Unmarshal(m, b) @@ -985,7 +986,7 @@ func (m *QuitGroupReq) Reset() { *m = QuitGroupReq{} } func (m *QuitGroupReq) String() string { return proto.CompactTextString(m) } func (*QuitGroupReq) ProtoMessage() {} func (*QuitGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{18} + return fileDescriptor_group_f05abf5eae29d157, []int{18} } func (m *QuitGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupReq.Unmarshal(m, b) @@ -1037,7 +1038,7 @@ func (m *QuitGroupResp) Reset() { *m = QuitGroupResp{} } func (m *QuitGroupResp) String() string { return proto.CompactTextString(m) } func (*QuitGroupResp) ProtoMessage() {} func (*QuitGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{19} + return fileDescriptor_group_f05abf5eae29d157, []int{19} } func (m *QuitGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupResp.Unmarshal(m, b) @@ -1079,7 +1080,7 @@ func (m *GetGroupMemberListReq) Reset() { *m = GetGroupMemberListReq{} } func (m *GetGroupMemberListReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberListReq) ProtoMessage() {} func (*GetGroupMemberListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{20} + return fileDescriptor_group_f05abf5eae29d157, []int{20} } func (m *GetGroupMemberListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListReq.Unmarshal(m, b) @@ -1148,7 +1149,7 @@ func (m *GetGroupMemberListResp) Reset() { *m = GetGroupMemberListResp{} func (m *GetGroupMemberListResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberListResp) ProtoMessage() {} func (*GetGroupMemberListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{21} + return fileDescriptor_group_f05abf5eae29d157, []int{21} } func (m *GetGroupMemberListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListResp.Unmarshal(m, b) @@ -1210,7 +1211,7 @@ func (m *GetGroupMembersInfoReq) Reset() { *m = GetGroupMembersInfoReq{} func (m *GetGroupMembersInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersInfoReq) ProtoMessage() {} func (*GetGroupMembersInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{22} + return fileDescriptor_group_f05abf5eae29d157, []int{22} } func (m *GetGroupMembersInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoReq.Unmarshal(m, b) @@ -1271,7 +1272,7 @@ func (m *GetGroupMembersInfoResp) Reset() { *m = GetGroupMembersInfoResp func (m *GetGroupMembersInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersInfoResp) ProtoMessage() {} func (*GetGroupMembersInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{23} + return fileDescriptor_group_f05abf5eae29d157, []int{23} } func (m *GetGroupMembersInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoResp.Unmarshal(m, b) @@ -1327,7 +1328,7 @@ func (m *KickGroupMemberReq) Reset() { *m = KickGroupMemberReq{} } func (m *KickGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*KickGroupMemberReq) ProtoMessage() {} func (*KickGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{24} + return fileDescriptor_group_f05abf5eae29d157, []int{24} } func (m *KickGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberReq.Unmarshal(m, b) @@ -1394,7 +1395,7 @@ func (m *Id2Result) Reset() { *m = Id2Result{} } func (m *Id2Result) String() string { return proto.CompactTextString(m) } func (*Id2Result) ProtoMessage() {} func (*Id2Result) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{25} + return fileDescriptor_group_f05abf5eae29d157, []int{25} } func (m *Id2Result) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Id2Result.Unmarshal(m, b) @@ -1441,7 +1442,7 @@ func (m *KickGroupMemberResp) Reset() { *m = KickGroupMemberResp{} } func (m *KickGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*KickGroupMemberResp) ProtoMessage() {} func (*KickGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{26} + return fileDescriptor_group_f05abf5eae29d157, []int{26} } func (m *KickGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberResp.Unmarshal(m, b) @@ -1495,7 +1496,7 @@ func (m *GetJoinedGroupListReq) Reset() { *m = GetJoinedGroupListReq{} } func (m *GetJoinedGroupListReq) String() string { return proto.CompactTextString(m) } func (*GetJoinedGroupListReq) ProtoMessage() {} func (*GetJoinedGroupListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{27} + return fileDescriptor_group_f05abf5eae29d157, []int{27} } func (m *GetJoinedGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListReq.Unmarshal(m, b) @@ -1549,7 +1550,7 @@ func (m *GetJoinedGroupListResp) Reset() { *m = GetJoinedGroupListResp{} func (m *GetJoinedGroupListResp) String() string { return proto.CompactTextString(m) } func (*GetJoinedGroupListResp) ProtoMessage() {} func (*GetJoinedGroupListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{28} + return fileDescriptor_group_f05abf5eae29d157, []int{28} } func (m *GetJoinedGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListResp.Unmarshal(m, b) @@ -1605,7 +1606,7 @@ func (m *InviteUserToGroupReq) Reset() { *m = InviteUserToGroupReq{} } func (m *InviteUserToGroupReq) String() string { return proto.CompactTextString(m) } func (*InviteUserToGroupReq) ProtoMessage() {} func (*InviteUserToGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{29} + return fileDescriptor_group_f05abf5eae29d157, []int{29} } func (m *InviteUserToGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupReq.Unmarshal(m, b) @@ -1673,7 +1674,7 @@ func (m *InviteUserToGroupResp) Reset() { *m = InviteUserToGroupResp{} } func (m *InviteUserToGroupResp) String() string { return proto.CompactTextString(m) } func (*InviteUserToGroupResp) ProtoMessage() {} func (*InviteUserToGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{30} + return fileDescriptor_group_f05abf5eae29d157, []int{30} } func (m *InviteUserToGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupResp.Unmarshal(m, b) @@ -1727,7 +1728,7 @@ func (m *GetGroupAllMemberReq) Reset() { *m = GetGroupAllMemberReq{} } func (m *GetGroupAllMemberReq) String() string { return proto.CompactTextString(m) } func (*GetGroupAllMemberReq) ProtoMessage() {} func (*GetGroupAllMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{31} + return fileDescriptor_group_f05abf5eae29d157, []int{31} } func (m *GetGroupAllMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberReq.Unmarshal(m, b) @@ -1781,7 +1782,7 @@ func (m *GetGroupAllMemberResp) Reset() { *m = GetGroupAllMemberResp{} } func (m *GetGroupAllMemberResp) String() string { return proto.CompactTextString(m) } func (*GetGroupAllMemberResp) ProtoMessage() {} func (*GetGroupAllMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{32} + return fileDescriptor_group_f05abf5eae29d157, []int{32} } func (m *GetGroupAllMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberResp.Unmarshal(m, b) @@ -1835,7 +1836,7 @@ func (m *CMSGroup) Reset() { *m = CMSGroup{} } func (m *CMSGroup) String() string { return proto.CompactTextString(m) } func (*CMSGroup) ProtoMessage() {} func (*CMSGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{33} + return fileDescriptor_group_f05abf5eae29d157, []int{33} } func (m *CMSGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CMSGroup.Unmarshal(m, b) @@ -1889,7 +1890,7 @@ func (m *GetGroupReq) Reset() { *m = GetGroupReq{} } func (m *GetGroupReq) String() string { return proto.CompactTextString(m) } func (*GetGroupReq) ProtoMessage() {} func (*GetGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{34} + return fileDescriptor_group_f05abf5eae29d157, []int{34} } func (m *GetGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupReq.Unmarshal(m, b) @@ -1943,7 +1944,7 @@ func (m *GetGroupResp) Reset() { *m = GetGroupResp{} } func (m *GetGroupResp) String() string { return proto.CompactTextString(m) } func (*GetGroupResp) ProtoMessage() {} func (*GetGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{35} + return fileDescriptor_group_f05abf5eae29d157, []int{35} } func (m *GetGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupResp.Unmarshal(m, b) @@ -1996,7 +1997,7 @@ func (m *GetGroupsReq) Reset() { *m = GetGroupsReq{} } func (m *GetGroupsReq) String() string { return proto.CompactTextString(m) } func (*GetGroupsReq) ProtoMessage() {} func (*GetGroupsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{36} + return fileDescriptor_group_f05abf5eae29d157, []int{36} } func (m *GetGroupsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsReq.Unmarshal(m, b) @@ -2043,7 +2044,7 @@ func (m *GetGroupsResp) Reset() { *m = GetGroupsResp{} } func (m *GetGroupsResp) String() string { return proto.CompactTextString(m) } func (*GetGroupsResp) ProtoMessage() {} func (*GetGroupsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{37} + return fileDescriptor_group_f05abf5eae29d157, []int{37} } func (m *GetGroupsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsResp.Unmarshal(m, b) @@ -2096,7 +2097,7 @@ func (m *GetGroupMemberReq) Reset() { *m = GetGroupMemberReq{} } func (m *GetGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberReq) ProtoMessage() {} func (*GetGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{38} + return fileDescriptor_group_f05abf5eae29d157, []int{38} } func (m *GetGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberReq.Unmarshal(m, b) @@ -2143,7 +2144,7 @@ func (m *OperateGroupStatusReq) Reset() { *m = OperateGroupStatusReq{} } func (m *OperateGroupStatusReq) String() string { return proto.CompactTextString(m) } func (*OperateGroupStatusReq) ProtoMessage() {} func (*OperateGroupStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{39} + return fileDescriptor_group_f05abf5eae29d157, []int{39} } func (m *OperateGroupStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateGroupStatusReq.Unmarshal(m, b) @@ -2194,7 +2195,7 @@ func (m *OperateGroupStatusResp) Reset() { *m = OperateGroupStatusResp{} func (m *OperateGroupStatusResp) String() string { return proto.CompactTextString(m) } func (*OperateGroupStatusResp) ProtoMessage() {} func (*OperateGroupStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{40} + return fileDescriptor_group_f05abf5eae29d157, []int{40} } func (m *OperateGroupStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateGroupStatusResp.Unmarshal(m, b) @@ -2228,7 +2229,7 @@ func (m *OperateUserRoleReq) Reset() { *m = OperateUserRoleReq{} } func (m *OperateUserRoleReq) String() string { return proto.CompactTextString(m) } func (*OperateUserRoleReq) ProtoMessage() {} func (*OperateUserRoleReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{41} + return fileDescriptor_group_f05abf5eae29d157, []int{41} } func (m *OperateUserRoleReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateUserRoleReq.Unmarshal(m, b) @@ -2286,7 +2287,7 @@ func (m *OperateUserRoleResp) Reset() { *m = OperateUserRoleResp{} } func (m *OperateUserRoleResp) String() string { return proto.CompactTextString(m) } func (*OperateUserRoleResp) ProtoMessage() {} func (*OperateUserRoleResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{42} + return fileDescriptor_group_f05abf5eae29d157, []int{42} } func (m *OperateUserRoleResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateUserRoleResp.Unmarshal(m, b) @@ -2318,7 +2319,7 @@ func (m *DeleteGroupReq) Reset() { *m = DeleteGroupReq{} } func (m *DeleteGroupReq) String() string { return proto.CompactTextString(m) } func (*DeleteGroupReq) ProtoMessage() {} func (*DeleteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{43} + return fileDescriptor_group_f05abf5eae29d157, []int{43} } func (m *DeleteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteGroupReq.Unmarshal(m, b) @@ -2362,7 +2363,7 @@ func (m *DeleteGroupResp) Reset() { *m = DeleteGroupResp{} } func (m *DeleteGroupResp) String() string { return proto.CompactTextString(m) } func (*DeleteGroupResp) ProtoMessage() {} func (*DeleteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{44} + return fileDescriptor_group_f05abf5eae29d157, []int{44} } func (m *DeleteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteGroupResp.Unmarshal(m, b) @@ -2394,7 +2395,7 @@ func (m *GetGroupByIdReq) Reset() { *m = GetGroupByIdReq{} } func (m *GetGroupByIdReq) String() string { return proto.CompactTextString(m) } func (*GetGroupByIdReq) ProtoMessage() {} func (*GetGroupByIdReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{45} + return fileDescriptor_group_f05abf5eae29d157, []int{45} } func (m *GetGroupByIdReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupByIdReq.Unmarshal(m, b) @@ -2439,7 +2440,7 @@ func (m *GetGroupByIdResp) Reset() { *m = GetGroupByIdResp{} } func (m *GetGroupByIdResp) String() string { return proto.CompactTextString(m) } func (*GetGroupByIdResp) ProtoMessage() {} func (*GetGroupByIdResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{46} + return fileDescriptor_group_f05abf5eae29d157, []int{46} } func (m *GetGroupByIdResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupByIdResp.Unmarshal(m, b) @@ -2480,7 +2481,7 @@ func (m *GetGroupMembersCMSReq) Reset() { *m = GetGroupMembersCMSReq{} } func (m *GetGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersCMSReq) ProtoMessage() {} func (*GetGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{47} + return fileDescriptor_group_f05abf5eae29d157, []int{47} } func (m *GetGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSReq.Unmarshal(m, b) @@ -2541,7 +2542,7 @@ func (m *GetGroupMembersCMSResp) Reset() { *m = GetGroupMembersCMSResp{} func (m *GetGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersCMSResp) ProtoMessage() {} func (*GetGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{48} + return fileDescriptor_group_f05abf5eae29d157, []int{48} } func (m *GetGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSResp.Unmarshal(m, b) @@ -2596,7 +2597,7 @@ func (m *RemoveGroupMembersCMSReq) Reset() { *m = RemoveGroupMembersCMSR func (m *RemoveGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*RemoveGroupMembersCMSReq) ProtoMessage() {} func (*RemoveGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{49} + return fileDescriptor_group_f05abf5eae29d157, []int{49} } func (m *RemoveGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveGroupMembersCMSReq.Unmarshal(m, b) @@ -2656,7 +2657,7 @@ func (m *RemoveGroupMembersCMSResp) Reset() { *m = RemoveGroupMembersCMS func (m *RemoveGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*RemoveGroupMembersCMSResp) ProtoMessage() {} func (*RemoveGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{50} + return fileDescriptor_group_f05abf5eae29d157, []int{50} } func (m *RemoveGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveGroupMembersCMSResp.Unmarshal(m, b) @@ -2704,7 +2705,7 @@ func (m *AddGroupMembersCMSReq) Reset() { *m = AddGroupMembersCMSReq{} } func (m *AddGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*AddGroupMembersCMSReq) ProtoMessage() {} func (*AddGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{51} + return fileDescriptor_group_f05abf5eae29d157, []int{51} } func (m *AddGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddGroupMembersCMSReq.Unmarshal(m, b) @@ -2764,7 +2765,7 @@ func (m *AddGroupMembersCMSResp) Reset() { *m = AddGroupMembersCMSResp{} func (m *AddGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*AddGroupMembersCMSResp) ProtoMessage() {} func (*AddGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{52} + return fileDescriptor_group_f05abf5eae29d157, []int{52} } func (m *AddGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddGroupMembersCMSResp.Unmarshal(m, b) @@ -2811,7 +2812,7 @@ func (m *DismissGroupReq) Reset() { *m = DismissGroupReq{} } func (m *DismissGroupReq) String() string { return proto.CompactTextString(m) } func (*DismissGroupReq) ProtoMessage() {} func (*DismissGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{53} + return fileDescriptor_group_f05abf5eae29d157, []int{53} } func (m *DismissGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupReq.Unmarshal(m, b) @@ -2863,7 +2864,7 @@ func (m *DismissGroupResp) Reset() { *m = DismissGroupResp{} } func (m *DismissGroupResp) String() string { return proto.CompactTextString(m) } func (*DismissGroupResp) ProtoMessage() {} func (*DismissGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{54} + return fileDescriptor_group_f05abf5eae29d157, []int{54} } func (m *DismissGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupResp.Unmarshal(m, b) @@ -2905,7 +2906,7 @@ func (m *MuteGroupMemberReq) Reset() { *m = MuteGroupMemberReq{} } func (m *MuteGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*MuteGroupMemberReq) ProtoMessage() {} func (*MuteGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{55} + return fileDescriptor_group_f05abf5eae29d157, []int{55} } func (m *MuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberReq.Unmarshal(m, b) @@ -2971,7 +2972,7 @@ func (m *MuteGroupMemberResp) Reset() { *m = MuteGroupMemberResp{} } func (m *MuteGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*MuteGroupMemberResp) ProtoMessage() {} func (*MuteGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{56} + return fileDescriptor_group_f05abf5eae29d157, []int{56} } func (m *MuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberResp.Unmarshal(m, b) @@ -3012,7 +3013,7 @@ func (m *CancelMuteGroupMemberReq) Reset() { *m = CancelMuteGroupMemberR func (m *CancelMuteGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupMemberReq) ProtoMessage() {} func (*CancelMuteGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{57} + return fileDescriptor_group_f05abf5eae29d157, []int{57} } func (m *CancelMuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberReq.Unmarshal(m, b) @@ -3071,7 +3072,7 @@ func (m *CancelMuteGroupMemberResp) Reset() { *m = CancelMuteGroupMember func (m *CancelMuteGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupMemberResp) ProtoMessage() {} func (*CancelMuteGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{58} + return fileDescriptor_group_f05abf5eae29d157, []int{58} } func (m *CancelMuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberResp.Unmarshal(m, b) @@ -3111,7 +3112,7 @@ func (m *MuteGroupReq) Reset() { *m = MuteGroupReq{} } func (m *MuteGroupReq) String() string { return proto.CompactTextString(m) } func (*MuteGroupReq) ProtoMessage() {} func (*MuteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{59} + return fileDescriptor_group_f05abf5eae29d157, []int{59} } func (m *MuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupReq.Unmarshal(m, b) @@ -3163,7 +3164,7 @@ func (m *MuteGroupResp) Reset() { *m = MuteGroupResp{} } func (m *MuteGroupResp) String() string { return proto.CompactTextString(m) } func (*MuteGroupResp) ProtoMessage() {} func (*MuteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{60} + return fileDescriptor_group_f05abf5eae29d157, []int{60} } func (m *MuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupResp.Unmarshal(m, b) @@ -3203,7 +3204,7 @@ func (m *CancelMuteGroupReq) Reset() { *m = CancelMuteGroupReq{} } func (m *CancelMuteGroupReq) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupReq) ProtoMessage() {} func (*CancelMuteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{61} + return fileDescriptor_group_f05abf5eae29d157, []int{61} } func (m *CancelMuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupReq.Unmarshal(m, b) @@ -3255,7 +3256,7 @@ func (m *CancelMuteGroupResp) Reset() { *m = CancelMuteGroupResp{} } func (m *CancelMuteGroupResp) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupResp) ProtoMessage() {} func (*CancelMuteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{62} + return fileDescriptor_group_f05abf5eae29d157, []int{62} } func (m *CancelMuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupResp.Unmarshal(m, b) @@ -3297,7 +3298,7 @@ func (m *SetGroupMemberNicknameReq) Reset() { *m = SetGroupMemberNicknam func (m *SetGroupMemberNicknameReq) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberNicknameReq) ProtoMessage() {} func (*SetGroupMemberNicknameReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{63} + return fileDescriptor_group_f05abf5eae29d157, []int{63} } func (m *SetGroupMemberNicknameReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameReq.Unmarshal(m, b) @@ -3363,7 +3364,7 @@ func (m *SetGroupMemberNicknameResp) Reset() { *m = SetGroupMemberNickna func (m *SetGroupMemberNicknameResp) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberNicknameResp) ProtoMessage() {} func (*SetGroupMemberNicknameResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{64} + return fileDescriptor_group_f05abf5eae29d157, []int{64} } func (m *SetGroupMemberNicknameResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameResp.Unmarshal(m, b) @@ -3403,7 +3404,7 @@ func (m *GetJoinedSuperGroupListReq) Reset() { *m = GetJoinedSuperGroupL func (m *GetJoinedSuperGroupListReq) String() string { return proto.CompactTextString(m) } func (*GetJoinedSuperGroupListReq) ProtoMessage() {} func (*GetJoinedSuperGroupListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{65} + return fileDescriptor_group_f05abf5eae29d157, []int{65} } func (m *GetJoinedSuperGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedSuperGroupListReq.Unmarshal(m, b) @@ -3456,7 +3457,7 @@ func (m *GetJoinedSuperGroupListResp) Reset() { *m = GetJoinedSuperGroup func (m *GetJoinedSuperGroupListResp) String() string { return proto.CompactTextString(m) } func (*GetJoinedSuperGroupListResp) ProtoMessage() {} func (*GetJoinedSuperGroupListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{66} + return fileDescriptor_group_f05abf5eae29d157, []int{66} } func (m *GetJoinedSuperGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedSuperGroupListResp.Unmarshal(m, b) @@ -3503,7 +3504,7 @@ func (m *GetSuperGroupsInfoReq) Reset() { *m = GetSuperGroupsInfoReq{} } func (m *GetSuperGroupsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetSuperGroupsInfoReq) ProtoMessage() {} func (*GetSuperGroupsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{67} + return fileDescriptor_group_f05abf5eae29d157, []int{67} } func (m *GetSuperGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSuperGroupsInfoReq.Unmarshal(m, b) @@ -3556,7 +3557,7 @@ func (m *GetSuperGroupsInfoResp) Reset() { *m = GetSuperGroupsInfoResp{} func (m *GetSuperGroupsInfoResp) String() string { return proto.CompactTextString(m) } func (*GetSuperGroupsInfoResp) ProtoMessage() {} func (*GetSuperGroupsInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_befc34d716b1ae6c, []int{68} + return fileDescriptor_group_f05abf5eae29d157, []int{68} } func (m *GetSuperGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSuperGroupsInfoResp.Unmarshal(m, b) @@ -3590,6 +3591,138 @@ func (m *GetSuperGroupsInfoResp) GetGroupInfoList() []*sdk_ws.GroupInfo { return nil } +type SetGroupMemberInfoReq struct { + GroupID string `protobuf:"bytes,1,opt,name=groupID" json:"groupID,omitempty"` + UserID string `protobuf:"bytes,2,opt,name=userID" json:"userID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + OperationID string `protobuf:"bytes,4,opt,name=operationID" json:"operationID,omitempty"` + Nickname *wrapperspb.StringValue `protobuf:"bytes,5,opt,name=nickname" json:"nickname,omitempty"` + FaceURL *wrapperspb.StringValue `protobuf:"bytes,6,opt,name=faceURL" json:"faceURL,omitempty"` + RoleLevel *wrapperspb.Int32Value `protobuf:"bytes,7,opt,name=roleLevel" json:"roleLevel,omitempty"` + Ex *wrapperspb.StringValue `protobuf:"bytes,8,opt,name=ex" json:"ex,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetGroupMemberInfoReq) Reset() { *m = SetGroupMemberInfoReq{} } +func (m *SetGroupMemberInfoReq) String() string { return proto.CompactTextString(m) } +func (*SetGroupMemberInfoReq) ProtoMessage() {} +func (*SetGroupMemberInfoReq) Descriptor() ([]byte, []int) { + return fileDescriptor_group_f05abf5eae29d157, []int{69} +} +func (m *SetGroupMemberInfoReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetGroupMemberInfoReq.Unmarshal(m, b) +} +func (m *SetGroupMemberInfoReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetGroupMemberInfoReq.Marshal(b, m, deterministic) +} +func (dst *SetGroupMemberInfoReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetGroupMemberInfoReq.Merge(dst, src) +} +func (m *SetGroupMemberInfoReq) XXX_Size() int { + return xxx_messageInfo_SetGroupMemberInfoReq.Size(m) +} +func (m *SetGroupMemberInfoReq) XXX_DiscardUnknown() { + xxx_messageInfo_SetGroupMemberInfoReq.DiscardUnknown(m) +} + +var xxx_messageInfo_SetGroupMemberInfoReq proto.InternalMessageInfo + +func (m *SetGroupMemberInfoReq) GetGroupID() string { + if m != nil { + return m.GroupID + } + return "" +} + +func (m *SetGroupMemberInfoReq) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +func (m *SetGroupMemberInfoReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +func (m *SetGroupMemberInfoReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *SetGroupMemberInfoReq) GetNickname() *wrapperspb.StringValue { + if m != nil { + return m.Nickname + } + return nil +} + +func (m *SetGroupMemberInfoReq) GetFaceURL() *wrapperspb.StringValue { + if m != nil { + return m.FaceURL + } + return nil +} + +func (m *SetGroupMemberInfoReq) GetRoleLevel() *wrapperspb.Int32Value { + if m != nil { + return m.RoleLevel + } + return nil +} + +func (m *SetGroupMemberInfoReq) GetEx() *wrapperspb.StringValue { + if m != nil { + return m.Ex + } + return nil +} + +type SetGroupMemberInfoResp struct { + CommonResp *CommonResp `protobuf:"bytes,1,opt,name=CommonResp" json:"CommonResp,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetGroupMemberInfoResp) Reset() { *m = SetGroupMemberInfoResp{} } +func (m *SetGroupMemberInfoResp) String() string { return proto.CompactTextString(m) } +func (*SetGroupMemberInfoResp) ProtoMessage() {} +func (*SetGroupMemberInfoResp) Descriptor() ([]byte, []int) { + return fileDescriptor_group_f05abf5eae29d157, []int{70} +} +func (m *SetGroupMemberInfoResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetGroupMemberInfoResp.Unmarshal(m, b) +} +func (m *SetGroupMemberInfoResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetGroupMemberInfoResp.Marshal(b, m, deterministic) +} +func (dst *SetGroupMemberInfoResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetGroupMemberInfoResp.Merge(dst, src) +} +func (m *SetGroupMemberInfoResp) XXX_Size() int { + return xxx_messageInfo_SetGroupMemberInfoResp.Size(m) +} +func (m *SetGroupMemberInfoResp) XXX_DiscardUnknown() { + xxx_messageInfo_SetGroupMemberInfoResp.DiscardUnknown(m) +} + +var xxx_messageInfo_SetGroupMemberInfoResp proto.InternalMessageInfo + +func (m *SetGroupMemberInfoResp) GetCommonResp() *CommonResp { + if m != nil { + return m.CommonResp + } + return nil +} + func init() { proto.RegisterType((*CommonResp)(nil), "group.CommonResp") proto.RegisterType((*GroupAddMemberInfo)(nil), "group.GroupAddMemberInfo") @@ -3660,6 +3793,8 @@ func init() { proto.RegisterType((*GetJoinedSuperGroupListResp)(nil), "group.GetJoinedSuperGroupListResp") proto.RegisterType((*GetSuperGroupsInfoReq)(nil), "group.GetSuperGroupsInfoReq") proto.RegisterType((*GetSuperGroupsInfoResp)(nil), "group.GetSuperGroupsInfoResp") + proto.RegisterType((*SetGroupMemberInfoReq)(nil), "group.SetGroupMemberInfoReq") + proto.RegisterType((*SetGroupMemberInfoResp)(nil), "group.SetGroupMemberInfoResp") } // Reference imports to suppress errors if they are not otherwise used. @@ -3705,6 +3840,7 @@ type GroupClient interface { SetGroupMemberNickname(ctx context.Context, in *SetGroupMemberNicknameReq, opts ...grpc.CallOption) (*SetGroupMemberNicknameResp, error) GetJoinedSuperGroupList(ctx context.Context, in *GetJoinedSuperGroupListReq, opts ...grpc.CallOption) (*GetJoinedSuperGroupListResp, error) GetSuperGroupsInfo(ctx context.Context, in *GetSuperGroupsInfoReq, opts ...grpc.CallOption) (*GetSuperGroupsInfoResp, error) + SetGroupMemberInfo(ctx context.Context, in *SetGroupMemberInfoReq, opts ...grpc.CallOption) (*SetGroupMemberInfoResp, error) } type groupClient struct { @@ -4003,6 +4139,15 @@ func (c *groupClient) GetSuperGroupsInfo(ctx context.Context, in *GetSuperGroups return out, nil } +func (c *groupClient) SetGroupMemberInfo(ctx context.Context, in *SetGroupMemberInfoReq, opts ...grpc.CallOption) (*SetGroupMemberInfoResp, error) { + out := new(SetGroupMemberInfoResp) + err := grpc.Invoke(ctx, "/group.group/SetGroupMemberInfo", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for Group service type GroupServer interface { @@ -4038,6 +4183,7 @@ type GroupServer interface { SetGroupMemberNickname(context.Context, *SetGroupMemberNicknameReq) (*SetGroupMemberNicknameResp, error) GetJoinedSuperGroupList(context.Context, *GetJoinedSuperGroupListReq) (*GetJoinedSuperGroupListResp, error) GetSuperGroupsInfo(context.Context, *GetSuperGroupsInfoReq) (*GetSuperGroupsInfoResp, error) + SetGroupMemberInfo(context.Context, *SetGroupMemberInfoReq) (*SetGroupMemberInfoResp, error) } func RegisterGroupServer(s *grpc.Server, srv GroupServer) { @@ -4620,6 +4766,24 @@ func _Group_GetSuperGroupsInfo_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +func _Group_SetGroupMemberInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetGroupMemberInfoReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(GroupServer).SetGroupMemberInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/group.group/SetGroupMemberInfo", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(GroupServer).SetGroupMemberInfo(ctx, req.(*SetGroupMemberInfoReq)) + } + return interceptor(ctx, in, info, handler) +} + var _Group_serviceDesc = grpc.ServiceDesc{ ServiceName: "group.group", HandlerType: (*GroupServer)(nil), @@ -4752,153 +4916,165 @@ var _Group_serviceDesc = grpc.ServiceDesc{ MethodName: "GetSuperGroupsInfo", Handler: _Group_GetSuperGroupsInfo_Handler, }, + { + MethodName: "SetGroupMemberInfo", + Handler: _Group_SetGroupMemberInfo_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "group/group.proto", } -func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_befc34d716b1ae6c) } - -var fileDescriptor_group_befc34d716b1ae6c = []byte{ - // 2228 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x5f, 0x6f, 0x1c, 0x49, - 0x11, 0xd7, 0xd8, 0x5e, 0xff, 0x29, 0xdb, 0x59, 0xbb, 0x7d, 0x6b, 0xaf, 0x27, 0xbe, 0x9c, 0x33, - 0x17, 0x4e, 0x11, 0x7f, 0x6c, 0x91, 0x93, 0xf2, 0xc0, 0x21, 0x42, 0xfc, 0x27, 0xf1, 0x26, 0x59, - 0x9b, 0x8c, 0xc3, 0x4b, 0x24, 0x14, 0xf6, 0x76, 0xda, 0xab, 0xc5, 0xbb, 0x33, 0xe3, 0xe9, 0x59, - 0x1b, 0x78, 0x39, 0xf1, 0x72, 0xd2, 0x01, 0x12, 0x20, 0x24, 0x9e, 0x90, 0xe0, 0x9e, 0x40, 0x88, - 0x07, 0x1e, 0xe0, 0x19, 0xf1, 0x31, 0xf8, 0x14, 0x7c, 0x05, 0x34, 0xdd, 0x3d, 0x3d, 0x3d, 0xdd, - 0x3d, 0xe3, 0xcd, 0x6c, 0x72, 0x79, 0x59, 0xa9, 0xab, 0xab, 0xa7, 0x7e, 0x55, 0xdd, 0x55, 0x5d, - 0x55, 0xbd, 0xb0, 0xda, 0x8b, 0x82, 0x51, 0xb8, 0x4b, 0x7f, 0x77, 0xc2, 0x28, 0x88, 0x03, 0x54, - 0xa3, 0x03, 0xfb, 0xf6, 0x49, 0x88, 0xfd, 0x57, 0xad, 0xf6, 0x6e, 0x78, 0xde, 0xdb, 0xa5, 0x33, - 0xbb, 0xc4, 0x3b, 0x7f, 0x75, 0x45, 0x76, 0xaf, 0x08, 0xe3, 0x74, 0xbe, 0x07, 0xb0, 0x1f, 0x0c, - 0x87, 0x81, 0xef, 0x62, 0x12, 0xa2, 0x26, 0xcc, 0x1d, 0x46, 0xd1, 0x7e, 0xe0, 0xe1, 0xa6, 0xb5, - 0x6d, 0xdd, 0xad, 0xb9, 0xe9, 0x10, 0xad, 0xc3, 0xec, 0x61, 0x14, 0xb5, 0x49, 0xaf, 0x39, 0xb5, - 0x6d, 0xdd, 0x5d, 0x70, 0xf9, 0xc8, 0x79, 0x02, 0xe8, 0x71, 0x22, 0xeb, 0xa1, 0xe7, 0xb5, 0xf1, - 0xf0, 0x53, 0x1c, 0xb5, 0xfc, 0xb3, 0x20, 0xe1, 0xfe, 0x21, 0xc1, 0x51, 0xeb, 0x80, 0x7e, 0x66, - 0xc1, 0xe5, 0x23, 0xb4, 0x05, 0x0b, 0x6e, 0x30, 0xc0, 0xcf, 0xf0, 0x25, 0x1e, 0xd0, 0x0f, 0xd5, - 0xdc, 0x8c, 0xe0, 0xfc, 0xcf, 0x82, 0x1b, 0xfb, 0x11, 0xee, 0xc4, 0x98, 0x7e, 0xd2, 0xc5, 0x17, - 0xe8, 0x21, 0xdc, 0x68, 0xf9, 0xfd, 0x98, 0x7d, 0xfa, 0x59, 0x9f, 0xc4, 0x4d, 0x6b, 0x7b, 0xfa, - 0xee, 0xe2, 0xbd, 0xcd, 0x1d, 0xa6, 0xae, 0x2e, 0xdb, 0x55, 0x16, 0xa0, 0xef, 0xc0, 0x02, 0xe5, - 0x4a, 0x26, 0xa9, 0xcc, 0xc5, 0x7b, 0x5b, 0x3b, 0x04, 0x47, 0x97, 0x38, 0x7a, 0xd5, 0x09, 0xfb, - 0xaf, 0xc2, 0x4e, 0xd4, 0x19, 0x92, 0x1d, 0xc1, 0xe3, 0x66, 0xec, 0x68, 0x1b, 0x16, 0x4f, 0x42, - 0x1c, 0x75, 0xe2, 0x7e, 0xe0, 0xb7, 0x0e, 0x9a, 0xd3, 0x54, 0x19, 0x99, 0x84, 0x6c, 0x98, 0x3f, - 0x09, 0xb9, 0xae, 0x33, 0x74, 0x5a, 0x8c, 0xe9, 0xea, 0x2b, 0x1f, 0x47, 0x7c, 0xba, 0xc6, 0x57, - 0x67, 0x24, 0xe7, 0x33, 0xa8, 0xe7, 0x14, 0xae, 0xb2, 0x05, 0x79, 0x05, 0xa7, 0x5f, 0x4b, 0x41, - 0x27, 0x82, 0x95, 0xc7, 0x38, 0xa6, 0x63, 0x42, 0xe7, 0xf0, 0x45, 0x02, 0x9b, 0x31, 0x1c, 0x08, - 0x83, 0x2f, 0xb8, 0x32, 0x49, 0x35, 0xcb, 0x54, 0xb9, 0x59, 0xa6, 0xf3, 0x66, 0x71, 0xbe, 0xb0, - 0x60, 0x55, 0x11, 0x5a, 0x49, 0xef, 0x3d, 0x58, 0x16, 0x8a, 0x50, 0xa4, 0xd3, 0xf4, 0x68, 0x94, - 0xeb, 0x9e, 0x5f, 0xe2, 0xfc, 0xca, 0x82, 0xfa, 0x29, 0xc7, 0x92, 0xea, 0x9f, 0xb3, 0xa7, 0xf5, - 0x7a, 0x07, 0x46, 0xd6, 0x7b, 0xca, 0x70, 0x1c, 0x4a, 0x0f, 0x93, 0x73, 0x08, 0x2b, 0x79, 0x30, - 0x24, 0x44, 0xdf, 0x96, 0x1d, 0x94, 0xc3, 0x59, 0xe5, 0xa7, 0x3f, 0x9b, 0x70, 0x25, 0x26, 0xe7, - 0xe7, 0x60, 0xa7, 0xf6, 0x7d, 0x18, 0x86, 0x83, 0x7e, 0x97, 0x7e, 0x3f, 0xd1, 0x37, 0x51, 0x4f, - 0x86, 0x68, 0x95, 0x43, 0x34, 0x6c, 0xec, 0x2d, 0x80, 0x47, 0x51, 0x30, 0xcc, 0x6d, 0xad, 0x44, - 0x71, 0xfe, 0x68, 0xc1, 0xcd, 0x42, 0xe1, 0x95, 0xb6, 0xf9, 0x29, 0xac, 0xa4, 0xe1, 0x60, 0x84, - 0x49, 0x2c, 0xed, 0xf4, 0x07, 0x45, 0xbb, 0xc2, 0x59, 0x5d, 0x6d, 0xa1, 0x13, 0xc3, 0xd6, 0x63, - 0x1c, 0x27, 0x58, 0x5d, 0x7c, 0x61, 0x30, 0x4e, 0x51, 0xe0, 0x9a, 0x6c, 0x5f, 0xff, 0x64, 0xc1, - 0xfb, 0x25, 0x62, 0x2b, 0xed, 0xb2, 0xd1, 0x2e, 0x53, 0x55, 0xed, 0xf2, 0x6f, 0x0b, 0x1a, 0x2f, - 0xa2, 0x8e, 0x4f, 0xce, 0x70, 0x44, 0x27, 0x69, 0x94, 0x4a, 0x2c, 0xd2, 0x84, 0x39, 0xee, 0xfa, - 0xdc, 0x24, 0xe9, 0x10, 0x7d, 0x04, 0x37, 0x4e, 0x06, 0x9e, 0x1c, 0xe1, 0x98, 0x65, 0x14, 0x6a, - 0xc2, 0x77, 0x8c, 0xaf, 0x64, 0x3e, 0x66, 0x22, 0x85, 0xaa, 0xda, 0x71, 0xa6, 0x3c, 0xaa, 0xd4, - 0x94, 0xa8, 0xf2, 0x14, 0xd6, 0x4d, 0x0a, 0x54, 0xf3, 0xa0, 0xcf, 0x2d, 0x58, 0x7a, 0x12, 0xf4, - 0x7d, 0x71, 0x0f, 0x15, 0x5b, 0xe1, 0x16, 0x80, 0x8b, 0x2f, 0xda, 0x98, 0x90, 0x4e, 0x0f, 0x73, - 0x0b, 0x48, 0x94, 0xb2, 0x48, 0x78, 0xbd, 0xc6, 0xce, 0x1e, 0x2c, 0x4b, 0x38, 0xaa, 0x29, 0xf3, - 0xdf, 0xc4, 0x25, 0x15, 0x7f, 0x4c, 0x26, 0x02, 0x9f, 0x60, 0x1e, 0xef, 0x65, 0x14, 0x56, 0xb9, - 0xdd, 0xd5, 0xd3, 0x2f, 0x59, 0x66, 0x5a, 0xb3, 0x8c, 0x14, 0x2a, 0x66, 0xd4, 0x50, 0x91, 0xcc, - 0x1f, 0x75, 0x7c, 0x6f, 0x80, 0xbd, 0xc4, 0xe9, 0xd9, 0x7e, 0x4a, 0x14, 0xe4, 0xc0, 0x12, 0x1b, - 0xb9, 0x98, 0x8c, 0x06, 0x71, 0x73, 0x96, 0xc6, 0x8b, 0x1c, 0xcd, 0x79, 0x0e, 0x5b, 0xc5, 0xaa, - 0x55, 0x33, 0xd7, 0x19, 0x2c, 0x3d, 0x1f, 0xf5, 0xe3, 0x31, 0xb6, 0x7e, 0xb2, 0x6b, 0x70, 0x0f, - 0x96, 0x25, 0x39, 0xd5, 0xb0, 0x7e, 0x69, 0x41, 0x23, 0x8d, 0xb6, 0x59, 0xca, 0x53, 0x8e, 0x7a, - 0xa2, 0x50, 0x96, 0x04, 0xc8, 0x47, 0xfd, 0x41, 0x8c, 0x23, 0xba, 0xa1, 0x35, 0x97, 0x8f, 0x12, - 0x79, 0xc7, 0xf8, 0xa7, 0xf1, 0x29, 0xbe, 0xa0, 0x3b, 0x59, 0x73, 0xd3, 0xa1, 0xf3, 0x77, 0x0b, - 0xd6, 0x4d, 0x18, 0x2b, 0x5d, 0x06, 0x8f, 0x00, 0x86, 0x59, 0x2e, 0xc8, 0xae, 0x81, 0x8f, 0x8a, - 0xc2, 0x1d, 0x93, 0xf6, 0x68, 0x34, 0x18, 0xd0, 0xdb, 0x54, 0x5a, 0x99, 0x48, 0xf6, 0x39, 0x5c, - 0xa6, 0x47, 0x3a, 0x74, 0x7e, 0xab, 0xc1, 0x15, 0x89, 0x51, 0x69, 0x10, 0x90, 0x60, 0x4d, 0xd1, - 0x8c, 0x49, 0x16, 0x37, 0x59, 0x10, 0xf8, 0xbd, 0x05, 0x1b, 0x46, 0x48, 0xef, 0xd2, 0x84, 0xce, - 0x3f, 0x2c, 0x40, 0x4f, 0xfb, 0xdd, 0x73, 0x89, 0xaf, 0xdc, 0x48, 0x5f, 0x87, 0x95, 0x84, 0x1f, - 0x7b, 0x4c, 0x71, 0xc9, 0x54, 0x1a, 0x3d, 0x01, 0xef, 0xe2, 0x0e, 0x09, 0x7c, 0x6e, 0x2e, 0x3e, - 0x52, 0x8d, 0x55, 0x2b, 0x77, 0xb9, 0x59, 0xc5, 0xe5, 0x3e, 0x81, 0x85, 0x96, 0x77, 0x8f, 0x85, - 0x8e, 0xc2, 0xab, 0x9e, 0x8a, 0xa6, 0x01, 0x87, 0x15, 0x28, 0x7c, 0xe4, 0x7c, 0x06, 0x6b, 0x9a, - 0xba, 0x95, 0x36, 0xe0, 0x3e, 0x2c, 0x0b, 0x14, 0xd2, 0x1e, 0xac, 0x70, 0x57, 0x17, 0x73, 0x6e, - 0x9e, 0xcd, 0x19, 0x51, 0x5f, 0x4f, 0xae, 0x03, 0xec, 0x51, 0x14, 0xa9, 0xaf, 0xe7, 0x03, 0xad, - 0xa5, 0x05, 0xda, 0x6d, 0x58, 0x0c, 0xf4, 0x38, 0x15, 0x8c, 0x19, 0xa7, 0x3e, 0x67, 0x0e, 0xa1, - 0xc9, 0x9d, 0xa8, 0x56, 0x19, 0x3b, 0x5f, 0xcf, 0xd8, 0x9d, 0x7f, 0x5a, 0xf0, 0x5e, 0xcb, 0xbf, - 0xec, 0xc7, 0x38, 0x41, 0xf6, 0x22, 0x10, 0x11, 0xfa, 0xfa, 0x38, 0x5c, 0x7c, 0x49, 0x65, 0x07, - 0x6d, 0x26, 0x77, 0xd0, 0xbe, 0x09, 0xab, 0x4c, 0x96, 0x7c, 0x5a, 0x6b, 0xf4, 0xb4, 0xea, 0x13, - 0xa5, 0x87, 0xee, 0x17, 0x16, 0x34, 0x0c, 0xb0, 0xbf, 0xd2, 0xa3, 0xe3, 0xc3, 0x7b, 0x22, 0x29, - 0x1f, 0x0c, 0xc6, 0x71, 0xd6, 0xc9, 0x12, 0xde, 0xdf, 0x49, 0xf7, 0x92, 0x24, 0xf0, 0x9d, 0xc6, - 0xab, 0x3f, 0x58, 0x30, 0xbf, 0xdf, 0x3e, 0xa5, 0x6c, 0x13, 0xd5, 0x78, 0x77, 0xa1, 0xce, 0x64, - 0x75, 0x48, 0x8c, 0xa3, 0xe3, 0xce, 0x30, 0x4d, 0xfb, 0x54, 0x32, 0xba, 0xc3, 0x2b, 0x54, 0x46, - 0x6a, 0x79, 0xdc, 0x54, 0x79, 0x62, 0x12, 0xde, 0x17, 0x53, 0x63, 0x25, 0x9b, 0xb2, 0xc5, 0xb1, - 0xd1, 0x2f, 0xb3, 0x6d, 0xc9, 0x08, 0xe8, 0x00, 0xe0, 0x07, 0x9d, 0x5e, 0xdf, 0xa7, 0xa6, 0xe6, - 0xfd, 0x8c, 0x3b, 0x06, 0xe8, 0x3c, 0xbb, 0xcf, 0x78, 0x5d, 0x69, 0xdd, 0x18, 0x5b, 0xf8, 0xa5, - 0x05, 0x4b, 0x19, 0x2a, 0x12, 0xa2, 0x6f, 0xc1, 0x42, 0x6a, 0x3e, 0xc2, 0xbb, 0x30, 0xf5, 0x34, - 0x3b, 0xe1, 0x74, 0x37, 0xe3, 0x78, 0x43, 0x38, 0x85, 0x2d, 0x46, 0x43, 0x42, 0x51, 0xd6, 0xdc, - 0x8c, 0xe0, 0x5c, 0x66, 0x10, 0x49, 0x62, 0xb9, 0xbc, 0x4c, 0xeb, 0xcd, 0xd8, 0x46, 0x0f, 0x27, - 0xce, 0x9f, 0x2d, 0x58, 0x96, 0x04, 0xbf, 0x2b, 0xe3, 0xd8, 0x30, 0x9f, 0xda, 0x82, 0xdb, 0x46, - 0x8c, 0x9d, 0x93, 0xac, 0xc7, 0x62, 0x70, 0x77, 0x2f, 0xef, 0xee, 0xde, 0x18, 0x3a, 0x9f, 0x43, - 0x83, 0x0d, 0x59, 0xaf, 0xea, 0x34, 0xee, 0xc4, 0x23, 0x52, 0xfe, 0xd1, 0x75, 0x98, 0x65, 0x6c, - 0xe9, 0x4d, 0xca, 0x46, 0x63, 0x1c, 0xbe, 0x26, 0xac, 0x9b, 0x84, 0xb1, 0xca, 0x0c, 0xf1, 0x29, - 0x5a, 0x4e, 0x07, 0x03, 0x7c, 0x2d, 0x08, 0x1a, 0xb6, 0xbc, 0x34, 0xac, 0xb0, 0x51, 0xbe, 0x15, - 0x39, 0xad, 0xb4, 0x22, 0xc7, 0x48, 0xca, 0x1a, 0xb0, 0xa6, 0xe1, 0x20, 0xa1, 0xf3, 0x0c, 0x6e, - 0x1c, 0xe0, 0x01, 0x96, 0x5a, 0x98, 0x93, 0x18, 0x7d, 0x15, 0xea, 0xb9, 0xaf, 0x91, 0xd0, 0x69, - 0x43, 0x3d, 0xdd, 0xd8, 0xbd, 0x9f, 0xb5, 0xbc, 0x49, 0x25, 0x3c, 0xc8, 0x1a, 0x80, 0xec, 0x73, - 0x24, 0x44, 0xdf, 0xc8, 0x02, 0x25, 0x77, 0x22, 0xed, 0x2c, 0x0b, 0x06, 0xe7, 0x5f, 0x5a, 0x09, - 0x42, 0xf6, 0xdb, 0xa7, 0xe5, 0xb0, 0x6c, 0x98, 0x4f, 0x8c, 0x26, 0x85, 0x4e, 0x31, 0x56, 0x5c, - 0x63, 0xfa, 0xcd, 0xf8, 0xb0, 0x61, 0xff, 0xfe, 0xa3, 0xe7, 0xf9, 0x14, 0x37, 0x09, 0xd1, 0xf7, - 0x61, 0x8e, 0xdd, 0x1b, 0xa9, 0x2b, 0x8f, 0x7b, 0xdd, 0xa4, 0xcb, 0xd0, 0xa1, 0xc1, 0xbf, 0xbf, - 0x66, 0x54, 0x82, 0xd5, 0xaa, 0x05, 0x5a, 0xdc, 0x02, 0x60, 0x12, 0xa4, 0xf0, 0x27, 0x51, 0x9c, - 0x5f, 0x5b, 0xd0, 0x74, 0xf1, 0x30, 0xb8, 0xc4, 0xaf, 0x65, 0xfe, 0x26, 0xcc, 0x31, 0x27, 0x20, - 0x3c, 0xff, 0x4e, 0x87, 0xaf, 0xd5, 0xef, 0xf6, 0x94, 0x7e, 0xb7, 0xe7, 0xb4, 0x61, 0xb3, 0x00, - 0x0d, 0xbb, 0xf8, 0xc9, 0xa8, 0xdb, 0xc5, 0x84, 0xf0, 0x8e, 0x72, 0x3a, 0x4c, 0x3c, 0xf4, 0xac, - 0xd3, 0x1f, 0x60, 0x8f, 0xa3, 0xe1, 0x23, 0xe7, 0x0b, 0x0b, 0x1a, 0x0f, 0x3d, 0xef, 0x6d, 0xa8, - 0xe6, 0xe9, 0xaa, 0x79, 0xa5, 0xaa, 0x3d, 0x81, 0x75, 0x13, 0x94, 0x4a, 0x7a, 0xf5, 0xa1, 0x7e, - 0xd0, 0x27, 0xc3, 0x3e, 0x21, 0x22, 0x46, 0xd8, 0x30, 0x1f, 0x28, 0x3d, 0xd9, 0x20, 0x1c, 0x3b, - 0x7b, 0x6f, 0xc2, 0x5c, 0x2f, 0x9f, 0xdd, 0xf2, 0xa1, 0x73, 0x08, 0x2b, 0x79, 0x51, 0xac, 0xcd, - 0xd0, 0x1d, 0xa7, 0xcd, 0x90, 0x31, 0x39, 0x7f, 0xb5, 0x00, 0xb5, 0x47, 0x31, 0x56, 0xae, 0x93, - 0xb7, 0x84, 0x3a, 0x31, 0xdc, 0x48, 0x6e, 0x1a, 0xf1, 0x11, 0x72, 0x60, 0x69, 0x38, 0x8a, 0xb1, - 0x77, 0x8a, 0xbb, 0x81, 0xef, 0x11, 0x5a, 0xfd, 0x2d, 0xbb, 0x39, 0x9a, 0x73, 0x04, 0x6b, 0x1a, - 0xd2, 0x6a, 0x4a, 0xff, 0xd2, 0x82, 0xe6, 0x7e, 0xc7, 0xef, 0xe2, 0xc1, 0xbb, 0x57, 0xdd, 0x39, - 0x86, 0xcd, 0x02, 0x2c, 0xd5, 0x94, 0x3b, 0x83, 0x25, 0xf1, 0xa5, 0xb7, 0x79, 0x00, 0xf7, 0x60, - 0x59, 0x92, 0x53, 0x0d, 0xeb, 0x00, 0x90, 0xa2, 0xfb, 0xdb, 0x44, 0x7c, 0x04, 0x6b, 0x9a, 0xb4, - 0x6a, 0xb8, 0xff, 0x62, 0xc1, 0xe6, 0x69, 0xee, 0x86, 0x39, 0xee, 0x77, 0xcf, 0xfd, 0xce, 0x30, - 0xcd, 0x58, 0x7a, 0xf9, 0xd2, 0xab, 0x97, 0x95, 0x5e, 0x3e, 0x67, 0x4c, 0x6f, 0xc7, 0x74, 0x9c, - 0xd3, 0x7a, 0xba, 0x5c, 0xeb, 0x19, 0x5d, 0xeb, 0xec, 0x74, 0xd5, 0x72, 0xa7, 0xeb, 0x04, 0xec, - 0x22, 0xa0, 0xd5, 0xfa, 0x92, 0x11, 0x7d, 0x81, 0x62, 0x2d, 0x83, 0xd3, 0x51, 0xc8, 0x5b, 0xf2, - 0x69, 0xbf, 0x42, 0x01, 0x6a, 0x95, 0x01, 0x9d, 0xca, 0x45, 0x80, 0x12, 0xf5, 0x93, 0xcb, 0xf0, - 0x66, 0xa1, 0xd0, 0x4a, 0x3b, 0x38, 0x51, 0xb7, 0xe2, 0x8a, 0xa6, 0x45, 0x19, 0x8e, 0xaf, 0xec, - 0x79, 0xf5, 0x37, 0x2c, 0xb1, 0xd1, 0x24, 0x57, 0x33, 0xc1, 0x1b, 0x78, 0x64, 0xbd, 0xf7, 0xb7, - 0x35, 0x60, 0x7f, 0x48, 0x40, 0xdf, 0x85, 0xc5, 0x6e, 0xf6, 0xde, 0x8d, 0x1a, 0xa9, 0xec, 0xdc, - 0xa3, 0xbf, 0xbd, 0x6e, 0x22, 0x93, 0x10, 0xdd, 0x87, 0x85, 0x9f, 0xa4, 0x8f, 0x21, 0x68, 0x8d, - 0x33, 0xc9, 0xcf, 0x34, 0xf6, 0x7b, 0x3a, 0x91, 0xad, 0xbb, 0x48, 0x3b, 0xed, 0x62, 0x9d, 0xdc, - 0xe3, 0x17, 0xeb, 0xf2, 0x0d, 0xf9, 0x3d, 0x58, 0xee, 0xc9, 0xef, 0xd4, 0x68, 0x23, 0xfd, 0xd7, - 0x81, 0xf2, 0x64, 0x6e, 0x37, 0xcd, 0x13, 0x24, 0x44, 0x0f, 0x60, 0x89, 0x48, 0x4f, 0xba, 0x28, - 0xd5, 0x4d, 0x79, 0x74, 0xb6, 0x37, 0x8c, 0x74, 0x12, 0xa2, 0x1f, 0xc3, 0x46, 0xcf, 0xfc, 0x9e, - 0x8a, 0x6e, 0x2b, 0x52, 0xf5, 0xf7, 0x4c, 0xdb, 0xb9, 0x8e, 0x85, 0x84, 0xe8, 0x0c, 0x36, 0x7b, - 0x45, 0x8f, 0x93, 0xe8, 0xc3, 0xec, 0x03, 0x85, 0xaf, 0xa6, 0xf6, 0x9d, 0xeb, 0x99, 0x48, 0x88, - 0x9e, 0x03, 0x8a, 0xb5, 0x17, 0x3a, 0xb4, 0xc5, 0xd7, 0x1a, 0x5f, 0x1f, 0xed, 0xf7, 0x4b, 0x66, - 0x49, 0x88, 0xba, 0xd0, 0xec, 0x15, 0x3c, 0xff, 0x20, 0x27, 0xf7, 0x17, 0x11, 0xe3, 0xd3, 0x97, - 0xfd, 0xe1, 0xb5, 0x3c, 0x0c, 0x77, 0x4f, 0x7b, 0xbf, 0x10, 0xb8, 0x8d, 0xcf, 0x2f, 0x02, 0x77, - 0xc1, 0xc3, 0xc7, 0x0b, 0x58, 0xeb, 0xe9, 0x0d, 0x7d, 0x64, 0x5e, 0x25, 0x4e, 0xd9, 0xad, 0xb2, - 0x69, 0x12, 0xa2, 0x23, 0xa8, 0x9f, 0xe7, 0x3b, 0xd4, 0x28, 0xfd, 0x9f, 0x8c, 0xde, 0xa8, 0xb7, - 0xed, 0xa2, 0x29, 0xa1, 0xb2, 0xd2, 0xf2, 0x95, 0x55, 0xd6, 0xbb, 0xd0, 0xb2, 0xca, 0xa6, 0x5e, - 0xf1, 0x31, 0xac, 0xf6, 0xd5, 0x2e, 0x28, 0xba, 0x99, 0x36, 0x2e, 0x0d, 0x6d, 0x5d, 0x7b, 0xab, - 0x78, 0x92, 0x7d, 0xaf, 0xa7, 0x76, 0x18, 0xc5, 0xf7, 0x4c, 0xcd, 0x4e, 0x7b, 0xab, 0x78, 0x92, - 0x39, 0xaa, 0x5c, 0x08, 0x0b, 0x47, 0x55, 0x8a, 0x6d, 0x7b, 0xc3, 0x48, 0x27, 0x21, 0xfa, 0x18, - 0xe6, 0x53, 0x1a, 0x42, 0x0a, 0x53, 0xb2, 0x70, 0x4d, 0xa3, 0xb1, 0xd0, 0x24, 0x62, 0x06, 0x52, - 0x39, 0x88, 0x1c, 0x9a, 0xf2, 0xfd, 0xa6, 0xe7, 0xa2, 0x0b, 0x22, 0x35, 0x48, 0xc4, 0x06, 0x19, - 0x1b, 0x35, 0x62, 0x83, 0xcc, 0x9d, 0x95, 0xe4, 0xf4, 0x28, 0x0d, 0x0d, 0x71, 0x7a, 0xf4, 0x86, - 0x8b, 0x38, 0x3d, 0x86, 0x1e, 0x48, 0x12, 0xe5, 0xa5, 0xae, 0x85, 0x88, 0xf2, 0xf9, 0xbe, 0x88, - 0x88, 0xf2, 0x4a, 0x83, 0x23, 0x51, 0x4d, 0xaf, 0xcb, 0x0b, 0xdc, 0x8d, 0x17, 0x84, 0x05, 0xee, - 0x26, 0x6a, 0xb4, 0x97, 0xd0, 0x30, 0x16, 0xa6, 0xe8, 0x03, 0xbe, 0xae, 0xa8, 0x88, 0xb6, 0xb7, - 0xcb, 0x19, 0x18, 0x5c, 0xbd, 0x32, 0x14, 0x70, 0x8d, 0xf5, 0xab, 0x80, 0x5b, 0x50, 0x52, 0x3e, - 0x80, 0x25, 0xb9, 0x6a, 0x13, 0x47, 0x51, 0xa9, 0x1a, 0xc5, 0x51, 0xd4, 0x4a, 0xbc, 0x23, 0xa8, - 0x2b, 0x75, 0x82, 0xd8, 0x4a, 0xbd, 0x96, 0x11, 0x5b, 0x69, 0x2a, 0x2d, 0x5e, 0x42, 0xc3, 0x58, - 0x77, 0x08, 0xcb, 0x15, 0x55, 0x48, 0xc2, 0x72, 0xc5, 0x65, 0xcb, 0x7d, 0x58, 0x10, 0x64, 0x71, - 0xf6, 0xe5, 0x1c, 0x5f, 0x9c, 0xfd, 0x7c, 0x2a, 0x7e, 0x04, 0x75, 0xe5, 0xa3, 0x42, 0x3b, 0xbd, - 0x4e, 0x10, 0xda, 0x99, 0x92, 0xfa, 0x1f, 0xc1, 0xba, 0x39, 0xef, 0x45, 0xdb, 0xca, 0x75, 0xac, - 0xe5, 0xef, 0xf6, 0xed, 0x6b, 0x38, 0xd8, 0xd5, 0x5d, 0x90, 0x90, 0xca, 0x57, 0x77, 0x41, 0x96, - 0x2c, 0x5f, 0xdd, 0x85, 0x39, 0x2d, 0xf3, 0x15, 0x25, 0xd5, 0x93, 0x7d, 0x45, 0xcf, 0x3f, 0x65, - 0x5f, 0x31, 0xe4, 0x88, 0x7b, 0xf5, 0x97, 0xcb, 0x3b, 0xec, 0xbf, 0xa4, 0x9f, 0xd0, 0xdf, 0x4f, - 0x67, 0xe9, 0x1f, 0x45, 0x3f, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x52, 0x12, 0xd4, 0x5c, - 0x67, 0x2a, 0x00, 0x00, +func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_f05abf5eae29d157) } + +var fileDescriptor_group_f05abf5eae29d157 = []byte{ + // 2362 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4f, 0x6f, 0x1c, 0x49, + 0x15, 0x57, 0xdb, 0x99, 0xd8, 0xf3, 0x6c, 0x67, 0xec, 0x72, 0xc6, 0x1e, 0x77, 0xbc, 0x59, 0xa7, + 0x37, 0x2c, 0x11, 0x2c, 0xb6, 0x70, 0xa4, 0x08, 0x58, 0x44, 0x88, 0xff, 0x24, 0x9e, 0x24, 0xb6, + 0x71, 0x3b, 0xcb, 0x21, 0x12, 0x0a, 0x9d, 0xe9, 0xf2, 0x68, 0xf0, 0x4c, 0x77, 0xbb, 0xab, 0xc7, + 0x0e, 0x5c, 0x56, 0x5c, 0x56, 0x5a, 0x40, 0x02, 0x84, 0xc4, 0x09, 0x09, 0xf6, 0x04, 0x07, 0x0e, + 0x1c, 0xe0, 0x8c, 0xf8, 0x18, 0x5c, 0xf9, 0x02, 0x7c, 0x02, 0x24, 0xd4, 0x55, 0xd5, 0xd5, 0xd5, + 0x5d, 0xd5, 0xed, 0x49, 0x4f, 0xb2, 0xb9, 0xb4, 0x54, 0x55, 0xaf, 0xea, 0xfd, 0xde, 0xab, 0xf7, + 0x5e, 0xd5, 0x7b, 0xd5, 0xb0, 0xd0, 0x0d, 0xfd, 0x61, 0xb0, 0x41, 0xbf, 0xeb, 0x41, 0xe8, 0x47, + 0x3e, 0xaa, 0xd1, 0x86, 0x79, 0xeb, 0x30, 0xc0, 0xde, 0x8b, 0xf6, 0xfe, 0x46, 0x70, 0xda, 0xdd, + 0xa0, 0x23, 0x1b, 0xc4, 0x3d, 0x7d, 0x71, 0x41, 0x36, 0x2e, 0x08, 0xa3, 0x34, 0xbf, 0x5a, 0x4c, + 0x12, 0x3a, 0x41, 0x80, 0x43, 0x4e, 0x68, 0x7d, 0x0f, 0x60, 0xdb, 0x1f, 0x0c, 0x7c, 0xcf, 0xc6, + 0x24, 0x40, 0x2d, 0x98, 0xda, 0x0d, 0xc3, 0x6d, 0xdf, 0xc5, 0x2d, 0x63, 0xcd, 0xb8, 0x53, 0xb3, + 0x93, 0x26, 0x5a, 0x82, 0xab, 0xbb, 0x61, 0xb8, 0x4f, 0xba, 0xad, 0x89, 0x35, 0xe3, 0x4e, 0xdd, + 0xe6, 0x2d, 0xeb, 0x31, 0xa0, 0x47, 0x31, 0xa8, 0x07, 0xae, 0xbb, 0x8f, 0x07, 0x2f, 0x71, 0xd8, + 0xf6, 0x4e, 0xfc, 0x98, 0xfa, 0x13, 0x82, 0xc3, 0xf6, 0x0e, 0x5d, 0xa6, 0x6e, 0xf3, 0x16, 0x5a, + 0x85, 0xba, 0xed, 0xf7, 0xf1, 0x53, 0x7c, 0x8e, 0xfb, 0x74, 0xa1, 0x9a, 0x9d, 0x76, 0x58, 0xff, + 0x35, 0xe0, 0xda, 0x76, 0x88, 0x9d, 0x08, 0xd3, 0x25, 0x6d, 0x7c, 0x86, 0x1e, 0xc0, 0xb5, 0xb6, + 0xd7, 0x8b, 0xd8, 0xd2, 0x4f, 0x7b, 0x24, 0x6a, 0x19, 0x6b, 0x93, 0x77, 0x66, 0x36, 0x57, 0xd6, + 0x99, 0x5e, 0x54, 0xde, 0x76, 0x6e, 0x02, 0xfa, 0x0e, 0xd4, 0x29, 0x55, 0x3c, 0x48, 0x79, 0xce, + 0x6c, 0xae, 0xae, 0x13, 0x1c, 0x9e, 0xe3, 0xf0, 0x85, 0x13, 0xf4, 0x5e, 0x04, 0x4e, 0xe8, 0x0c, + 0xc8, 0xba, 0xa0, 0xb1, 0x53, 0x72, 0xb4, 0x06, 0x33, 0x87, 0x01, 0x0e, 0x9d, 0xa8, 0xe7, 0x7b, + 0xed, 0x9d, 0xd6, 0x24, 0x15, 0x46, 0xee, 0x42, 0x26, 0x4c, 0x1f, 0x06, 0x5c, 0xd6, 0x2b, 0x74, + 0x58, 0xb4, 0xe9, 0xec, 0x0b, 0x0f, 0x87, 0x7c, 0xb8, 0xc6, 0x67, 0xa7, 0x5d, 0xd6, 0xa7, 0xd0, + 0xc8, 0x08, 0x5c, 0x65, 0x0b, 0xb2, 0x02, 0x4e, 0xbe, 0x96, 0x80, 0x56, 0x08, 0xf3, 0x8f, 0x70, + 0x44, 0xdb, 0x84, 0x8e, 0xe1, 0xb3, 0x18, 0x36, 0x23, 0xd8, 0x11, 0x0a, 0xaf, 0xdb, 0x72, 0x57, + 0x5e, 0x2d, 0x13, 0xe5, 0x6a, 0x99, 0xcc, 0xaa, 0xc5, 0xfa, 0xdc, 0x80, 0x85, 0x1c, 0xd3, 0x4a, + 0x72, 0x6f, 0xc1, 0x9c, 0x10, 0x84, 0x22, 0x9d, 0xa4, 0xa6, 0x51, 0x2e, 0x7b, 0x76, 0x8a, 0xf5, + 0x4b, 0x03, 0x1a, 0xc7, 0x1c, 0x4b, 0x22, 0x7f, 0x46, 0x9f, 0xc6, 0xeb, 0x19, 0x8c, 0x2c, 0xf7, + 0x84, 0xc6, 0x1c, 0x4a, 0x8d, 0xc9, 0xda, 0x85, 0xf9, 0x2c, 0x18, 0x12, 0xa0, 0x6f, 0xca, 0x0e, + 0xca, 0xe1, 0x2c, 0x70, 0xeb, 0x4f, 0x07, 0x6c, 0x89, 0xc8, 0xfa, 0x19, 0x98, 0x89, 0x7e, 0x1f, + 0x04, 0x41, 0xbf, 0xd7, 0xa1, 0xeb, 0xc7, 0xf2, 0xc6, 0xe2, 0xc9, 0x10, 0x8d, 0x72, 0x88, 0x9a, + 0x8d, 0xbd, 0x09, 0xf0, 0x30, 0xf4, 0x07, 0x99, 0xad, 0x95, 0x7a, 0xac, 0x3f, 0x18, 0x70, 0xa3, + 0x90, 0x79, 0xa5, 0x6d, 0x7e, 0x02, 0xf3, 0x49, 0x38, 0x18, 0x62, 0x12, 0x49, 0x3b, 0xfd, 0x7e, + 0xd1, 0xae, 0x70, 0x52, 0x5b, 0x99, 0x68, 0x45, 0xb0, 0xfa, 0x08, 0x47, 0x31, 0x56, 0x1b, 0x9f, + 0x69, 0x94, 0x53, 0x14, 0xb8, 0xc6, 0xdb, 0xd7, 0x3f, 0x1a, 0xf0, 0x5e, 0x09, 0xdb, 0x4a, 0xbb, + 0xac, 0xd5, 0xcb, 0x44, 0x55, 0xbd, 0xfc, 0xd3, 0x80, 0xe6, 0xb3, 0xd0, 0xf1, 0xc8, 0x09, 0x0e, + 0xe9, 0x20, 0x8d, 0x52, 0xb1, 0x46, 0x5a, 0x30, 0xc5, 0x5d, 0x9f, 0xab, 0x24, 0x69, 0xa2, 0x0f, + 0xe1, 0xda, 0x61, 0xdf, 0x95, 0x23, 0x1c, 0xd3, 0x4c, 0xae, 0x37, 0xa6, 0x3b, 0xc0, 0x17, 0x32, + 0x1d, 0x53, 0x51, 0xae, 0x37, 0xaf, 0xc7, 0x2b, 0xe5, 0x51, 0xa5, 0x96, 0x8b, 0x2a, 0x4f, 0x60, + 0x49, 0x27, 0x40, 0x35, 0x0f, 0xfa, 0xcc, 0x80, 0xd9, 0xc7, 0x7e, 0xcf, 0x13, 0xe7, 0x50, 0xb1, + 0x16, 0x6e, 0x02, 0xd8, 0xf8, 0x6c, 0x1f, 0x13, 0xe2, 0x74, 0x31, 0xd7, 0x80, 0xd4, 0x53, 0x16, + 0x09, 0x2f, 0x97, 0xd8, 0xda, 0x82, 0x39, 0x09, 0x47, 0x35, 0x61, 0xfe, 0x1d, 0xbb, 0x64, 0xce, + 0x1f, 0xe3, 0x01, 0xdf, 0x23, 0x98, 0xc7, 0x7b, 0x19, 0x85, 0x51, 0xae, 0xf7, 0xbc, 0xf5, 0x4b, + 0x9a, 0x99, 0x54, 0x34, 0x23, 0x85, 0x8a, 0x2b, 0xf9, 0x50, 0x11, 0x8f, 0xef, 0x39, 0x9e, 0xdb, + 0xc7, 0x6e, 0xec, 0xf4, 0x6c, 0x3f, 0xa5, 0x1e, 0x64, 0xc1, 0x2c, 0x6b, 0xd9, 0x98, 0x0c, 0xfb, + 0x51, 0xeb, 0x2a, 0x8d, 0x17, 0x99, 0x3e, 0xeb, 0x08, 0x56, 0x8b, 0x45, 0xab, 0xa6, 0xae, 0x13, + 0x98, 0x3d, 0x1a, 0xf6, 0xa2, 0x11, 0xb6, 0x7e, 0xbc, 0x63, 0x70, 0x0b, 0xe6, 0x24, 0x3e, 0xd5, + 0xb0, 0x7e, 0x61, 0x40, 0x33, 0x89, 0xb6, 0xe9, 0x95, 0xa7, 0x1c, 0xf5, 0x58, 0xa1, 0x2c, 0x0e, + 0x90, 0x0f, 0x7b, 0xfd, 0x08, 0x87, 0x74, 0x43, 0x6b, 0x36, 0x6f, 0xc5, 0xfc, 0x0e, 0xf0, 0xab, + 0xe8, 0x18, 0x9f, 0xd1, 0x9d, 0xac, 0xd9, 0x49, 0xd3, 0xfa, 0xab, 0x01, 0x4b, 0x3a, 0x8c, 0x95, + 0x0e, 0x83, 0x87, 0x00, 0x83, 0xf4, 0x2e, 0xc8, 0x8e, 0x81, 0x0f, 0x8b, 0xc2, 0x1d, 0xe3, 0xf6, + 0x70, 0xd8, 0xef, 0xd3, 0xd3, 0x54, 0x9a, 0x19, 0x73, 0xf6, 0x38, 0x5c, 0x26, 0x47, 0xd2, 0xb4, + 0x7e, 0xa3, 0xc0, 0x15, 0x17, 0xa3, 0xd2, 0x20, 0x20, 0xc1, 0x9a, 0xa0, 0x37, 0x26, 0x99, 0xdd, + 0x78, 0x41, 0xe0, 0x77, 0x06, 0x2c, 0x6b, 0x21, 0xbd, 0x4b, 0x15, 0x5a, 0x7f, 0x33, 0x00, 0x3d, + 0xe9, 0x75, 0x4e, 0x25, 0xba, 0x72, 0x25, 0x7d, 0x0d, 0xe6, 0x63, 0x7a, 0xec, 0x32, 0xc1, 0x25, + 0x55, 0x29, 0xfd, 0x31, 0x78, 0x1b, 0x3b, 0xc4, 0xf7, 0xb8, 0xba, 0x78, 0x2b, 0xaf, 0xac, 0x5a, + 0xb9, 0xcb, 0x5d, 0xcd, 0xb9, 0xdc, 0xc7, 0x50, 0x6f, 0xbb, 0x9b, 0x2c, 0x74, 0x14, 0x1e, 0xf5, + 0x94, 0x35, 0x0d, 0x38, 0x2c, 0x41, 0xe1, 0x2d, 0xeb, 0x53, 0x58, 0x54, 0xc4, 0xad, 0xb4, 0x01, + 0xf7, 0x60, 0x4e, 0xa0, 0x90, 0xf6, 0x60, 0x9e, 0xbb, 0xba, 0x18, 0xb3, 0xb3, 0x64, 0xd6, 0x90, + 0xfa, 0x7a, 0x7c, 0x1c, 0x60, 0x97, 0xa2, 0x48, 0x7c, 0x3d, 0x1b, 0x68, 0x0d, 0x25, 0xd0, 0xae, + 0xc1, 0x8c, 0xaf, 0xc6, 0x29, 0x7f, 0xc4, 0x38, 0xf5, 0x19, 0x73, 0x08, 0x85, 0xef, 0x58, 0xb9, + 0xca, 0xc8, 0xf7, 0xf5, 0x94, 0xdc, 0xfa, 0xbb, 0x01, 0xd7, 0xdb, 0xde, 0x79, 0x2f, 0xc2, 0x31, + 0xb2, 0x67, 0xbe, 0x88, 0xd0, 0x97, 0xc7, 0xe1, 0xe2, 0x43, 0x2a, 0x35, 0xb4, 0x2b, 0x19, 0x43, + 0xfb, 0x08, 0x16, 0x18, 0x2f, 0xd9, 0x5a, 0x6b, 0xd4, 0x5a, 0xd5, 0x81, 0x52, 0xa3, 0xfb, 0xb9, + 0x01, 0x4d, 0x0d, 0xec, 0x2f, 0xd5, 0x74, 0x3c, 0xb8, 0x2e, 0x2e, 0xe5, 0xfd, 0xfe, 0x28, 0xce, + 0x3a, 0xde, 0x85, 0xf7, 0xb7, 0xd2, 0xb9, 0x24, 0x31, 0x7c, 0xa7, 0xf1, 0xea, 0xf7, 0x06, 0x4c, + 0x6f, 0xef, 0x1f, 0x53, 0xb2, 0xb1, 0x72, 0xbc, 0x3b, 0xd0, 0x60, 0xbc, 0x1c, 0x12, 0xe1, 0xf0, + 0xc0, 0x19, 0x24, 0xd7, 0xbe, 0x7c, 0x37, 0xba, 0xcd, 0x33, 0x54, 0xd6, 0xd5, 0x76, 0xb9, 0xaa, + 0xb2, 0x9d, 0x71, 0x78, 0x9f, 0x49, 0x94, 0x15, 0x6f, 0xca, 0x2a, 0xc7, 0x46, 0x57, 0x66, 0xdb, + 0x92, 0x76, 0xa0, 0x1d, 0x80, 0x1f, 0x38, 0xdd, 0x9e, 0x47, 0x55, 0xcd, 0xeb, 0x19, 0xb7, 0x35, + 0xd0, 0xf9, 0xed, 0x3e, 0xa5, 0xb5, 0xa5, 0x79, 0x23, 0x6c, 0xe1, 0x17, 0x06, 0xcc, 0xa6, 0xa8, + 0x48, 0x80, 0xbe, 0x01, 0xf5, 0x44, 0x7d, 0x84, 0x57, 0x61, 0x1a, 0xc9, 0xed, 0x84, 0xf7, 0xdb, + 0x29, 0xc5, 0x1b, 0xc2, 0x29, 0x74, 0x31, 0x1c, 0x10, 0x8a, 0xb2, 0x66, 0xa7, 0x1d, 0xd6, 0x79, + 0x0a, 0x91, 0xc4, 0x9a, 0xcb, 0xf2, 0x34, 0xde, 0x8c, 0x6e, 0xd4, 0x70, 0x62, 0xfd, 0xc9, 0x80, + 0x39, 0x89, 0xf1, 0xbb, 0x52, 0x8e, 0x09, 0xd3, 0x89, 0x2e, 0xb8, 0x6e, 0x44, 0xdb, 0x3a, 0x4c, + 0x6b, 0x2c, 0x1a, 0x77, 0x77, 0xb3, 0xee, 0xee, 0x8e, 0x20, 0xf3, 0x29, 0x34, 0x59, 0x93, 0xd5, + 0xaa, 0x8e, 0x23, 0x27, 0x1a, 0x92, 0xf2, 0x45, 0x97, 0xe0, 0x2a, 0x23, 0x4b, 0x4e, 0x52, 0xd6, + 0x1a, 0xc1, 0xf8, 0x5a, 0xb0, 0xa4, 0x63, 0xc6, 0x32, 0x33, 0xc4, 0x87, 0x68, 0x3a, 0xed, 0xf7, + 0xf1, 0xa5, 0x20, 0x68, 0xd8, 0x72, 0x93, 0xb0, 0xc2, 0x5a, 0xd9, 0x52, 0xe4, 0x64, 0xae, 0x14, + 0x39, 0xc2, 0xa5, 0xac, 0x09, 0x8b, 0x0a, 0x0e, 0x12, 0x58, 0x4f, 0xe1, 0xda, 0x0e, 0xee, 0x63, + 0xa9, 0x84, 0x39, 0x8e, 0xd2, 0x17, 0xa0, 0x91, 0x59, 0x8d, 0x04, 0xd6, 0x3e, 0x34, 0x92, 0x8d, + 0xdd, 0xfa, 0x69, 0xdb, 0x1d, 0x97, 0xc3, 0xfd, 0xb4, 0x00, 0xc8, 0x96, 0x23, 0x01, 0xfa, 0x7a, + 0x1a, 0x28, 0xb9, 0x13, 0x29, 0xb6, 0x2c, 0x08, 0xac, 0x7f, 0x28, 0x29, 0x08, 0xd9, 0xde, 0x3f, + 0x2e, 0x87, 0x65, 0xc2, 0x74, 0xac, 0x34, 0x29, 0x74, 0x8a, 0x76, 0xce, 0x35, 0x26, 0xdf, 0x8c, + 0x0f, 0x6b, 0xf6, 0xef, 0x5f, 0xea, 0x3d, 0x9f, 0xe2, 0x26, 0x01, 0xfa, 0x3e, 0x4c, 0xb1, 0x73, + 0x23, 0x71, 0xe5, 0x51, 0x8f, 0x9b, 0x64, 0x1a, 0xda, 0xd5, 0xf8, 0xf7, 0x57, 0xb4, 0x42, 0xb0, + 0x5c, 0xb5, 0x40, 0x8a, 0x9b, 0x00, 0x8c, 0x83, 0x14, 0xfe, 0xa4, 0x1e, 0xeb, 0x57, 0x06, 0xb4, + 0x6c, 0x3c, 0xf0, 0xcf, 0xf1, 0x6b, 0xa9, 0xbf, 0x05, 0x53, 0xcc, 0x09, 0x08, 0xbf, 0x7f, 0x27, + 0xcd, 0xd7, 0xaa, 0x77, 0xbb, 0xb9, 0x7a, 0xb7, 0x6b, 0xed, 0xc3, 0x4a, 0x01, 0x1a, 0x76, 0xf0, + 0x93, 0x61, 0xa7, 0x83, 0x09, 0xe1, 0x15, 0xe5, 0xa4, 0x19, 0x7b, 0xe8, 0x89, 0xd3, 0xeb, 0x63, + 0x97, 0xa3, 0xe1, 0x2d, 0xeb, 0x73, 0x03, 0x9a, 0x0f, 0x5c, 0xf7, 0x6d, 0x88, 0xe6, 0xaa, 0xa2, + 0xb9, 0xa5, 0xa2, 0x3d, 0x86, 0x25, 0x1d, 0x94, 0x4a, 0x72, 0xf5, 0xa0, 0xb1, 0xd3, 0x23, 0x83, + 0x1e, 0x21, 0x22, 0x46, 0x98, 0x30, 0xed, 0xe7, 0x6a, 0xb2, 0x7e, 0x30, 0xf2, 0xed, 0xbd, 0x05, + 0x53, 0xdd, 0xec, 0xed, 0x96, 0x37, 0xad, 0x5d, 0x98, 0xcf, 0xb2, 0x62, 0x65, 0x86, 0xce, 0x28, + 0x65, 0x86, 0x94, 0xc8, 0xfa, 0x8b, 0x01, 0x68, 0x7f, 0x18, 0xe1, 0xdc, 0x71, 0xf2, 0x96, 0x50, + 0xc7, 0x8a, 0x1b, 0xca, 0x45, 0x23, 0xde, 0x42, 0x16, 0xcc, 0x0e, 0x86, 0x11, 0x76, 0x8f, 0x71, + 0xc7, 0xf7, 0x5c, 0x42, 0xb3, 0xbf, 0x39, 0x3b, 0xd3, 0x67, 0xed, 0xc1, 0xa2, 0x82, 0xb4, 0x9a, + 0xd0, 0xbf, 0x30, 0xa0, 0xb5, 0xed, 0x78, 0x1d, 0xdc, 0x7f, 0xf7, 0xa2, 0x5b, 0x07, 0xb0, 0x52, + 0x80, 0xa5, 0x9a, 0x70, 0x27, 0x30, 0x2b, 0x56, 0x7a, 0x9b, 0x06, 0xb8, 0x05, 0x73, 0x12, 0x9f, + 0x6a, 0x58, 0xfb, 0x80, 0x72, 0xb2, 0xbf, 0x4d, 0xc4, 0x7b, 0xb0, 0xa8, 0x70, 0xab, 0x86, 0xfb, + 0xcf, 0x06, 0xac, 0x1c, 0x67, 0x4e, 0x98, 0x83, 0x5e, 0xe7, 0xd4, 0x73, 0x06, 0xc9, 0x8d, 0xa5, + 0x9b, 0x4d, 0xbd, 0xba, 0x69, 0xea, 0xe5, 0x71, 0xc2, 0xe4, 0x74, 0x4c, 0xda, 0x19, 0xa9, 0x27, + 0xcb, 0xa5, 0xbe, 0xa2, 0x4a, 0x9d, 0x5a, 0x57, 0x2d, 0x63, 0x5d, 0x87, 0x60, 0x16, 0x01, 0xad, + 0x56, 0x97, 0x0c, 0xe9, 0x0b, 0x14, 0x2b, 0x19, 0x1c, 0x0f, 0x03, 0x5e, 0x92, 0x4f, 0xea, 0x15, + 0x39, 0xa0, 0x46, 0x19, 0xd0, 0x89, 0x4c, 0x04, 0x28, 0x11, 0x3f, 0x3e, 0x0c, 0x6f, 0x14, 0x32, + 0xad, 0xb4, 0x83, 0x63, 0x55, 0x2b, 0x2e, 0xe8, 0xb5, 0x28, 0xc5, 0xf1, 0xa5, 0x3d, 0xaf, 0xfe, + 0x9a, 0x5d, 0x6c, 0x14, 0xce, 0xd5, 0x54, 0xf0, 0x26, 0x1e, 0x59, 0xff, 0x33, 0x01, 0xcd, 0xac, + 0x7d, 0x49, 0x15, 0xd5, 0x02, 0x27, 0xa8, 0x60, 0x01, 0x23, 0x38, 0xc0, 0xb7, 0x24, 0xd7, 0xaa, + 0xf1, 0xac, 0xbf, 0xeb, 0xfb, 0xdd, 0x3e, 0x66, 0xbf, 0x43, 0xbc, 0x1c, 0x9e, 0xac, 0x1f, 0x47, + 0x61, 0xcf, 0xeb, 0xfe, 0xd0, 0xe9, 0x0f, 0xb1, 0xe4, 0x78, 0xf7, 0x60, 0xea, 0xc4, 0xe9, 0xe0, + 0x4f, 0xec, 0xa7, 0xb4, 0xc0, 0x73, 0xd9, 0xc4, 0x84, 0x18, 0x7d, 0x1b, 0xea, 0xa1, 0x48, 0x33, + 0xa6, 0xe8, 0xcc, 0x1b, 0xca, 0xcc, 0xb6, 0x17, 0xdd, 0xdd, 0x64, 0x13, 0x53, 0x6a, 0xf4, 0x11, + 0x4c, 0xe0, 0x57, 0xad, 0xe9, 0x11, 0xb8, 0x4d, 0xe0, 0x57, 0xd6, 0x13, 0x58, 0xd2, 0xe9, 0xb8, + 0x92, 0xff, 0x6e, 0xfe, 0x6f, 0x11, 0xd8, 0xbf, 0x26, 0xe8, 0xbb, 0x30, 0xd3, 0x49, 0xff, 0x50, + 0x40, 0xcd, 0x64, 0x5e, 0xe6, 0x37, 0x0d, 0x73, 0x49, 0xd7, 0x4d, 0x02, 0x74, 0x0f, 0xea, 0x3f, + 0x49, 0x9e, 0xaf, 0xd0, 0x22, 0x27, 0x92, 0x1f, 0xd6, 0xcc, 0xeb, 0x6a, 0x27, 0x9b, 0x77, 0x96, + 0xbc, 0x8d, 0x88, 0x79, 0xf2, 0xab, 0x8c, 0x98, 0x97, 0x7d, 0x42, 0xd9, 0x82, 0xb9, 0xae, 0xfc, + 0x67, 0x01, 0x5a, 0x4e, 0xfe, 0x13, 0xc9, 0xfd, 0xe4, 0x60, 0xb6, 0xf4, 0x03, 0x24, 0x40, 0xf7, + 0x61, 0x96, 0x48, 0x8f, 0xf0, 0x28, 0x91, 0x2d, 0xf7, 0x9b, 0x80, 0xb9, 0xac, 0xed, 0x27, 0x01, + 0xfa, 0x31, 0x2c, 0x77, 0xf5, 0x2f, 0xe0, 0xe8, 0x56, 0x8e, 0xab, 0xfa, 0x02, 0x6d, 0x5a, 0x97, + 0x91, 0x90, 0x00, 0x9d, 0xc0, 0x4a, 0xb7, 0xe8, 0x39, 0x19, 0x7d, 0x90, 0x2e, 0x50, 0xf8, 0xce, + 0x6d, 0xde, 0xbe, 0x9c, 0x88, 0x04, 0xe8, 0x08, 0x50, 0xa4, 0xbc, 0xa9, 0xa2, 0x55, 0x3e, 0x57, + 0xfb, 0x5e, 0x6c, 0xbe, 0x57, 0x32, 0x4a, 0x02, 0xd4, 0x81, 0x56, 0xb7, 0xe0, 0xc1, 0x0e, 0x59, + 0x99, 0x9f, 0x7a, 0xb4, 0x8f, 0x95, 0xe6, 0x07, 0x97, 0xd2, 0x30, 0xdc, 0x5d, 0xe5, 0xc5, 0x49, + 0xe0, 0xd6, 0x3e, 0x98, 0x09, 0xdc, 0x05, 0x4f, 0x55, 0xcf, 0x60, 0xb1, 0xab, 0x3e, 0xc1, 0x20, + 0xfd, 0x2c, 0x61, 0x65, 0x37, 0xcb, 0x86, 0x49, 0x80, 0xf6, 0xa0, 0x71, 0x9a, 0x7d, 0x53, 0x40, + 0xc9, 0x9f, 0x4d, 0xea, 0xd3, 0x8a, 0x69, 0x16, 0x0d, 0x09, 0x91, 0x73, 0x45, 0x7a, 0x59, 0x64, + 0xf5, 0xdd, 0x40, 0x16, 0x59, 0x57, 0xdd, 0x3f, 0x80, 0x85, 0x5e, 0xbe, 0x6e, 0x8d, 0x6e, 0x24, + 0xa5, 0x66, 0x4d, 0x21, 0xde, 0x5c, 0x2d, 0x1e, 0x64, 0xeb, 0x75, 0xf3, 0x35, 0x61, 0xb1, 0x9e, + 0xae, 0x3c, 0x6d, 0xae, 0x16, 0x0f, 0x32, 0x47, 0x95, 0x4b, 0x17, 0xc2, 0x51, 0x73, 0xe5, 0x11, + 0x73, 0x59, 0xdb, 0x4f, 0x02, 0x74, 0x17, 0xa6, 0x93, 0x3e, 0x84, 0x72, 0x44, 0xf1, 0xc4, 0x45, + 0xa5, 0x8f, 0x85, 0x26, 0x11, 0x33, 0x50, 0x9e, 0x82, 0xc8, 0xa1, 0x29, 0x5b, 0x21, 0x3c, 0x12, + 0x75, 0x2b, 0xa9, 0xa4, 0x25, 0x36, 0x48, 0x5b, 0x5a, 0x13, 0x1b, 0xa4, 0xaf, 0x85, 0xc5, 0xd6, + 0x93, 0x2b, 0x41, 0x09, 0xeb, 0x51, 0x4b, 0x64, 0xc2, 0x7a, 0x34, 0x55, 0xab, 0x38, 0xca, 0x4b, + 0x75, 0x26, 0x11, 0xe5, 0xb3, 0x95, 0x2c, 0x11, 0xe5, 0x73, 0x25, 0xa9, 0x58, 0x34, 0xb5, 0x92, + 0x52, 0xe0, 0x6e, 0x3c, 0x85, 0x2f, 0x70, 0x37, 0x91, 0x55, 0x3f, 0x87, 0xa6, 0xb6, 0x94, 0x80, + 0xde, 0xe7, 0xf3, 0x8a, 0xca, 0x1e, 0xe6, 0x5a, 0x39, 0x01, 0x83, 0xab, 0xe6, 0xf2, 0x02, 0xae, + 0xb6, 0xe2, 0x20, 0xe0, 0x16, 0x14, 0x01, 0xee, 0xc3, 0xac, 0x9c, 0x67, 0x0b, 0x53, 0xcc, 0xe5, + 0xf9, 0xc2, 0x14, 0x95, 0xa4, 0x7c, 0x0f, 0x1a, 0xb9, 0xcc, 0x4e, 0x6c, 0xa5, 0x9a, 0x7d, 0x8a, + 0xad, 0xd4, 0x25, 0x83, 0xcf, 0xa1, 0xa9, 0xcd, 0x14, 0x85, 0xe6, 0x8a, 0x72, 0x5a, 0xa1, 0xb9, + 0xe2, 0x44, 0xf3, 0x1e, 0xd4, 0x45, 0xb7, 0xb0, 0x7d, 0x39, 0x2b, 0x13, 0xb6, 0x9f, 0x4d, 0x9e, + 0xf6, 0xa0, 0x91, 0x5b, 0x54, 0x48, 0xa7, 0x66, 0x76, 0x42, 0x3a, 0x5d, 0x1a, 0xf6, 0xa3, 0xfc, + 0x2d, 0x27, 0xc9, 0x54, 0xd0, 0x5a, 0xee, 0x38, 0x56, 0x32, 0x2e, 0xf3, 0xd6, 0x25, 0x14, 0xec, + 0xe8, 0x2e, 0x48, 0x21, 0xe4, 0xa3, 0xbb, 0x20, 0xaf, 0x91, 0x8f, 0xee, 0xc2, 0x2c, 0x84, 0xf9, + 0x4a, 0xee, 0x72, 0x2e, 0xfb, 0x8a, 0x9a, 0x31, 0xc8, 0xbe, 0xa2, 0xbb, 0xd5, 0x1f, 0x01, 0x52, + 0x6f, 0x7e, 0x62, 0x49, 0xed, 0xc5, 0x5b, 0x2c, 0xa9, 0xbf, 0x32, 0x6e, 0x35, 0x9e, 0xcf, 0xad, + 0xb3, 0x3f, 0x8f, 0x3f, 0xa6, 0xdf, 0x97, 0x57, 0xe9, 0xbd, 0xf3, 0xee, 0xff, 0x03, 0x00, 0x00, + 0xff, 0xff, 0xce, 0xc7, 0x31, 0xb6, 0x95, 0x2c, 0x00, 0x00, } diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index 146852752..f9c93ee3d 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -1,5 +1,6 @@ syntax = "proto3"; import "Open_IM/pkg/proto/sdk_ws/ws.proto"; +import "Open_IM/pkg/proto/sdk_ws/wrappers.proto"; option go_package = "./group;group"; package group; @@ -412,6 +413,21 @@ message GetSuperGroupsInfoResp { repeated server_api_params.GroupInfo GroupInfoList = 3; } +message SetGroupMemberInfoReq{ + string groupID = 1; + string userID = 2; + string opUserID = 3; + string operationID = 4; + google.protobuf.StringValue nickname = 5; + google.protobuf.StringValue faceURL = 6; + google.protobuf.Int32Value roleLevel = 7; + google.protobuf.StringValue ex = 8; +} + +message SetGroupMemberInfoResp{ + CommonResp CommonResp = 1; +} + service group{ rpc createGroup(CreateGroupReq) returns(CreateGroupResp); rpc joinGroup(JoinGroupReq) returns(JoinGroupResp); @@ -449,6 +465,8 @@ service group{ rpc GetJoinedSuperGroupList(GetJoinedSuperGroupListReq) returns (GetJoinedSuperGroupListResp); rpc GetSuperGroupsInfo(GetSuperGroupsInfoReq) returns (GetSuperGroupsInfoResp); + rpc SetGroupMemberInfo(SetGroupMemberInfoReq) returns (SetGroupMemberInfoResp); + } diff --git a/pkg/proto/sdk_ws/wrappers.proto b/pkg/proto/sdk_ws/wrappers.proto new file mode 100644 index 000000000..c571f0968 --- /dev/null +++ b/pkg/proto/sdk_ws/wrappers.proto @@ -0,0 +1,123 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Wrappers for primitive (non-message) types. These types are useful +// for embedding primitives in the `google.protobuf.Any` type and for places +// where we need to distinguish between the absence of a primitive +// typed field and its default value. +// +// These wrappers have no meaningful use within repeated fields as they lack +// the ability to detect presence on individual elements. +// These wrappers have no meaningful use within a map or a oneof since +// individual entries of a map or fields of a oneof can already detect presence. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "google.golang.org/protobuf/types/known/wrapperspb"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "WrappersProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// Wrapper message for `double`. +// +// The JSON representation for `DoubleValue` is JSON number. +message DoubleValue { + // The double value. + double value = 1; +} + +// Wrapper message for `float`. +// +// The JSON representation for `FloatValue` is JSON number. +message FloatValue { + // The float value. + float value = 1; +} + +// Wrapper message for `int64`. +// +// The JSON representation for `Int64Value` is JSON string. +message Int64Value { + // The int64 value. + int64 value = 1; +} + +// Wrapper message for `uint64`. +// +// The JSON representation for `UInt64Value` is JSON string. +message UInt64Value { + // The uint64 value. + uint64 value = 1; +} + +// Wrapper message for `int32`. +// +// The JSON representation for `Int32Value` is JSON number. +message Int32Value { + // The int32 value. + int32 value = 1; +} + +// Wrapper message for `uint32`. +// +// The JSON representation for `UInt32Value` is JSON number. +message UInt32Value { + // The uint32 value. + uint32 value = 1; +} + +// Wrapper message for `bool`. +// +// The JSON representation for `BoolValue` is JSON `true` and `false`. +message BoolValue { + // The bool value. + bool value = 1; +} + +// Wrapper message for `string`. +// +// The JSON representation for `StringValue` is JSON string. +message StringValue { + // The string value. + string value = 1; +} + +// Wrapper message for `bytes`. +// +// The JSON representation for `BytesValue` is JSON string. +message BytesValue { + // The bytes value. + bytes value = 1; +} \ No newline at end of file