From 8967343079c5edaed726af7ffa642bba5e551de4 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 27 May 2022 19:33:47 +0800 Subject: [PATCH 01/67] superGroup --- internal/msg_gateway/gate/callback.go | 22 ++++++++++++++-------- internal/push/logic/callback.go | 14 ++++++++++---- internal/push/logic/push_to_client.go | 2 +- pkg/call_back_struct/msg_gateway.go | 2 ++ pkg/call_back_struct/push.go | 7 +++++++ 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/internal/msg_gateway/gate/callback.go b/internal/msg_gateway/gate/callback.go index 58d3a98b2..5f472c9f3 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 int32, token string) cbApi.CommonCallbackResp { @@ -21,7 +22,9 @@ func callbackUserOnline(operationID, userID string, platformID int32, token stri UserID: userID, PlatformID: 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, platform string) cbApi.Comm if !config.Config.Callback.CallbackUserOffline.Enable { return callbackResp } - callbackOfflineReq := cbApi.CallbackUserOfflineReq{UserStatusCallbackReq: cbApi.UserStatusCallbackReq{ - CallbackCommand: constant.CallbackUserOfflineCommand, - OperationID: operationID, - UserID: userID, - PlatformID: constant.PlatformNameToID(platform), - Platform: platform, - }} + callbackOfflineReq := cbApi.CallbackUserOfflineReq{ + UserStatusCallbackReq: cbApi.UserStatusCallbackReq{ + CallbackCommand: constant.CallbackUserOfflineCommand, + OperationID: operationID, + UserID: userID, + PlatformID: constant.PlatformNameToID(platform), + Platform: platform, + }, + 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/push/logic/callback.go b/internal/push/logic/callback.go index 655751dc2..8e269e1dd 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(platformID), + PlatformID: msg.SenderPlatformID, + Platform: constant.PlatformIDToName(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 35618013a..ba657aff1 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -106,7 +106,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { content = constant.ContentType2PushContent[constant.Common] } } - callbackResp := callbackOfflinePush(pushMsg.OperationID, UIDList[0], pushMsg.MsgData.OfflinePushInfo, v.RecvPlatFormID) + 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) 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 { From c0a3bdcf990ab67051cb004dade0803dae5dcf55 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sun, 29 May 2022 19:44:22 +0800 Subject: [PATCH 02/67] k8s --- internal/rpc/admin_cms/admin_cms.go | 4 +++- internal/rpc/auth/auth.go | 2 +- internal/rpc/cache/cache.go | 5 +++-- internal/rpc/conversation/conversaion.go | 1 + internal/rpc/friend/firend.go | 5 +++-- internal/rpc/group/group.go | 1 + internal/rpc/message_cms/message_cms.go | 1 + internal/rpc/office/office.go | 5 +++-- internal/rpc/organization/organization.go | 6 ++++-- 9 files changed, 20 insertions(+), 10 deletions(-) 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 09b903c68..44c7ab82d 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -104,7 +104,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 57faf3fe2..05c226378 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()) 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/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..e952c6894 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()) From 05b4ddfd461e833aeb5d85c132ee258c190fd6ed Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 19:37:32 +0800 Subject: [PATCH 03/67] k8s --- deploy_k8s/admin_cms/admin_cms.Dockerfile | 8 ++++---- deploy_k8s/api/api.Dockerfile | 8 ++++---- deploy_k8s/auth/auth.Dockerfile | 8 ++++---- deploy_k8s/cache/cache.Dockerfile | 8 ++++---- deploy_k8s/cms_api/cms_api.Dockerfile | 9 ++++----- deploy_k8s/conversation/conversation.Dockerfile | 9 ++++----- deploy_k8s/demo/demo.Dockerfile | 8 ++++---- deploy_k8s/friend/friend.Dockerfile | 9 ++++----- deploy_k8s/group/group.Dockerfile | 8 ++++---- deploy_k8s/message_cms/message_cms.Dockerfile | 8 ++++---- deploy_k8s/msg/msg.Dockerfile | 8 ++++---- deploy_k8s/msg_gateway/msg_gateway.Dockerfile | 8 ++++---- deploy_k8s/msg_transfer/msg_transfer.Dockerfile | 9 +++++---- deploy_k8s/office/office.Dockerfile | 9 +++++---- deploy_k8s/organization/organization.Dockerfile | 9 +++++---- deploy_k8s/push/push.Dockerfile | 9 +++++---- deploy_k8s/sdk_server/sdk_server.Dockerfile | 4 ++-- deploy_k8s/statistics/statistics.Dockerfile | 9 +++++---- deploy_k8s/user/user.Dockerfile | 9 +++++---- 19 files changed, 80 insertions(+), 77 deletions(-) diff --git a/deploy_k8s/admin_cms/admin_cms.Dockerfile b/deploy_k8s/admin_cms/admin_cms.Dockerfile index bf310981c..993e2e655 100644 --- a/deploy_k8s/admin_cms/admin_cms.Dockerfile +++ b/deploy_k8s/admin_cms/admin_cms.Dockerfile @@ -5,14 +5,14 @@ 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/api.Dockerfile b/deploy_k8s/api/api.Dockerfile index 346045b7c..92f824f33 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/auth/auth.Dockerfile b/deploy_k8s/auth/auth.Dockerfile index f757d5801..acf750a8d 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/cache.Dockerfile b/deploy_k8s/cache/cache.Dockerfile index c040f622a..f9bf81738 100644 --- a/deploy_k8s/cache/cache.Dockerfile +++ b/deploy_k8s/cache/cache.Dockerfile @@ -5,13 +5,13 @@ 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/cms_api/cms_api.Dockerfile b/deploy_k8s/cms_api/cms_api.Dockerfile index 1fcc67afc..3bcd7bc17 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/conversation/conversation.Dockerfile b/deploy_k8s/conversation/conversation.Dockerfile index 443734175..c45528d8e 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/demo.Dockerfile b/deploy_k8s/demo/demo.Dockerfile index 61ffbe566..afb3f8e7b 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/friend/friend.Dockerfile b/deploy_k8s/friend/friend.Dockerfile index 80a3580b3..2ca3461e9 100644 --- a/deploy_k8s/friend/friend.Dockerfile +++ b/deploy_k8s/friend/friend.Dockerfile @@ -5,14 +5,13 @@ 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/group/group.Dockerfile b/deploy_k8s/group/group.Dockerfile index 159db839f..065b38497 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/message_cms/message_cms.Dockerfile b/deploy_k8s/message_cms/message_cms.Dockerfile index 0ae1a6abf..a737ee34c 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/msg.Dockerfile b/deploy_k8s/msg/msg.Dockerfile index 32f094ed9..c22a45fa4 100644 --- a/deploy_k8s/msg/msg.Dockerfile +++ b/deploy_k8s/msg/msg.Dockerfile @@ -5,14 +5,14 @@ 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/msg_gateway.Dockerfile b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile index 552ee3b1e..1f976c3b0 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/msg_transfer.Dockerfile b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile index 9ff56c71a..d3ed37644 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/office/office.Dockerfile b/deploy_k8s/office/office.Dockerfile index bdb509abc..ecbb34907 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/organization/organization.Dockerfile b/deploy_k8s/organization/organization.Dockerfile index 0fccb1c47..aa23865fb 100644 --- a/deploy_k8s/organization/organization.Dockerfile +++ b/deploy_k8s/organization/organization.Dockerfile @@ -5,13 +5,14 @@ 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/push/push.Dockerfile b/deploy_k8s/push/push.Dockerfile index 6b12925d8..c92afb967 100644 --- a/deploy_k8s/push/push.Dockerfile +++ b/deploy_k8s/push/push.Dockerfile @@ -5,13 +5,14 @@ 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index 6e8ec93cc..456cd0ace 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -5,7 +5,7 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_sdk_server $WORKDIR/main +ADD ./open_im_sdk_server $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ @@ -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 ./cmd/main diff --git a/deploy_k8s/statistics/statistics.Dockerfile b/deploy_k8s/statistics/statistics.Dockerfile index 1b33f1732..ba05f7c57 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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/user/user.Dockerfile b/deploy_k8s/user/user.Dockerfile index bafd9215f..88b6e6f55 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 && \ +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/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 From 9e16629d6910eee19333584d6b08f7202888ba96 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 19:41:28 +0800 Subject: [PATCH 04/67] k8s --- deploy_k8s/admin_cms/admin_cms.Dockerfile | 2 +- deploy_k8s/api/api.Dockerfile | 2 +- deploy_k8s/auth/auth.Dockerfile | 2 +- deploy_k8s/cache/cache.Dockerfile | 2 +- deploy_k8s/cms_api/cms_api.Dockerfile | 2 +- deploy_k8s/conversation/conversation.Dockerfile | 2 +- deploy_k8s/demo/demo.Dockerfile | 2 +- deploy_k8s/friend/friend.Dockerfile | 2 +- deploy_k8s/group/group.Dockerfile | 2 +- deploy_k8s/message_cms/message_cms.Dockerfile | 2 +- deploy_k8s/msg/msg.Dockerfile | 2 +- deploy_k8s/msg_gateway/msg_gateway.Dockerfile | 2 +- deploy_k8s/msg_transfer/msg_transfer.Dockerfile | 2 +- deploy_k8s/office/office.Dockerfile | 2 +- deploy_k8s/organization/organization.Dockerfile | 2 +- deploy_k8s/push/push.Dockerfile | 2 +- deploy_k8s/sdk_server/sdk_server.Dockerfile | 2 +- deploy_k8s/statistics/statistics.Dockerfile | 2 +- deploy_k8s/user/user.Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/deploy_k8s/admin_cms/admin_cms.Dockerfile b/deploy_k8s/admin_cms/admin_cms.Dockerfile index 993e2e655..e9edc9a6f 100644 --- a/deploy_k8s/admin_cms/admin_cms.Dockerfile +++ b/deploy_k8s/admin_cms/admin_cms.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_admin_cms $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config", "/Open-IM-Server/script"] diff --git a/deploy_k8s/api/api.Dockerfile b/deploy_k8s/api/api.Dockerfile index 92f824f33..f1dd4c748 100644 --- a/deploy_k8s/api/api.Dockerfile +++ b/deploy_k8s/api/api.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_api $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/auth/auth.Dockerfile b/deploy_k8s/auth/auth.Dockerfile index acf750a8d..04fbdf32a 100644 --- a/deploy_k8s/auth/auth.Dockerfile +++ b/deploy_k8s/auth/auth.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_auth $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/cache/cache.Dockerfile b/deploy_k8s/cache/cache.Dockerfile index f9bf81738..82f661df7 100644 --- a/deploy_k8s/cache/cache.Dockerfile +++ b/deploy_k8s/cache/cache.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_cache $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/cms_api/cms_api.Dockerfile b/deploy_k8s/cms_api/cms_api.Dockerfile index 3bcd7bc17..64c4ae25a 100644 --- a/deploy_k8s/cms_api/cms_api.Dockerfile +++ b/deploy_k8s/cms_api/cms_api.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_cms_api $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/conversation/conversation.Dockerfile b/deploy_k8s/conversation/conversation.Dockerfile index c45528d8e..4518627d3 100644 --- a/deploy_k8s/conversation/conversation.Dockerfile +++ b/deploy_k8s/conversation/conversation.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_conversation $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/demo/demo.Dockerfile b/deploy_k8s/demo/demo.Dockerfile index afb3f8e7b..05b532fd4 100644 --- a/deploy_k8s/demo/demo.Dockerfile +++ b/deploy_k8s/demo/demo.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_demo $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/friend/friend.Dockerfile b/deploy_k8s/friend/friend.Dockerfile index 2ca3461e9..1bdfe7c63 100644 --- a/deploy_k8s/friend/friend.Dockerfile +++ b/deploy_k8s/friend/friend.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_friend $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/group/group.Dockerfile b/deploy_k8s/group/group.Dockerfile index 065b38497..7b902ee67 100644 --- a/deploy_k8s/group/group.Dockerfile +++ b/deploy_k8s/group/group.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_group $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/message_cms/message_cms.Dockerfile b/deploy_k8s/message_cms/message_cms.Dockerfile index a737ee34c..f77ebc3c2 100644 --- a/deploy_k8s/message_cms/message_cms.Dockerfile +++ b/deploy_k8s/message_cms/message_cms.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_message_cms $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/msg/msg.Dockerfile b/deploy_k8s/msg/msg.Dockerfile index c22a45fa4..29ac3c0d4 100644 --- a/deploy_k8s/msg/msg.Dockerfile +++ b/deploy_k8s/msg/msg.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_msg $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile index 1f976c3b0..48441eb56 100644 --- a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile +++ b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_msg_gateway $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile index d3ed37644..68c3f3819 100644 --- a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile +++ b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_msg_transfer $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/office/office.Dockerfile b/deploy_k8s/office/office.Dockerfile index ecbb34907..c6db928fa 100644 --- a/deploy_k8s/office/office.Dockerfile +++ b/deploy_k8s/office/office.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_office $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/organization/organization.Dockerfile b/deploy_k8s/organization/organization.Dockerfile index aa23865fb..b492e8300 100644 --- a/deploy_k8s/organization/organization.Dockerfile +++ b/deploy_k8s/organization/organization.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_organization $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/push/push.Dockerfile b/deploy_k8s/push/push.Dockerfile index c92afb967..2ac18c56d 100644 --- a/deploy_k8s/push/push.Dockerfile +++ b/deploy_k8s/push/push.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_push $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index 456cd0ace..b56b852a4 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_sdk_server $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] diff --git a/deploy_k8s/statistics/statistics.Dockerfile b/deploy_k8s/statistics/statistics.Dockerfile index ba05f7c57..44e8f2fe1 100644 --- a/deploy_k8s/statistics/statistics.Dockerfile +++ b/deploy_k8s/statistics/statistics.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_statistics $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] diff --git a/deploy_k8s/user/user.Dockerfile b/deploy_k8s/user/user.Dockerfile index 88b6e6f55..3218949d4 100644 --- a/deploy_k8s/user/user.Dockerfile +++ b/deploy_k8s/user/user.Dockerfile @@ -9,7 +9,7 @@ ADD ./open_im_user $WORKDIR/cmd/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ - chmod +x $WORKDIR/main + chmod +x $WORKDIR/cmd/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"] From da4ac6d70982b88667071be1d7183b71a7d59698 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:07:01 +0800 Subject: [PATCH 05/67] k8s --- deploy_k8s/ingress.yaml | 7 ++++--- deploy_k8s/msg_gateway/deployment.yaml | 10 ++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 4b3a81aa9..26c424822 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -33,8 +33,8 @@ metadata: 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" +# nginx.ingress.kubernetes.io/use-regex: "true" +# nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: msg-gateway-ingress spec: rules: @@ -46,7 +46,8 @@ spec: name: msg-gateway port: number: 10001 - path: /msg-gateway/(.*) +# path: /msg-gateway/(.*) + path: / pathType: Prefix --- apiVersion: networking.k8s.io/v1 diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index b927717c9..7829fc77f 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -1,4 +1,4 @@ ---- + --- apiVersion: apps/v1 kind: Deployment metadata: @@ -17,8 +17,10 @@ spec: - name: msg-gateway image: openim/msg_gateway:v2.0.10 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 +41,7 @@ spec: - name: msg-gateway-port protocol: TCP port: 10001 - targetPort: 10001 + targetPort: ws-port selector: app: msg-gateway From 38bd2bd011a1d04c3c07ddeefc183a2904dcaa71 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:10:01 +0800 Subject: [PATCH 06/67] k8s --- deploy_k8s/msg_gateway/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index 7829fc77f..23b67b988 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -1,4 +1,4 @@ - --- +--- apiVersion: apps/v1 kind: Deployment metadata: From 1edaf152203a11cc40adac32bb8a0ce588a0c898 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:15:17 +0800 Subject: [PATCH 07/67] k8s --- deploy_k8s/admin_cms/admin_cms.Dockerfile | 3 +++ deploy_k8s/api/api.Dockerfile | 2 ++ deploy_k8s/auth/auth.Dockerfile | 2 ++ deploy_k8s/cache/cache.Dockerfile | 3 +++ deploy_k8s/cms_api/cms_api.Dockerfile | 2 ++ deploy_k8s/conversation/conversation.Dockerfile | 1 + deploy_k8s/demo/demo.Dockerfile | 2 ++ deploy_k8s/friend/friend.Dockerfile | 2 ++ deploy_k8s/group/group.Dockerfile | 2 ++ deploy_k8s/message_cms/message_cms.Dockerfile | 2 ++ deploy_k8s/msg/msg.Dockerfile | 2 ++ deploy_k8s/msg_gateway/msg_gateway.Dockerfile | 2 ++ deploy_k8s/msg_transfer/msg_transfer.Dockerfile | 2 ++ deploy_k8s/office/office.Dockerfile | 2 ++ deploy_k8s/organization/organization.Dockerfile | 3 +++ deploy_k8s/push/push.Dockerfile | 2 ++ deploy_k8s/sdk_server/sdk_server.Dockerfile | 2 ++ deploy_k8s/statistics/statistics.Dockerfile | 2 ++ deploy_k8s/user/user.Dockerfile | 2 ++ 19 files changed, 40 insertions(+) diff --git a/deploy_k8s/admin_cms/admin_cms.Dockerfile b/deploy_k8s/admin_cms/admin_cms.Dockerfile index e9edc9a6f..d373741d3 100644 --- a/deploy_k8s/admin_cms/admin_cms.Dockerfile +++ b/deploy_k8s/admin_cms/admin_cms.Dockerfile @@ -4,6 +4,9 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + + # 将可执行文件复制到目标目录 ADD ./open_im_admin_cms $WORKDIR/cmd/main diff --git a/deploy_k8s/api/api.Dockerfile b/deploy_k8s/api/api.Dockerfile index f1dd4c748..c6f287fee 100644 --- a/deploy_k8s/api/api.Dockerfile +++ b/deploy_k8s/api/api.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_api $WORKDIR/cmd/main diff --git a/deploy_k8s/auth/auth.Dockerfile b/deploy_k8s/auth/auth.Dockerfile index 04fbdf32a..6ddc5967c 100644 --- a/deploy_k8s/auth/auth.Dockerfile +++ b/deploy_k8s/auth/auth.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_auth $WORKDIR/cmd/main diff --git a/deploy_k8s/cache/cache.Dockerfile b/deploy_k8s/cache/cache.Dockerfile index 82f661df7..0ee6ed1bd 100644 --- a/deploy_k8s/cache/cache.Dockerfile +++ b/deploy_k8s/cache/cache.Dockerfile @@ -4,6 +4,9 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + + # 将可执行文件复制到目标目录 ADD ./open_im_cache $WORKDIR/cmd/main diff --git a/deploy_k8s/cms_api/cms_api.Dockerfile b/deploy_k8s/cms_api/cms_api.Dockerfile index 64c4ae25a..7921dfc4c 100644 --- a/deploy_k8s/cms_api/cms_api.Dockerfile +++ b/deploy_k8s/cms_api/cms_api.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_cms_api $WORKDIR/cmd/main diff --git a/deploy_k8s/conversation/conversation.Dockerfile b/deploy_k8s/conversation/conversation.Dockerfile index 4518627d3..9f92c8dea 100644 --- a/deploy_k8s/conversation/conversation.Dockerfile +++ b/deploy_k8s/conversation/conversation.Dockerfile @@ -4,6 +4,7 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd # 将可执行文件复制到目标目录 ADD ./open_im_conversation $WORKDIR/cmd/main diff --git a/deploy_k8s/demo/demo.Dockerfile b/deploy_k8s/demo/demo.Dockerfile index 05b532fd4..bccc97561 100644 --- a/deploy_k8s/demo/demo.Dockerfile +++ b/deploy_k8s/demo/demo.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_demo $WORKDIR/cmd/main diff --git a/deploy_k8s/friend/friend.Dockerfile b/deploy_k8s/friend/friend.Dockerfile index 1bdfe7c63..a545a5425 100644 --- a/deploy_k8s/friend/friend.Dockerfile +++ b/deploy_k8s/friend/friend.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_friend $WORKDIR/cmd/main diff --git a/deploy_k8s/group/group.Dockerfile b/deploy_k8s/group/group.Dockerfile index 7b902ee67..167214960 100644 --- a/deploy_k8s/group/group.Dockerfile +++ b/deploy_k8s/group/group.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_group $WORKDIR/cmd/main diff --git a/deploy_k8s/message_cms/message_cms.Dockerfile b/deploy_k8s/message_cms/message_cms.Dockerfile index f77ebc3c2..95edd64b9 100644 --- a/deploy_k8s/message_cms/message_cms.Dockerfile +++ b/deploy_k8s/message_cms/message_cms.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_message_cms $WORKDIR/cmd/main diff --git a/deploy_k8s/msg/msg.Dockerfile b/deploy_k8s/msg/msg.Dockerfile index 29ac3c0d4..668587bf1 100644 --- a/deploy_k8s/msg/msg.Dockerfile +++ b/deploy_k8s/msg/msg.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_msg $WORKDIR/cmd/main diff --git a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile index 48441eb56..a88280fe3 100644 --- a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile +++ b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_msg_gateway $WORKDIR/cmd/main diff --git a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile index 68c3f3819..be9bab452 100644 --- a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile +++ b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_msg_transfer $WORKDIR/cmd/main diff --git a/deploy_k8s/office/office.Dockerfile b/deploy_k8s/office/office.Dockerfile index c6db928fa..373611bc3 100644 --- a/deploy_k8s/office/office.Dockerfile +++ b/deploy_k8s/office/office.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_office $WORKDIR/cmd/main diff --git a/deploy_k8s/organization/organization.Dockerfile b/deploy_k8s/organization/organization.Dockerfile index b492e8300..eac9d114e 100644 --- a/deploy_k8s/organization/organization.Dockerfile +++ b/deploy_k8s/organization/organization.Dockerfile @@ -4,9 +4,12 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_organization $WORKDIR/cmd/main + # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \ chmod +x $WORKDIR/cmd/main diff --git a/deploy_k8s/push/push.Dockerfile b/deploy_k8s/push/push.Dockerfile index 2ac18c56d..a690ccd27 100644 --- a/deploy_k8s/push/push.Dockerfile +++ b/deploy_k8s/push/push.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_push $WORKDIR/cmd/main diff --git a/deploy_k8s/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index b56b852a4..985878620 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_sdk_server $WORKDIR/cmd/main diff --git a/deploy_k8s/statistics/statistics.Dockerfile b/deploy_k8s/statistics/statistics.Dockerfile index 44e8f2fe1..1e615b416 100644 --- a/deploy_k8s/statistics/statistics.Dockerfile +++ b/deploy_k8s/statistics/statistics.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_statistics $WORKDIR/cmd/main diff --git a/deploy_k8s/user/user.Dockerfile b/deploy_k8s/user/user.Dockerfile index 3218949d4..096ae62dd 100644 --- a/deploy_k8s/user/user.Dockerfile +++ b/deploy_k8s/user/user.Dockerfile @@ -4,6 +4,8 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml +RUN mkdir $WORKDIR/cmd + # 将可执行文件复制到目标目录 ADD ./open_im_user $WORKDIR/cmd/main From d67fdbc24eee46d0c58ef8ababa2a5e98904c431 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:17:10 +0800 Subject: [PATCH 08/67] k8s --- deploy_k8s/ingress.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 26c424822..4b3a81aa9 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -33,8 +33,8 @@ metadata: 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" + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: msg-gateway-ingress spec: rules: @@ -46,8 +46,7 @@ spec: name: msg-gateway port: number: 10001 -# path: /msg-gateway/(.*) - path: / + path: /msg-gateway/(.*) pathType: Prefix --- apiVersion: networking.k8s.io/v1 From d7283b92acb4d1ae5c219fe7894815efae393300 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:19:56 +0800 Subject: [PATCH 09/67] k8s --- deploy_k8s/admin_cms/admin_cms.Dockerfile | 2 -- deploy_k8s/api/api.Dockerfile | 2 -- deploy_k8s/auth/auth.Dockerfile | 2 -- deploy_k8s/cache/cache.Dockerfile | 2 -- deploy_k8s/cms_api/cms_api.Dockerfile | 2 -- deploy_k8s/conversation/conversation.Dockerfile | 1 - deploy_k8s/demo/demo.Dockerfile | 2 -- deploy_k8s/friend/friend.Dockerfile | 1 - deploy_k8s/group/group.Dockerfile | 2 -- deploy_k8s/message_cms/message_cms.Dockerfile | 2 -- deploy_k8s/msg/msg.Dockerfile | 1 - deploy_k8s/msg_gateway/msg_gateway.Dockerfile | 2 -- deploy_k8s/msg_transfer/msg_transfer.Dockerfile | 2 -- deploy_k8s/office/office.Dockerfile | 2 -- deploy_k8s/organization/organization.Dockerfile | 2 -- deploy_k8s/push/push.Dockerfile | 1 - deploy_k8s/sdk_server/sdk_server.Dockerfile | 2 -- deploy_k8s/statistics/statistics.Dockerfile | 2 -- deploy_k8s/user/user.Dockerfile | 2 -- 19 files changed, 34 deletions(-) diff --git a/deploy_k8s/admin_cms/admin_cms.Dockerfile b/deploy_k8s/admin_cms/admin_cms.Dockerfile index d373741d3..1144ef09d 100644 --- a/deploy_k8s/admin_cms/admin_cms.Dockerfile +++ b/deploy_k8s/admin_cms/admin_cms.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_admin_cms $WORKDIR/cmd/main diff --git a/deploy_k8s/api/api.Dockerfile b/deploy_k8s/api/api.Dockerfile index c6f287fee..f1dd4c748 100644 --- a/deploy_k8s/api/api.Dockerfile +++ b/deploy_k8s/api/api.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_api $WORKDIR/cmd/main diff --git a/deploy_k8s/auth/auth.Dockerfile b/deploy_k8s/auth/auth.Dockerfile index 6ddc5967c..04fbdf32a 100644 --- a/deploy_k8s/auth/auth.Dockerfile +++ b/deploy_k8s/auth/auth.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_auth $WORKDIR/cmd/main diff --git a/deploy_k8s/cache/cache.Dockerfile b/deploy_k8s/cache/cache.Dockerfile index 0ee6ed1bd..e69d131ab 100644 --- a/deploy_k8s/cache/cache.Dockerfile +++ b/deploy_k8s/cache/cache.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_cache $WORKDIR/cmd/main diff --git a/deploy_k8s/cms_api/cms_api.Dockerfile b/deploy_k8s/cms_api/cms_api.Dockerfile index 7921dfc4c..64c4ae25a 100644 --- a/deploy_k8s/cms_api/cms_api.Dockerfile +++ b/deploy_k8s/cms_api/cms_api.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_cms_api $WORKDIR/cmd/main diff --git a/deploy_k8s/conversation/conversation.Dockerfile b/deploy_k8s/conversation/conversation.Dockerfile index 9f92c8dea..4518627d3 100644 --- a/deploy_k8s/conversation/conversation.Dockerfile +++ b/deploy_k8s/conversation/conversation.Dockerfile @@ -4,7 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd # 将可执行文件复制到目标目录 ADD ./open_im_conversation $WORKDIR/cmd/main diff --git a/deploy_k8s/demo/demo.Dockerfile b/deploy_k8s/demo/demo.Dockerfile index bccc97561..05b532fd4 100644 --- a/deploy_k8s/demo/demo.Dockerfile +++ b/deploy_k8s/demo/demo.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_demo $WORKDIR/cmd/main diff --git a/deploy_k8s/friend/friend.Dockerfile b/deploy_k8s/friend/friend.Dockerfile index a545a5425..3741a7c89 100644 --- a/deploy_k8s/friend/friend.Dockerfile +++ b/deploy_k8s/friend/friend.Dockerfile @@ -4,7 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd # 将可执行文件复制到目标目录 ADD ./open_im_friend $WORKDIR/cmd/main diff --git a/deploy_k8s/group/group.Dockerfile b/deploy_k8s/group/group.Dockerfile index 167214960..7b902ee67 100644 --- a/deploy_k8s/group/group.Dockerfile +++ b/deploy_k8s/group/group.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_group $WORKDIR/cmd/main diff --git a/deploy_k8s/message_cms/message_cms.Dockerfile b/deploy_k8s/message_cms/message_cms.Dockerfile index 95edd64b9..f77ebc3c2 100644 --- a/deploy_k8s/message_cms/message_cms.Dockerfile +++ b/deploy_k8s/message_cms/message_cms.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_message_cms $WORKDIR/cmd/main diff --git a/deploy_k8s/msg/msg.Dockerfile b/deploy_k8s/msg/msg.Dockerfile index 668587bf1..50299b41d 100644 --- a/deploy_k8s/msg/msg.Dockerfile +++ b/deploy_k8s/msg/msg.Dockerfile @@ -4,7 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd # 将可执行文件复制到目标目录 ADD ./open_im_msg $WORKDIR/cmd/main diff --git a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile index a88280fe3..48441eb56 100644 --- a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile +++ b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_msg_gateway $WORKDIR/cmd/main diff --git a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile index be9bab452..68c3f3819 100644 --- a/deploy_k8s/msg_transfer/msg_transfer.Dockerfile +++ b/deploy_k8s/msg_transfer/msg_transfer.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_msg_transfer $WORKDIR/cmd/main diff --git a/deploy_k8s/office/office.Dockerfile b/deploy_k8s/office/office.Dockerfile index 373611bc3..c6db928fa 100644 --- a/deploy_k8s/office/office.Dockerfile +++ b/deploy_k8s/office/office.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_office $WORKDIR/cmd/main diff --git a/deploy_k8s/organization/organization.Dockerfile b/deploy_k8s/organization/organization.Dockerfile index eac9d114e..345ee9692 100644 --- a/deploy_k8s/organization/organization.Dockerfile +++ b/deploy_k8s/organization/organization.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_organization $WORKDIR/cmd/main diff --git a/deploy_k8s/push/push.Dockerfile b/deploy_k8s/push/push.Dockerfile index a690ccd27..2904ce56f 100644 --- a/deploy_k8s/push/push.Dockerfile +++ b/deploy_k8s/push/push.Dockerfile @@ -4,7 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd # 将可执行文件复制到目标目录 ADD ./open_im_push $WORKDIR/cmd/main diff --git a/deploy_k8s/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index 985878620..b56b852a4 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_sdk_server $WORKDIR/cmd/main diff --git a/deploy_k8s/statistics/statistics.Dockerfile b/deploy_k8s/statistics/statistics.Dockerfile index 1e615b416..44e8f2fe1 100644 --- a/deploy_k8s/statistics/statistics.Dockerfile +++ b/deploy_k8s/statistics/statistics.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_statistics $WORKDIR/cmd/main diff --git a/deploy_k8s/user/user.Dockerfile b/deploy_k8s/user/user.Dockerfile index 096ae62dd..3218949d4 100644 --- a/deploy_k8s/user/user.Dockerfile +++ b/deploy_k8s/user/user.Dockerfile @@ -4,8 +4,6 @@ FROM ubuntu ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml -RUN mkdir $WORKDIR/cmd - # 将可执行文件复制到目标目录 ADD ./open_im_user $WORKDIR/cmd/main From 6c324414b1507d8bc3d4540d0a4f952a491808a6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:26:11 +0800 Subject: [PATCH 10/67] k8s --- deploy_k8s/ingress.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 4b3a81aa9..7d8b88c60 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -32,6 +32,17 @@ 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/server-snippets: | + location / { + proxy_set_header Upgrade $http_upgrade; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header Host $host; + proxy_set_header Connection "upgrade"; + proxy_cache_bypass $http_upgrade; + } # 使用重写后的路径进行路由 nginx.ingress.kubernetes.io/use-regex: "true" nginx.ingress.kubernetes.io/rewrite-target: "/$1" @@ -43,9 +54,8 @@ spec: paths: - backend: service: - name: msg-gateway - port: - number: 10001 + serviceName: msg-gateway + servicePort: 10001 path: /msg-gateway/(.*) pathType: Prefix --- From fc71a757dd84f2bc609c32f4dc670c2208a15614 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:29:22 +0800 Subject: [PATCH 11/67] k8s --- deploy_k8s/admin_cms/deployment.yaml | 2 +- deploy_k8s/api/deployment.yaml | 2 +- deploy_k8s/auth/deployment.yaml | 2 +- deploy_k8s/build_push_all_images.sh | 2 +- deploy_k8s/cache/deployment.yaml | 2 +- deploy_k8s/cms_api/deployment.yaml | 2 +- deploy_k8s/conversation/deployment.yaml | 2 +- deploy_k8s/demo/deployment.yaml | 2 +- deploy_k8s/friend/deployment.yaml | 2 +- deploy_k8s/group/deployment.yaml | 2 +- deploy_k8s/message_cms/deployment.yaml | 2 +- deploy_k8s/msg/deployment.yaml | 2 +- deploy_k8s/msg_gateway/deployment.yaml | 2 +- deploy_k8s/msg_transfer/deployment.yaml | 2 +- deploy_k8s/office/deployment.yaml | 2 +- deploy_k8s/organization/deployment.yaml | 2 +- deploy_k8s/push/deployment.yaml | 2 +- deploy_k8s/sdk_server/deployment.yaml | 2 +- deploy_k8s/statistics/deployment.yaml | 2 +- deploy_k8s/user/deployment.yaml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 437b1ffc5..88e260740 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: admin-cms - image: openim/admin_cms:v2.0.10 + image: openim/admin_cms:v2.0.10k ports: - containerPort: 10200 volumeMounts: diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index 870423066..a699d3a10 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: api - image: openim/api:v2.0.10 + image: openim/api:v2.0.10k ports: - containerPort: 10002 volumeMounts: diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 89428d08c..4367f6d1f 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: auth - image: openim/auth:v2.0.10 + image: openim/auth:v2.0.10k ports: - containerPort: 10160 volumeMounts: diff --git a/deploy_k8s/build_push_all_images.sh b/deploy_k8s/build_push_all_images.sh index 4d083e241..756add942 100644 --- a/deploy_k8s/build_push_all_images.sh +++ b/deploy_k8s/build_push_all_images.sh @@ -2,7 +2,7 @@ source ./path_info.cfg # images version -version=v2.0.10 +version=v2.0.10k cd ../script/; ./build_all_service.sh cd ../deploy_k8s/ diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index f957a8ef5..f92ceece0 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: cache - image: openim/cache:v2.0.10 + image: openim/cache:v2.0.10k ports: - containerPort: 10240 volumeMounts: diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index 7cffa4c2b..d584cfb5f 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: cms-api - image: openim/cms_api:v2.0.10 + image: openim/cms_api:v2.0.10k ports: - containerPort: 10006 volumeMounts: diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index 1e14e794a..fa897e104 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: conversation - image: openim/conversation:v2.0.10 + image: openim/conversation:v2.0.10k ports: - containerPort: 10230 volumeMounts: diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index edaaf1d03..6eab5fa7b 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: demo - image: openim/demo:v2.0.10 + image: openim/demo:v2.0.10k ports: - containerPort: 10004 volumeMounts: diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index 79070b768..ee3a025ac 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: friend - image: openim/friend:v2.0.10 + image: openim/friend:v2.0.10k ports: - containerPort: 10120 volumeMounts: diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 47acea4a8..9f9e75ee7 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: group - image: openim/group:v2.0.10 + image: openim/group:v2.0.10k ports: - containerPort: 10150 volumeMounts: diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index 3792e4da4..0e3a33894 100644 --- a/deploy_k8s/message_cms/deployment.yaml +++ b/deploy_k8s/message_cms/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: message-cms - image: openim/message_cms:v2.0.10 + image: openim/message_cms:v2.0.10k ports: - containerPort: 10190 volumeMounts: diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index 4ab52e999..a4959004d 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: msg - image: openim/msg:v2.0.10 + image: openim/msg:v2.0.10k ports: - containerPort: 10130 volumeMounts: diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index 23b67b988..ff3b3c1b1 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: msg-gateway - image: openim/msg_gateway:v2.0.10 + image: openim/msg_gateway:v2.0.10k ports: - name: rpc-port containerPort: 10140 diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index 24ff62289..fc2537ef2 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: msg-transfer - image: openim/msg_transfer:v2.0.10 + image: openim/msg_transfer:v2.0.10k volumeMounts: - name: config mountPath: /Open-IM-Server/config diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index 5fec3450a..b9e20fa84 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: office - image: openim/office:v2.0.10 + image: openim/office:v2.0.10k ports: - containerPort: 10210 volumeMounts: diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index 7d5318c64..29da1b05f 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: organization - image: openim/organization:v2.0.10 + image: openim/organization:v2.0.10k ports: - containerPort: 10220 volumeMounts: diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 61c9929fc..8cb712598 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: push - image: openim/push:v2.0.10 + image: openim/push:v2.0.10k ports: - containerPort: 10170 volumeMounts: diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 7bec639b5..73a28ad2b 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: sdk-server - image: openim/sdk_server:v2.0.10 + image: openim/sdk_server:v2.0.10k ports: - containerPort: 10003 volumeMounts: diff --git a/deploy_k8s/statistics/deployment.yaml b/deploy_k8s/statistics/deployment.yaml index a517caf7d..4265317fc 100644 --- a/deploy_k8s/statistics/deployment.yaml +++ b/deploy_k8s/statistics/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: statistics - image: openim/statistics:v2.0.10 + image: openim/statistics:v2.0.10k ports: - containerPort: 10180 volumeMounts: diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 8ad91a526..05b0e60b8 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: user - image: openim/user:v2.0.10 + image: openim/user:v2.0.10k volumeMounts: - name: config mountPath: /Open-IM-Server/config From 810b08c50db86b1ab90959c23bca812e00618733 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:43:19 +0800 Subject: [PATCH 12/67] k8s --- deploy_k8s/ingress.yaml | 8 +++++--- deploy_k8s/kubectl_start_all.sh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 7d8b88c60..4a961f897 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -54,9 +54,11 @@ spec: paths: - backend: service: - serviceName: msg-gateway - servicePort: 10001 - path: /msg-gateway/(.*) + name: msg-gateway + port: + number: 10001 +# path: /msg-gateway/(.*) + path: / pathType: Prefix --- apiVersion: networking.k8s.io/v1 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 From b892749c7591a3403e554091181664141451080b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:46:53 +0800 Subject: [PATCH 13/67] k8s --- deploy_k8s/ingress.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 4a961f897..28d62b9b1 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -44,8 +44,8 @@ metadata: proxy_cache_bypass $http_upgrade; } # 使用重写后的路径进行路由 - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" +# nginx.ingress.kubernetes.io/use-regex: "true" +# nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: msg-gateway-ingress spec: rules: From 26f11fabb7376847a16fc5596fdc6d330e84269a Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:47:49 +0800 Subject: [PATCH 14/67] k8s --- deploy_k8s/ingress.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 28d62b9b1..7684797c7 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -43,7 +43,6 @@ metadata: proxy_set_header Connection "upgrade"; proxy_cache_bypass $http_upgrade; } - # 使用重写后的路径进行路由 # nginx.ingress.kubernetes.io/use-regex: "true" # nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: msg-gateway-ingress From 17bab31b183e0a981d6662f65e69fae071f971e6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:49:51 +0800 Subject: [PATCH 15/67] k8s --- deploy_k8s/ingress.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 7684797c7..f6e1d16b6 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -27,6 +27,7 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: + name: msg-gateway-ingress annotations: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/proxy-http-version: "1.1" @@ -43,9 +44,8 @@ metadata: proxy_set_header Connection "upgrade"; proxy_cache_bypass $http_upgrade; } -# 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 From 13e9c20be0a7b594bd25c5b0582b851756f86932 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:50:32 +0800 Subject: [PATCH 16/67] k8s --- deploy_k8s/ingress.yaml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index f6e1d16b6..ad5609610 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -33,18 +33,19 @@ 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/server-snippets: | - location / { - proxy_set_header Upgrade $http_upgrade; - proxy_http_version 1.1; - proxy_set_header X-Forwarded-Host $http_host; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header Host $host; - proxy_set_header Connection "upgrade"; - proxy_cache_bypass $http_upgrade; - } - +# nginx.ingress.kubernetes.io/server-snippets: | +# location / { +# proxy_set_header Upgrade $http_upgrade; +# proxy_http_version 1.1; +# proxy_set_header X-Forwarded-Host $http_host; +# proxy_set_header X-Forwarded-Proto $scheme; +# proxy_set_header X-Forwarded-For $remote_addr; +# proxy_set_header Host $host; +# proxy_set_header Connection "upgrade"; +# proxy_cache_bypass $http_upgrade; +# } + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/rewrite-target: "/$1" spec: rules: From 0f40bc4ccef46970e9070976cd157a0747db7f79 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:52:39 +0800 Subject: [PATCH 17/67] k8s --- deploy_k8s/ingress.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index ad5609610..f49b09f57 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -33,17 +33,17 @@ 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/server-snippets: | -# location / { -# proxy_set_header Upgrade $http_upgrade; -# proxy_http_version 1.1; -# proxy_set_header X-Forwarded-Host $http_host; -# proxy_set_header X-Forwarded-Proto $scheme; -# proxy_set_header X-Forwarded-For $remote_addr; -# proxy_set_header Host $host; -# proxy_set_header Connection "upgrade"; -# proxy_cache_bypass $http_upgrade; -# } + nginx.ingress.kubernetes.io/server-snippets: | + location / { + proxy_set_header Upgrade $http_upgrade; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header Host $host; + proxy_set_header Connection "upgrade"; + proxy_cache_bypass $http_upgrade; + } nginx.ingress.kubernetes.io/use-regex: "true" nginx.ingress.kubernetes.io/rewrite-target: "/$1" From 0441662e0c0cab3cb7c50fb177886c4b44fc2f35 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:53:54 +0800 Subject: [PATCH 18/67] k8s --- deploy_k8s/ingress.yaml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index f49b09f57..0279ba607 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -33,19 +33,8 @@ 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/server-snippets: | - location / { - proxy_set_header Upgrade $http_upgrade; - proxy_http_version 1.1; - proxy_set_header X-Forwarded-Host $http_host; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header Host $host; - proxy_set_header Connection "upgrade"; - proxy_cache_bypass $http_upgrade; - } - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" +# nginx.ingress.kubernetes.io/use-regex: "true" +# nginx.ingress.kubernetes.io/rewrite-target: "/$1" spec: rules: From fe25d52082dca5d042c80c6142defc8f30d4b52b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 20:56:32 +0800 Subject: [PATCH 19/67] k8s --- deploy_k8s/ingress.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 0279ba607..20f361244 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -35,7 +35,6 @@ metadata: nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" # nginx.ingress.kubernetes.io/use-regex: "true" # nginx.ingress.kubernetes.io/rewrite-target: "/$1" - spec: rules: - host: k8s.open-im-test.rentsoft.cn @@ -46,7 +45,6 @@ spec: name: msg-gateway port: number: 10001 -# path: /msg-gateway/(.*) path: / pathType: Prefix --- From d71536ab86d9aa85d6e7141a0064f5e3cd884452 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 21:01:35 +0800 Subject: [PATCH 20/67] k8s --- deploy_k8s/ingress.yaml | 2 -- deploy_k8s/k8s_openim_deploy.md | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 20f361244..4080a286d 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -33,8 +33,6 @@ 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" spec: rules: - host: k8s.open-im-test.rentsoft.cn diff --git a/deploy_k8s/k8s_openim_deploy.md b/deploy_k8s/k8s_openim_deploy.md index 017fb0e85..6eca21618 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地址 ### 2. 项目根目录创建im configMap到k8s openim namespace kubectl create namespace openim From aad4482a78fd3e3e1874d3ed75016e05f9aa0e47 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 21:02:42 +0800 Subject: [PATCH 21/67] k8s --- deploy_k8s/ingress.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 4080a286d..ef68fc8fc 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -27,12 +27,15 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: msg-gateway-ingress annotations: kubernetes.io/ingress.class: "nginx" 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 @@ -41,9 +44,9 @@ spec: - backend: service: name: msg-gateway - port: - number: 10001 - path: / + port: + number: 10001 + path: /msg-gateway/(.*) pathType: Prefix --- apiVersion: networking.k8s.io/v1 @@ -51,7 +54,7 @@ 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 @@ -73,7 +76,7 @@ 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 @@ -95,7 +98,7 @@ 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 @@ -110,4 +113,4 @@ spec: port: number: 10006 path: /cms-api/(.*) - pathType: Prefix + pathType: Prefix \ No newline at end of file From 2d055c8d8d323967177b3a53022b9094183f067d Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 21:03:29 +0800 Subject: [PATCH 22/67] k8s --- deploy_k8s/ingress.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index ef68fc8fc..1e4e10b15 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -33,8 +33,8 @@ metadata: 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" +# nginx.ingress.kubernetes.io/use-regex: "true" +# nginx.ingress.kubernetes.io/rewrite-target: "/$1" name: msg-gateway-ingress spec: rules: @@ -46,7 +46,7 @@ spec: name: msg-gateway port: number: 10001 - path: /msg-gateway/(.*) + path: / pathType: Prefix --- apiVersion: networking.k8s.io/v1 From f0dd3aada3ab212b18f36feeb670906632912b6b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 21:10:24 +0800 Subject: [PATCH 23/67] k8s --- deploy_k8s/ingress.yaml | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 1e4e10b15..847ea78a3 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.open-im-test.rentsoft.cn 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.open-im-test.rentsoft.cn http: paths: - backend: @@ -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.open-im-test.rentsoft.cn 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.open-im-test.rentsoft.cn 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.open-im-test.rentsoft.cn http: paths: - backend: @@ -112,5 +97,5 @@ spec: name: cms-api port: number: 10006 - path: /cms-api/(.*) + path: / pathType: Prefix \ No newline at end of file From cb895d17ff741318b79ac02f2c76160324c9ffc2 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 21:12:53 +0800 Subject: [PATCH 24/67] k8s --- deploy_k8s/ingress.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy_k8s/ingress.yaml b/deploy_k8s/ingress.yaml index 847ea78a3..f2d247d0f 100644 --- a/deploy_k8s/ingress.yaml +++ b/deploy_k8s/ingress.yaml @@ -10,7 +10,7 @@ metadata: name: sdk-server-ingress spec: rules: - - host: sdk-server.open-im-test.rentsoft.cn + - host: sdk-server.openim.xxx.com http: paths: - backend: @@ -32,7 +32,7 @@ metadata: name: msg-gateway-ingress spec: rules: - - host: msg-gateway.open-im-test.rentsoft.cn + - host: msg-gateway.openim.xxx.com http: paths: - backend: @@ -51,7 +51,7 @@ metadata: name: api-ingress spec: rules: - - host: api.open-im-test.rentsoft.cn + - host: api.openim.xxx.com http: paths: - backend: @@ -70,7 +70,7 @@ metadata: name: demo-ingress spec: rules: - - host: demo.open-im-test.rentsoft.cn + - host: demo.openim.xxx.com http: paths: - backend: @@ -89,7 +89,7 @@ metadata: name: cms-api-ingress spec: rules: - - host: cms-api.open-im-test.rentsoft.cn + - host: cms-api.openim.xxx.com http: paths: - backend: From b304c130349ae37bf0efae9321182c6068a903c2 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 21:15:59 +0800 Subject: [PATCH 25/67] k8s --- deploy_k8s/k8s_openim_deploy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy_k8s/k8s_openim_deploy.md b/deploy_k8s/k8s_openim_deploy.md index 6eca21618..010a8d09e 100644 --- a/deploy_k8s/k8s_openim_deploy.md +++ b/deploy_k8s/k8s_openim_deploy.md @@ -1,7 +1,7 @@ #### openIM k8s部署文档 ### 1. 修改配置文件 在Open-IM-SERVER目录下修改config/config.yaml配置文件, 将MySQL, Kafka, MongoDB等配置修改。 -使用demo需要修改demo/imAPIURL地址 +使用demo需要修改demo/imAPIURL地址 让demo能请求到im的api ### 2. 项目根目录创建im configMap到k8s openim namespace kubectl create namespace openim From 53c40a87b2f43221f42123c9c847c8a405d02e24 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 21:17:57 +0800 Subject: [PATCH 26/67] k8s --- deploy_k8s/sdk_server/sdk_server.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy_k8s/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index b56b852a4..6e8ec93cc 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -5,13 +5,13 @@ ENV WORKDIR /Open-IM-Server ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_sdk_server $WORKDIR/cmd/main +ADD ./open_im_sdk_server $WORKDIR/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ - chmod +x $WORKDIR/cmd/main + chmod +x $WORKDIR/main VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script","/Open-IM-Server/db/sdk"] WORKDIR $WORKDIR -CMD ./cmd/main +CMD ./main From 197be510478a9994f28059d6ee1773e6408a66ff Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 May 2022 21:19:05 +0800 Subject: [PATCH 27/67] k8s --- deploy_k8s/sdk_server/sdk_server.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 29e75a48519970f06bf65601f825b0d46e6e74af Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 31 May 2022 14:30:14 +0800 Subject: [PATCH 28/67] organization --- .../im_mysql_model/organization_model.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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..525ebf59d 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 @@ -256,19 +256,19 @@ func getDepartmentParent(departmentID string, dbConn *gorm.DB) (*db.Department, 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 +277,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 } From f98da25fda07e644b145b23484dc66697d263807 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 31 May 2022 19:14:00 +0800 Subject: [PATCH 29/67] organization --- deploy_k8s/admin_cms/deployment.yaml | 1 + deploy_k8s/api/deployment.yaml | 1 + deploy_k8s/auth/deployment.yaml | 1 + deploy_k8s/cache/deployment.yaml | 1 + deploy_k8s/cms_api/deployment.yaml | 1 + deploy_k8s/conversation/deployment.yaml | 1 + deploy_k8s/demo/deployment.yaml | 1 + deploy_k8s/friend/deployment.yaml | 1 + deploy_k8s/group/deployment.yaml | 1 + deploy_k8s/message_cms/deployment.yaml | 1 + deploy_k8s/msg/deployment.yaml | 1 + deploy_k8s/msg_gateway/deployment.yaml | 1 + deploy_k8s/msg_transfer/deployment.yaml | 1 + deploy_k8s/office/deployment.yaml | 1 + deploy_k8s/organization/deployment.yaml | 1 + deploy_k8s/push/deployment.yaml | 1 + deploy_k8s/sdk_server/deployment.yaml | 1 + internal/demo/register/onboarding_process.go | 1 + internal/rpc/organization/organization.go | 2 +- .../db/mysql_model/im_mysql_model/organization_model.go | 5 +++-- 20 files changed, 22 insertions(+), 3 deletions(-) diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 88e260740..518655965 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: admin-cms image: openim/admin_cms:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10200 volumeMounts: diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index a699d3a10..5c5bfb72f 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: api image: openim/api:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10002 volumeMounts: diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 4367f6d1f..ef1aef5ab 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: auth image: openim/auth:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10160 volumeMounts: diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index f92ceece0..fd29244f0 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: cache image: openim/cache:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10240 volumeMounts: diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index d584cfb5f..1218316e9 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: cms-api image: openim/cms_api:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10006 volumeMounts: diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index fa897e104..b982faf98 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: conversation image: openim/conversation:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10230 volumeMounts: diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index 6eab5fa7b..d12f902b9 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: demo 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 ee3a025ac..171849e7e 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: friend image: openim/friend:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10120 volumeMounts: diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 9f9e75ee7..3938cec84 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: group image: openim/group:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10150 volumeMounts: diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index 0e3a33894..c321ac382 100644 --- a/deploy_k8s/message_cms/deployment.yaml +++ b/deploy_k8s/message_cms/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: message-cms image: openim/message_cms:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10190 volumeMounts: diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index a4959004d..25912cc60 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: msg image: openim/msg:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10130 volumeMounts: diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index ff3b3c1b1..06570d76e 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: msg-gateway image: openim/msg_gateway:v2.0.10k + imagePullPolicy: Always ports: - name: rpc-port containerPort: 10140 diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index fc2537ef2..98410331e 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: msg-transfer image: openim/msg_transfer:v2.0.10k + imagePullPolicy: Always volumeMounts: - name: config mountPath: /Open-IM-Server/config diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index b9e20fa84..4a035db57 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: office image: openim/office:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10210 volumeMounts: diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index 29da1b05f..ec727ff53 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: organization image: openim/organization:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10220 volumeMounts: diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 8cb712598..2b463f838 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: push image: openim/push:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10170 volumeMounts: diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 73a28ad2b..50127015d 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: sdk-server image: openim/sdk_server:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10003 volumeMounts: 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/rpc/organization/organization.go b/internal/rpc/organization/organization.go index e952c6894..02523c35e 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -154,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() @@ -343,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/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index 525ebf59d..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,10 +249,11 @@ 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 } From 16d33b1c1fa64617c94a2fc08a0555ba0f35b678 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 18:17:11 +0800 Subject: [PATCH 30/67] singal offline push --- cmd/open_im_api/main.go | 4 +- config/config.yaml | 4 +- deploy_k8s/admin_cms/deployment.yaml | 2 +- internal/api/group/group.go | 24 +- internal/api/third/rtc.go | 49 ++ internal/msg_gateway/gate/logic.go | 9 +- internal/push/getui/push.go | 3 +- internal/push/jpush/push.go | 9 +- .../push/jpush/requestBody/notification.go | 17 +- internal/push/logic/push_to_client.go | 34 +- internal/push/push_interface.go | 4 +- internal/rpc/group/group.go | 5 + pkg/base_info/group_api_struct.go | 14 + ...inio_api_struct.go => third_api_struct.go} | 22 + pkg/common/config/config.go | 3 +- pkg/common/db/redisModel.go | 25 + pkg/proto/group/group.pb.go | 575 +++++++++++------- pkg/proto/group/group.proto | 16 +- pkg/proto/sdk_ws/wrappers.proto | 123 ++++ 19 files changed, 718 insertions(+), 224 deletions(-) create mode 100644 internal/api/third/rtc.go rename pkg/base_info/{minio_api_struct.go => third_api_struct.go} (72%) create mode 100644 pkg/proto/sdk_ws/wrappers.proto diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 84ea9b705..294f79d9c 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -88,9 +88,8 @@ func main() { groupRouterGroup.POST("/cancel_mute_group_member", group.CancelMuteGroupMember) //MuteGroup 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) } //certificate authRouterGroup := r.Group("/auth") @@ -108,6 +107,7 @@ 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) } //Message chatGroup := r.Group("/msg") diff --git a/config/config.yaml b/config/config.yaml index 481bbc103..bfccb0eec 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 @@ -697,5 +698,4 @@ demo: imAPIURL: http://127.0.0.1:10002 rtc: - port: 11300 - address: 127.0.0.1 + signalTimeout: 300 diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 518655965..8ed81cc05 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: admin-cms image: openim/admin_cms:v2.0.10k - imagePullPolicy: Always + imagePullPolicy: Always #每次启动都重新拉取镜像 ports: - containerPort: 10200 volumeMounts: diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 08ee1f274..a7e3c8244 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -806,6 +806,26 @@ 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 + //} + // + //var ok bool + //var errInfo string + //ok, req.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 + //} + // + //log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String()) } diff --git a/internal/api/third/rtc.go b/internal/api/third/rtc.go new file mode 100644 index 000000000..4522c4e2c --- /dev/null +++ b/internal/api/third/rtc.go @@ -0,0 +1,49 @@ +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.GetSignalInfoFromCache(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.StatusInternalServerError, resp) +} diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index 884f5f842..ccb1cd6eb 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" @@ -237,7 +238,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.CacheSignalInfo(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..fd4efaaa8 100644 --- a/internal/push/getui/push.go +++ b/internal/push/getui/push.go @@ -1,6 +1,7 @@ package getui import ( + "Open_IM/internal/push/logic" "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 logic.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..e1f2ea12f 100644 --- a/internal/push/jpush/push.go +++ b/internal/push/jpush/push.go @@ -3,6 +3,7 @@ package push import ( "Open_IM/internal/push/jpush/common" "Open_IM/internal/push/jpush/requestBody" + "Open_IM/internal/push/logic" "Open_IM/pkg/common/config" "bytes" "encoding/json" @@ -32,13 +33,19 @@ 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 logic.PushOpts) (string, error) { var pf requestBody.Platform pf.SetAll() var au requestBody.Audience au.SetAlias(accounts) var no requestBody.Notification no.SetAlert(alert) + + var extras requestBody.Extras + if opts.Signal.ClientMsgID != "" { + extras.ClientMsgID = opts.Signal.ClientMsgID + } + no.SetExtras(extras) var me requestBody.Message me.SetMsgContent(detailContent) var o requestBody.Options diff --git a/internal/push/jpush/requestBody/notification.go b/internal/push/jpush/requestBody/notification.go index 9ff49a439..9dd878147 100644 --- a/internal/push/jpush/requestBody/notification.go +++ b/internal/push/jpush/requestBody/notification.go @@ -15,11 +15,17 @@ 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"` +} + +type Extras struct { + ClientMsgID string `json:"clientMsgID"` } func (n *Notification) SetAlert(alert string) { @@ -29,8 +35,13 @@ 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 } diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index ba657aff1..5584c8d21 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -7,16 +7,17 @@ package logic import ( - jpush "Open_IM/internal/push/jpush" "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" ) @@ -35,6 +36,14 @@ type AtContent struct { var grpcCons []*grpc.ClientConn +type PushOpts struct { + Signal Signal +} + +type Signal struct { + ClientMsgID string +} + func MsgToUser(pushMsg *pbPush.PushMsgReq) { var wsResult []*pbRelay.SingleMsgToUser isOfflinePush := utils.GetSwitchFromOptions(pushMsg.MsgData.Options, constant.IsOfflinePush) @@ -117,9 +126,13 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { } if offlinePusher == nil { - offlinePusher = jpush.JPushClient + break + } + opts, err := GetOfflinePushOpts(pushMsg) + if err != nil { + log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error()) } - pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID) + 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 { @@ -133,6 +146,21 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { } } +func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts PushOpts, err error) { + if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotification { + req := &pbRtc.SignalMessageAssembleReq{} + if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil { + return opts, err + } + switch req.SignalReq.Payload.(type) { + case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup: + opts.Signal.ClientMsgID = pushMsg.MsgData.ClientMsgID + } + + } + 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..cc6e25271 100644 --- a/internal/push/push_interface.go +++ b/internal/push/push_interface.go @@ -1,5 +1,7 @@ package push +import "Open_IM/internal/push/logic" + type OfflinePusher interface { - Push(userIDList []string, alert, detailContent, operationID string) (resp string, err error) + Push(userIDList []string, alert, detailContent, operationID string, opts logic.PushOpts) (resp string, err error) } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 05c226378..699e9b395 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1405,3 +1405,8 @@ 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) { + resp = &pbGroup.SetGroupMemberInfoResp{} + return resp, nil +} diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index 169cb0b6e..3e021fdb4 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:"user_group_face_url"` + RoleLevel string `json:"role_level"` + 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 72% rename from pkg/base_info/minio_api_struct.go rename to pkg/base_info/third_api_struct.go index b553e22c7..8cfb1cfaf 100644 --- a/pkg/base_info/minio_api_struct.go +++ b/pkg/base_info/third_api_struct.go @@ -57,3 +57,25 @@ type GetDownloadURLResp struct { UpdateLog string `json:"update_log"` } `json:"data"` } + +type GetRTCInvitationInfoReq struct { + OperationID string `json:"operationID" binding:"required"` + ClientMsgID string `json:"clientMsgID"` +} + +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"` + } +} diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 53ac8023e..d17677781 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -442,8 +442,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/db/redisModel.go b/pkg/common/db/redisModel.go index 92b27c614..3a4fbd5cb 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -5,6 +5,7 @@ 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" @@ -12,6 +13,8 @@ import ( "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 +32,7 @@ const ( blackListCache = "BLACK_LIST_CACHE:" groupCache = "GROUP_CACHE:" messageCache = "MESSAGE_CACHE:" + SignalCache = "Signal_CACHE:" ) func (d *DataBases) Exec(cmd string, key interface{}, args ...interface{}) (interface{}, error) { @@ -342,3 +346,24 @@ 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) + if err != nil { + invitationInfo := &pbRtc.SignalInviteReq{} + return invitationInfo, err + } + req := &pbRtc.SignalMessageAssembleReq{} + err = proto.Unmarshal(result, req) + req2 := req.SignalReq.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 db8bb328b..f46f9f6d6 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_95c16320d90511af, []int{0} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{1} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{2} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{3} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{4} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{5} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{6} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{7} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{8} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{9} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{10} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{11} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{12} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{13} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{14} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{15} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{16} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{17} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{18} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{19} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{20} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{21} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{22} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{23} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{24} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{25} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{26} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{27} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{28} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{29} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{30} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{31} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{32} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{33} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{34} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{35} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{36} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{37} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{38} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{39} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{40} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{41} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{42} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{43} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{44} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{45} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{46} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{47} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{48} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{49} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{50} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{51} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{52} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{53} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{54} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{55} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{56} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{57} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{58} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{59} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{60} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{61} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{62} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{63} + return fileDescriptor_group_e5947a1008c7a757, []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_95c16320d90511af, []int{64} + return fileDescriptor_group_e5947a1008c7a757, []int{64} } func (m *SetGroupMemberNicknameResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameResp.Unmarshal(m, b) @@ -3390,6 +3391,130 @@ func (m *SetGroupMemberNicknameResp) GetCommonResp() *CommonResp { 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"` + OperationID string `protobuf:"bytes,3,opt,name=operationID" json:"operationID,omitempty"` + Nickname *wrapperspb.StringValue `protobuf:"bytes,4,opt,name=nickname" json:"nickname,omitempty"` + FaceURL *wrapperspb.StringValue `protobuf:"bytes,5,opt,name=faceURL" json:"faceURL,omitempty"` + RoleLevel *wrapperspb.Int32Value `protobuf:"bytes,6,opt,name=roleLevel" json:"roleLevel,omitempty"` + Ex *wrapperspb.StringValue `protobuf:"bytes,7,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_e5947a1008c7a757, []int{65} +} +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) 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_e5947a1008c7a757, []int{66} +} +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") @@ -3456,6 +3581,8 @@ func init() { proto.RegisterType((*CancelMuteGroupResp)(nil), "group.CancelMuteGroupResp") proto.RegisterType((*SetGroupMemberNicknameReq)(nil), "group.SetGroupMemberNicknameReq") proto.RegisterType((*SetGroupMemberNicknameResp)(nil), "group.SetGroupMemberNicknameResp") + proto.RegisterType((*SetGroupMemberInfoReq)(nil), "group.SetGroupMemberInfoReq") + proto.RegisterType((*SetGroupMemberInfoResp)(nil), "group.SetGroupMemberInfoResp") } // Reference imports to suppress errors if they are not otherwise used. @@ -3499,6 +3626,7 @@ type GroupClient interface { MuteGroup(ctx context.Context, in *MuteGroupReq, opts ...grpc.CallOption) (*MuteGroupResp, error) CancelMuteGroup(ctx context.Context, in *CancelMuteGroupReq, opts ...grpc.CallOption) (*CancelMuteGroupResp, error) SetGroupMemberNickname(ctx context.Context, in *SetGroupMemberNicknameReq, opts ...grpc.CallOption) (*SetGroupMemberNicknameResp, error) + SetGroupMemberInfo(ctx context.Context, in *SetGroupMemberInfoReq, opts ...grpc.CallOption) (*SetGroupMemberInfoResp, error) } type groupClient struct { @@ -3779,6 +3907,15 @@ func (c *groupClient) SetGroupMemberNickname(ctx context.Context, in *SetGroupMe 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 { @@ -3812,6 +3949,7 @@ type GroupServer interface { MuteGroup(context.Context, *MuteGroupReq) (*MuteGroupResp, error) CancelMuteGroup(context.Context, *CancelMuteGroupReq) (*CancelMuteGroupResp, error) SetGroupMemberNickname(context.Context, *SetGroupMemberNicknameReq) (*SetGroupMemberNicknameResp, error) + SetGroupMemberInfo(context.Context, *SetGroupMemberInfoReq) (*SetGroupMemberInfoResp, error) } func RegisterGroupServer(s *grpc.Server, srv GroupServer) { @@ -4358,6 +4496,24 @@ func _Group_SetGroupMemberNickname_Handler(srv interface{}, ctx context.Context, 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), @@ -4482,147 +4638,160 @@ var _Group_serviceDesc = grpc.ServiceDesc{ MethodName: "SetGroupMemberNickname", Handler: _Group_SetGroupMemberNickname_Handler, }, + { + MethodName: "SetGroupMemberInfo", + Handler: _Group_SetGroupMemberInfo_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "group/group.proto", } -func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_95c16320d90511af) } - -var fileDescriptor_group_95c16320d90511af = []byte{ - // 2138 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x1a, 0x4d, 0x6f, 0x1c, 0x49, - 0x55, 0xed, 0xf1, 0xd8, 0x9e, 0x67, 0x4f, 0xc6, 0x2e, 0xef, 0xd8, 0xe3, 0x5e, 0x6f, 0xd6, 0xa9, - 0x0d, 0xab, 0x88, 0x0f, 0x5b, 0x64, 0xa5, 0x1c, 0x58, 0x44, 0x88, 0x3f, 0x12, 0x4f, 0x92, 0xb1, - 0x49, 0x3b, 0x5c, 0x22, 0xa1, 0x30, 0x3b, 0x5d, 0x1e, 0x0d, 0x9e, 0xe9, 0x6e, 0x77, 0xf5, 0x38, - 0xc0, 0x65, 0xc5, 0x65, 0xa5, 0x05, 0x0e, 0x20, 0x24, 0x4e, 0x48, 0xb0, 0x27, 0x38, 0x70, 0xe0, - 0x00, 0x67, 0xc4, 0xcf, 0xe0, 0x57, 0x70, 0xe2, 0x8e, 0xba, 0xaa, 0xba, 0xba, 0xba, 0xab, 0xba, - 0x3d, 0x99, 0x49, 0xc8, 0x65, 0xa4, 0xf7, 0xea, 0x55, 0xbf, 0x8f, 0x7a, 0xef, 0xd5, 0x7b, 0xaf, - 0x06, 0xd6, 0xfa, 0xa1, 0x3f, 0x0e, 0xf6, 0xd8, 0xef, 0x6e, 0x10, 0xfa, 0x91, 0x8f, 0xaa, 0x0c, - 0xb0, 0x6f, 0x9d, 0x06, 0xc4, 0x7b, 0xd9, 0xee, 0xec, 0x05, 0x17, 0xfd, 0x3d, 0xb6, 0xb2, 0x47, - 0xdd, 0x8b, 0x97, 0xaf, 0xe8, 0xde, 0x2b, 0xca, 0x29, 0xf1, 0xf7, 0x00, 0x0e, 0xfc, 0xd1, 0xc8, - 0xf7, 0x1c, 0x42, 0x03, 0xd4, 0x82, 0xc5, 0xa3, 0x30, 0x3c, 0xf0, 0x5d, 0xd2, 0xb2, 0x76, 0xac, - 0x3b, 0x55, 0x27, 0x01, 0xd1, 0x06, 0x2c, 0x1c, 0x85, 0x61, 0x87, 0xf6, 0x5b, 0x73, 0x3b, 0xd6, - 0x9d, 0x9a, 0x23, 0x20, 0xfc, 0x18, 0xd0, 0xa3, 0x98, 0xd7, 0x03, 0xd7, 0xed, 0x90, 0xd1, 0x67, - 0x24, 0x6c, 0x7b, 0xe7, 0x7e, 0x4c, 0xfd, 0x43, 0x4a, 0xc2, 0xf6, 0x21, 0xfb, 0x4c, 0xcd, 0x11, - 0x10, 0xda, 0x86, 0x9a, 0xe3, 0x0f, 0xc9, 0x53, 0x72, 0x45, 0x86, 0xec, 0x43, 0x55, 0x27, 0x45, - 0xe0, 0xff, 0x58, 0x70, 0xe3, 0x20, 0x24, 0xdd, 0x88, 0xb0, 0x4f, 0x3a, 0xe4, 0x12, 0x3d, 0x80, - 0x1b, 0x6d, 0x6f, 0x10, 0xf1, 0x4f, 0x3f, 0x1d, 0xd0, 0xa8, 0x65, 0xed, 0x54, 0xee, 0x2c, 0xdf, - 0xdd, 0xda, 0xe5, 0xea, 0xea, 0xbc, 0x9d, 0xdc, 0x06, 0xf4, 0x1d, 0xa8, 0x31, 0xaa, 0x78, 0x91, - 0xf1, 0x5c, 0xbe, 0xbb, 0xbd, 0x4b, 0x49, 0x78, 0x45, 0xc2, 0x97, 0xdd, 0x60, 0xf0, 0x32, 0xe8, - 0x86, 0xdd, 0x11, 0xdd, 0x95, 0x34, 0x4e, 0x4a, 0x8e, 0x76, 0x60, 0xf9, 0x34, 0x20, 0x61, 0x37, - 0x1a, 0xf8, 0x5e, 0xfb, 0xb0, 0x55, 0x61, 0xca, 0xa8, 0x28, 0x64, 0xc3, 0xd2, 0x69, 0x20, 0x74, - 0x9d, 0x67, 0xcb, 0x12, 0x66, 0xbb, 0x5f, 0x79, 0x24, 0x14, 0xcb, 0x55, 0xb1, 0x3b, 0x45, 0xe1, - 0xcf, 0xa1, 0x91, 0x51, 0x78, 0x9a, 0x23, 0xc8, 0x2a, 0x58, 0x79, 0x2d, 0x05, 0x71, 0x08, 0xab, - 0x8f, 0x48, 0xc4, 0x60, 0xca, 0xd6, 0xc8, 0x65, 0x2c, 0x36, 0x27, 0x38, 0x94, 0x06, 0xaf, 0x39, - 0x2a, 0x2a, 0x6f, 0x96, 0xb9, 0x72, 0xb3, 0x54, 0xb2, 0x66, 0xc1, 0x5f, 0x5a, 0xb0, 0x96, 0x63, - 0x3a, 0x95, 0xde, 0xfb, 0x50, 0x97, 0x8a, 0x30, 0x49, 0x2b, 0xcc, 0x35, 0xca, 0x75, 0xcf, 0x6e, - 0xc1, 0xbf, 0xb2, 0xa0, 0x71, 0x26, 0x64, 0x49, 0xf4, 0xcf, 0xd8, 0xd3, 0x7a, 0x3d, 0x87, 0x51, - 0xf5, 0x9e, 0x33, 0xb8, 0x43, 0xa9, 0x33, 0xe1, 0x23, 0x58, 0xcd, 0x0a, 0x43, 0x03, 0xf4, 0x6d, - 0x35, 0x40, 0x85, 0x38, 0x6b, 0xc2, 0xfb, 0xd3, 0x05, 0x47, 0x21, 0xc2, 0x3f, 0x07, 0x3b, 0xb1, - 0xef, 0x83, 0x20, 0x18, 0x0e, 0x7a, 0xec, 0xfb, 0xb1, 0xbe, 0xb1, 0x7a, 0xaa, 0x88, 0x56, 0xb9, - 0x88, 0x86, 0x83, 0xbd, 0x09, 0xf0, 0x30, 0xf4, 0x47, 0x99, 0xa3, 0x55, 0x30, 0xf8, 0x0f, 0x16, - 0xbc, 0x5f, 0xc8, 0x7c, 0xaa, 0x63, 0x7e, 0x02, 0xab, 0x49, 0x3a, 0x18, 0x13, 0x1a, 0x29, 0x27, - 0xfd, 0x61, 0xd1, 0xa9, 0x08, 0x52, 0x47, 0xdb, 0x88, 0x23, 0xd8, 0x7e, 0x44, 0xa2, 0x58, 0x56, - 0x87, 0x5c, 0x1a, 0x8c, 0x53, 0x94, 0xb8, 0x66, 0x3b, 0xd7, 0x3f, 0x5a, 0xf0, 0x41, 0x09, 0xdb, - 0xa9, 0x4e, 0xd9, 0x68, 0x97, 0xb9, 0x69, 0xed, 0xf2, 0x4f, 0x0b, 0x9a, 0xcf, 0xc3, 0xae, 0x47, - 0xcf, 0x49, 0xc8, 0x16, 0x59, 0x96, 0x8a, 0x2d, 0xd2, 0x82, 0x45, 0x11, 0xfa, 0xc2, 0x24, 0x09, - 0x88, 0x3e, 0x86, 0x1b, 0xa7, 0x43, 0x57, 0xcd, 0x70, 0xdc, 0x32, 0x39, 0x6c, 0x4c, 0x77, 0x42, - 0x5e, 0xa9, 0x74, 0xdc, 0x44, 0x39, 0x6c, 0xde, 0x8e, 0xf3, 0xe5, 0x59, 0xa5, 0x9a, 0xcb, 0x2a, - 0x4f, 0x60, 0xc3, 0xa4, 0xc0, 0x74, 0x11, 0xf4, 0x85, 0x05, 0x2b, 0x8f, 0xfd, 0x81, 0x27, 0xef, - 0xa1, 0x62, 0x2b, 0xdc, 0x04, 0x70, 0xc8, 0x65, 0x87, 0x50, 0xda, 0xed, 0x13, 0x61, 0x01, 0x05, - 0x53, 0x96, 0x09, 0xaf, 0xd7, 0x18, 0xef, 0x43, 0x5d, 0x91, 0x63, 0x3a, 0x65, 0xfe, 0x1d, 0x87, - 0x64, 0x2e, 0x1e, 0xe3, 0x05, 0xdf, 0xa3, 0x44, 0xe4, 0x7b, 0x55, 0x0a, 0xab, 0xdc, 0xee, 0x79, - 0xef, 0x57, 0x2c, 0x53, 0xd1, 0x2c, 0xa3, 0xa4, 0x8a, 0xf9, 0x7c, 0xaa, 0x88, 0xd7, 0x8f, 0xbb, - 0x9e, 0x3b, 0x24, 0x6e, 0x1c, 0xf4, 0xfc, 0x3c, 0x15, 0x0c, 0xc2, 0xb0, 0xc2, 0x21, 0x87, 0xd0, - 0xf1, 0x30, 0x6a, 0x2d, 0xb0, 0x7c, 0x91, 0xc1, 0xe1, 0x67, 0xb0, 0x5d, 0xac, 0xda, 0x74, 0xe6, - 0x3a, 0x87, 0x95, 0x67, 0xe3, 0x41, 0x34, 0xc1, 0xd1, 0xcf, 0x76, 0x0d, 0xee, 0x43, 0x5d, 0xe1, - 0x33, 0x9d, 0xac, 0x5f, 0x59, 0xd0, 0x4c, 0xb2, 0x6d, 0x5a, 0xf2, 0x94, 0x4b, 0x3d, 0x53, 0x2a, - 0x8b, 0x13, 0xe4, 0xc3, 0xc1, 0x30, 0x22, 0x21, 0x3b, 0xd0, 0xaa, 0x23, 0xa0, 0x98, 0xdf, 0x09, - 0xf9, 0x69, 0x74, 0x46, 0x2e, 0xd9, 0x49, 0x56, 0x9d, 0x04, 0xc4, 0x7f, 0xb5, 0x60, 0xc3, 0x24, - 0xe3, 0x54, 0x97, 0xc1, 0x43, 0x80, 0x51, 0x5a, 0x0b, 0xf2, 0x6b, 0xe0, 0xe3, 0xa2, 0x74, 0xc7, - 0xb9, 0x3d, 0x1c, 0x0f, 0x87, 0xec, 0x36, 0x55, 0x76, 0xc6, 0x9c, 0x3d, 0x21, 0x2e, 0xd7, 0x23, - 0x01, 0xf1, 0x6f, 0x34, 0x71, 0x65, 0x61, 0x54, 0x9a, 0x04, 0x14, 0xb1, 0xe6, 0x58, 0xc5, 0xa4, - 0xb2, 0x9b, 0x2d, 0x09, 0xfc, 0xce, 0x82, 0x4d, 0xa3, 0x48, 0xef, 0xd2, 0x84, 0xf8, 0x6f, 0x16, - 0xa0, 0x27, 0x83, 0xde, 0x85, 0x42, 0x57, 0x6e, 0xa4, 0xaf, 0xc3, 0x6a, 0x4c, 0x4f, 0x5c, 0xae, - 0xb8, 0x62, 0x2a, 0x0d, 0x1f, 0x0b, 0xef, 0x90, 0x2e, 0xf5, 0x3d, 0x61, 0x2e, 0x01, 0xe5, 0x8d, - 0x55, 0x2d, 0x0f, 0xb9, 0x85, 0x5c, 0xc8, 0x7d, 0x0a, 0xb5, 0xb6, 0x7b, 0x97, 0xa7, 0x8e, 0xc2, - 0xab, 0x9e, 0xb1, 0x66, 0x09, 0x87, 0x37, 0x28, 0x02, 0xc2, 0x9f, 0xc3, 0xba, 0xa6, 0xee, 0x54, - 0x07, 0x70, 0x0f, 0xea, 0x52, 0x0a, 0xe5, 0x0c, 0x56, 0x45, 0xa8, 0xcb, 0x35, 0x27, 0x4b, 0x86, - 0xc7, 0x2c, 0xd6, 0xe3, 0xeb, 0x80, 0xb8, 0x4c, 0x8a, 0x24, 0xd6, 0xb3, 0x89, 0xd6, 0xd2, 0x12, - 0xed, 0x0e, 0x2c, 0xfb, 0x7a, 0x9e, 0xf2, 0x27, 0xcc, 0x53, 0x5f, 0xf0, 0x80, 0xd0, 0xf8, 0xce, - 0xd4, 0xab, 0x4c, 0x5c, 0xaf, 0xa7, 0xe4, 0xf8, 0xef, 0x16, 0xbc, 0xd7, 0xf6, 0xae, 0x06, 0x11, - 0x89, 0x25, 0x7b, 0xee, 0xcb, 0x0c, 0x7d, 0x7d, 0x1e, 0x2e, 0xbe, 0xa4, 0x52, 0x47, 0x9b, 0xcf, - 0x38, 0xda, 0x37, 0x61, 0x8d, 0xf3, 0x52, 0xbd, 0xb5, 0xca, 0xbc, 0x55, 0x5f, 0x28, 0x75, 0xba, - 0x5f, 0x58, 0xd0, 0x34, 0x88, 0xfd, 0x7f, 0x75, 0x1d, 0x0f, 0xde, 0x93, 0x45, 0xf9, 0x70, 0x38, - 0x49, 0xb0, 0xce, 0x56, 0xf0, 0xfe, 0x56, 0xb9, 0x97, 0x14, 0x86, 0xef, 0x34, 0x5f, 0xfd, 0xde, - 0x82, 0xa5, 0x83, 0xce, 0x19, 0x23, 0x9b, 0xa9, 0xc7, 0xbb, 0x03, 0x0d, 0xce, 0xab, 0x4b, 0x23, - 0x12, 0x9e, 0x74, 0x47, 0x49, 0xd9, 0x97, 0x47, 0xa3, 0xdb, 0xa2, 0x43, 0xe5, 0xa8, 0xb6, 0x2b, - 0x4c, 0x95, 0x45, 0xc6, 0xe9, 0x7d, 0x39, 0x31, 0x56, 0x7c, 0x28, 0xdb, 0x42, 0x36, 0xf6, 0x65, - 0x7e, 0x2c, 0x29, 0x02, 0x1d, 0x02, 0xfc, 0xa0, 0xdb, 0x1f, 0x78, 0xcc, 0xd4, 0x62, 0x9e, 0x71, - 0xdb, 0x20, 0xba, 0xa8, 0xee, 0x53, 0x5a, 0x47, 0xd9, 0x37, 0xc1, 0x11, 0x7e, 0x65, 0xc1, 0x4a, - 0x2a, 0x15, 0x0d, 0xd0, 0xb7, 0xa0, 0x96, 0x98, 0x8f, 0x8a, 0x29, 0x4c, 0x23, 0xa9, 0x4e, 0x04, - 0xde, 0x49, 0x29, 0xde, 0x90, 0x9c, 0xd2, 0x16, 0xe3, 0x11, 0x65, 0x52, 0x56, 0x9d, 0x14, 0x81, - 0xaf, 0x52, 0x11, 0x69, 0x6c, 0xb9, 0x2c, 0x4f, 0xeb, 0xcd, 0xd8, 0x46, 0x4f, 0x27, 0xf8, 0x4f, - 0x16, 0xd4, 0x15, 0xc6, 0xef, 0xca, 0x38, 0x36, 0x2c, 0x25, 0xb6, 0x10, 0xb6, 0x91, 0x30, 0x3e, - 0x4d, 0x67, 0x2c, 0x86, 0x70, 0x77, 0xb3, 0xe1, 0xee, 0x4e, 0xa0, 0xf3, 0x05, 0x34, 0x39, 0xc8, - 0x67, 0x55, 0x67, 0x51, 0x37, 0x1a, 0xd3, 0xf2, 0x8f, 0x6e, 0xc0, 0x02, 0x27, 0x4b, 0x6e, 0x52, - 0x0e, 0x4d, 0xe0, 0x7c, 0x2d, 0xd8, 0x30, 0x31, 0xe3, 0x9d, 0x19, 0x12, 0x4b, 0xac, 0x9d, 0xf6, - 0x87, 0xe4, 0x5a, 0x21, 0x58, 0xda, 0x72, 0x93, 0xb4, 0xc2, 0xa1, 0xec, 0x28, 0xb2, 0x92, 0x1b, - 0x45, 0x4e, 0x50, 0x94, 0x35, 0x61, 0x5d, 0x93, 0x83, 0x06, 0xf8, 0x29, 0xdc, 0x38, 0x24, 0x43, - 0xa2, 0x8c, 0x30, 0x67, 0x31, 0xfa, 0x1a, 0x34, 0x32, 0x5f, 0xa3, 0x01, 0xee, 0x40, 0x23, 0x39, - 0xd8, 0xfd, 0x9f, 0xb5, 0xdd, 0x59, 0x39, 0xdc, 0x4f, 0x07, 0x80, 0xfc, 0x73, 0x34, 0x40, 0xdf, - 0x48, 0x13, 0xa5, 0x08, 0x22, 0xcd, 0x97, 0x25, 0x01, 0xfe, 0x87, 0xd6, 0x82, 0xd0, 0x83, 0xce, - 0x59, 0xb9, 0x58, 0x36, 0x2c, 0xc5, 0x46, 0x53, 0x52, 0xa7, 0x84, 0x73, 0xa1, 0x51, 0x79, 0x33, - 0x31, 0x6c, 0x38, 0xbf, 0x7f, 0xe9, 0x75, 0x3e, 0x93, 0x9b, 0x06, 0xe8, 0xfb, 0xb0, 0xc8, 0xef, - 0x8d, 0x24, 0x94, 0x27, 0xbd, 0x6e, 0x92, 0x6d, 0xe8, 0xc8, 0x10, 0xdf, 0x5f, 0x33, 0x2a, 0xc1, - 0x7b, 0xd5, 0x02, 0x2d, 0x6e, 0x02, 0x70, 0x0e, 0x4a, 0xfa, 0x53, 0x30, 0xf8, 0xd7, 0x16, 0xb4, - 0x1c, 0x32, 0xf2, 0xaf, 0xc8, 0x6b, 0x99, 0xbf, 0x05, 0x8b, 0x3c, 0x08, 0xa8, 0xa8, 0xbf, 0x13, - 0xf0, 0xb5, 0xe6, 0xdd, 0x6e, 0x6e, 0xde, 0xed, 0xe2, 0x0e, 0x6c, 0x15, 0x48, 0xc3, 0x2f, 0x7e, - 0x3a, 0xee, 0xf5, 0x08, 0xa5, 0x62, 0xa2, 0x9c, 0x80, 0x71, 0x84, 0x9e, 0x77, 0x07, 0x43, 0xe2, - 0x0a, 0x69, 0x04, 0x84, 0xbf, 0xb4, 0xa0, 0xf9, 0xc0, 0x75, 0xdf, 0x86, 0x6a, 0xae, 0xae, 0x9a, - 0x5b, 0xaa, 0xda, 0x63, 0xd8, 0x30, 0x89, 0x32, 0x95, 0x5e, 0x03, 0x68, 0x1c, 0x0e, 0xe8, 0x68, - 0x40, 0xa9, 0xcc, 0x11, 0x36, 0x2c, 0xf9, 0xb9, 0x99, 0xac, 0x1f, 0x4c, 0x5c, 0xbd, 0xb7, 0x60, - 0xb1, 0x9f, 0xad, 0x6e, 0x05, 0x88, 0x8f, 0x60, 0x35, 0xcb, 0x8a, 0x8f, 0x19, 0x7a, 0x93, 0x8c, - 0x19, 0x52, 0x22, 0xfc, 0x17, 0x0b, 0x50, 0x67, 0x1c, 0x91, 0xdc, 0x75, 0xf2, 0x96, 0xa4, 0x8e, - 0x0d, 0x37, 0x56, 0x87, 0x46, 0x02, 0x42, 0x18, 0x56, 0x46, 0xe3, 0x88, 0xb8, 0x67, 0xa4, 0xe7, - 0x7b, 0x2e, 0x65, 0xdd, 0x5f, 0xdd, 0xc9, 0xe0, 0xf0, 0x31, 0xac, 0x6b, 0x92, 0x4e, 0xa7, 0xf4, - 0x2f, 0x2d, 0x68, 0x1d, 0x74, 0xbd, 0x1e, 0x19, 0xbe, 0x7b, 0xd5, 0xf1, 0x09, 0x6c, 0x15, 0xc8, - 0x32, 0x9d, 0x72, 0xe7, 0xb0, 0x22, 0xbf, 0xf4, 0x36, 0x1d, 0x70, 0x1f, 0xea, 0x0a, 0x9f, 0xe9, - 0x64, 0x1d, 0x02, 0xca, 0xe9, 0xfe, 0x36, 0x25, 0x3e, 0x86, 0x75, 0x8d, 0xdb, 0x74, 0x72, 0xff, - 0xd9, 0x82, 0xad, 0xb3, 0xcc, 0x0d, 0x73, 0x32, 0xe8, 0x5d, 0x78, 0xdd, 0x51, 0x52, 0xb1, 0xf4, - 0xb3, 0xad, 0x57, 0x3f, 0x6d, 0xbd, 0x3c, 0x41, 0x98, 0xdc, 0x8e, 0x09, 0x9c, 0xd1, 0xba, 0x52, - 0xae, 0xf5, 0xbc, 0xae, 0x75, 0xea, 0x5d, 0xd5, 0x8c, 0x77, 0x9d, 0x82, 0x5d, 0x24, 0xe8, 0x54, - 0x73, 0xc9, 0xbb, 0xff, 0x5d, 0x03, 0xfe, 0x04, 0x8d, 0xbe, 0x0b, 0xcb, 0xbd, 0xf4, 0x85, 0x13, - 0x35, 0x93, 0x7d, 0x99, 0x67, 0x5e, 0x7b, 0xc3, 0x84, 0xa6, 0x01, 0xba, 0x07, 0xb5, 0x9f, 0x24, - 0xe3, 0x6f, 0xb4, 0x2e, 0x88, 0xd4, 0xc1, 0xbc, 0xfd, 0x9e, 0x8e, 0xe4, 0xfb, 0x2e, 0x93, 0xd9, - 0xaa, 0xdc, 0xa7, 0x4e, 0x75, 0xe5, 0xbe, 0xec, 0x08, 0x76, 0x1f, 0xea, 0x7d, 0xf5, 0x65, 0x12, - 0x6d, 0x26, 0xef, 0xcc, 0xb9, 0x47, 0x52, 0xbb, 0x65, 0x5e, 0xa0, 0x01, 0xba, 0x0f, 0x2b, 0x54, - 0x79, 0xc4, 0x43, 0x89, 0x6e, 0xb9, 0x67, 0x46, 0x7b, 0xd3, 0x88, 0xa7, 0x01, 0xfa, 0x31, 0x6c, - 0xf6, 0xcd, 0x2f, 0x68, 0xe8, 0x56, 0x8e, 0xab, 0xfe, 0x82, 0x65, 0xe3, 0xeb, 0x48, 0x68, 0x80, - 0xce, 0x61, 0xab, 0x5f, 0xf4, 0x1c, 0x85, 0x3e, 0x4a, 0x3f, 0x50, 0xf8, 0x4e, 0x66, 0xdf, 0xbe, - 0x9e, 0x88, 0x06, 0xe8, 0x19, 0xa0, 0x48, 0x7b, 0x93, 0x41, 0xdb, 0x62, 0xaf, 0xf1, 0xbd, 0xc9, - 0xfe, 0xa0, 0x64, 0x95, 0x06, 0xa8, 0x07, 0xad, 0x7e, 0xc1, 0xc0, 0x1f, 0xe1, 0xcc, 0x9f, 0x02, - 0x8c, 0x8f, 0x1d, 0xf6, 0x47, 0xd7, 0xd2, 0x70, 0xb9, 0xfb, 0xda, 0xc4, 0x5a, 0xca, 0x6d, 0x1c, - 0xb8, 0x4b, 0xb9, 0x0b, 0x46, 0xdd, 0xcf, 0x61, 0xbd, 0xaf, 0x8f, 0x70, 0x91, 0x79, 0x97, 0xf4, - 0xb2, 0x9b, 0x65, 0xcb, 0x34, 0x40, 0xc7, 0xd0, 0xb8, 0xc8, 0xce, 0x24, 0x51, 0xf2, 0xcf, 0x08, - 0x7d, 0x34, 0x6b, 0xdb, 0x45, 0x4b, 0x52, 0xe5, 0xdc, 0x90, 0x4f, 0x55, 0x59, 0x9f, 0x3b, 0xaa, - 0x2a, 0x9b, 0xa6, 0x83, 0x27, 0xb0, 0x36, 0xc8, 0xcf, 0xbd, 0xd0, 0xfb, 0xc9, 0xa8, 0xca, 0x30, - 0xc8, 0xb3, 0xb7, 0x8b, 0x17, 0xf9, 0xf7, 0xfa, 0xf9, 0x99, 0x92, 0xfc, 0x9e, 0x69, 0xbc, 0x65, - 0x6f, 0x17, 0x2f, 0xf2, 0x40, 0x55, 0x5b, 0x1f, 0x19, 0xa8, 0xb9, 0xf6, 0xca, 0xde, 0x34, 0xe2, - 0x69, 0x80, 0x3e, 0x81, 0xa5, 0x04, 0x87, 0x50, 0x8e, 0x28, 0xde, 0xb8, 0xae, 0xe1, 0x78, 0x6a, - 0x92, 0x39, 0x03, 0xe5, 0x29, 0xa8, 0x9a, 0x9a, 0xb2, 0x13, 0x86, 0x67, 0xb2, 0xef, 0x55, 0x5a, - 0x62, 0x79, 0x40, 0xc6, 0xd6, 0x5c, 0x1e, 0x90, 0xb9, 0x97, 0x8e, 0xbd, 0x27, 0xd7, 0xc2, 0x4a, - 0xef, 0xd1, 0x5b, 0x6c, 0xe9, 0x3d, 0x86, 0xae, 0x37, 0xce, 0xf2, 0x4a, 0x9f, 0x2a, 0xb3, 0x7c, - 0xb6, 0x13, 0x96, 0x59, 0x3e, 0xd7, 0xd2, 0xc6, 0xaa, 0xe9, 0x9d, 0x58, 0x41, 0xb8, 0x89, 0x16, - 0xa0, 0x20, 0xdc, 0x64, 0x55, 0xfe, 0x02, 0x9a, 0xc6, 0x56, 0x04, 0x7d, 0x28, 0xf6, 0x15, 0xb5, - 0x4d, 0xf6, 0x4e, 0x39, 0x01, 0x17, 0x57, 0xef, 0x05, 0xa4, 0xb8, 0xc6, 0x8e, 0x45, 0x8a, 0x5b, - 0xd0, 0x44, 0xdc, 0x87, 0x15, 0xb5, 0x4e, 0x97, 0xae, 0x98, 0xeb, 0x13, 0xa4, 0x2b, 0x6a, 0x45, - 0xfd, 0x31, 0x34, 0x72, 0x95, 0xa1, 0x3c, 0x4a, 0xbd, 0x7a, 0x95, 0x47, 0x69, 0x2a, 0x26, 0x5f, - 0x40, 0xd3, 0x58, 0x69, 0x4a, 0xcb, 0x15, 0xd5, 0xc4, 0xd2, 0x72, 0xc5, 0x85, 0xea, 0x3d, 0xa8, - 0x49, 0xb4, 0xf4, 0x7d, 0xb5, 0xaa, 0x93, 0xbe, 0x9f, 0x2d, 0xbe, 0x8e, 0xa1, 0x91, 0xfb, 0xa8, - 0xd4, 0x4e, 0xaf, 0x0c, 0xa5, 0x76, 0xa6, 0x32, 0xee, 0x47, 0xb0, 0x61, 0xae, 0x74, 0xd0, 0x4e, - 0xee, 0x3a, 0xd6, 0x2a, 0x36, 0xfb, 0xd6, 0x35, 0x14, 0x34, 0xd8, 0x6f, 0xbc, 0xa8, 0xef, 0xf2, - 0x3f, 0xe2, 0x7d, 0xca, 0x7e, 0x3f, 0x5b, 0x60, 0xff, 0xb2, 0xfb, 0xe4, 0x7f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x14, 0x45, 0xba, 0x3b, 0xa4, 0x27, 0x00, 0x00, +func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_e5947a1008c7a757) } + +var fileDescriptor_group_e5947a1008c7a757 = []byte{ + // 2274 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4f, 0x6f, 0x1c, 0x4b, + 0x11, 0xd7, 0x78, 0xbd, 0xb6, 0xb7, 0x6c, 0x67, 0xed, 0x76, 0xd6, 0x5e, 0x4f, 0xfc, 0xf2, 0x9c, + 0x7e, 0xe1, 0x11, 0xc1, 0xc3, 0x16, 0x8e, 0x14, 0x01, 0x0f, 0x11, 0xe2, 0x3f, 0x89, 0x37, 0x89, + 0x6d, 0x32, 0xce, 0xe3, 0x10, 0x09, 0x85, 0xcd, 0x4e, 0x7b, 0xb5, 0x78, 0x77, 0x66, 0x3c, 0x3d, + 0xeb, 0x04, 0x2e, 0x4f, 0x5c, 0x9e, 0xf4, 0x80, 0x03, 0x08, 0x89, 0x13, 0x12, 0xe4, 0x04, 0x07, + 0x0e, 0x1c, 0xe0, 0x8c, 0xb8, 0x20, 0xbe, 0x02, 0x9f, 0x82, 0xaf, 0x80, 0xa6, 0xbb, 0xa7, 0xa7, + 0x67, 0xba, 0x67, 0xbc, 0x59, 0x27, 0xe4, 0xb2, 0x52, 0x57, 0x57, 0x4f, 0xff, 0xaa, 0xba, 0xaa, + 0xba, 0xaa, 0x7a, 0x61, 0xb1, 0x1b, 0xfa, 0xc3, 0x60, 0x93, 0xfd, 0x6e, 0x04, 0xa1, 0x1f, 0xf9, + 0xa8, 0xca, 0x06, 0xf6, 0x8d, 0xa3, 0x80, 0x78, 0xcf, 0x5b, 0x07, 0x9b, 0xc1, 0x69, 0x77, 0x93, + 0xcd, 0x6c, 0x52, 0xf7, 0xf4, 0xf9, 0x4b, 0xba, 0xf9, 0x92, 0x72, 0x4e, 0xfb, 0xab, 0xc5, 0x2c, + 0x61, 0x3b, 0x08, 0x48, 0x28, 0x18, 0xf1, 0xf7, 0x00, 0x76, 0xfc, 0xc1, 0xc0, 0xf7, 0x1c, 0x42, + 0x03, 0xd4, 0x84, 0xe9, 0xbd, 0x30, 0xdc, 0xf1, 0x5d, 0xd2, 0xb4, 0xd6, 0xad, 0x5b, 0x55, 0x27, + 0x19, 0xa2, 0x65, 0x98, 0xda, 0x0b, 0xc3, 0x03, 0xda, 0x6d, 0x4e, 0xac, 0x5b, 0xb7, 0x6a, 0x8e, + 0x18, 0xe1, 0x87, 0x80, 0x1e, 0xc4, 0xa0, 0xee, 0xb9, 0xee, 0x01, 0x19, 0xbc, 0x20, 0x61, 0xcb, + 0x3b, 0xf1, 0x63, 0xee, 0xcf, 0x28, 0x09, 0x5b, 0xbb, 0xec, 0x33, 0x35, 0x47, 0x8c, 0xd0, 0x1a, + 0xd4, 0x1c, 0xbf, 0x4f, 0x1e, 0x93, 0x73, 0xd2, 0x67, 0x1f, 0xaa, 0x3a, 0x29, 0x01, 0xff, 0xd7, + 0x82, 0x2b, 0x3b, 0x21, 0x69, 0x47, 0x84, 0x7d, 0xd2, 0x21, 0x67, 0xe8, 0x1e, 0x5c, 0x69, 0x79, + 0xbd, 0x88, 0x7f, 0xfa, 0x71, 0x8f, 0x46, 0x4d, 0x6b, 0xbd, 0x72, 0x6b, 0x76, 0x6b, 0x75, 0x83, + 0xeb, 0x45, 0xdf, 0xdb, 0xc9, 0x2d, 0x40, 0xdf, 0x81, 0x1a, 0xe3, 0x8a, 0x27, 0xd9, 0x9e, 0xb3, + 0x5b, 0x6b, 0x1b, 0x94, 0x84, 0xe7, 0x24, 0x7c, 0xde, 0x0e, 0x7a, 0xcf, 0x83, 0x76, 0xd8, 0x1e, + 0xd0, 0x0d, 0xc9, 0xe3, 0xa4, 0xec, 0x68, 0x1d, 0x66, 0x8f, 0x02, 0x12, 0xb6, 0xa3, 0x9e, 0xef, + 0xb5, 0x76, 0x9b, 0x15, 0x26, 0x8c, 0x4a, 0x42, 0x36, 0xcc, 0x1c, 0x05, 0x42, 0xd6, 0x49, 0x36, + 0x2d, 0xc7, 0x6c, 0xf5, 0x4b, 0x8f, 0x84, 0x62, 0xba, 0x2a, 0x56, 0xa7, 0x24, 0xfc, 0x39, 0xd4, + 0x33, 0x02, 0x8f, 0x73, 0x04, 0x59, 0x01, 0x2b, 0x6f, 0x24, 0x20, 0x0e, 0x61, 0xe1, 0x01, 0x89, + 0xd8, 0x98, 0xb2, 0x39, 0x72, 0x16, 0xc3, 0xe6, 0x0c, 0xbb, 0x52, 0xe1, 0x35, 0x47, 0x25, 0xe5, + 0xd5, 0x32, 0x51, 0xae, 0x96, 0x4a, 0x56, 0x2d, 0xf8, 0x4b, 0x0b, 0x16, 0x73, 0x9b, 0x8e, 0x25, + 0xf7, 0x36, 0xcc, 0x4b, 0x41, 0x18, 0xd2, 0x0a, 0x33, 0x8d, 0x72, 0xd9, 0xb3, 0x4b, 0xf0, 0x2f, + 0x2d, 0xa8, 0x1f, 0x0b, 0x2c, 0x89, 0xfc, 0x19, 0x7d, 0x5a, 0x6f, 0x66, 0x30, 0xaa, 0xdc, 0x13, + 0x06, 0x73, 0x28, 0x35, 0x26, 0xbc, 0x07, 0x0b, 0x59, 0x30, 0x34, 0x40, 0xdf, 0x54, 0x1d, 0x54, + 0xc0, 0x59, 0x14, 0xd6, 0x9f, 0x4e, 0x38, 0x0a, 0x13, 0xfe, 0x19, 0xd8, 0x89, 0x7e, 0xef, 0x05, + 0x41, 0xbf, 0xd7, 0x61, 0xdf, 0x8f, 0xe5, 0x8d, 0xc5, 0x53, 0x21, 0x5a, 0xe5, 0x10, 0x0d, 0x07, + 0x7b, 0x1d, 0xe0, 0x7e, 0xe8, 0x0f, 0x32, 0x47, 0xab, 0x50, 0xf0, 0xef, 0x2d, 0xb8, 0x56, 0xb8, + 0xf9, 0x58, 0xc7, 0xfc, 0x08, 0x16, 0x92, 0x70, 0x30, 0x24, 0x34, 0x52, 0x4e, 0xfa, 0xc3, 0xa2, + 0x53, 0x11, 0xac, 0x8e, 0xb6, 0x10, 0x47, 0xb0, 0xf6, 0x80, 0x44, 0x31, 0x56, 0x87, 0x9c, 0x19, + 0x94, 0x53, 0x14, 0xb8, 0x2e, 0x77, 0xae, 0x7f, 0xb0, 0xe0, 0x83, 0x92, 0x6d, 0xc7, 0x3a, 0x65, + 0xa3, 0x5e, 0x26, 0xc6, 0xd5, 0xcb, 0x3f, 0x2c, 0x68, 0x3c, 0x0d, 0xdb, 0x1e, 0x3d, 0x21, 0x21, + 0x9b, 0x64, 0x51, 0x2a, 0xd6, 0x48, 0x13, 0xa6, 0x85, 0xeb, 0x0b, 0x95, 0x24, 0x43, 0xf4, 0x31, + 0x5c, 0x39, 0xea, 0xbb, 0x6a, 0x84, 0xe3, 0x9a, 0xc9, 0x51, 0x63, 0xbe, 0x43, 0xf2, 0x52, 0xe5, + 0xe3, 0x2a, 0xca, 0x51, 0xf3, 0x7a, 0x9c, 0x2c, 0x8f, 0x2a, 0xd5, 0x5c, 0x54, 0x79, 0x04, 0xcb, + 0x26, 0x01, 0xc6, 0xf3, 0xa0, 0x2f, 0x2c, 0x98, 0x7b, 0xe8, 0xf7, 0x3c, 0x79, 0x0f, 0x15, 0x6b, + 0xe1, 0x3a, 0x80, 0x43, 0xce, 0x0e, 0x08, 0xa5, 0xed, 0x2e, 0x11, 0x1a, 0x50, 0x28, 0x65, 0x91, + 0xf0, 0x62, 0x89, 0xf1, 0x36, 0xcc, 0x2b, 0x38, 0xc6, 0x13, 0xe6, 0x3f, 0xb1, 0x4b, 0xe6, 0xfc, + 0x31, 0x9e, 0xf0, 0x3d, 0x4a, 0x44, 0xbc, 0x57, 0x51, 0x58, 0xe5, 0x7a, 0xcf, 0x5b, 0xbf, 0xa2, + 0x99, 0x8a, 0xa6, 0x19, 0x25, 0x54, 0x4c, 0xe6, 0x43, 0x45, 0x3c, 0xbf, 0xdf, 0xf6, 0xdc, 0x3e, + 0x71, 0x63, 0xa7, 0xe7, 0xe7, 0xa9, 0x50, 0x10, 0x86, 0x39, 0x3e, 0x72, 0x08, 0x1d, 0xf6, 0xa3, + 0xe6, 0x14, 0x8b, 0x17, 0x19, 0x1a, 0x7e, 0x02, 0x6b, 0xc5, 0xa2, 0x8d, 0xa7, 0xae, 0x13, 0x98, + 0x7b, 0x32, 0xec, 0x45, 0x23, 0x1c, 0xfd, 0xe5, 0xae, 0xc1, 0x6d, 0x98, 0x57, 0xf6, 0x19, 0x0f, + 0xeb, 0x6b, 0x0b, 0x1a, 0x49, 0xb4, 0x4d, 0x53, 0x9e, 0x72, 0xd4, 0x97, 0x0a, 0x65, 0x71, 0x80, + 0xbc, 0xdf, 0xeb, 0x47, 0x24, 0x64, 0x07, 0x5a, 0x75, 0xc4, 0x28, 0xde, 0xef, 0x90, 0xbc, 0x8a, + 0x8e, 0xc9, 0x19, 0x3b, 0xc9, 0xaa, 0x93, 0x0c, 0xf1, 0x5f, 0x2c, 0x58, 0x36, 0x61, 0x1c, 0xeb, + 0x32, 0xb8, 0x0f, 0x30, 0x48, 0x73, 0x41, 0x7e, 0x0d, 0x7c, 0x5c, 0x14, 0xee, 0xf8, 0x6e, 0xf7, + 0x87, 0xfd, 0x3e, 0xbb, 0x4d, 0x95, 0x95, 0xf1, 0xce, 0x9e, 0x80, 0xcb, 0xe5, 0x48, 0x86, 0xf8, + 0xd7, 0x1a, 0x5c, 0x99, 0x18, 0x95, 0x06, 0x01, 0x05, 0xd6, 0x04, 0xcb, 0x98, 0xd4, 0xed, 0x2e, + 0x17, 0x04, 0x7e, 0x6b, 0xc1, 0x8a, 0x11, 0xd2, 0xfb, 0x54, 0x21, 0xfe, 0xab, 0x05, 0xe8, 0x51, + 0xaf, 0x73, 0xaa, 0xf0, 0x95, 0x2b, 0xe9, 0x6b, 0xb0, 0x10, 0xf3, 0x13, 0x97, 0x0b, 0xae, 0xa8, + 0x4a, 0xa3, 0xc7, 0xe0, 0x1d, 0xd2, 0xa6, 0xbe, 0x27, 0xd4, 0x25, 0x46, 0x79, 0x65, 0x55, 0xcb, + 0x5d, 0x6e, 0x2a, 0xe7, 0x72, 0x9f, 0x42, 0xad, 0xe5, 0x6e, 0xf1, 0xd0, 0x51, 0x78, 0xd5, 0xb3, + 0xad, 0x59, 0xc0, 0xe1, 0x05, 0x8a, 0x18, 0xe1, 0xcf, 0x61, 0x49, 0x13, 0x77, 0xac, 0x03, 0xb8, + 0x03, 0xf3, 0x12, 0x85, 0x72, 0x06, 0x0b, 0xc2, 0xd5, 0xe5, 0x9c, 0x93, 0x65, 0xc3, 0x43, 0xe6, + 0xeb, 0xf1, 0x75, 0x40, 0x5c, 0x86, 0x22, 0xf1, 0xf5, 0x6c, 0xa0, 0xb5, 0xb4, 0x40, 0xbb, 0x0e, + 0xb3, 0xbe, 0x1e, 0xa7, 0xfc, 0x11, 0xe3, 0xd4, 0x17, 0xdc, 0x21, 0xb4, 0x7d, 0x2f, 0x55, 0xab, + 0x8c, 0x9c, 0xaf, 0xa7, 0xec, 0xf8, 0x6f, 0x16, 0x5c, 0x6d, 0x79, 0xe7, 0xbd, 0x88, 0xc4, 0xc8, + 0x9e, 0xfa, 0x32, 0x42, 0x5f, 0x1c, 0x87, 0x8b, 0x2f, 0xa9, 0xd4, 0xd0, 0x26, 0x33, 0x86, 0xf6, + 0x09, 0x2c, 0xf2, 0xbd, 0x54, 0x6b, 0xad, 0x32, 0x6b, 0xd5, 0x27, 0x4a, 0x8d, 0xee, 0xe7, 0x16, + 0x34, 0x0c, 0xb0, 0xff, 0xaf, 0xa6, 0xe3, 0xc1, 0x55, 0x99, 0x94, 0xf7, 0xfb, 0xa3, 0x38, 0xeb, + 0xe5, 0x12, 0xde, 0xdf, 0x28, 0xf7, 0x92, 0xb2, 0xe1, 0x7b, 0x8d, 0x57, 0xbf, 0xb3, 0x60, 0x66, + 0xe7, 0xe0, 0x98, 0xb1, 0x5d, 0xaa, 0xc6, 0xbb, 0x05, 0x75, 0xbe, 0x57, 0x9b, 0x46, 0x24, 0x3c, + 0x6c, 0x0f, 0x92, 0xb4, 0x2f, 0x4f, 0x46, 0x37, 0x45, 0x85, 0xca, 0x49, 0x2d, 0x57, 0xa8, 0x2a, + 0x4b, 0x8c, 0xc3, 0xfb, 0x6c, 0xa2, 0xac, 0xf8, 0x50, 0xd6, 0x04, 0x36, 0xf6, 0x65, 0x7e, 0x2c, + 0x29, 0x01, 0xed, 0x02, 0xfc, 0xa0, 0xdd, 0xed, 0x79, 0x4c, 0xd5, 0xa2, 0x9f, 0x71, 0xd3, 0x00, + 0x5d, 0x64, 0xf7, 0x29, 0xaf, 0xa3, 0xac, 0x1b, 0xe1, 0x08, 0x5f, 0x5b, 0x30, 0x97, 0xa2, 0xa2, + 0x01, 0xfa, 0x06, 0xd4, 0x12, 0xf5, 0x51, 0xd1, 0x85, 0xa9, 0x27, 0xd9, 0x89, 0xa0, 0x3b, 0x29, + 0xc7, 0x5b, 0xc2, 0x29, 0x75, 0x31, 0x1c, 0x50, 0x86, 0xb2, 0xea, 0xa4, 0x04, 0x7c, 0x9e, 0x42, + 0xa4, 0xb1, 0xe6, 0xb2, 0x7b, 0x5a, 0x6f, 0x47, 0x37, 0x7a, 0x38, 0xc1, 0x7f, 0xb4, 0x60, 0x5e, + 0xd9, 0xf8, 0x7d, 0x29, 0xc7, 0x86, 0x99, 0x44, 0x17, 0x42, 0x37, 0x72, 0x8c, 0x8f, 0xd2, 0x1e, + 0x8b, 0xc1, 0xdd, 0xdd, 0xac, 0xbb, 0xbb, 0x23, 0xc8, 0x7c, 0x0a, 0x0d, 0x3e, 0xe4, 0xbd, 0xaa, + 0xe3, 0xa8, 0x1d, 0x0d, 0x69, 0xf9, 0x47, 0x97, 0x61, 0x8a, 0xb3, 0x25, 0x37, 0x29, 0x1f, 0x8d, + 0x60, 0x7c, 0x4d, 0x58, 0x36, 0x6d, 0xc6, 0x2b, 0x33, 0x24, 0xa6, 0x58, 0x39, 0xed, 0xf7, 0xc9, + 0x85, 0x20, 0x58, 0xd8, 0x72, 0x93, 0xb0, 0xc2, 0x47, 0xd9, 0x56, 0x64, 0x25, 0xd7, 0x8a, 0x1c, + 0x21, 0x29, 0x6b, 0xc0, 0x92, 0x86, 0x83, 0x06, 0xf8, 0x31, 0x5c, 0xd9, 0x25, 0x7d, 0xa2, 0xb4, + 0x30, 0x2f, 0xa3, 0xf4, 0x45, 0xa8, 0x67, 0xbe, 0x46, 0x03, 0x7c, 0x00, 0xf5, 0xe4, 0x60, 0xb7, + 0x7f, 0xda, 0x72, 0x2f, 0xbb, 0xc3, 0xdd, 0xb4, 0x01, 0xc8, 0x3f, 0x47, 0x03, 0xf4, 0xf5, 0x34, + 0x50, 0x0a, 0x27, 0xd2, 0x6c, 0x59, 0x32, 0xe0, 0xbf, 0x6b, 0x25, 0x08, 0xdd, 0x39, 0x38, 0x2e, + 0x87, 0x65, 0xc3, 0x4c, 0xac, 0x34, 0x25, 0x74, 0xca, 0x71, 0xce, 0x35, 0x2a, 0x6f, 0xc7, 0x87, + 0x0d, 0xe7, 0xf7, 0x4f, 0x3d, 0xcf, 0x67, 0xb8, 0x69, 0x80, 0xbe, 0x0f, 0xd3, 0xfc, 0xde, 0x48, + 0x5c, 0x79, 0xd4, 0xeb, 0x26, 0x59, 0x86, 0xf6, 0x0c, 0xfe, 0xfd, 0x15, 0xa3, 0x10, 0xbc, 0x56, + 0x2d, 0x90, 0xe2, 0x3a, 0x00, 0xdf, 0x41, 0x09, 0x7f, 0x0a, 0x05, 0xff, 0xca, 0x82, 0xa6, 0x43, + 0x06, 0xfe, 0x39, 0x79, 0x23, 0xf5, 0x37, 0x61, 0x9a, 0x3b, 0x01, 0x15, 0xf9, 0x77, 0x32, 0x7c, + 0xa3, 0x7e, 0xb7, 0x9b, 0xeb, 0x77, 0xbb, 0xf8, 0x00, 0x56, 0x0b, 0xd0, 0xf0, 0x8b, 0x9f, 0x0e, + 0x3b, 0x1d, 0x42, 0xa9, 0xe8, 0x28, 0x27, 0xc3, 0xd8, 0x43, 0x4f, 0xda, 0xbd, 0x3e, 0x71, 0x05, + 0x1a, 0x31, 0xc2, 0x5f, 0x5a, 0xd0, 0xb8, 0xe7, 0xba, 0xef, 0x42, 0x34, 0x57, 0x17, 0xcd, 0x2d, + 0x15, 0xed, 0x21, 0x2c, 0x9b, 0xa0, 0x8c, 0x25, 0x57, 0x0f, 0xea, 0xbb, 0x3d, 0x3a, 0xe8, 0x51, + 0x2a, 0x63, 0x84, 0x0d, 0x33, 0x7e, 0xae, 0x27, 0xeb, 0x07, 0x23, 0x67, 0xef, 0x4d, 0x98, 0xee, + 0x66, 0xb3, 0x5b, 0x31, 0xc4, 0x7b, 0xb0, 0x90, 0xdd, 0x8a, 0xb7, 0x19, 0x3a, 0xa3, 0xb4, 0x19, + 0x52, 0x26, 0xfc, 0x67, 0x0b, 0xd0, 0xc1, 0x30, 0x22, 0xb9, 0xeb, 0xe4, 0x1d, 0xa1, 0x8e, 0x15, + 0x37, 0x54, 0x9b, 0x46, 0x62, 0x84, 0x30, 0xcc, 0x0d, 0x86, 0x11, 0x71, 0x8f, 0x49, 0xc7, 0xf7, + 0x5c, 0xca, 0xaa, 0xbf, 0x79, 0x27, 0x43, 0xc3, 0xfb, 0xb0, 0xa4, 0x21, 0x1d, 0x4f, 0xe8, 0x5f, + 0x58, 0xd0, 0xdc, 0x69, 0x7b, 0x1d, 0xd2, 0x7f, 0xff, 0xa2, 0xe3, 0x43, 0x58, 0x2d, 0xc0, 0x32, + 0x9e, 0x70, 0x27, 0x30, 0x27, 0xbf, 0xf4, 0x2e, 0x0d, 0x70, 0x1b, 0xe6, 0x95, 0x7d, 0xc6, 0xc3, + 0xda, 0x07, 0x94, 0x93, 0xfd, 0x5d, 0x22, 0xde, 0x87, 0x25, 0x6d, 0xb7, 0xf1, 0x70, 0xff, 0xc9, + 0x82, 0xd5, 0xe3, 0xcc, 0x0d, 0x73, 0xd8, 0xeb, 0x9c, 0x7a, 0xed, 0x41, 0x92, 0xb1, 0x74, 0xb3, + 0xa5, 0x57, 0x37, 0x2d, 0xbd, 0x3c, 0xc1, 0x98, 0xdc, 0x8e, 0xc9, 0x38, 0x23, 0x75, 0xa5, 0x5c, + 0xea, 0x49, 0x5d, 0xea, 0xd4, 0xba, 0xaa, 0x19, 0xeb, 0x3a, 0x02, 0xbb, 0x08, 0xe8, 0x78, 0x7d, + 0xc9, 0x7f, 0x4d, 0x40, 0x23, 0xfb, 0x45, 0xa5, 0x87, 0x56, 0x20, 0x76, 0x0a, 0x6e, 0x22, 0xe3, + 0xf5, 0x39, 0xb1, 0x2a, 0xba, 0x58, 0xdf, 0x52, 0x14, 0x36, 0x29, 0x6a, 0xb9, 0xae, 0xef, 0x77, + 0xfb, 0x84, 0x3f, 0x72, 0xbf, 0x18, 0x9e, 0x6c, 0x1c, 0x47, 0x61, 0xcf, 0xeb, 0xfe, 0xb0, 0xdd, + 0x1f, 0x12, 0x45, 0x9d, 0x77, 0x60, 0xfa, 0xa4, 0xdd, 0x21, 0x9f, 0x39, 0x8f, 0x99, 0x46, 0x2e, + 0x5a, 0x98, 0x30, 0xa3, 0x6f, 0x43, 0x2d, 0x94, 0xc9, 0xe3, 0x14, 0x5b, 0x79, 0x4d, 0x5b, 0xd9, + 0xf2, 0xa2, 0xdb, 0x5b, 0x7c, 0x61, 0xca, 0x8d, 0x3e, 0x81, 0x09, 0xf2, 0xaa, 0x39, 0x3d, 0xc2, + 0x6e, 0x13, 0xe4, 0x15, 0x7e, 0x04, 0xcb, 0x26, 0x3d, 0x8e, 0x75, 0x2a, 0x5b, 0xff, 0x46, 0xc0, + 0xff, 0x41, 0x80, 0xbe, 0x0b, 0xb3, 0x9d, 0xf4, 0xdd, 0x19, 0x35, 0x92, 0x75, 0x99, 0xc7, 0x77, + 0x7b, 0xd9, 0x44, 0xa6, 0x01, 0xba, 0x03, 0xb5, 0x9f, 0x24, 0x8f, 0x12, 0x68, 0x49, 0x30, 0xa9, + 0xcf, 0x25, 0xf6, 0x55, 0x9d, 0xc8, 0xd7, 0x9d, 0x25, 0x1d, 0x6f, 0xb9, 0x4e, 0xed, 0xb5, 0xcb, + 0x75, 0xd9, 0xc6, 0xf8, 0x36, 0xcc, 0x77, 0xd5, 0xf7, 0x62, 0xb4, 0x92, 0xbc, 0xfe, 0xe7, 0x9e, + 0xae, 0xed, 0xa6, 0x79, 0x82, 0x06, 0xe8, 0x2e, 0xcc, 0x51, 0xe5, 0x69, 0x15, 0x25, 0xb2, 0xe5, + 0x1e, 0x7f, 0xed, 0x15, 0x23, 0x9d, 0x06, 0xe8, 0xc7, 0xb0, 0xd2, 0x35, 0xbf, 0x6b, 0xa2, 0x1b, + 0xb9, 0x5d, 0xf5, 0x77, 0x45, 0x1b, 0x5f, 0xc4, 0x42, 0x03, 0x74, 0x02, 0xab, 0xdd, 0xa2, 0x47, + 0x42, 0xf4, 0x51, 0xfa, 0x81, 0xc2, 0xd7, 0x4b, 0xfb, 0xe6, 0xc5, 0x4c, 0x34, 0x40, 0x4f, 0x00, + 0x45, 0xda, 0x4b, 0x19, 0x5a, 0x13, 0x6b, 0x8d, 0xaf, 0x80, 0xf6, 0x07, 0x25, 0xb3, 0x34, 0x40, + 0x1d, 0x68, 0x76, 0x0b, 0x9e, 0x61, 0x10, 0xce, 0xfc, 0x55, 0xc3, 0xf8, 0x04, 0x65, 0x7f, 0x74, + 0x21, 0x0f, 0xc7, 0xdd, 0xd5, 0xde, 0x11, 0x24, 0x6e, 0xe3, 0x33, 0x88, 0xc4, 0x5d, 0xf0, 0x00, + 0xf1, 0x14, 0x96, 0xba, 0x7a, 0x63, 0x1d, 0x99, 0x57, 0x49, 0x2b, 0xbb, 0x5e, 0x36, 0x4d, 0x03, + 0xb4, 0x0f, 0xf5, 0xd3, 0x6c, 0xa7, 0x18, 0x25, 0xff, 0x57, 0xd1, 0x1b, 0xe6, 0xb6, 0x5d, 0x34, + 0x25, 0x45, 0xce, 0xb5, 0x5e, 0x55, 0x91, 0xf5, 0x6e, 0xb0, 0x2a, 0xb2, 0xa9, 0x67, 0x7b, 0x08, + 0x8b, 0xbd, 0x7c, 0x37, 0x12, 0x5d, 0x4b, 0x1a, 0x88, 0x86, 0xf6, 0xaa, 0xbd, 0x56, 0x3c, 0xc9, + 0xbf, 0xd7, 0xcd, 0x77, 0xfa, 0xe4, 0xf7, 0x4c, 0x4d, 0x47, 0x7b, 0xad, 0x78, 0x92, 0x3b, 0xaa, + 0x5a, 0x90, 0x4a, 0x47, 0xcd, 0x15, 0xbd, 0xf6, 0x8a, 0x91, 0x4e, 0x03, 0x74, 0x1b, 0x66, 0x12, + 0x1a, 0x42, 0x39, 0xa6, 0x78, 0xe1, 0x92, 0x46, 0xe3, 0xa1, 0x49, 0xc6, 0x0c, 0x94, 0xe7, 0xa0, + 0x6a, 0x68, 0xca, 0xf6, 0x7d, 0x9e, 0xc8, 0x6e, 0x84, 0xd2, 0xa8, 0x90, 0x07, 0x64, 0x6c, 0x98, + 0xc8, 0x03, 0x32, 0x77, 0x38, 0x62, 0xeb, 0xc9, 0x35, 0x16, 0xa4, 0xf5, 0xe8, 0x8d, 0x0f, 0x69, + 0x3d, 0x86, 0x5e, 0x44, 0x1c, 0xe5, 0x95, 0xee, 0x81, 0x8c, 0xf2, 0xd9, 0xfe, 0x84, 0x8c, 0xf2, + 0xb9, 0x46, 0x43, 0x2c, 0x9a, 0x5e, 0x1f, 0x17, 0xb8, 0x9b, 0x28, 0xcc, 0x0a, 0xdc, 0x4d, 0xd6, + 0x4a, 0xcf, 0xa0, 0x61, 0x2c, 0x10, 0xd1, 0x87, 0x62, 0x5d, 0x51, 0x31, 0x6b, 0xaf, 0x97, 0x33, + 0x70, 0xb8, 0x7a, 0x85, 0x26, 0xe1, 0x1a, 0xeb, 0x48, 0x09, 0xb7, 0xa0, 0xb4, 0xbb, 0x0b, 0x73, + 0x6a, 0xf5, 0x24, 0x4d, 0x31, 0x57, 0xbd, 0x49, 0x53, 0xd4, 0x4a, 0xad, 0x7d, 0xa8, 0xe7, 0xf2, + 0x75, 0x79, 0x94, 0x7a, 0x4d, 0x21, 0x8f, 0xd2, 0x94, 0xe2, 0x3f, 0x83, 0x86, 0x31, 0xff, 0x97, + 0x9a, 0x2b, 0xaa, 0x54, 0xa4, 0xe6, 0x8a, 0xcb, 0x87, 0x3b, 0x50, 0x93, 0x64, 0x69, 0xfb, 0x6a, + 0xae, 0x2d, 0x6d, 0x3f, 0x9b, 0x12, 0xef, 0x43, 0x3d, 0xf7, 0x51, 0x29, 0x9d, 0x9e, 0xaf, 0x4b, + 0xe9, 0x4c, 0xc9, 0xf5, 0x8f, 0xf2, 0x59, 0x4e, 0x92, 0x7f, 0xa2, 0xf5, 0xdc, 0x75, 0xac, 0xe5, + 0xd1, 0xf6, 0x8d, 0x0b, 0x38, 0xb8, 0x69, 0xe8, 0x49, 0x94, 0x34, 0x0d, 0x63, 0x9e, 0x2a, 0x4d, + 0xc3, 0x9c, 0x7d, 0x6d, 0xd7, 0x9f, 0xcd, 0x6f, 0xf0, 0xbf, 0x66, 0x7e, 0xca, 0x7e, 0x5f, 0x4c, + 0xb1, 0x14, 0xee, 0xf6, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x20, 0x7b, 0x1e, 0x22, 0xb6, 0x29, + 0x00, 0x00, } diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index f0db47bad..be76b2f9d 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; @@ -391,8 +392,19 @@ message SetGroupMemberNicknameResp{ CommonResp CommonResp = 1; } +message SetGroupMemberInfoReq{ + string groupID = 1; + string userID = 2; + string operationID = 3; + google.protobuf.StringValue nickname = 4; + google.protobuf.StringValue faceURL = 5; + google.protobuf.Int32Value roleLevel = 6; + google.protobuf.StringValue ex = 7; +} - +message SetGroupMemberInfoResp{ + CommonResp CommonResp = 1; +} service group{ rpc createGroup(CreateGroupReq) returns(CreateGroupResp); @@ -428,7 +440,7 @@ service group{ rpc CancelMuteGroup(CancelMuteGroupReq) returns(CancelMuteGroupResp); rpc SetGroupMemberNickname(SetGroupMemberNicknameReq) returns (SetGroupMemberNicknameResp); - + 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 From 64fa52452ce9ec172fff61539498d6e0cf2a02fa Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 18:19:20 +0800 Subject: [PATCH 31/67] singal offline push --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 3a4fbd5cb..2e7904e7b 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -14,7 +14,7 @@ import ( "github.com/garyburd/redigo/redis" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - osconfig "google.golang.org/genproto/googleapis/cloud/osconfig/v1alpha" + //osconfig "google.golang.org/genproto/googleapis/cloud/osconfig/v1alpha" "strconv" ) From 6996c008d08d9bfcb6c4ecb6f6c337fe5b1dec33 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 18:36:42 +0800 Subject: [PATCH 32/67] singal offline push --- internal/push/jpush/push.go | 1 + internal/push/jpush/requestBody/notification.go | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/push/jpush/push.go b/internal/push/jpush/push.go index e1f2ea12f..8868c9616 100644 --- a/internal/push/jpush/push.go +++ b/internal/push/jpush/push.go @@ -45,6 +45,7 @@ func (j *JPush) Push(accounts []string, alert, detailContent, operationID string if opts.Signal.ClientMsgID != "" { extras.ClientMsgID = opts.Signal.ClientMsgID } + no.IOSEnableMutableContent() no.SetExtras(extras) var me requestBody.Message me.SetMsgContent(detailContent) diff --git a/internal/push/jpush/requestBody/notification.go b/internal/push/jpush/requestBody/notification.go index 9dd878147..56ada1551 100644 --- a/internal/push/jpush/requestBody/notification.go +++ b/internal/push/jpush/requestBody/notification.go @@ -18,10 +18,11 @@ type Android struct { Extras Extras `json:"extras"` } type Ios struct { - Alert string `json:"alert,omitempty"` - Sound string `json:"sound,omitempty"` - Badge string `json:"badge,omitempty"` - Extras Extras `json:"extras"` + 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 { @@ -45,3 +46,7 @@ func (n *Notification) SetExtras(extras Extras) { func (n *Notification) SetAndroidIntent() { n.Android.Intent.URL = config.Config.Push.Jpns.PushIntent } + +func (n *Notification) IOSEnableMutableContent() { + n.IOS.MutableContent = true +} From 409a8311b1fe693f459732eed46afd14559f9260 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 19:14:11 +0800 Subject: [PATCH 33/67] singal offline push --- internal/push/getui/push.go | 4 ++-- internal/push/jpush/push.go | 4 ++-- internal/push/logic/push_to_client.go | 11 ++--------- internal/push/push_interface.go | 12 +++++++++--- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/internal/push/getui/push.go b/internal/push/getui/push.go index fd4efaaa8..03d3346ce 100644 --- a/internal/push/getui/push.go +++ b/internal/push/getui/push.go @@ -1,7 +1,7 @@ package getui import ( - "Open_IM/internal/push/logic" + "Open_IM/internal/push" "Open_IM/pkg/common/config" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" @@ -99,7 +99,7 @@ func newGetuiClient() *Getui { return &Getui{} } -func (g *Getui) Push(userIDList []string, alert, detailContent, operationID string, opts logic.PushOpts) (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 8868c9616..01f827753 100644 --- a/internal/push/jpush/push.go +++ b/internal/push/jpush/push.go @@ -1,9 +1,9 @@ package push import ( + "Open_IM/internal/push" "Open_IM/internal/push/jpush/common" "Open_IM/internal/push/jpush/requestBody" - "Open_IM/internal/push/logic" "Open_IM/pkg/common/config" "bytes" "encoding/json" @@ -33,7 +33,7 @@ func (j *JPush) SetAlias(cid, alias string) (resp string, err error) { return resp, nil } -func (j *JPush) Push(accounts []string, alert, detailContent, operationID string, opts logic.PushOpts) (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 diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 5584c8d21..1085208d8 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -7,6 +7,7 @@ package logic import ( + "Open_IM/internal/push" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" @@ -36,14 +37,6 @@ type AtContent struct { var grpcCons []*grpc.ClientConn -type PushOpts struct { - Signal Signal -} - -type Signal struct { - ClientMsgID string -} - func MsgToUser(pushMsg *pbPush.PushMsgReq) { var wsResult []*pbRelay.SingleMsgToUser isOfflinePush := utils.GetSwitchFromOptions(pushMsg.MsgData.Options, constant.IsOfflinePush) @@ -146,7 +139,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { } } -func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts PushOpts, err error) { +func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err error) { if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotification { req := &pbRtc.SignalMessageAssembleReq{} if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil { diff --git a/internal/push/push_interface.go b/internal/push/push_interface.go index cc6e25271..a1d45d7b7 100644 --- a/internal/push/push_interface.go +++ b/internal/push/push_interface.go @@ -1,7 +1,13 @@ package push -import "Open_IM/internal/push/logic" - type OfflinePusher interface { - Push(userIDList []string, alert, detailContent, operationID string, opts logic.PushOpts) (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 } From 2b25fea86cdd62afc49587758481b3833b8003b8 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 19:52:29 +0800 Subject: [PATCH 34/67] singal offline push --- internal/push/logic/push_to_client.go | 5 +++-- pkg/common/db/redisModel.go | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 1085208d8..b079c439e 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -125,6 +125,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { if err != nil { log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error()) } + log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), "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()) @@ -141,11 +142,11 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err error) { if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotification { - req := &pbRtc.SignalMessageAssembleReq{} + req := &pbRtc.SignalReq{} if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil { return opts, err } - switch req.SignalReq.Payload.(type) { + switch req.Payload.(type) { case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup: opts.Signal.ClientMsgID = pushMsg.MsgData.ClientMsgID } diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 2e7904e7b..b1c72e12a 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -356,14 +356,15 @@ func (d *DataBases) CacheSignalInfo(msg *pbCommon.MsgData) error { 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) + log2.NewDebug("", utils.GetSelfFuncName(), clientMsgID, result, string(result)) if err != nil { - invitationInfo := &pbRtc.SignalInviteReq{} - return invitationInfo, err + return nil, err + } + req := &pbRtc.SignalReq{} + if err = proto.Unmarshal(result, req); err != nil { + return nil, err } - req := &pbRtc.SignalMessageAssembleReq{} - err = proto.Unmarshal(result, req) - req2 := req.SignalReq.Payload.(*pbRtc.SignalReq_Invite) + req2 := req.Payload.(*pbRtc.SignalReq_Invite) invitationInfo = req2.Invite return invitationInfo, err } From 1fffd360547d0d678643c71866b0d1acd4ba16be Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 20:06:14 +0800 Subject: [PATCH 35/67] singal offline push --- internal/push/jpush/push.go | 3 ++- internal/push/logic/push_to_client.go | 2 ++ pkg/common/config/config.go | 5 +++++ pkg/common/constant/constant.go | 18 ++++++++++-------- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/internal/push/jpush/push.go b/internal/push/jpush/push.go index 01f827753..833174de5 100644 --- a/internal/push/jpush/push.go +++ b/internal/push/jpush/push.go @@ -34,12 +34,12 @@ func (j *JPush) SetAlias(cid, alias string) (resp string, err 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 - no.SetAlert(alert) var extras requestBody.Extras if opts.Signal.ClientMsgID != "" { @@ -47,6 +47,7 @@ func (j *JPush) Push(accounts []string, alert, detailContent, operationID string } no.IOSEnableMutableContent() no.SetExtras(extras) + no.SetAlert(alert) var me requestBody.Message me.SetMsgContent(detailContent) var o requestBody.Options diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index b079c439e..d3d9ab068 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -104,6 +104,8 @@ 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] } diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index d17677781..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"` diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index e27be4d8e..53a4cce38 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 @@ -212,14 +213,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 ( From 6b8ebe11de1f7a67ddf2ab752b871d738bf45edd Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 20:17:12 +0800 Subject: [PATCH 36/67] singal offline push --- internal/push/logic/push_to_client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index d3d9ab068..692df1be1 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -148,6 +148,7 @@ func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err err if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil { return opts, err } + log.NewInfo("", utils.GetSelfFuncName(), "SignalReq: ", req.String()) switch req.Payload.(type) { case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup: opts.Signal.ClientMsgID = pushMsg.MsgData.ClientMsgID From 2e3b55d9e83f5ae0105d8678c3bf2cefd1dcd5ad Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 20:19:24 +0800 Subject: [PATCH 37/67] singal offline push --- internal/push/logic/push_to_client.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 692df1be1..78ecbf93a 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -143,15 +143,16 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { } func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err error) { - if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotification { + 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, err } - log.NewInfo("", utils.GetSelfFuncName(), "SignalReq: ", req.String()) + 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) } } From cfe0272022fa6b4f4d6d15e34bcd263a8d100c1e Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 2 Jun 2022 20:53:50 +0800 Subject: [PATCH 38/67] singal offline push --- internal/api/third/rtc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/third/rtc.go b/internal/api/third/rtc.go index 4522c4e2c..9014b6c44 100644 --- a/internal/api/third/rtc.go +++ b/internal/api/third/rtc.go @@ -45,5 +45,5 @@ func GetRTCInvitationInfo(c *gin.Context) { resp.Data.Invitation.InviteeUserIDList = invitationInfo.Invitation.InviteeUserIDList resp.Data.Invitation.MediaType = invitationInfo.Invitation.MediaType resp.Data.Invitation.Timeout = invitationInfo.Invitation.Timeout - c.JSON(http.StatusInternalServerError, resp) + c.JSON(http.StatusOK, resp) } From e04a4908cf29c19181b5ae1d1a59a9ab5658c545 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sun, 5 Jun 2022 23:42:27 +0800 Subject: [PATCH 39/67] k8s --- deploy_k8s/admin_cms/deployment.yaml | 2 +- deploy_k8s/api/deployment.yaml | 2 +- deploy_k8s/auth/deployment.yaml | 2 +- deploy_k8s/cache/deployment.yaml | 2 +- deploy_k8s/cms_api/deployment.yaml | 2 +- deploy_k8s/conversation/deployment.yaml | 2 +- deploy_k8s/friend/deployment.yaml | 2 +- deploy_k8s/group/deployment.yaml | 2 +- deploy_k8s/message_cms/deployment.yaml | 2 +- deploy_k8s/msg/deployment.yaml | 2 +- deploy_k8s/msg_gateway/deployment.yaml | 2 +- deploy_k8s/msg_transfer/deployment.yaml | 2 +- deploy_k8s/office/deployment.yaml | 2 +- deploy_k8s/organization/deployment.yaml | 2 +- deploy_k8s/push/deployment.yaml | 2 +- deploy_k8s/sdk_server/deployment.yaml | 2 +- deploy_k8s/statistics/deployment.yaml | 1 + deploy_k8s/user/deployment.yaml | 1 + 18 files changed, 18 insertions(+), 16 deletions(-) diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 8ed81cc05..39ad73a06 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: admin-cms image: openim/admin_cms:v2.0.10k - imagePullPolicy: Always #每次启动都重新拉取镜像 + # imagePullPolicy: Always #每次启动都重新拉取镜像 ports: - containerPort: 10200 volumeMounts: diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index 5c5bfb72f..52990ca2f 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: api image: openim/api:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10002 volumeMounts: diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index ef1aef5ab..d6b2e91d8 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: auth image: openim/auth:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10160 volumeMounts: diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index fd29244f0..5de56fcf0 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: cache image: openim/cache:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10240 volumeMounts: diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index 1218316e9..4dd0626ac 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: cms-api image: openim/cms_api:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10006 volumeMounts: diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index b982faf98..7da7aad7a 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: conversation image: openim/conversation:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10230 volumeMounts: diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index 171849e7e..a03ca12c7 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: friend image: openim/friend:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10120 volumeMounts: diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 3938cec84..74aaa0d5a 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: group image: openim/group:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10150 volumeMounts: diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index c321ac382..148316e5b 100644 --- a/deploy_k8s/message_cms/deployment.yaml +++ b/deploy_k8s/message_cms/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: message-cms image: openim/message_cms:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10190 volumeMounts: diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index 25912cc60..a4697c631 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: msg image: openim/msg:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10130 volumeMounts: diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index 06570d76e..0eec0f5f5 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: msg-gateway image: openim/msg_gateway:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - name: rpc-port containerPort: 10140 diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index 98410331e..cbb44717e 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: msg-transfer image: openim/msg_transfer:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always volumeMounts: - name: config mountPath: /Open-IM-Server/config diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index 4a035db57..333a11aba 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: office image: openim/office:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10210 volumeMounts: diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index ec727ff53..a32488d44 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: organization image: openim/organization:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10220 volumeMounts: diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 2b463f838..c1a8d0299 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: push image: openim/push:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10170 volumeMounts: diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 50127015d..57cb0c412 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -16,7 +16,7 @@ spec: containers: - name: sdk-server image: openim/sdk_server:v2.0.10k - imagePullPolicy: Always + # imagePullPolicy: Always ports: - containerPort: 10003 volumeMounts: diff --git a/deploy_k8s/statistics/deployment.yaml b/deploy_k8s/statistics/deployment.yaml index 4265317fc..3743d7e6b 100644 --- a/deploy_k8s/statistics/deployment.yaml +++ b/deploy_k8s/statistics/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: statistics image: openim/statistics:v2.0.10k + # imagePullPolicy: Always ports: - containerPort: 10180 volumeMounts: diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 05b0e60b8..1ad605d14 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: user image: openim/user:v2.0.10k + # imagePullPolicy: Always volumeMounts: - name: config mountPath: /Open-IM-Server/config From a647007a0fc0f1430621176d4f42c7c1a5774b05 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 10:22:42 +0800 Subject: [PATCH 40/67] singal offline push --- internal/push/logic/push_to_client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 78ecbf93a..5b5f66bae 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -129,6 +129,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { } log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), "opts:", opts) pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID, opts) + log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offline pushResult: ", pushResult) if err != nil { log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error()) } else { From e5a314bb3a026267285192bce1f9dd13eb5a433d Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 10:29:21 +0800 Subject: [PATCH 41/67] singal offline push --- config/config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index bfccb0eec..e11407c5c 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -671,7 +671,6 @@ notification: defaultTips: tips: "welcome user join department" - #---------------demo configuration---------------------# #The following configuration items are applied to openIM Demo configuration #是否启动demo，如果自身没有账号体系，设置为true @@ -698,4 +697,4 @@ demo: imAPIURL: http://127.0.0.1:10002 rtc: - signalTimeout: 300 + signalTimeout: 3000 From 5e2e8f91c7f0e476a25fbaf12ed1e9cb194fc665 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 10:42:23 +0800 Subject: [PATCH 42/67] singal offline push --- pkg/base_info/third_api_struct.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/base_info/third_api_struct.go b/pkg/base_info/third_api_struct.go index 8cfb1cfaf..d03e9f505 100644 --- a/pkg/base_info/third_api_struct.go +++ b/pkg/base_info/third_api_struct.go @@ -77,5 +77,5 @@ type GetRTCInvitationInfoResp struct { SessionType int32 `json:"sessionType"` } `json:"invitation"` OfflinePushInfo struct{} `json:"offlinePushInfo"` - } + } `json:"data"` } From dc7c10014dca4a793e41804b24af0ebdd13b0661 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 10:45:04 +0800 Subject: [PATCH 43/67] singal offline push --- pkg/base_info/third_api_struct.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/base_info/third_api_struct.go b/pkg/base_info/third_api_struct.go index d03e9f505..39dff1bb1 100644 --- a/pkg/base_info/third_api_struct.go +++ b/pkg/base_info/third_api_struct.go @@ -68,8 +68,8 @@ type GetRTCInvitationInfoResp struct { Data struct { OpUserID string `json:"opUserID"` Invitation struct { - InviterUserID string `json:"InviterUserID"` - InviteeUserIDList []string `json:"InviteeUserIDList"` + InviterUserID string `json:"inviterUserID"` + InviteeUserIDList []string `json:"inviteeUserIDList"` GroupID string `json:"groupID"` RoomID string `json:"roomID"` Timeout int32 `json:"timeout"` From d3abc4497675b2dc73bcc6d6c945703849ca90d0 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 18:15:32 +0800 Subject: [PATCH 44/67] singal offline push --- cmd/open_im_api/main.go | 1 + internal/api/third/rtc.go | 41 ++++++- internal/msg_gateway/gate/logic.go | 2 +- internal/push/logic/push_to_client.go | 1 - pkg/base_info/third_api_struct.go | 10 +- pkg/common/db/model.go | 8 ++ pkg/common/db/newRedisModel.go | 157 ++++++++++++++++++++++++++ pkg/common/db/redisModel.go | 3 +- 8 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 pkg/common/db/newRedisModel.go diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 294f79d9c..61d3e127e 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -108,6 +108,7 @@ func main() { 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/internal/api/third/rtc.go b/internal/api/third/rtc.go index 9014b6c44..30fd5be7b 100644 --- a/internal/api/third/rtc.go +++ b/internal/api/third/rtc.go @@ -31,7 +31,7 @@ func GetRTCInvitationInfo(c *gin.Context) { return } var err error - invitationInfo, err := db.DB.GetSignalInfoFromCache(req.ClientMsgID) + 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()}) @@ -47,3 +47,42 @@ func GetRTCInvitationInfo(c *gin.Context) { 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.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) + +} diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index ccb1cd6eb..47b58cde2 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -239,7 +239,7 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) { } else { log.NewInfo(pbData.OperationID, "rpc call success to sendMsgReq", reply.String()) // save invitation info for offline push - if err := db.DB.CacheSignalInfo(pbData.MsgData); err != nil { + 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 { diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 5b5f66bae..3ba1e58fb 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -119,7 +119,6 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offlinePush stop") break } - if offlinePusher == nil { break } diff --git a/pkg/base_info/third_api_struct.go b/pkg/base_info/third_api_struct.go index 39dff1bb1..758c3494c 100644 --- a/pkg/base_info/third_api_struct.go +++ b/pkg/base_info/third_api_struct.go @@ -60,7 +60,7 @@ type GetDownloadURLResp struct { type GetRTCInvitationInfoReq struct { OperationID string `json:"operationID" binding:"required"` - ClientMsgID string `json:"clientMsgID"` + ClientMsgID string `json:"clientMsgID" binding:"required"` } type GetRTCInvitationInfoResp struct { @@ -79,3 +79,11 @@ type GetRTCInvitationInfoResp struct { OfflinePushInfo struct{} `json:"offlinePushInfo"` } `json:"data"` } + +type GetRTCInvitationInfoStartAppReq struct { + OperationID string `json:"operationID" binding:"required"` +} + +type GetRTCInvitationInfoStartAppResp struct { + GetRTCInvitationInfoResp +} diff --git a/pkg/common/db/model.go b/pkg/common/db/model.go index f8aaca54a..e7282e596 100644 --- a/pkg/common/db/model.go +++ b/pkg/common/db/model.go @@ -8,6 +8,7 @@ import ( //"Open_IM/pkg/common/log" "Open_IM/pkg/utils" "fmt" + go_redis "github.com/go-redis/redis/v8" "go.mongodb.org/mongo-driver/mongo/options" // "context" @@ -30,6 +31,7 @@ type DataBases struct { mgoSession *mgo.Session redisPool *redis.Pool mongoClient *mongo.Client + rdb *go_redis.Client } func key(dbAddress, dbName string) string { @@ -113,6 +115,12 @@ func init() { ) }, } + DB.rdb = go_redis.NewClient(&go_redis.Options{ + Addr: config.Config.Redis.DBAddress, + Password: config.Config.Redis.DBPassWord, // no password set + DB: 0, // use default DB + PoolSize: 100, // 连接池大小 + }) } func createMongoIndex(client *mongo.Client, collection string, isUnique bool, keys ...string) error { diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go new file mode 100644 index 000000000..b477c20ea --- /dev/null +++ b/pkg/common/db/newRedisModel.go @@ -0,0 +1,157 @@ +package db + +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" + goRedis "github.com/go-redis/redis/v8" + "github.com/golang/protobuf/proto" + "github.com/mitchellh/mapstructure" + "strconv" + "time" +) + +//func (d * DataBases)pubMessage(channel, msg string) { +// d.rdb.Publish(context.Background(),channel,msg) +//} +//func (d * DataBases)pubMessage(channel, msg string) { +// d.rdb.Publish(context.Background(),channel,msg) +//} + +func (d *DataBases) NewGetMessageListBySeq(userID string, seqList []uint32, operationID string) (seqMsg []*pbCommon.MsgData, failedSeqList []uint32, errResult error) { + for _, v := range seqList { + //MESSAGE_CACHE:169.254.225.224_reliability1653387820_0_1 + key := messageCache + userID + "_" + strconv.Itoa(int(v)) + + result, err := d.rdb.HGetAll(context.Background(), key).Result() + if err != nil { + errResult = err + failedSeqList = append(failedSeqList, v) + log2.NewWarn(operationID, "redis get message error:", err.Error(), v) + } else { + msg, err := Map2Pb(result) + //msg := pbCommon.MsgData{} + //err = jsonpb.UnmarshalString(result, &msg) + if err != nil { + errResult = err + failedSeqList = append(failedSeqList, v) + log2.NewWarn(operationID, "Unmarshal err", result, err.Error()) + } else { + log2.NewDebug(operationID, "redis get msg is ", msg.String()) + seqMsg = append(seqMsg, msg) + } + + } + } + return seqMsg, failedSeqList, errResult +} +func Map2Pb(m map[string]string) (*pbCommon.MsgData, error) { + var data pbCommon.MsgData + err := mapstructure.Decode(m, &data) + if err != nil { + return nil, err + } + return &data, nil +} + +func (d *DataBases) NewSetMessageToCache(msgList []*pbChat.MsgDataToMQ, uid string, operationID string) error { + ctx := context.Background() + var failedList []pbChat.MsgDataToMQ + for _, msg := range msgList { + key := messageCache + uid + "_" + strconv.Itoa(int(msg.MsgData.Seq)) + s, err := utils.Pb2Map(msg.MsgData) + if err != nil { + log2.NewWarn(operationID, utils.GetSelfFuncName(), "Pb2Map failed", msg.MsgData.String(), uid, err.Error()) + continue + } + log2.NewDebug(operationID, "convert map is ", s) + fmt.Println("ts", s) + err = d.rdb.HMSet(context.Background(), key, s).Err() + //err = d.rdb.HMSet(context.Background(), "12", map[string]interface{}{"1": 2, "343": false}).Err() + if err != nil { + return err + log2.NewWarn(operationID, utils.GetSelfFuncName(), "redis failed", "args:", key, *msg, uid, s, err.Error()) + failedList = append(failedList, *msg) + } + d.rdb.Expire(ctx, key, time.Second*time.Duration(config.Config.MsgCacheTimeout)) + } + if len(failedList) != 0 { + return errors.New(fmt.Sprintf("set msg to cache failed, failed lists: %q,%s", failedList, operationID)) + } + return nil +} + +func (d *DataBases) CleanUpOneUserAllMsgFromRedis(userID string, operationID string) error { + ctx := context.Background() + key := messageCache + userID + "_" + "*" + vals, err := d.rdb.Keys(ctx, key).Result() + log2.Debug(operationID, "vals: ", vals) + if err == redis.ErrNil { + return nil + } + if err != nil { + return utils.Wrap(err, "") + } + if err = d.rdb.Del(ctx, vals...).Err(); err != nil { + return utils.Wrap(err, "") + } + return nil +} + +func (d *DataBases) NewCacheSignalInfo(msg *pbCommon.MsgData) error { + keyList := SignalListCache + msg.RecvID + timeout, err := strconv.Atoi(config.Config.Rtc.SignalTimeout) + if err != nil { + return err + } + 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 + } + err = d.rdb.Expire(context.Background(), key, time.Duration(timeout)*time.Second).Err() + if err != nil { + return err + } + return err +} + +func (d *DataBases) GetSignalInfoFromCacheByClientMsgID(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) { + key := SignalCache + clientMsgID + 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 + } + req2 := req.Payload.(*pbRtc.SignalReq_Invite) + invitationInfo = req2.Invite + 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, err + } + invitationInfo, err = d.GetSignalInfoFromCacheByClientMsgID(result.String()) + return invitationInfo, err +} diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index b1c72e12a..4e360802f 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -32,7 +32,8 @@ const ( blackListCache = "BLACK_LIST_CACHE:" groupCache = "GROUP_CACHE:" messageCache = "MESSAGE_CACHE:" - SignalCache = "Signal_CACHE:" + SignalCache = "SIGNAL_CACHE:" + SignalListCache = "SIGNAL_ZSET_CACHE:" ) func (d *DataBases) Exec(cmd string, key interface{}, args ...interface{}) (interface{}, error) { From ebf07eddfb6f5419b17d518f653ace34f6fcf78f Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 18:18:30 +0800 Subject: [PATCH 45/67] singal offline push --- pkg/common/db/newRedisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index b477c20ea..7fd979f39 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -11,7 +11,7 @@ import ( "errors" "fmt" "github.com/garyburd/redigo/redis" - goRedis "github.com/go-redis/redis/v8" + //goRedis "github.com/go-redis/redis/v8" "github.com/golang/protobuf/proto" "github.com/mitchellh/mapstructure" "strconv" From e428e186f0d4c36196f0bd5d938d250eb11499ce Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 18:23:08 +0800 Subject: [PATCH 46/67] singal offline push --- internal/api/third/rtc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/third/rtc.go b/internal/api/third/rtc.go index 30fd5be7b..4986558d7 100644 --- a/internal/api/third/rtc.go +++ b/internal/api/third/rtc.go @@ -72,7 +72,7 @@ func GetRTCInvitationInfoStartApp(c *gin.Context) { invitationInfo, err := db.DB.GetAvailableSignalInvitationInfo(userID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSignalInfoFromCache", err.Error(), req) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) + c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": err.Error(), "data": struct{}{}}) return } resp.Data.OpUserID = invitationInfo.OpUserID From 78dfba8771cfeb18879dc731725316a323308b94 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 18:52:17 +0800 Subject: [PATCH 47/67] singal offline push --- pkg/common/db/newRedisModel.go | 43 +++++++++++++++++++--------------- pkg/common/db/redisModel.go | 2 +- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index 7fd979f39..e966b5aa5 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -106,29 +106,34 @@ func (d *DataBases) CleanUpOneUserAllMsgFromRedis(userID string, operationID str } func (d *DataBases) NewCacheSignalInfo(msg *pbCommon.MsgData) error { - keyList := SignalListCache + msg.RecvID - timeout, err := strconv.Atoi(config.Config.Rtc.SignalTimeout) - if err != nil { - return err - } - 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 { + req := &pbRtc.SignalReq{} + if err := proto.Unmarshal(msg.Content, req); err != nil { return err } - err = d.rdb.Expire(context.Background(), key, time.Duration(timeout)*time.Second).Err() - if err != nil { + //log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "SignalReq: ", req.String()) + switch req.Payload.(type) { + case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup: + keyList := SignalListCache + msg.RecvID + timeout, err := strconv.Atoi(config.Config.Rtc.SignalTimeout) + if err != nil { + return err + } + 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 err + return nil } func (d *DataBases) GetSignalInfoFromCacheByClientMsgID(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) { diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 4e360802f..6d54974ed 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -33,7 +33,7 @@ const ( groupCache = "GROUP_CACHE:" messageCache = "MESSAGE_CACHE:" SignalCache = "SIGNAL_CACHE:" - SignalListCache = "SIGNAL_ZSET_CACHE:" + SignalListCache = "SIGNAL_LIST_CACHE:" ) func (d *DataBases) Exec(cmd string, key interface{}, args ...interface{}) (interface{}, error) { From f15684a562a72d57c5dee0c8cbf1508adb91ca68 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 19:02:35 +0800 Subject: [PATCH 48/67] singal offline push --- pkg/common/db/newRedisModel.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index e966b5aa5..14a137009 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -132,6 +132,8 @@ func (d *DataBases) NewCacheSignalInfo(msg *pbCommon.MsgData) error { return err } return err + default: + log2.NewDebug("", utils.GetSelfFuncName(), "req type not invite", string(msg.Content)) } return nil } From 4efdd342d6b2344b42b97676804c949abd2fe5de Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 19:20:12 +0800 Subject: [PATCH 49/67] singal offline push --- pkg/common/db/newRedisModel.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index 14a137009..f8808e4fd 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -157,8 +157,13 @@ func (d *DataBases) GetAvailableSignalInvitationInfo(userID string) (invitationI keyList := SignalListCache + userID result := d.rdb.RPop(context.Background(), keyList) if err = result.Err(); err != nil { - return nil, err + return nil, utils.Wrap(err, "GetAvailableSignalInvitationInfo failed") } - invitationInfo, err = d.GetSignalInfoFromCacheByClientMsgID(result.String()) - return invitationInfo, err + 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) + return invitationInfo, utils.Wrap(err, "GetSignalInfoFromCacheByClientMsgID") } From 1a42f6dded3b8da24ea97b2dfd6746ec9651b9bb Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 19:36:25 +0800 Subject: [PATCH 50/67] singal offline push --- pkg/common/db/newRedisModel.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index f8808e4fd..04bcd28c7 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -140,6 +140,7 @@ func (d *DataBases) NewCacheSignalInfo(msg *pbCommon.MsgData) error { 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 @@ -148,8 +149,12 @@ func (d *DataBases) GetSignalInfoFromCacheByClientMsgID(clientMsgID string) (inv if err = proto.Unmarshal(bytes, req); err != nil { return nil, err } - req2 := req.Payload.(*pbRtc.SignalReq_Invite) - invitationInfo = req2.Invite + 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 } From 0f66fa528dfac6c5e85b436c1b13a9b9bc7e54da Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 19:48:59 +0800 Subject: [PATCH 51/67] singal offline push --- internal/push/logic/push_to_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 3ba1e58fb..bba61244a 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -126,7 +126,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { if err != nil { log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error()) } - log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), "opts:", opts) + log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), UIDList, content, jsonCustomContent, "opts:", opts) pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID, opts) log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offline pushResult: ", pushResult) if err != nil { From 538656fcc7e170d276cdc433bea6adabd968c07a Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 19:58:31 +0800 Subject: [PATCH 52/67] singal offline push --- internal/push/logic/push_to_client.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index bba61244a..8aeb6b82c 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -83,8 +83,9 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { var content string if pushMsg.MsgData.OfflinePushInfo != nil { content = pushMsg.MsgData.OfflinePushInfo.Title - + log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "xxxx OfflinePushInfo", content) } else { + log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "xxxx2222 OfflinePushInfo", content) switch pushMsg.MsgData.ContentType { case constant.Text: content = constant.ContentType2PushContent[constant.Text] From f8b4cbcc132a1f2b2937e25ce2e49273779a8d6b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 21:04:11 +0800 Subject: [PATCH 53/67] singal offline push --- internal/push/logic/push_to_client.go | 1 - pkg/common/db/newRedisModel.go | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 8aeb6b82c..90e56c1f7 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -85,7 +85,6 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) { content = pushMsg.MsgData.OfflinePushInfo.Title log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "xxxx OfflinePushInfo", content) } else { - log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "xxxx2222 OfflinePushInfo", content) switch pushMsg.MsgData.ContentType { case constant.Text: content = constant.ContentType2PushContent[constant.Text] diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index 04bcd28c7..254a06975 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -111,13 +111,22 @@ func (d *DataBases) NewCacheSignalInfo(msg *pbCommon.MsgData) error { return err } //log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "SignalReq: ", req.String()) - switch req.Payload.(type) { - case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup: - keyList := SignalListCache + msg.RecvID + 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 @@ -132,8 +141,6 @@ func (d *DataBases) NewCacheSignalInfo(msg *pbCommon.MsgData) error { return err } return err - default: - log2.NewDebug("", utils.GetSelfFuncName(), "req type not invite", string(msg.Content)) } return nil } From 34c091f232e510ed95dd6e827f9a555cd6e5691b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 6 Jun 2022 23:27:16 +0800 Subject: [PATCH 54/67] signal --- pkg/common/db/newRedisModel.go | 22 +++++++++++++++++++--- pkg/common/db/redisModel.go | 2 ++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pkg/common/db/newRedisModel.go b/pkg/common/db/newRedisModel.go index 254a06975..ab7a28d8c 100644 --- a/pkg/common/db/newRedisModel.go +++ b/pkg/common/db/newRedisModel.go @@ -10,12 +10,15 @@ import ( "context" "errors" "fmt" + "github.com/garyburd/redigo/redis" + //goRedis "github.com/go-redis/redis/v8" - "github.com/golang/protobuf/proto" - "github.com/mitchellh/mapstructure" "strconv" "time" + + "github.com/golang/protobuf/proto" + "github.com/mitchellh/mapstructure" ) //func (d * DataBases)pubMessage(channel, msg string) { @@ -177,5 +180,18 @@ func (d *DataBases) GetAvailableSignalInvitationInfo(userID string) (invitationI } log2.NewDebug("", utils.GetSelfFuncName(), result, result.String()) invitationInfo, err = d.GetSignalInfoFromCacheByClientMsgID(key) - return invitationInfo, utils.Wrap(err, "GetSignalInfoFromCacheByClientMsgID") + 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 6d54974ed..364b386ce 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -11,9 +11,11 @@ import ( "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" ) From 6efb1a670597d34c3db12e389f18b27aee4f0008 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 7 Jun 2022 10:40:19 +0800 Subject: [PATCH 55/67] fix bug: v.MsgData == nil --- internal/msg_transfer/logic/online_history_msg_handler.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index fb5b33ce9..e42bbf22a 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -107,6 +107,10 @@ func (och *OnlineHistoryConsumerHandler) Run(channelID int) { log.Debug(triggerID, "msg arrived channel", "channel id", channelID, msgList, msgChannelValue.userID, len(msgList)) for _, v := range msgList { log.Debug(triggerID, "msg come to storage center", v.String()) + if v.MsgData == nil { + log.NewWarn(triggerID, "msg come to storage center nil", v.String()) + continue + } isHistory := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsHistory) isSenderSync := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsSenderSync) if isHistory { From 385f371c063cb1a70157011cb0dd8e3567c3df0a Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 7 Jun 2022 10:52:52 +0800 Subject: [PATCH 56/67] fix bug: v.MsgData == nil --- internal/msg_transfer/logic/online_history_msg_handler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index e42bbf22a..60b54e65d 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -109,6 +109,7 @@ func (och *OnlineHistoryConsumerHandler) Run(channelID int) { log.Debug(triggerID, "msg come to storage center", v.String()) if v.MsgData == nil { log.NewWarn(triggerID, "msg come to storage center nil", v.String()) + panic(v.String()) continue } isHistory := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsHistory) From fcda79eb3c221baf89332883fd5ffc00cd632047 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 7 Jun 2022 11:10:49 +0800 Subject: [PATCH 57/67] fix bug: v.MsgData == nil --- internal/msg_transfer/logic/online_history_msg_handler.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index 60b54e65d..e42bbf22a 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -109,7 +109,6 @@ func (och *OnlineHistoryConsumerHandler) Run(channelID int) { log.Debug(triggerID, "msg come to storage center", v.String()) if v.MsgData == nil { log.NewWarn(triggerID, "msg come to storage center nil", v.String()) - panic(v.String()) continue } isHistory := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsHistory) From ae52f85502580f9dc4426ea8418c1a0f2df7bf82 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 7 Jun 2022 11:24:27 +0800 Subject: [PATCH 58/67] log --- internal/msg_transfer/logic/online_history_msg_handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index e42bbf22a..5e0b9a520 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -108,7 +108,7 @@ func (och *OnlineHistoryConsumerHandler) Run(channelID int) { for _, v := range msgList { log.Debug(triggerID, "msg come to storage center", v.String()) if v.MsgData == nil { - log.NewWarn(triggerID, "msg come to storage center nil", v.String()) + log.NewWarn(triggerID, "msg come to storage center nil", v.String(), v.OperationID) continue } isHistory := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsHistory) From 6ec65965a45ab0df3cf9262a935d246a41aa667f Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 7 Jun 2022 11:50:05 +0800 Subject: [PATCH 59/67] log --- internal/msg_transfer/logic/online_history_msg_handler.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index 5e0b9a520..5c2668976 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -108,7 +108,7 @@ func (och *OnlineHistoryConsumerHandler) Run(channelID int) { for _, v := range msgList { log.Debug(triggerID, "msg come to storage center", v.String()) if v.MsgData == nil { - log.NewWarn(triggerID, "msg come to storage center nil", v.String(), v.OperationID) + log.NewWarn(triggerID, "msg come to storage center nil", v.String(), v.OperationID, msgChannelValue.userID) continue } isHistory := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsHistory) @@ -238,7 +238,10 @@ func (och *OnlineHistoryConsumerHandler) MessagesDistributionHandle() { if len(v) >= 0 { hashCode := getHashCode(userID) channelID := hashCode % ChannelNum - log.Debug(triggerID, "generate channelID", hashCode, channelID, userID) + log.Debug(triggerID, "generate channelID", hashCode, channelID, userID, len(v)) + for _, y := range v { + log.Debug(triggerID, "single user slice is ", y.String()) + } //go func(cID uint32, userID string, messages []*pbMsg.MsgDataToMQ) { och.chArrays[channelID] <- Cmd2Value{Cmd: UserMessages, Value: MsgChannelValue{userID: userID, msgList: v, triggerID: triggerID}} //}(channelID, userID, v) From 07b652c1d4ff94956844a9b77a123cf44c052517 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 7 Jun 2022 12:08:53 +0800 Subject: [PATCH 60/67] singal offline push --- deploy_k8s/build_push_all_images.sh | 2 +- internal/push/logic/push_to_client.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy_k8s/build_push_all_images.sh b/deploy_k8s/build_push_all_images.sh index 756add942..b6333a8bd 100644 --- a/deploy_k8s/build_push_all_images.sh +++ b/deploy_k8s/build_push_all_images.sh @@ -3,7 +3,7 @@ source ./path_info.cfg # images version version=v2.0.10k - +git pull cd ../script/; ./build_all_service.sh cd ../deploy_k8s/ diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 90e56c1f7..da5e680ec 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -146,7 +146,7 @@ func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err err 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, err + return opts, utils.Wrap(err, "") } log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "SignalReq: ", req.String()) switch req.Payload.(type) { From 95705cc95a69fa74189f4a76f12d2a872330f0ce Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 7 Jun 2022 12:28:36 +0800 Subject: [PATCH 61/67] log --- internal/msg_transfer/logic/online_history_msg_handler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index 5c2668976..7baccf176 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -223,7 +223,7 @@ func (och *OnlineHistoryConsumerHandler) MessagesDistributionHandle() { log.Error(triggerID, "msg_transfer Unmarshal msg err", "msg", string(consumerMessages[i].Value), "err", err.Error()) return } - log.Debug(triggerID, "single msg come to distribution center", msgFromMQ.String(), string(consumerMessages[i].Key)) + log.Debug(triggerID, "single msg come to distribution center", string(consumerMessages[i].Key)) if oldM, ok := UserAggregationMsgs[string(consumerMessages[i].Key)]; ok { oldM = append(oldM, &msgFromMQ) UserAggregationMsgs[string(consumerMessages[i].Key)] = oldM @@ -233,7 +233,7 @@ func (och *OnlineHistoryConsumerHandler) MessagesDistributionHandle() { UserAggregationMsgs[string(consumerMessages[i].Key)] = m } } - log.Debug(triggerID, "generate map list users len", len(UserAggregationMsgs)) + log.Debug(triggerID, "generate map list users len", len(UserAggregationMsgs), UserAggregationMsgs) for userID, v := range UserAggregationMsgs { if len(v) >= 0 { hashCode := getHashCode(userID) From 3adcb9f164e1f269a2fe1658ffe007fa478fad39 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 7 Jun 2022 13:44:52 +0800 Subject: [PATCH 62/67] debug userid == "" --- internal/msg_transfer/logic/online_history_msg_handler.go | 1 + internal/rpc/msg/send_msg.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go index e42bbf22a..ac7a7abed 100644 --- a/internal/msg_transfer/logic/online_history_msg_handler.go +++ b/internal/msg_transfer/logic/online_history_msg_handler.go @@ -109,6 +109,7 @@ func (och *OnlineHistoryConsumerHandler) Run(channelID int) { log.Debug(triggerID, "msg come to storage center", v.String()) if v.MsgData == nil { log.NewWarn(triggerID, "msg come to storage center nil", v.String()) + continue } isHistory := utils.GetSwitchFromOptions(v.MsgData.Options, constant.IsHistory) diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index a97dd84ed..a2a037cd8 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -830,6 +830,9 @@ 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 == "" { + panic(groupPB.OperationID) + } err := rpc.sendMsgToKafka(&msgToMQGroup, v, status) if err != nil { log.NewError(msgToMQGroup.OperationID, "kafka send msg err:UserId", v, msgToMQGroup.String()) From dd76c268c520aefeffb6d8f6e92a9349e3714758 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 7 Jun 2022 13:50:35 +0800 Subject: [PATCH 63/67] debug userid == "" --- internal/rpc/msg/send_msg.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index a2a037cd8..5f86c39d5 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -228,7 +228,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: From dae1569f0ee449fb466463ff9b6c4695b3dea714 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 7 Jun 2022 14:02:11 +0800 Subject: [PATCH 64/67] debug userid == "" --- internal/rpc/msg/send_msg.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index 5f86c39d5..7897d3f3d 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -831,7 +831,8 @@ func (rpc *rpcChat) sendMsgToGroupOptimization(list []string, groupPB *pbChat.Se isSend := modifyMessageByUserMessageReceiveOpt(v, groupPB.MsgData.GroupID, constant.GroupChatType, groupPB) if isSend { if v == "" || groupPB.MsgData.SendID == "" { - panic(groupPB.OperationID) + log.Error(msgToMQGroup.OperationID, "sendMsgToGroupOptimization userID nil ", msgToMQGroup.String()) + continue } err := rpc.sendMsgToKafka(&msgToMQGroup, v, status) if err != nil { From f3fc452904c045ed2d21b477f24de09088c0029e Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 7 Jun 2022 16:18:18 +0800 Subject: [PATCH 65/67] group set memberInfo --- internal/api/group/group.go | 73 ++- internal/rpc/group/group.go | 29 +- pkg/base_info/group_api_struct.go | 14 +- .../im_mysql_model/group_member_model.go | 12 + pkg/proto/group/group.pb.go | 441 +++++++++--------- pkg/proto/group/group.proto | 11 +- 6 files changed, 329 insertions(+), 251 deletions(-) diff --git a/internal/api/group/group.go b/internal/api/group/group.go index a7e3c8244..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" @@ -807,25 +808,55 @@ func SetGroupMemberNickname(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 - //} - // - //var ok bool - //var errInfo string - //ok, req.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 - //} - // - //log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String()) + 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/rpc/group/group.go b/internal/rpc/group/group.go index 699e9b395..bd7aa3264 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1407,6 +1407,33 @@ func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.S } func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGroupMemberInfoReq) (resp *pbGroup.SetGroupMemberInfoResp, err error) { - resp = &pbGroup.SetGroupMemberInfoResp{} + 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() + } + 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/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index 3e021fdb4..e00f6daf0 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -234,13 +234,13 @@ type SetGroupMemberNicknameResp struct { } 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:"user_group_face_url"` - RoleLevel string `json:"role_level"` - Ex string `json:"ex"` + 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 { 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/proto/group/group.pb.go b/pkg/proto/group/group.pb.go index f46f9f6d6..d036b6641 100644 --- a/pkg/proto/group/group.pb.go +++ b/pkg/proto/group/group.pb.go @@ -37,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_e5947a1008c7a757, []int{0} + return fileDescriptor_group_8c320ccb494991ed, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -83,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_e5947a1008c7a757, []int{1} + return fileDescriptor_group_8c320ccb494991ed, []int{1} } func (m *GroupAddMemberInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupAddMemberInfo.Unmarshal(m, b) @@ -132,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_e5947a1008c7a757, []int{2} + return fileDescriptor_group_8c320ccb494991ed, []int{2} } func (m *CreateGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupReq.Unmarshal(m, b) @@ -200,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_e5947a1008c7a757, []int{3} + return fileDescriptor_group_8c320ccb494991ed, []int{3} } func (m *CreateGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupResp.Unmarshal(m, b) @@ -254,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_e5947a1008c7a757, []int{4} + return fileDescriptor_group_8c320ccb494991ed, []int{4} } func (m *GetGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoReq.Unmarshal(m, b) @@ -308,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_e5947a1008c7a757, []int{5} + return fileDescriptor_group_8c320ccb494991ed, []int{5} } func (m *GetGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoResp.Unmarshal(m, b) @@ -362,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_e5947a1008c7a757, []int{6} + return fileDescriptor_group_8c320ccb494991ed, []int{6} } func (m *SetGroupInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoReq.Unmarshal(m, b) @@ -414,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_e5947a1008c7a757, []int{7} + return fileDescriptor_group_8c320ccb494991ed, []int{7} } func (m *SetGroupInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoResp.Unmarshal(m, b) @@ -454,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_e5947a1008c7a757, []int{8} + return fileDescriptor_group_8c320ccb494991ed, []int{8} } func (m *GetGroupApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListReq.Unmarshal(m, b) @@ -508,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_e5947a1008c7a757, []int{9} + return fileDescriptor_group_8c320ccb494991ed, []int{9} } func (m *GetGroupApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListResp.Unmarshal(m, b) @@ -562,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_e5947a1008c7a757, []int{10} + return fileDescriptor_group_8c320ccb494991ed, []int{10} } func (m *GetUserReqApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListReq.Unmarshal(m, b) @@ -615,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_e5947a1008c7a757, []int{11} + return fileDescriptor_group_8c320ccb494991ed, []int{11} } func (m *GetUserReqApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListResp.Unmarshal(m, b) @@ -664,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_e5947a1008c7a757, []int{12} + return fileDescriptor_group_8c320ccb494991ed, []int{12} } func (m *TransferGroupOwnerReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerReq.Unmarshal(m, b) @@ -730,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_e5947a1008c7a757, []int{13} + return fileDescriptor_group_8c320ccb494991ed, []int{13} } func (m *TransferGroupOwnerResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerResp.Unmarshal(m, b) @@ -771,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_e5947a1008c7a757, []int{14} + return fileDescriptor_group_8c320ccb494991ed, []int{14} } func (m *JoinGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupReq.Unmarshal(m, b) @@ -830,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_e5947a1008c7a757, []int{15} + return fileDescriptor_group_8c320ccb494991ed, []int{15} } func (m *JoinGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupResp.Unmarshal(m, b) @@ -873,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_e5947a1008c7a757, []int{16} + return fileDescriptor_group_8c320ccb494991ed, []int{16} } func (m *GroupApplicationResponseReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseReq.Unmarshal(m, b) @@ -946,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_e5947a1008c7a757, []int{17} + return fileDescriptor_group_8c320ccb494991ed, []int{17} } func (m *GroupApplicationResponseResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseResp.Unmarshal(m, b) @@ -986,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_e5947a1008c7a757, []int{18} + return fileDescriptor_group_8c320ccb494991ed, []int{18} } func (m *QuitGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupReq.Unmarshal(m, b) @@ -1038,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_e5947a1008c7a757, []int{19} + return fileDescriptor_group_8c320ccb494991ed, []int{19} } func (m *QuitGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupResp.Unmarshal(m, b) @@ -1080,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_e5947a1008c7a757, []int{20} + return fileDescriptor_group_8c320ccb494991ed, []int{20} } func (m *GetGroupMemberListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListReq.Unmarshal(m, b) @@ -1149,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_e5947a1008c7a757, []int{21} + return fileDescriptor_group_8c320ccb494991ed, []int{21} } func (m *GetGroupMemberListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListResp.Unmarshal(m, b) @@ -1211,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_e5947a1008c7a757, []int{22} + return fileDescriptor_group_8c320ccb494991ed, []int{22} } func (m *GetGroupMembersInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoReq.Unmarshal(m, b) @@ -1272,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_e5947a1008c7a757, []int{23} + return fileDescriptor_group_8c320ccb494991ed, []int{23} } func (m *GetGroupMembersInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoResp.Unmarshal(m, b) @@ -1328,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_e5947a1008c7a757, []int{24} + return fileDescriptor_group_8c320ccb494991ed, []int{24} } func (m *KickGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberReq.Unmarshal(m, b) @@ -1395,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_e5947a1008c7a757, []int{25} + return fileDescriptor_group_8c320ccb494991ed, []int{25} } func (m *Id2Result) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Id2Result.Unmarshal(m, b) @@ -1442,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_e5947a1008c7a757, []int{26} + return fileDescriptor_group_8c320ccb494991ed, []int{26} } func (m *KickGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberResp.Unmarshal(m, b) @@ -1496,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_e5947a1008c7a757, []int{27} + return fileDescriptor_group_8c320ccb494991ed, []int{27} } func (m *GetJoinedGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListReq.Unmarshal(m, b) @@ -1550,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_e5947a1008c7a757, []int{28} + return fileDescriptor_group_8c320ccb494991ed, []int{28} } func (m *GetJoinedGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListResp.Unmarshal(m, b) @@ -1606,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_e5947a1008c7a757, []int{29} + return fileDescriptor_group_8c320ccb494991ed, []int{29} } func (m *InviteUserToGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupReq.Unmarshal(m, b) @@ -1674,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_e5947a1008c7a757, []int{30} + return fileDescriptor_group_8c320ccb494991ed, []int{30} } func (m *InviteUserToGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupResp.Unmarshal(m, b) @@ -1728,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_e5947a1008c7a757, []int{31} + return fileDescriptor_group_8c320ccb494991ed, []int{31} } func (m *GetGroupAllMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberReq.Unmarshal(m, b) @@ -1782,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_e5947a1008c7a757, []int{32} + return fileDescriptor_group_8c320ccb494991ed, []int{32} } func (m *GetGroupAllMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberResp.Unmarshal(m, b) @@ -1836,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_e5947a1008c7a757, []int{33} + return fileDescriptor_group_8c320ccb494991ed, []int{33} } func (m *CMSGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CMSGroup.Unmarshal(m, b) @@ -1890,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_e5947a1008c7a757, []int{34} + return fileDescriptor_group_8c320ccb494991ed, []int{34} } func (m *GetGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupReq.Unmarshal(m, b) @@ -1944,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_e5947a1008c7a757, []int{35} + return fileDescriptor_group_8c320ccb494991ed, []int{35} } func (m *GetGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupResp.Unmarshal(m, b) @@ -1997,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_e5947a1008c7a757, []int{36} + return fileDescriptor_group_8c320ccb494991ed, []int{36} } func (m *GetGroupsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsReq.Unmarshal(m, b) @@ -2044,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_e5947a1008c7a757, []int{37} + return fileDescriptor_group_8c320ccb494991ed, []int{37} } func (m *GetGroupsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsResp.Unmarshal(m, b) @@ -2097,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_e5947a1008c7a757, []int{38} + return fileDescriptor_group_8c320ccb494991ed, []int{38} } func (m *GetGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberReq.Unmarshal(m, b) @@ -2144,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_e5947a1008c7a757, []int{39} + return fileDescriptor_group_8c320ccb494991ed, []int{39} } func (m *OperateGroupStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateGroupStatusReq.Unmarshal(m, b) @@ -2195,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_e5947a1008c7a757, []int{40} + return fileDescriptor_group_8c320ccb494991ed, []int{40} } func (m *OperateGroupStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateGroupStatusResp.Unmarshal(m, b) @@ -2229,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_e5947a1008c7a757, []int{41} + return fileDescriptor_group_8c320ccb494991ed, []int{41} } func (m *OperateUserRoleReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateUserRoleReq.Unmarshal(m, b) @@ -2287,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_e5947a1008c7a757, []int{42} + return fileDescriptor_group_8c320ccb494991ed, []int{42} } func (m *OperateUserRoleResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateUserRoleResp.Unmarshal(m, b) @@ -2319,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_e5947a1008c7a757, []int{43} + return fileDescriptor_group_8c320ccb494991ed, []int{43} } func (m *DeleteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteGroupReq.Unmarshal(m, b) @@ -2363,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_e5947a1008c7a757, []int{44} + return fileDescriptor_group_8c320ccb494991ed, []int{44} } func (m *DeleteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteGroupResp.Unmarshal(m, b) @@ -2395,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_e5947a1008c7a757, []int{45} + return fileDescriptor_group_8c320ccb494991ed, []int{45} } func (m *GetGroupByIdReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupByIdReq.Unmarshal(m, b) @@ -2440,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_e5947a1008c7a757, []int{46} + return fileDescriptor_group_8c320ccb494991ed, []int{46} } func (m *GetGroupByIdResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupByIdResp.Unmarshal(m, b) @@ -2481,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_e5947a1008c7a757, []int{47} + return fileDescriptor_group_8c320ccb494991ed, []int{47} } func (m *GetGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSReq.Unmarshal(m, b) @@ -2542,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_e5947a1008c7a757, []int{48} + return fileDescriptor_group_8c320ccb494991ed, []int{48} } func (m *GetGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSResp.Unmarshal(m, b) @@ -2597,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_e5947a1008c7a757, []int{49} + return fileDescriptor_group_8c320ccb494991ed, []int{49} } func (m *RemoveGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveGroupMembersCMSReq.Unmarshal(m, b) @@ -2657,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_e5947a1008c7a757, []int{50} + return fileDescriptor_group_8c320ccb494991ed, []int{50} } func (m *RemoveGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveGroupMembersCMSResp.Unmarshal(m, b) @@ -2705,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_e5947a1008c7a757, []int{51} + return fileDescriptor_group_8c320ccb494991ed, []int{51} } func (m *AddGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddGroupMembersCMSReq.Unmarshal(m, b) @@ -2765,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_e5947a1008c7a757, []int{52} + return fileDescriptor_group_8c320ccb494991ed, []int{52} } func (m *AddGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddGroupMembersCMSResp.Unmarshal(m, b) @@ -2812,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_e5947a1008c7a757, []int{53} + return fileDescriptor_group_8c320ccb494991ed, []int{53} } func (m *DismissGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupReq.Unmarshal(m, b) @@ -2864,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_e5947a1008c7a757, []int{54} + return fileDescriptor_group_8c320ccb494991ed, []int{54} } func (m *DismissGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupResp.Unmarshal(m, b) @@ -2906,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_e5947a1008c7a757, []int{55} + return fileDescriptor_group_8c320ccb494991ed, []int{55} } func (m *MuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberReq.Unmarshal(m, b) @@ -2972,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_e5947a1008c7a757, []int{56} + return fileDescriptor_group_8c320ccb494991ed, []int{56} } func (m *MuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberResp.Unmarshal(m, b) @@ -3013,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_e5947a1008c7a757, []int{57} + return fileDescriptor_group_8c320ccb494991ed, []int{57} } func (m *CancelMuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberReq.Unmarshal(m, b) @@ -3072,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_e5947a1008c7a757, []int{58} + return fileDescriptor_group_8c320ccb494991ed, []int{58} } func (m *CancelMuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberResp.Unmarshal(m, b) @@ -3112,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_e5947a1008c7a757, []int{59} + return fileDescriptor_group_8c320ccb494991ed, []int{59} } func (m *MuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupReq.Unmarshal(m, b) @@ -3164,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_e5947a1008c7a757, []int{60} + return fileDescriptor_group_8c320ccb494991ed, []int{60} } func (m *MuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupResp.Unmarshal(m, b) @@ -3204,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_e5947a1008c7a757, []int{61} + return fileDescriptor_group_8c320ccb494991ed, []int{61} } func (m *CancelMuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupReq.Unmarshal(m, b) @@ -3256,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_e5947a1008c7a757, []int{62} + return fileDescriptor_group_8c320ccb494991ed, []int{62} } func (m *CancelMuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupResp.Unmarshal(m, b) @@ -3298,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_e5947a1008c7a757, []int{63} + return fileDescriptor_group_8c320ccb494991ed, []int{63} } func (m *SetGroupMemberNicknameReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameReq.Unmarshal(m, b) @@ -3364,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_e5947a1008c7a757, []int{64} + return fileDescriptor_group_8c320ccb494991ed, []int{64} } func (m *SetGroupMemberNicknameResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameResp.Unmarshal(m, b) @@ -3394,11 +3394,12 @@ func (m *SetGroupMemberNicknameResp) GetCommonResp() *CommonResp { 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"` - OperationID string `protobuf:"bytes,3,opt,name=operationID" json:"operationID,omitempty"` - Nickname *wrapperspb.StringValue `protobuf:"bytes,4,opt,name=nickname" json:"nickname,omitempty"` - FaceURL *wrapperspb.StringValue `protobuf:"bytes,5,opt,name=faceURL" json:"faceURL,omitempty"` - RoleLevel *wrapperspb.Int32Value `protobuf:"bytes,6,opt,name=roleLevel" json:"roleLevel,omitempty"` - Ex *wrapperspb.StringValue `protobuf:"bytes,7,opt,name=ex" json:"ex,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:"-"` @@ -3408,7 +3409,7 @@ 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_e5947a1008c7a757, []int{65} + return fileDescriptor_group_8c320ccb494991ed, []int{65} } func (m *SetGroupMemberInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberInfoReq.Unmarshal(m, b) @@ -3442,6 +3443,13 @@ func (m *SetGroupMemberInfoReq) GetUserID() string { return "" } +func (m *SetGroupMemberInfoReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + func (m *SetGroupMemberInfoReq) GetOperationID() string { if m != nil { return m.OperationID @@ -3488,7 +3496,7 @@ 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_e5947a1008c7a757, []int{66} + return fileDescriptor_group_8c320ccb494991ed, []int{66} } func (m *SetGroupMemberInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberInfoResp.Unmarshal(m, b) @@ -4647,151 +4655,150 @@ var _Group_serviceDesc = grpc.ServiceDesc{ Metadata: "group/group.proto", } -func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_e5947a1008c7a757) } +func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_8c320ccb494991ed) } -var fileDescriptor_group_e5947a1008c7a757 = []byte{ - // 2274 bytes of a gzipped FileDescriptorProto +var fileDescriptor_group_8c320ccb494991ed = []byte{ + // 2272 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4f, 0x6f, 0x1c, 0x4b, - 0x11, 0xd7, 0x78, 0xbd, 0xb6, 0xb7, 0x6c, 0x67, 0xed, 0x76, 0xd6, 0x5e, 0x4f, 0xfc, 0xf2, 0x9c, - 0x7e, 0xe1, 0x11, 0xc1, 0xc3, 0x16, 0x8e, 0x14, 0x01, 0x0f, 0x11, 0xe2, 0x3f, 0x89, 0x37, 0x89, - 0x6d, 0x32, 0xce, 0xe3, 0x10, 0x09, 0x85, 0xcd, 0x4e, 0x7b, 0xb5, 0x78, 0x77, 0x66, 0x3c, 0x3d, - 0xeb, 0x04, 0x2e, 0x4f, 0x5c, 0x9e, 0xf4, 0x80, 0x03, 0x08, 0x89, 0x13, 0x12, 0xe4, 0x04, 0x07, - 0x0e, 0x1c, 0xe0, 0x8c, 0xb8, 0x20, 0xbe, 0x02, 0x9f, 0x82, 0xaf, 0x80, 0xa6, 0xbb, 0xa7, 0xa7, - 0x67, 0xba, 0x67, 0xbc, 0x59, 0x27, 0xe4, 0xb2, 0x52, 0x57, 0x57, 0x4f, 0xff, 0xaa, 0xba, 0xaa, - 0xba, 0xaa, 0x7a, 0x61, 0xb1, 0x1b, 0xfa, 0xc3, 0x60, 0x93, 0xfd, 0x6e, 0x04, 0xa1, 0x1f, 0xf9, - 0xa8, 0xca, 0x06, 0xf6, 0x8d, 0xa3, 0x80, 0x78, 0xcf, 0x5b, 0x07, 0x9b, 0xc1, 0x69, 0x77, 0x93, - 0xcd, 0x6c, 0x52, 0xf7, 0xf4, 0xf9, 0x4b, 0xba, 0xf9, 0x92, 0x72, 0x4e, 0xfb, 0xab, 0xc5, 0x2c, - 0x61, 0x3b, 0x08, 0x48, 0x28, 0x18, 0xf1, 0xf7, 0x00, 0x76, 0xfc, 0xc1, 0xc0, 0xf7, 0x1c, 0x42, - 0x03, 0xd4, 0x84, 0xe9, 0xbd, 0x30, 0xdc, 0xf1, 0x5d, 0xd2, 0xb4, 0xd6, 0xad, 0x5b, 0x55, 0x27, - 0x19, 0xa2, 0x65, 0x98, 0xda, 0x0b, 0xc3, 0x03, 0xda, 0x6d, 0x4e, 0xac, 0x5b, 0xb7, 0x6a, 0x8e, - 0x18, 0xe1, 0x87, 0x80, 0x1e, 0xc4, 0xa0, 0xee, 0xb9, 0xee, 0x01, 0x19, 0xbc, 0x20, 0x61, 0xcb, - 0x3b, 0xf1, 0x63, 0xee, 0xcf, 0x28, 0x09, 0x5b, 0xbb, 0xec, 0x33, 0x35, 0x47, 0x8c, 0xd0, 0x1a, - 0xd4, 0x1c, 0xbf, 0x4f, 0x1e, 0x93, 0x73, 0xd2, 0x67, 0x1f, 0xaa, 0x3a, 0x29, 0x01, 0xff, 0xd7, - 0x82, 0x2b, 0x3b, 0x21, 0x69, 0x47, 0x84, 0x7d, 0xd2, 0x21, 0x67, 0xe8, 0x1e, 0x5c, 0x69, 0x79, - 0xbd, 0x88, 0x7f, 0xfa, 0x71, 0x8f, 0x46, 0x4d, 0x6b, 0xbd, 0x72, 0x6b, 0x76, 0x6b, 0x75, 0x83, - 0xeb, 0x45, 0xdf, 0xdb, 0xc9, 0x2d, 0x40, 0xdf, 0x81, 0x1a, 0xe3, 0x8a, 0x27, 0xd9, 0x9e, 0xb3, - 0x5b, 0x6b, 0x1b, 0x94, 0x84, 0xe7, 0x24, 0x7c, 0xde, 0x0e, 0x7a, 0xcf, 0x83, 0x76, 0xd8, 0x1e, - 0xd0, 0x0d, 0xc9, 0xe3, 0xa4, 0xec, 0x68, 0x1d, 0x66, 0x8f, 0x02, 0x12, 0xb6, 0xa3, 0x9e, 0xef, - 0xb5, 0x76, 0x9b, 0x15, 0x26, 0x8c, 0x4a, 0x42, 0x36, 0xcc, 0x1c, 0x05, 0x42, 0xd6, 0x49, 0x36, - 0x2d, 0xc7, 0x6c, 0xf5, 0x4b, 0x8f, 0x84, 0x62, 0xba, 0x2a, 0x56, 0xa7, 0x24, 0xfc, 0x39, 0xd4, - 0x33, 0x02, 0x8f, 0x73, 0x04, 0x59, 0x01, 0x2b, 0x6f, 0x24, 0x20, 0x0e, 0x61, 0xe1, 0x01, 0x89, - 0xd8, 0x98, 0xb2, 0x39, 0x72, 0x16, 0xc3, 0xe6, 0x0c, 0xbb, 0x52, 0xe1, 0x35, 0x47, 0x25, 0xe5, - 0xd5, 0x32, 0x51, 0xae, 0x96, 0x4a, 0x56, 0x2d, 0xf8, 0x4b, 0x0b, 0x16, 0x73, 0x9b, 0x8e, 0x25, - 0xf7, 0x36, 0xcc, 0x4b, 0x41, 0x18, 0xd2, 0x0a, 0x33, 0x8d, 0x72, 0xd9, 0xb3, 0x4b, 0xf0, 0x2f, - 0x2d, 0xa8, 0x1f, 0x0b, 0x2c, 0x89, 0xfc, 0x19, 0x7d, 0x5a, 0x6f, 0x66, 0x30, 0xaa, 0xdc, 0x13, - 0x06, 0x73, 0x28, 0x35, 0x26, 0xbc, 0x07, 0x0b, 0x59, 0x30, 0x34, 0x40, 0xdf, 0x54, 0x1d, 0x54, - 0xc0, 0x59, 0x14, 0xd6, 0x9f, 0x4e, 0x38, 0x0a, 0x13, 0xfe, 0x19, 0xd8, 0x89, 0x7e, 0xef, 0x05, - 0x41, 0xbf, 0xd7, 0x61, 0xdf, 0x8f, 0xe5, 0x8d, 0xc5, 0x53, 0x21, 0x5a, 0xe5, 0x10, 0x0d, 0x07, - 0x7b, 0x1d, 0xe0, 0x7e, 0xe8, 0x0f, 0x32, 0x47, 0xab, 0x50, 0xf0, 0xef, 0x2d, 0xb8, 0x56, 0xb8, - 0xf9, 0x58, 0xc7, 0xfc, 0x08, 0x16, 0x92, 0x70, 0x30, 0x24, 0x34, 0x52, 0x4e, 0xfa, 0xc3, 0xa2, - 0x53, 0x11, 0xac, 0x8e, 0xb6, 0x10, 0x47, 0xb0, 0xf6, 0x80, 0x44, 0x31, 0x56, 0x87, 0x9c, 0x19, - 0x94, 0x53, 0x14, 0xb8, 0x2e, 0x77, 0xae, 0x7f, 0xb0, 0xe0, 0x83, 0x92, 0x6d, 0xc7, 0x3a, 0x65, - 0xa3, 0x5e, 0x26, 0xc6, 0xd5, 0xcb, 0x3f, 0x2c, 0x68, 0x3c, 0x0d, 0xdb, 0x1e, 0x3d, 0x21, 0x21, - 0x9b, 0x64, 0x51, 0x2a, 0xd6, 0x48, 0x13, 0xa6, 0x85, 0xeb, 0x0b, 0x95, 0x24, 0x43, 0xf4, 0x31, - 0x5c, 0x39, 0xea, 0xbb, 0x6a, 0x84, 0xe3, 0x9a, 0xc9, 0x51, 0x63, 0xbe, 0x43, 0xf2, 0x52, 0xe5, - 0xe3, 0x2a, 0xca, 0x51, 0xf3, 0x7a, 0x9c, 0x2c, 0x8f, 0x2a, 0xd5, 0x5c, 0x54, 0x79, 0x04, 0xcb, - 0x26, 0x01, 0xc6, 0xf3, 0xa0, 0x2f, 0x2c, 0x98, 0x7b, 0xe8, 0xf7, 0x3c, 0x79, 0x0f, 0x15, 0x6b, - 0xe1, 0x3a, 0x80, 0x43, 0xce, 0x0e, 0x08, 0xa5, 0xed, 0x2e, 0x11, 0x1a, 0x50, 0x28, 0x65, 0x91, - 0xf0, 0x62, 0x89, 0xf1, 0x36, 0xcc, 0x2b, 0x38, 0xc6, 0x13, 0xe6, 0x3f, 0xb1, 0x4b, 0xe6, 0xfc, - 0x31, 0x9e, 0xf0, 0x3d, 0x4a, 0x44, 0xbc, 0x57, 0x51, 0x58, 0xe5, 0x7a, 0xcf, 0x5b, 0xbf, 0xa2, - 0x99, 0x8a, 0xa6, 0x19, 0x25, 0x54, 0x4c, 0xe6, 0x43, 0x45, 0x3c, 0xbf, 0xdf, 0xf6, 0xdc, 0x3e, - 0x71, 0x63, 0xa7, 0xe7, 0xe7, 0xa9, 0x50, 0x10, 0x86, 0x39, 0x3e, 0x72, 0x08, 0x1d, 0xf6, 0xa3, - 0xe6, 0x14, 0x8b, 0x17, 0x19, 0x1a, 0x7e, 0x02, 0x6b, 0xc5, 0xa2, 0x8d, 0xa7, 0xae, 0x13, 0x98, - 0x7b, 0x32, 0xec, 0x45, 0x23, 0x1c, 0xfd, 0xe5, 0xae, 0xc1, 0x6d, 0x98, 0x57, 0xf6, 0x19, 0x0f, - 0xeb, 0x6b, 0x0b, 0x1a, 0x49, 0xb4, 0x4d, 0x53, 0x9e, 0x72, 0xd4, 0x97, 0x0a, 0x65, 0x71, 0x80, - 0xbc, 0xdf, 0xeb, 0x47, 0x24, 0x64, 0x07, 0x5a, 0x75, 0xc4, 0x28, 0xde, 0xef, 0x90, 0xbc, 0x8a, - 0x8e, 0xc9, 0x19, 0x3b, 0xc9, 0xaa, 0x93, 0x0c, 0xf1, 0x5f, 0x2c, 0x58, 0x36, 0x61, 0x1c, 0xeb, - 0x32, 0xb8, 0x0f, 0x30, 0x48, 0x73, 0x41, 0x7e, 0x0d, 0x7c, 0x5c, 0x14, 0xee, 0xf8, 0x6e, 0xf7, - 0x87, 0xfd, 0x3e, 0xbb, 0x4d, 0x95, 0x95, 0xf1, 0xce, 0x9e, 0x80, 0xcb, 0xe5, 0x48, 0x86, 0xf8, - 0xd7, 0x1a, 0x5c, 0x99, 0x18, 0x95, 0x06, 0x01, 0x05, 0xd6, 0x04, 0xcb, 0x98, 0xd4, 0xed, 0x2e, - 0x17, 0x04, 0x7e, 0x6b, 0xc1, 0x8a, 0x11, 0xd2, 0xfb, 0x54, 0x21, 0xfe, 0xab, 0x05, 0xe8, 0x51, - 0xaf, 0x73, 0xaa, 0xf0, 0x95, 0x2b, 0xe9, 0x6b, 0xb0, 0x10, 0xf3, 0x13, 0x97, 0x0b, 0xae, 0xa8, - 0x4a, 0xa3, 0xc7, 0xe0, 0x1d, 0xd2, 0xa6, 0xbe, 0x27, 0xd4, 0x25, 0x46, 0x79, 0x65, 0x55, 0xcb, - 0x5d, 0x6e, 0x2a, 0xe7, 0x72, 0x9f, 0x42, 0xad, 0xe5, 0x6e, 0xf1, 0xd0, 0x51, 0x78, 0xd5, 0xb3, - 0xad, 0x59, 0xc0, 0xe1, 0x05, 0x8a, 0x18, 0xe1, 0xcf, 0x61, 0x49, 0x13, 0x77, 0xac, 0x03, 0xb8, - 0x03, 0xf3, 0x12, 0x85, 0x72, 0x06, 0x0b, 0xc2, 0xd5, 0xe5, 0x9c, 0x93, 0x65, 0xc3, 0x43, 0xe6, - 0xeb, 0xf1, 0x75, 0x40, 0x5c, 0x86, 0x22, 0xf1, 0xf5, 0x6c, 0xa0, 0xb5, 0xb4, 0x40, 0xbb, 0x0e, - 0xb3, 0xbe, 0x1e, 0xa7, 0xfc, 0x11, 0xe3, 0xd4, 0x17, 0xdc, 0x21, 0xb4, 0x7d, 0x2f, 0x55, 0xab, - 0x8c, 0x9c, 0xaf, 0xa7, 0xec, 0xf8, 0x6f, 0x16, 0x5c, 0x6d, 0x79, 0xe7, 0xbd, 0x88, 0xc4, 0xc8, - 0x9e, 0xfa, 0x32, 0x42, 0x5f, 0x1c, 0x87, 0x8b, 0x2f, 0xa9, 0xd4, 0xd0, 0x26, 0x33, 0x86, 0xf6, - 0x09, 0x2c, 0xf2, 0xbd, 0x54, 0x6b, 0xad, 0x32, 0x6b, 0xd5, 0x27, 0x4a, 0x8d, 0xee, 0xe7, 0x16, - 0x34, 0x0c, 0xb0, 0xff, 0xaf, 0xa6, 0xe3, 0xc1, 0x55, 0x99, 0x94, 0xf7, 0xfb, 0xa3, 0x38, 0xeb, - 0xe5, 0x12, 0xde, 0xdf, 0x28, 0xf7, 0x92, 0xb2, 0xe1, 0x7b, 0x8d, 0x57, 0xbf, 0xb3, 0x60, 0x66, - 0xe7, 0xe0, 0x98, 0xb1, 0x5d, 0xaa, 0xc6, 0xbb, 0x05, 0x75, 0xbe, 0x57, 0x9b, 0x46, 0x24, 0x3c, - 0x6c, 0x0f, 0x92, 0xb4, 0x2f, 0x4f, 0x46, 0x37, 0x45, 0x85, 0xca, 0x49, 0x2d, 0x57, 0xa8, 0x2a, - 0x4b, 0x8c, 0xc3, 0xfb, 0x6c, 0xa2, 0xac, 0xf8, 0x50, 0xd6, 0x04, 0x36, 0xf6, 0x65, 0x7e, 0x2c, - 0x29, 0x01, 0xed, 0x02, 0xfc, 0xa0, 0xdd, 0xed, 0x79, 0x4c, 0xd5, 0xa2, 0x9f, 0x71, 0xd3, 0x00, - 0x5d, 0x64, 0xf7, 0x29, 0xaf, 0xa3, 0xac, 0x1b, 0xe1, 0x08, 0x5f, 0x5b, 0x30, 0x97, 0xa2, 0xa2, - 0x01, 0xfa, 0x06, 0xd4, 0x12, 0xf5, 0x51, 0xd1, 0x85, 0xa9, 0x27, 0xd9, 0x89, 0xa0, 0x3b, 0x29, - 0xc7, 0x5b, 0xc2, 0x29, 0x75, 0x31, 0x1c, 0x50, 0x86, 0xb2, 0xea, 0xa4, 0x04, 0x7c, 0x9e, 0x42, - 0xa4, 0xb1, 0xe6, 0xb2, 0x7b, 0x5a, 0x6f, 0x47, 0x37, 0x7a, 0x38, 0xc1, 0x7f, 0xb4, 0x60, 0x5e, - 0xd9, 0xf8, 0x7d, 0x29, 0xc7, 0x86, 0x99, 0x44, 0x17, 0x42, 0x37, 0x72, 0x8c, 0x8f, 0xd2, 0x1e, - 0x8b, 0xc1, 0xdd, 0xdd, 0xac, 0xbb, 0xbb, 0x23, 0xc8, 0x7c, 0x0a, 0x0d, 0x3e, 0xe4, 0xbd, 0xaa, - 0xe3, 0xa8, 0x1d, 0x0d, 0x69, 0xf9, 0x47, 0x97, 0x61, 0x8a, 0xb3, 0x25, 0x37, 0x29, 0x1f, 0x8d, - 0x60, 0x7c, 0x4d, 0x58, 0x36, 0x6d, 0xc6, 0x2b, 0x33, 0x24, 0xa6, 0x58, 0x39, 0xed, 0xf7, 0xc9, - 0x85, 0x20, 0x58, 0xd8, 0x72, 0x93, 0xb0, 0xc2, 0x47, 0xd9, 0x56, 0x64, 0x25, 0xd7, 0x8a, 0x1c, - 0x21, 0x29, 0x6b, 0xc0, 0x92, 0x86, 0x83, 0x06, 0xf8, 0x31, 0x5c, 0xd9, 0x25, 0x7d, 0xa2, 0xb4, - 0x30, 0x2f, 0xa3, 0xf4, 0x45, 0xa8, 0x67, 0xbe, 0x46, 0x03, 0x7c, 0x00, 0xf5, 0xe4, 0x60, 0xb7, - 0x7f, 0xda, 0x72, 0x2f, 0xbb, 0xc3, 0xdd, 0xb4, 0x01, 0xc8, 0x3f, 0x47, 0x03, 0xf4, 0xf5, 0x34, - 0x50, 0x0a, 0x27, 0xd2, 0x6c, 0x59, 0x32, 0xe0, 0xbf, 0x6b, 0x25, 0x08, 0xdd, 0x39, 0x38, 0x2e, - 0x87, 0x65, 0xc3, 0x4c, 0xac, 0x34, 0x25, 0x74, 0xca, 0x71, 0xce, 0x35, 0x2a, 0x6f, 0xc7, 0x87, - 0x0d, 0xe7, 0xf7, 0x4f, 0x3d, 0xcf, 0x67, 0xb8, 0x69, 0x80, 0xbe, 0x0f, 0xd3, 0xfc, 0xde, 0x48, - 0x5c, 0x79, 0xd4, 0xeb, 0x26, 0x59, 0x86, 0xf6, 0x0c, 0xfe, 0xfd, 0x15, 0xa3, 0x10, 0xbc, 0x56, - 0x2d, 0x90, 0xe2, 0x3a, 0x00, 0xdf, 0x41, 0x09, 0x7f, 0x0a, 0x05, 0xff, 0xca, 0x82, 0xa6, 0x43, - 0x06, 0xfe, 0x39, 0x79, 0x23, 0xf5, 0x37, 0x61, 0x9a, 0x3b, 0x01, 0x15, 0xf9, 0x77, 0x32, 0x7c, - 0xa3, 0x7e, 0xb7, 0x9b, 0xeb, 0x77, 0xbb, 0xf8, 0x00, 0x56, 0x0b, 0xd0, 0xf0, 0x8b, 0x9f, 0x0e, - 0x3b, 0x1d, 0x42, 0xa9, 0xe8, 0x28, 0x27, 0xc3, 0xd8, 0x43, 0x4f, 0xda, 0xbd, 0x3e, 0x71, 0x05, - 0x1a, 0x31, 0xc2, 0x5f, 0x5a, 0xd0, 0xb8, 0xe7, 0xba, 0xef, 0x42, 0x34, 0x57, 0x17, 0xcd, 0x2d, - 0x15, 0xed, 0x21, 0x2c, 0x9b, 0xa0, 0x8c, 0x25, 0x57, 0x0f, 0xea, 0xbb, 0x3d, 0x3a, 0xe8, 0x51, - 0x2a, 0x63, 0x84, 0x0d, 0x33, 0x7e, 0xae, 0x27, 0xeb, 0x07, 0x23, 0x67, 0xef, 0x4d, 0x98, 0xee, - 0x66, 0xb3, 0x5b, 0x31, 0xc4, 0x7b, 0xb0, 0x90, 0xdd, 0x8a, 0xb7, 0x19, 0x3a, 0xa3, 0xb4, 0x19, - 0x52, 0x26, 0xfc, 0x67, 0x0b, 0xd0, 0xc1, 0x30, 0x22, 0xb9, 0xeb, 0xe4, 0x1d, 0xa1, 0x8e, 0x15, - 0x37, 0x54, 0x9b, 0x46, 0x62, 0x84, 0x30, 0xcc, 0x0d, 0x86, 0x11, 0x71, 0x8f, 0x49, 0xc7, 0xf7, - 0x5c, 0xca, 0xaa, 0xbf, 0x79, 0x27, 0x43, 0xc3, 0xfb, 0xb0, 0xa4, 0x21, 0x1d, 0x4f, 0xe8, 0x5f, - 0x58, 0xd0, 0xdc, 0x69, 0x7b, 0x1d, 0xd2, 0x7f, 0xff, 0xa2, 0xe3, 0x43, 0x58, 0x2d, 0xc0, 0x32, - 0x9e, 0x70, 0x27, 0x30, 0x27, 0xbf, 0xf4, 0x2e, 0x0d, 0x70, 0x1b, 0xe6, 0x95, 0x7d, 0xc6, 0xc3, - 0xda, 0x07, 0x94, 0x93, 0xfd, 0x5d, 0x22, 0xde, 0x87, 0x25, 0x6d, 0xb7, 0xf1, 0x70, 0xff, 0xc9, - 0x82, 0xd5, 0xe3, 0xcc, 0x0d, 0x73, 0xd8, 0xeb, 0x9c, 0x7a, 0xed, 0x41, 0x92, 0xb1, 0x74, 0xb3, - 0xa5, 0x57, 0x37, 0x2d, 0xbd, 0x3c, 0xc1, 0x98, 0xdc, 0x8e, 0xc9, 0x38, 0x23, 0x75, 0xa5, 0x5c, - 0xea, 0x49, 0x5d, 0xea, 0xd4, 0xba, 0xaa, 0x19, 0xeb, 0x3a, 0x02, 0xbb, 0x08, 0xe8, 0x78, 0x7d, - 0xc9, 0x7f, 0x4d, 0x40, 0x23, 0xfb, 0x45, 0xa5, 0x87, 0x56, 0x20, 0x76, 0x0a, 0x6e, 0x22, 0xe3, - 0xf5, 0x39, 0xb1, 0x2a, 0xba, 0x58, 0xdf, 0x52, 0x14, 0x36, 0x29, 0x6a, 0xb9, 0xae, 0xef, 0x77, - 0xfb, 0x84, 0x3f, 0x72, 0xbf, 0x18, 0x9e, 0x6c, 0x1c, 0x47, 0x61, 0xcf, 0xeb, 0xfe, 0xb0, 0xdd, - 0x1f, 0x12, 0x45, 0x9d, 0x77, 0x60, 0xfa, 0xa4, 0xdd, 0x21, 0x9f, 0x39, 0x8f, 0x99, 0x46, 0x2e, - 0x5a, 0x98, 0x30, 0xa3, 0x6f, 0x43, 0x2d, 0x94, 0xc9, 0xe3, 0x14, 0x5b, 0x79, 0x4d, 0x5b, 0xd9, - 0xf2, 0xa2, 0xdb, 0x5b, 0x7c, 0x61, 0xca, 0x8d, 0x3e, 0x81, 0x09, 0xf2, 0xaa, 0x39, 0x3d, 0xc2, - 0x6e, 0x13, 0xe4, 0x15, 0x7e, 0x04, 0xcb, 0x26, 0x3d, 0x8e, 0x75, 0x2a, 0x5b, 0xff, 0x46, 0xc0, - 0xff, 0x41, 0x80, 0xbe, 0x0b, 0xb3, 0x9d, 0xf4, 0xdd, 0x19, 0x35, 0x92, 0x75, 0x99, 0xc7, 0x77, - 0x7b, 0xd9, 0x44, 0xa6, 0x01, 0xba, 0x03, 0xb5, 0x9f, 0x24, 0x8f, 0x12, 0x68, 0x49, 0x30, 0xa9, - 0xcf, 0x25, 0xf6, 0x55, 0x9d, 0xc8, 0xd7, 0x9d, 0x25, 0x1d, 0x6f, 0xb9, 0x4e, 0xed, 0xb5, 0xcb, - 0x75, 0xd9, 0xc6, 0xf8, 0x36, 0xcc, 0x77, 0xd5, 0xf7, 0x62, 0xb4, 0x92, 0xbc, 0xfe, 0xe7, 0x9e, - 0xae, 0xed, 0xa6, 0x79, 0x82, 0x06, 0xe8, 0x2e, 0xcc, 0x51, 0xe5, 0x69, 0x15, 0x25, 0xb2, 0xe5, - 0x1e, 0x7f, 0xed, 0x15, 0x23, 0x9d, 0x06, 0xe8, 0xc7, 0xb0, 0xd2, 0x35, 0xbf, 0x6b, 0xa2, 0x1b, - 0xb9, 0x5d, 0xf5, 0x77, 0x45, 0x1b, 0x5f, 0xc4, 0x42, 0x03, 0x74, 0x02, 0xab, 0xdd, 0xa2, 0x47, - 0x42, 0xf4, 0x51, 0xfa, 0x81, 0xc2, 0xd7, 0x4b, 0xfb, 0xe6, 0xc5, 0x4c, 0x34, 0x40, 0x4f, 0x00, - 0x45, 0xda, 0x4b, 0x19, 0x5a, 0x13, 0x6b, 0x8d, 0xaf, 0x80, 0xf6, 0x07, 0x25, 0xb3, 0x34, 0x40, - 0x1d, 0x68, 0x76, 0x0b, 0x9e, 0x61, 0x10, 0xce, 0xfc, 0x55, 0xc3, 0xf8, 0x04, 0x65, 0x7f, 0x74, - 0x21, 0x0f, 0xc7, 0xdd, 0xd5, 0xde, 0x11, 0x24, 0x6e, 0xe3, 0x33, 0x88, 0xc4, 0x5d, 0xf0, 0x00, - 0xf1, 0x14, 0x96, 0xba, 0x7a, 0x63, 0x1d, 0x99, 0x57, 0x49, 0x2b, 0xbb, 0x5e, 0x36, 0x4d, 0x03, - 0xb4, 0x0f, 0xf5, 0xd3, 0x6c, 0xa7, 0x18, 0x25, 0xff, 0x57, 0xd1, 0x1b, 0xe6, 0xb6, 0x5d, 0x34, - 0x25, 0x45, 0xce, 0xb5, 0x5e, 0x55, 0x91, 0xf5, 0x6e, 0xb0, 0x2a, 0xb2, 0xa9, 0x67, 0x7b, 0x08, - 0x8b, 0xbd, 0x7c, 0x37, 0x12, 0x5d, 0x4b, 0x1a, 0x88, 0x86, 0xf6, 0xaa, 0xbd, 0x56, 0x3c, 0xc9, - 0xbf, 0xd7, 0xcd, 0x77, 0xfa, 0xe4, 0xf7, 0x4c, 0x4d, 0x47, 0x7b, 0xad, 0x78, 0x92, 0x3b, 0xaa, - 0x5a, 0x90, 0x4a, 0x47, 0xcd, 0x15, 0xbd, 0xf6, 0x8a, 0x91, 0x4e, 0x03, 0x74, 0x1b, 0x66, 0x12, - 0x1a, 0x42, 0x39, 0xa6, 0x78, 0xe1, 0x92, 0x46, 0xe3, 0xa1, 0x49, 0xc6, 0x0c, 0x94, 0xe7, 0xa0, - 0x6a, 0x68, 0xca, 0xf6, 0x7d, 0x9e, 0xc8, 0x6e, 0x84, 0xd2, 0xa8, 0x90, 0x07, 0x64, 0x6c, 0x98, - 0xc8, 0x03, 0x32, 0x77, 0x38, 0x62, 0xeb, 0xc9, 0x35, 0x16, 0xa4, 0xf5, 0xe8, 0x8d, 0x0f, 0x69, - 0x3d, 0x86, 0x5e, 0x44, 0x1c, 0xe5, 0x95, 0xee, 0x81, 0x8c, 0xf2, 0xd9, 0xfe, 0x84, 0x8c, 0xf2, - 0xb9, 0x46, 0x43, 0x2c, 0x9a, 0x5e, 0x1f, 0x17, 0xb8, 0x9b, 0x28, 0xcc, 0x0a, 0xdc, 0x4d, 0xd6, - 0x4a, 0xcf, 0xa0, 0x61, 0x2c, 0x10, 0xd1, 0x87, 0x62, 0x5d, 0x51, 0x31, 0x6b, 0xaf, 0x97, 0x33, - 0x70, 0xb8, 0x7a, 0x85, 0x26, 0xe1, 0x1a, 0xeb, 0x48, 0x09, 0xb7, 0xa0, 0xb4, 0xbb, 0x0b, 0x73, - 0x6a, 0xf5, 0x24, 0x4d, 0x31, 0x57, 0xbd, 0x49, 0x53, 0xd4, 0x4a, 0xad, 0x7d, 0xa8, 0xe7, 0xf2, - 0x75, 0x79, 0x94, 0x7a, 0x4d, 0x21, 0x8f, 0xd2, 0x94, 0xe2, 0x3f, 0x83, 0x86, 0x31, 0xff, 0x97, - 0x9a, 0x2b, 0xaa, 0x54, 0xa4, 0xe6, 0x8a, 0xcb, 0x87, 0x3b, 0x50, 0x93, 0x64, 0x69, 0xfb, 0x6a, - 0xae, 0x2d, 0x6d, 0x3f, 0x9b, 0x12, 0xef, 0x43, 0x3d, 0xf7, 0x51, 0x29, 0x9d, 0x9e, 0xaf, 0x4b, - 0xe9, 0x4c, 0xc9, 0xf5, 0x8f, 0xf2, 0x59, 0x4e, 0x92, 0x7f, 0xa2, 0xf5, 0xdc, 0x75, 0xac, 0xe5, - 0xd1, 0xf6, 0x8d, 0x0b, 0x38, 0xb8, 0x69, 0xe8, 0x49, 0x94, 0x34, 0x0d, 0x63, 0x9e, 0x2a, 0x4d, - 0xc3, 0x9c, 0x7d, 0x6d, 0xd7, 0x9f, 0xcd, 0x6f, 0xf0, 0xbf, 0x66, 0x7e, 0xca, 0x7e, 0x5f, 0x4c, - 0xb1, 0x14, 0xee, 0xf6, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x20, 0x7b, 0x1e, 0x22, 0xb6, 0x29, - 0x00, 0x00, + 0x11, 0xd7, 0xd8, 0x5e, 0xdb, 0x5b, 0xb6, 0xb3, 0x76, 0x3b, 0x6b, 0xaf, 0x27, 0x7e, 0x79, 0x4e, + 0xbf, 0xf0, 0x88, 0xe0, 0x61, 0x0b, 0x47, 0x8a, 0x80, 0x87, 0x08, 0xf1, 0x9f, 0xc4, 0x9b, 0xc4, + 0x36, 0x19, 0xe7, 0x71, 0x88, 0x84, 0xc2, 0x64, 0xa7, 0xbd, 0x5a, 0xbc, 0x3b, 0x33, 0x9e, 0x9e, + 0x75, 0x02, 0x97, 0x27, 0x2e, 0x4f, 0x7a, 0xc0, 0x01, 0x84, 0xc4, 0x09, 0x09, 0x72, 0x82, 0x03, + 0x07, 0x0e, 0x70, 0x46, 0xdc, 0xf8, 0x0a, 0x5c, 0xf9, 0x02, 0x7c, 0x05, 0x34, 0xdd, 0x3d, 0x3d, + 0x3d, 0x33, 0x3d, 0xe3, 0xcd, 0x6c, 0x42, 0x2e, 0x2b, 0x75, 0x75, 0xf5, 0xf4, 0xaf, 0xaa, 0xab, + 0xaa, 0xab, 0xaa, 0x17, 0x96, 0xba, 0x81, 0x37, 0xf4, 0xb7, 0xd8, 0xef, 0xa6, 0x1f, 0x78, 0xa1, + 0x87, 0x6a, 0x6c, 0x60, 0xde, 0x38, 0xf6, 0x89, 0xfb, 0xbc, 0x7d, 0xb8, 0xe5, 0x9f, 0x75, 0xb7, + 0xd8, 0xcc, 0x16, 0x75, 0xce, 0x9e, 0xbf, 0xa4, 0x5b, 0x2f, 0x29, 0xe7, 0x34, 0xbf, 0x5a, 0xcc, + 0x12, 0xd8, 0xbe, 0x4f, 0x02, 0xc1, 0x88, 0xbf, 0x07, 0xb0, 0xeb, 0x0d, 0x06, 0x9e, 0x6b, 0x11, + 0xea, 0xa3, 0x16, 0xcc, 0xec, 0x07, 0xc1, 0xae, 0xe7, 0x90, 0x96, 0xb1, 0x61, 0xdc, 0xaa, 0x59, + 0xf1, 0x10, 0xad, 0xc0, 0xf4, 0x7e, 0x10, 0x1c, 0xd2, 0x6e, 0x6b, 0x62, 0xc3, 0xb8, 0x55, 0xb7, + 0xc4, 0x08, 0x3f, 0x04, 0xf4, 0x20, 0x02, 0x75, 0xcf, 0x71, 0x0e, 0xc9, 0xe0, 0x05, 0x09, 0xda, + 0xee, 0xa9, 0x17, 0x71, 0x7f, 0x46, 0x49, 0xd0, 0xde, 0x63, 0x9f, 0xa9, 0x5b, 0x62, 0x84, 0xd6, + 0xa1, 0x6e, 0x79, 0x7d, 0xf2, 0x98, 0x5c, 0x90, 0x3e, 0xfb, 0x50, 0xcd, 0x4a, 0x08, 0xf8, 0xbf, + 0x06, 0x5c, 0xd9, 0x0d, 0x88, 0x1d, 0x12, 0xf6, 0x49, 0x8b, 0x9c, 0xa3, 0x7b, 0x70, 0xa5, 0xed, + 0xf6, 0x42, 0xfe, 0xe9, 0xc7, 0x3d, 0x1a, 0xb6, 0x8c, 0x8d, 0xc9, 0x5b, 0x73, 0xdb, 0x6b, 0x9b, + 0x5c, 0x2f, 0xf9, 0xbd, 0xad, 0xcc, 0x02, 0xf4, 0x1d, 0xa8, 0x33, 0xae, 0x68, 0x92, 0xed, 0x39, + 0xb7, 0xbd, 0xbe, 0x49, 0x49, 0x70, 0x41, 0x82, 0xe7, 0xb6, 0xdf, 0x7b, 0xee, 0xdb, 0x81, 0x3d, + 0xa0, 0x9b, 0x92, 0xc7, 0x4a, 0xd8, 0xd1, 0x06, 0xcc, 0x1d, 0xfb, 0x24, 0xb0, 0xc3, 0x9e, 0xe7, + 0xb6, 0xf7, 0x5a, 0x93, 0x4c, 0x18, 0x95, 0x84, 0x4c, 0x98, 0x3d, 0xf6, 0x85, 0xac, 0x53, 0x6c, + 0x5a, 0x8e, 0xd9, 0xea, 0x97, 0x2e, 0x09, 0xc4, 0x74, 0x4d, 0xac, 0x4e, 0x48, 0xf8, 0x73, 0x68, + 0xa4, 0x04, 0xae, 0x72, 0x04, 0x69, 0x01, 0x27, 0xdf, 0x48, 0x40, 0x1c, 0xc0, 0xe2, 0x03, 0x12, + 0xb2, 0x31, 0x65, 0x73, 0xe4, 0x3c, 0x82, 0xcd, 0x19, 0xf6, 0xa4, 0xc2, 0xeb, 0x96, 0x4a, 0xca, + 0xaa, 0x65, 0xa2, 0x5c, 0x2d, 0x93, 0x69, 0xb5, 0xe0, 0x2f, 0x0d, 0x58, 0xca, 0x6c, 0x5a, 0x49, + 0xee, 0x1d, 0x58, 0x90, 0x82, 0x30, 0xa4, 0x93, 0xcc, 0x34, 0xca, 0x65, 0x4f, 0x2f, 0xc1, 0xbf, + 0x34, 0xa0, 0x71, 0x22, 0xb0, 0xc4, 0xf2, 0xa7, 0xf4, 0x69, 0xbc, 0x99, 0xc1, 0xa8, 0x72, 0x4f, + 0x68, 0xcc, 0xa1, 0xd4, 0x98, 0xf0, 0x3e, 0x2c, 0xa6, 0xc1, 0x50, 0x1f, 0x7d, 0x53, 0x75, 0x50, + 0x01, 0x67, 0x49, 0x58, 0x7f, 0x32, 0x61, 0x29, 0x4c, 0xf8, 0x67, 0x60, 0xc6, 0xfa, 0xbd, 0xe7, + 0xfb, 0xfd, 0x5e, 0x87, 0x7d, 0x3f, 0x92, 0x37, 0x12, 0x4f, 0x85, 0x68, 0x94, 0x43, 0xd4, 0x1c, + 0xec, 0x75, 0x80, 0xfb, 0x81, 0x37, 0x48, 0x1d, 0xad, 0x42, 0xc1, 0xbf, 0x37, 0xe0, 0x5a, 0xe1, + 0xe6, 0x95, 0x8e, 0xf9, 0x11, 0x2c, 0xc6, 0xe1, 0x60, 0x48, 0x68, 0xa8, 0x9c, 0xf4, 0x87, 0x45, + 0xa7, 0x22, 0x58, 0xad, 0xdc, 0x42, 0x1c, 0xc2, 0xfa, 0x03, 0x12, 0x46, 0x58, 0x2d, 0x72, 0xae, + 0x51, 0x4e, 0x51, 0xe0, 0x1a, 0xef, 0x5c, 0xff, 0x60, 0xc0, 0x07, 0x25, 0xdb, 0x56, 0x3a, 0x65, + 0xad, 0x5e, 0x26, 0xaa, 0xea, 0xe5, 0x1f, 0x06, 0x34, 0x9f, 0x06, 0xb6, 0x4b, 0x4f, 0x49, 0xc0, + 0x26, 0x59, 0x94, 0x8a, 0x34, 0xd2, 0x82, 0x19, 0xe1, 0xfa, 0x42, 0x25, 0xf1, 0x10, 0x7d, 0x0c, + 0x57, 0x8e, 0xfb, 0x8e, 0x1a, 0xe1, 0xb8, 0x66, 0x32, 0xd4, 0x88, 0xef, 0x88, 0xbc, 0x54, 0xf9, + 0xb8, 0x8a, 0x32, 0xd4, 0xac, 0x1e, 0xa7, 0xca, 0xa3, 0x4a, 0x2d, 0x13, 0x55, 0x1e, 0xc1, 0x8a, + 0x4e, 0x80, 0x6a, 0x1e, 0xf4, 0x85, 0x01, 0xf3, 0x0f, 0xbd, 0x9e, 0x2b, 0xef, 0xa1, 0x62, 0x2d, + 0x5c, 0x07, 0xb0, 0xc8, 0xf9, 0x21, 0xa1, 0xd4, 0xee, 0x12, 0xa1, 0x01, 0x85, 0x52, 0x16, 0x09, + 0x2f, 0x97, 0x18, 0xef, 0xc0, 0x82, 0x82, 0xa3, 0x9a, 0x30, 0xff, 0x8e, 0x5c, 0x32, 0xe3, 0x8f, + 0xd1, 0x84, 0xe7, 0x52, 0x22, 0xe2, 0xbd, 0x8a, 0xc2, 0x28, 0xd7, 0x7b, 0xd6, 0xfa, 0x15, 0xcd, + 0x4c, 0xe6, 0x34, 0xa3, 0x84, 0x8a, 0xa9, 0x6c, 0xa8, 0x88, 0xe6, 0x0f, 0x6c, 0xd7, 0xe9, 0x13, + 0x27, 0x72, 0x7a, 0x7e, 0x9e, 0x0a, 0x05, 0x61, 0x98, 0xe7, 0x23, 0x8b, 0xd0, 0x61, 0x3f, 0x6c, + 0x4d, 0xb3, 0x78, 0x91, 0xa2, 0xe1, 0x27, 0xb0, 0x5e, 0x2c, 0x5a, 0x35, 0x75, 0x9d, 0xc2, 0xfc, + 0x93, 0x61, 0x2f, 0x1c, 0xe1, 0xe8, 0xc7, 0xbb, 0x06, 0x77, 0x60, 0x41, 0xd9, 0xa7, 0x1a, 0xd6, + 0xd7, 0x06, 0x34, 0xe3, 0x68, 0x9b, 0xa4, 0x3c, 0xe5, 0xa8, 0xc7, 0x0a, 0x65, 0x51, 0x80, 0xbc, + 0xdf, 0xeb, 0x87, 0x24, 0x60, 0x07, 0x5a, 0xb3, 0xc4, 0x28, 0xda, 0xef, 0x88, 0xbc, 0x0a, 0x4f, + 0xc8, 0x39, 0x3b, 0xc9, 0x9a, 0x15, 0x0f, 0xf1, 0x5f, 0x0c, 0x58, 0xd1, 0x61, 0xac, 0x74, 0x19, + 0xdc, 0x07, 0x18, 0x24, 0xb9, 0x20, 0xbf, 0x06, 0x3e, 0x2e, 0x0a, 0x77, 0x7c, 0xb7, 0xfb, 0xc3, + 0x7e, 0x9f, 0xdd, 0xa6, 0xca, 0xca, 0x68, 0x67, 0x57, 0xc0, 0xe5, 0x72, 0xc4, 0x43, 0xfc, 0xeb, + 0x1c, 0x5c, 0x99, 0x18, 0x95, 0x06, 0x01, 0x05, 0xd6, 0x04, 0xcb, 0x98, 0xd4, 0xed, 0xc6, 0x0b, + 0x02, 0xbf, 0x35, 0x60, 0x55, 0x0b, 0xe9, 0x7d, 0xaa, 0x10, 0xff, 0xd5, 0x00, 0xf4, 0xa8, 0xd7, + 0x39, 0x53, 0xf8, 0xca, 0x95, 0xf4, 0x35, 0x58, 0x8c, 0xf8, 0x89, 0xc3, 0x05, 0x57, 0x54, 0x95, + 0xa3, 0x47, 0xe0, 0x2d, 0x62, 0x53, 0xcf, 0x15, 0xea, 0x12, 0xa3, 0xac, 0xb2, 0x6a, 0xe5, 0x2e, + 0x37, 0x9d, 0x71, 0xb9, 0x4f, 0xa1, 0xde, 0x76, 0xb6, 0x79, 0xe8, 0x28, 0xbc, 0xea, 0xd9, 0xd6, + 0x2c, 0xe0, 0xf0, 0x02, 0x45, 0x8c, 0xf0, 0xe7, 0xb0, 0x9c, 0x13, 0xb7, 0xd2, 0x01, 0xdc, 0x81, + 0x05, 0x89, 0x42, 0x39, 0x83, 0x45, 0xe1, 0xea, 0x72, 0xce, 0x4a, 0xb3, 0xe1, 0x21, 0xf3, 0xf5, + 0xe8, 0x3a, 0x20, 0x0e, 0x43, 0x11, 0xfb, 0x7a, 0x3a, 0xd0, 0x1a, 0xb9, 0x40, 0xbb, 0x01, 0x73, + 0x5e, 0x3e, 0x4e, 0x79, 0x23, 0xc6, 0xa9, 0x2f, 0xb8, 0x43, 0xe4, 0xf6, 0x1d, 0xab, 0x56, 0x19, + 0x39, 0x5f, 0x4f, 0xd8, 0xf1, 0xdf, 0x0c, 0xb8, 0xda, 0x76, 0x2f, 0x7a, 0x21, 0x89, 0x90, 0x3d, + 0xf5, 0x64, 0x84, 0xbe, 0x3c, 0x0e, 0x17, 0x5f, 0x52, 0x89, 0xa1, 0x4d, 0xa5, 0x0c, 0xed, 0x13, + 0x58, 0xe2, 0x7b, 0xa9, 0xd6, 0x5a, 0x63, 0xd6, 0x9a, 0x9f, 0x28, 0x35, 0xba, 0x9f, 0x1b, 0xd0, + 0xd4, 0xc0, 0xfe, 0xbf, 0x9a, 0x8e, 0x0b, 0x57, 0x65, 0x52, 0xde, 0xef, 0x8f, 0xe2, 0xac, 0xe3, + 0x25, 0xbc, 0xbf, 0x51, 0xee, 0x25, 0x65, 0xc3, 0xf7, 0x1a, 0xaf, 0x7e, 0x67, 0xc0, 0xec, 0xee, + 0xe1, 0x09, 0x63, 0x1b, 0xab, 0xc6, 0xbb, 0x05, 0x0d, 0xbe, 0x97, 0x4d, 0x43, 0x12, 0x1c, 0xd9, + 0x83, 0x38, 0xed, 0xcb, 0x92, 0xd1, 0x4d, 0x51, 0xa1, 0x72, 0x52, 0xdb, 0x11, 0xaa, 0x4a, 0x13, + 0xa3, 0xf0, 0x3e, 0x17, 0x2b, 0x2b, 0x3a, 0x94, 0x75, 0x81, 0x8d, 0x7d, 0x99, 0x1f, 0x4b, 0x42, + 0x40, 0x7b, 0x00, 0x3f, 0xb0, 0xbb, 0x3d, 0x97, 0xa9, 0x5a, 0xf4, 0x33, 0x6e, 0x6a, 0xa0, 0x8b, + 0xec, 0x3e, 0xe1, 0xb5, 0x94, 0x75, 0x23, 0x1c, 0xe1, 0x6b, 0x03, 0xe6, 0x13, 0x54, 0xd4, 0x47, + 0xdf, 0x80, 0x7a, 0xac, 0x3e, 0x2a, 0xba, 0x30, 0x8d, 0x38, 0x3b, 0x11, 0x74, 0x2b, 0xe1, 0x78, + 0x4b, 0x38, 0xa5, 0x2e, 0x86, 0x03, 0xca, 0x50, 0xd6, 0xac, 0x84, 0x80, 0x2f, 0x12, 0x88, 0x34, + 0xd2, 0x5c, 0x7a, 0x4f, 0xe3, 0xed, 0xe8, 0x26, 0x1f, 0x4e, 0xf0, 0x1f, 0x0d, 0x58, 0x50, 0x36, + 0x7e, 0x5f, 0xca, 0x31, 0x61, 0x36, 0xd6, 0x85, 0xd0, 0x8d, 0x1c, 0xe3, 0xe3, 0xa4, 0xc7, 0xa2, + 0x71, 0x77, 0x27, 0xed, 0xee, 0xce, 0x08, 0x32, 0x9f, 0x41, 0x93, 0x0f, 0x79, 0xaf, 0xea, 0x24, + 0xb4, 0xc3, 0x21, 0x2d, 0xff, 0xe8, 0x0a, 0x4c, 0x73, 0xb6, 0xf8, 0x26, 0xe5, 0xa3, 0x11, 0x8c, + 0xaf, 0x05, 0x2b, 0xba, 0xcd, 0x78, 0x65, 0x86, 0xc4, 0x14, 0x2b, 0xa7, 0xbd, 0x3e, 0xb9, 0x14, + 0x04, 0x0b, 0x5b, 0x4e, 0x1c, 0x56, 0xf8, 0x28, 0xdd, 0x8a, 0x9c, 0xcc, 0xb4, 0x22, 0x47, 0x48, + 0xca, 0x9a, 0xb0, 0x9c, 0xc3, 0x41, 0x7d, 0xfc, 0x18, 0xae, 0xec, 0x91, 0x3e, 0x51, 0x5a, 0x98, + 0xe3, 0x28, 0x7d, 0x09, 0x1a, 0xa9, 0xaf, 0x51, 0x1f, 0x1f, 0x42, 0x23, 0x3e, 0xd8, 0x9d, 0x9f, + 0xb6, 0x9d, 0x71, 0x77, 0xb8, 0x9b, 0x34, 0x00, 0xf9, 0xe7, 0xa8, 0x8f, 0xbe, 0x9e, 0x04, 0x4a, + 0xe1, 0x44, 0x39, 0x5b, 0x96, 0x0c, 0xf8, 0xef, 0xb9, 0x12, 0x84, 0xee, 0x1e, 0x9e, 0x94, 0xc3, + 0x32, 0x61, 0x36, 0x52, 0x9a, 0x12, 0x3a, 0xe5, 0x38, 0xe3, 0x1a, 0x93, 0x6f, 0xc7, 0x87, 0x35, + 0xe7, 0xf7, 0xcf, 0x7c, 0x9e, 0xcf, 0x70, 0x53, 0x1f, 0x7d, 0x1f, 0x66, 0xf8, 0xbd, 0x11, 0xbb, + 0xf2, 0xa8, 0xd7, 0x4d, 0xbc, 0x0c, 0xed, 0x6b, 0xfc, 0xfb, 0x2b, 0x5a, 0x21, 0x78, 0xad, 0x5a, + 0x20, 0xc5, 0x75, 0x00, 0xbe, 0x83, 0x12, 0xfe, 0x14, 0x0a, 0xfe, 0x95, 0x01, 0x2d, 0x8b, 0x0c, + 0xbc, 0x0b, 0xf2, 0x46, 0xea, 0x6f, 0xc1, 0x0c, 0x77, 0x02, 0x2a, 0xf2, 0xef, 0x78, 0xf8, 0x46, + 0xfd, 0x6e, 0x27, 0xd3, 0xef, 0x76, 0xf0, 0x21, 0xac, 0x15, 0xa0, 0xe1, 0x17, 0x3f, 0x1d, 0x76, + 0x3a, 0x84, 0x52, 0xd1, 0x51, 0x8e, 0x87, 0x91, 0x87, 0x9e, 0xda, 0xbd, 0x3e, 0x71, 0x04, 0x1a, + 0x31, 0xc2, 0x5f, 0x1a, 0xd0, 0xbc, 0xe7, 0x38, 0xef, 0x42, 0x34, 0x27, 0x2f, 0x9a, 0x53, 0x2a, + 0xda, 0x43, 0x58, 0xd1, 0x41, 0xa9, 0x24, 0x57, 0x0f, 0x1a, 0x7b, 0x3d, 0x3a, 0xe8, 0x51, 0x2a, + 0x63, 0x84, 0x09, 0xb3, 0x5e, 0xa6, 0x27, 0xeb, 0xf9, 0x23, 0x67, 0xef, 0x2d, 0x98, 0xe9, 0xa6, + 0xb3, 0x5b, 0x31, 0xc4, 0xfb, 0xb0, 0x98, 0xde, 0x8a, 0xb7, 0x19, 0x3a, 0xa3, 0xb4, 0x19, 0x12, + 0x26, 0xfc, 0x67, 0x03, 0xd0, 0xe1, 0x30, 0x24, 0x99, 0xeb, 0xe4, 0x1d, 0xa1, 0x8e, 0x14, 0x37, + 0x54, 0x9b, 0x46, 0x62, 0x84, 0x30, 0xcc, 0x0f, 0x86, 0x21, 0x71, 0x4e, 0x48, 0xc7, 0x73, 0x1d, + 0xca, 0xaa, 0xbf, 0x05, 0x2b, 0x45, 0xc3, 0x07, 0xb0, 0x9c, 0x43, 0x5a, 0x4d, 0xe8, 0x5f, 0x18, + 0xd0, 0xda, 0xb5, 0xdd, 0x0e, 0xe9, 0xbf, 0x7f, 0xd1, 0xf1, 0x11, 0xac, 0x15, 0x60, 0xa9, 0x26, + 0xdc, 0x29, 0xcc, 0xcb, 0x2f, 0xbd, 0x4b, 0x03, 0xdc, 0x81, 0x05, 0x65, 0x9f, 0x6a, 0x58, 0xfb, + 0x80, 0x32, 0xb2, 0xbf, 0x4b, 0xc4, 0x07, 0xb0, 0x9c, 0xdb, 0xad, 0x1a, 0xee, 0x3f, 0x19, 0xb0, + 0x76, 0x92, 0xba, 0x61, 0x8e, 0x7a, 0x9d, 0x33, 0xd7, 0x1e, 0xc4, 0x19, 0x4b, 0x37, 0x5d, 0x7a, + 0x75, 0x93, 0xd2, 0xcb, 0x15, 0x8c, 0xf1, 0xed, 0x18, 0x8f, 0x53, 0x52, 0x4f, 0x96, 0x4b, 0x3d, + 0x95, 0x97, 0x3a, 0xb1, 0xae, 0x5a, 0xca, 0xba, 0x8e, 0xc1, 0x2c, 0x02, 0x5a, 0xad, 0x2f, 0xf9, + 0x9f, 0x09, 0x68, 0xa6, 0xbf, 0xa8, 0xf4, 0xd0, 0x0a, 0xc4, 0x4e, 0xc0, 0x4d, 0xa4, 0xbc, 0x7e, + 0x3c, 0x91, 0xbf, 0xa5, 0x28, 0xb3, 0x26, 0xea, 0xbc, 0xae, 0xe7, 0x75, 0xfb, 0x84, 0x3f, 0x80, + 0xbf, 0x18, 0x9e, 0x6e, 0x9e, 0x84, 0x41, 0xcf, 0xed, 0xfe, 0xd0, 0xee, 0x0f, 0x89, 0xa2, 0xea, + 0x3b, 0x30, 0x73, 0x6a, 0x77, 0xc8, 0x67, 0xd6, 0x63, 0x56, 0xd2, 0x5f, 0xb6, 0x30, 0x66, 0x46, + 0xdf, 0x86, 0x7a, 0x20, 0x13, 0xcb, 0x19, 0xb6, 0xf2, 0x5a, 0x6e, 0x65, 0xdb, 0x0d, 0x6f, 0x6f, + 0xf3, 0x85, 0x09, 0x37, 0xfa, 0x04, 0x26, 0xc8, 0xab, 0xd6, 0xec, 0x08, 0xbb, 0x4d, 0x90, 0x57, + 0xf8, 0x11, 0xac, 0xe8, 0x74, 0x5c, 0xe9, 0xc4, 0xb6, 0xff, 0x85, 0x80, 0xff, 0xbb, 0x00, 0x7d, + 0x17, 0xe6, 0x3a, 0xc9, 0x9b, 0x34, 0x6a, 0xc6, 0xeb, 0x52, 0x0f, 0xf3, 0xe6, 0x8a, 0x8e, 0x4c, + 0x7d, 0x74, 0x07, 0xea, 0x3f, 0x89, 0x1f, 0x2c, 0xd0, 0xb2, 0x60, 0x52, 0x9f, 0x52, 0xcc, 0xab, + 0x79, 0x22, 0x5f, 0x77, 0x1e, 0x77, 0xc3, 0xe5, 0x3a, 0xb5, 0x0f, 0x2f, 0xd7, 0xa5, 0x9b, 0xe6, + 0x3b, 0xb0, 0xd0, 0x55, 0xdf, 0x92, 0xd1, 0x6a, 0xfc, 0xcf, 0x80, 0xcc, 0xb3, 0xb6, 0xd9, 0xd2, + 0x4f, 0x50, 0x1f, 0xdd, 0x85, 0x79, 0xaa, 0x3c, 0xbb, 0xa2, 0x58, 0xb6, 0xcc, 0xc3, 0xb0, 0xb9, + 0xaa, 0xa5, 0x53, 0x1f, 0xfd, 0x18, 0x56, 0xbb, 0xfa, 0x37, 0x4f, 0x74, 0x23, 0xb3, 0x6b, 0xfe, + 0xcd, 0xd1, 0xc4, 0x97, 0xb1, 0x50, 0x1f, 0x9d, 0xc2, 0x5a, 0xb7, 0xe8, 0x01, 0x11, 0x7d, 0x94, + 0x7c, 0xa0, 0xf0, 0x65, 0xd3, 0xbc, 0x79, 0x39, 0x13, 0xf5, 0xd1, 0x13, 0x40, 0x61, 0xee, 0x15, + 0x0d, 0xad, 0x8b, 0xb5, 0xda, 0x17, 0x42, 0xf3, 0x83, 0x92, 0x59, 0xea, 0xa3, 0x0e, 0xb4, 0xba, + 0x05, 0x4f, 0x34, 0x08, 0xa7, 0xfe, 0xc6, 0xa1, 0x7d, 0x9e, 0x32, 0x3f, 0xba, 0x94, 0x87, 0xe3, + 0xee, 0xe6, 0xde, 0x18, 0x24, 0x6e, 0xed, 0x13, 0x89, 0xc4, 0x5d, 0xf0, 0x38, 0xf1, 0x14, 0x96, + 0xbb, 0xf9, 0xa6, 0x3b, 0xd2, 0xaf, 0x92, 0x56, 0x76, 0xbd, 0x6c, 0x9a, 0xfa, 0xe8, 0x00, 0x1a, + 0x67, 0xe9, 0x2e, 0x32, 0x8a, 0xff, 0xcb, 0x92, 0x6f, 0xa6, 0x9b, 0x66, 0xd1, 0x94, 0x14, 0x39, + 0xd3, 0x96, 0x55, 0x45, 0xce, 0x77, 0x8a, 0x55, 0x91, 0x75, 0xfd, 0xdc, 0x23, 0x58, 0xea, 0x65, + 0x3b, 0x95, 0xe8, 0x5a, 0xdc, 0x5c, 0xd4, 0xb4, 0x5e, 0xcd, 0xf5, 0xe2, 0x49, 0xfe, 0xbd, 0x6e, + 0xb6, 0x0b, 0x28, 0xbf, 0xa7, 0x6b, 0x48, 0x9a, 0xeb, 0xc5, 0x93, 0xdc, 0x51, 0xd5, 0x62, 0x55, + 0x3a, 0x6a, 0xa6, 0x20, 0x36, 0x57, 0xb5, 0x74, 0xea, 0xa3, 0xdb, 0x30, 0x1b, 0xd3, 0x10, 0xca, + 0x30, 0x45, 0x0b, 0x97, 0x73, 0x34, 0x1e, 0x9a, 0x64, 0xcc, 0x40, 0x59, 0x0e, 0xaa, 0x86, 0xa6, + 0x74, 0x4f, 0xe8, 0x89, 0xec, 0x54, 0x28, 0x4d, 0x0c, 0x79, 0x40, 0xda, 0x66, 0x8a, 0x3c, 0x20, + 0x7d, 0xf7, 0x23, 0xb2, 0x9e, 0x4c, 0xd3, 0x41, 0x5a, 0x4f, 0xbe, 0x29, 0x22, 0xad, 0x47, 0xd3, + 0xa7, 0x88, 0xa2, 0xbc, 0xd2, 0x59, 0x90, 0x51, 0x3e, 0xdd, 0xbb, 0x90, 0x51, 0x3e, 0xd3, 0x84, + 0x88, 0x44, 0xcb, 0xd7, 0xce, 0x05, 0xee, 0x26, 0x8a, 0xb6, 0x02, 0x77, 0x93, 0x75, 0xd4, 0x33, + 0x68, 0x6a, 0x8b, 0x47, 0xf4, 0xa1, 0x58, 0x57, 0x54, 0xe8, 0x9a, 0x1b, 0xe5, 0x0c, 0x1c, 0x6e, + 0xbe, 0x7a, 0x93, 0x70, 0xb5, 0x35, 0xa6, 0x84, 0x5b, 0x50, 0xf6, 0xdd, 0x85, 0x79, 0xb5, 0xb2, + 0x92, 0xa6, 0x98, 0xa9, 0xec, 0xa4, 0x29, 0xe6, 0xca, 0xb0, 0x03, 0x68, 0x64, 0x72, 0x79, 0x79, + 0x94, 0xf9, 0x7a, 0x43, 0x1e, 0xa5, 0x2e, 0xfd, 0x7f, 0x06, 0x4d, 0x6d, 0x6d, 0x20, 0x35, 0x57, + 0x54, 0xc5, 0x48, 0xcd, 0x15, 0x97, 0x16, 0x77, 0xa0, 0x2e, 0xc9, 0xd2, 0xf6, 0xd5, 0x3c, 0x5c, + 0xda, 0x7e, 0x3a, 0x5d, 0x3e, 0x80, 0x46, 0xe6, 0xa3, 0x52, 0xba, 0x7c, 0x2e, 0x2f, 0xa5, 0xd3, + 0x25, 0xde, 0x3f, 0xca, 0x66, 0x39, 0x71, 0x6e, 0x8a, 0x36, 0x32, 0xd7, 0x71, 0x2e, 0xc7, 0x36, + 0x6f, 0x5c, 0xc2, 0xc1, 0x4d, 0x23, 0x9f, 0x44, 0x49, 0xd3, 0xd0, 0xe6, 0xb0, 0xd2, 0x34, 0xf4, + 0xd9, 0xd7, 0x4e, 0xe3, 0xd9, 0xc2, 0x26, 0xff, 0xdb, 0xe6, 0xa7, 0xec, 0xf7, 0xc5, 0x34, 0x4b, + 0xe1, 0x6e, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x53, 0x05, 0x0a, 0x0e, 0xd2, 0x29, 0x00, 0x00, } diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index be76b2f9d..b457983b5 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -395,11 +395,12 @@ message SetGroupMemberNicknameResp{ message SetGroupMemberInfoReq{ string groupID = 1; string userID = 2; - string operationID = 3; - google.protobuf.StringValue nickname = 4; - google.protobuf.StringValue faceURL = 5; - google.protobuf.Int32Value roleLevel = 6; - google.protobuf.StringValue ex = 7; + 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{ From c40dc64bd0c6162ecad41db73c1ae4c21dfe2b04 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 7 Jun 2022 16:59:05 +0800 Subject: [PATCH 66/67] set group memberInfo --- internal/rpc/group/group.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index bd7aa3264..551606ffe 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1432,6 +1432,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr 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()) From 269df23851eb1f18e03fa29f6dc20af93df2e946 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 7 Jun 2022 17:06:47 +0800 Subject: [PATCH 67/67] set group memberInfo --- internal/rpc/group/group.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 551606ffe..ad98775f6 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1426,7 +1426,6 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr 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())