From f7cf573ba84e365f17c564fac80e02277ba6af8d Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Mon, 15 May 2023 09:53:14 +0800
Subject: [PATCH 1/3] push

---
 internal/push/offlinepush/getui/push.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/push/offlinepush/getui/push.go b/internal/push/offlinepush/getui/push.go
index da1ec8ff8..5ebcaa3b6 100644
--- a/internal/push/offlinepush/getui/push.go
+++ b/internal/push/offlinepush/getui/push.go
@@ -1,6 +1,8 @@
 package getui
 
 import (
+	"sync"
+
 	"github.com/OpenIMSDK/Open-IM-Server/internal/push/offlinepush"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
@@ -9,15 +11,15 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils/splitter"
 	"github.com/go-redis/redis/v8"
-	"sync"
 
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
 	"errors"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 	"strconv"
 	"time"
+
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
 )
 
 var (
@@ -51,6 +53,7 @@ func (g *Client) Push(ctx context.Context, userIDs []string, title, content stri
 	token, err := g.cache.GetGetuiToken(ctx)
 	if err != nil {
 		if err == redis.Nil {
+			log.ZInfo(ctx, "getui token not exist in redis")
 			token, err = g.getTokenAndSave2Redis(ctx)
 			if err != nil {
 				return err

From 2d6c837f0d3cb872c1bb800ebe6b87b30cce63fc Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Mon, 15 May 2023 10:01:05 +0800
Subject: [PATCH 2/3] err

---
 internal/push/offlinepush/getui/push.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/internal/push/offlinepush/getui/push.go b/internal/push/offlinepush/getui/push.go
index 5ebcaa3b6..1fced52fe 100644
--- a/internal/push/offlinepush/getui/push.go
+++ b/internal/push/offlinepush/getui/push.go
@@ -9,6 +9,7 @@ import (
 	http2 "github.com/OpenIMSDK/Open-IM-Server/pkg/common/http"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils/splitter"
 	"github.com/go-redis/redis/v8"
 
@@ -23,8 +24,8 @@ import (
 )
 
 var (
-	TokenExpireError = errors.New("token expire")
-	UserIDEmptyError = errors.New("userIDs is empty")
+	ErrTokenExpire = errors.New("token expire")
+	ErrUserIDEmpty = errors.New("userIDs is empty")
 )
 
 const (
@@ -52,7 +53,7 @@ func NewClient(cache cache.MsgModel) *Client {
 func (g *Client) Push(ctx context.Context, userIDs []string, title, content string, opts *offlinepush.Opts) error {
 	token, err := g.cache.GetGetuiToken(ctx)
 	if err != nil {
-		if err == redis.Nil {
+		if errs.Unwrap(err) == redis.Nil {
 			log.ZInfo(ctx, "getui token not exist in redis")
 			token, err = g.getTokenAndSave2Redis(ctx)
 			if err != nil {
@@ -86,10 +87,10 @@ func (g *Client) Push(ctx context.Context, userIDs []string, title, content stri
 	} else if len(userIDs) == 1 {
 		err = g.singlePush(ctx, token, userIDs[0], pushReq)
 	} else {
-		return UserIDEmptyError
+		return ErrUserIDEmpty
 	}
 	switch err {
-	case TokenExpireError:
+	case ErrTokenExpire:
 		token, err = g.getTokenAndSave2Redis(ctx)
 	}
 	return err

From 54a5e06f37490ef628fe421ce8d11747e2667bb6 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Mon, 15 May 2023 10:04:11 +0800
Subject: [PATCH 3/3] getui

---
 internal/push/offlinepush/getui/body.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/push/offlinepush/getui/body.go b/internal/push/offlinepush/getui/body.go
index 70fbf5a7a..6cee9a545 100644
--- a/internal/push/offlinepush/getui/body.go
+++ b/internal/push/offlinepush/getui/body.go
@@ -2,6 +2,7 @@ package getui
 
 import (
 	"fmt"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
@@ -14,7 +15,7 @@ type Resp struct {
 func (r *Resp) parseError() (err error) {
 	switch r.Code {
 	case tokenExpireCode:
-		err = TokenExpireError
+		err = ErrTokenExpire
 	case 0:
 		err = nil
 	default: