From 151fec445e51d21b7a27ac19d17329170a6473da Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 29 Jul 2022 17:50:00 +0800 Subject: [PATCH 1/2] fix bug --- internal/rpc/group/super_group.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/rpc/group/super_group.go b/internal/rpc/group/super_group.go index d08a38742..9b50c7955 100644 --- a/internal/rpc/group/super_group.go +++ b/internal/rpc/group/super_group.go @@ -9,6 +9,7 @@ import ( commonPb "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" + "github.com/go-redis/redis/v8" ) func (s *groupServer) GetJoinedSuperGroupList(ctx context.Context, req *pbGroup.GetJoinedSuperGroupListReq) (*pbGroup.GetJoinedSuperGroupListResp, error) { @@ -17,6 +18,10 @@ func (s *groupServer) GetJoinedSuperGroupList(ctx context.Context, req *pbGroup. //userToSuperGroup, err := db.DB.GetSuperGroupByUserID(req.UserID) groupIDList, err := rocksCache.GetJoinedSuperGroupListFromCache(req.UserID) if err != nil { + if err == redis.Nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSuperGroupByUserID nil ", err.Error(), req.UserID) + return resp, nil + } log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSuperGroupByUserID failed ", err.Error(), req.UserID) resp.CommonResp.ErrCode = constant.ErrDB.ErrCode resp.CommonResp.ErrMsg = constant.ErrDB.ErrMsg From 147e8d5f9e3a5bad799e58ceba383960e8b25c46 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 29 Jul 2022 17:54:50 +0800 Subject: [PATCH 2/2] remove fcm json file --- config/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 19ea87728..7b2067be9 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -211,7 +211,7 @@ push: masterSecret: 02204efe3f3832947a236ee5 pushUrl: "https://api.jpush.cn/v3/push" pushIntent: "intent:#Intent;component=io.openim.app.enterprisechat/io.openim.app.enterprisechat.MainActivity;end" - enable: false + enable: true getui: #个推推送 pushUrl: "https://restapi.getui.com/v2/$appId" masterSecret: "" @@ -220,7 +220,7 @@ push: enable: false fcm: #firebase cloud message 消息推送 serviceAccount: "openim-5c6c0-firebase-adminsdk-ppwol-8765884a78.json" #帐号文件，此处需要改修配置，并且这个文件放在 config目录下 - enable: true + enable: false