From 35ad4a9510e6f4d8140569286b89097c6eb833d0 Mon Sep 17 00:00:00 2001
From: OpenIM Bot <124379614+kubbot@users.noreply.github.com>
Date: Mon, 19 Feb 2024 10:19:32 +0800
Subject: [PATCH] cicd: bump League Patch (#1921)

---
 cmd/openim-api/main.go                   |  3 ++-
 internal/msgtransfer/init.go             | 22 +++++++++++++---------
 internal/push/consumer_init.go           |  1 +
 internal/push/push_rpc_server.go         |  1 +
 internal/rpc/conversation/conversaion.go |  1 +
 pkg/authverify/token.go                  |  3 ++-
 pkg/common/kafka/consumer_group.go       |  4 +++-
 pkg/common/startrpc/start.go             | 11 +++++++----
 8 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/cmd/openim-api/main.go b/cmd/openim-api/main.go
index c8746bc20b..7a7e062939 100644
--- a/cmd/openim-api/main.go
+++ b/cmd/openim-api/main.go
@@ -17,7 +17,6 @@ package main
 import (
 	"context"
 	"fmt"
-	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
@@ -27,6 +26,8 @@ import (
 	"syscall"
 	"time"
 
+	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
+
 	"github.com/OpenIMSDK/tools/errs"
 
 	"github.com/OpenIMSDK/protocol/constant"
diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go
index 062017f448..16d8613dbf 100644
--- a/internal/msgtransfer/init.go
+++ b/internal/msgtransfer/init.go
@@ -18,11 +18,24 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
+
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 
+	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
+
 	"github.com/OpenIMSDK/tools/mw"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/collectors"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/controller"
@@ -30,15 +43,6 @@ import (
 	kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/collectors"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
 )
 
 type MsgTransfer struct {
diff --git a/internal/push/consumer_init.go b/internal/push/consumer_init.go
index 80478de99d..572afe0eb1 100644
--- a/internal/push/consumer_init.go
+++ b/internal/push/consumer_init.go
@@ -16,6 +16,7 @@ package push
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/tools/log"
 )
 
diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go
index caaf955259..f558aeec3d 100644
--- a/internal/push/push_rpc_server.go
+++ b/internal/push/push_rpc_server.go
@@ -16,6 +16,7 @@ package push
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/tools/utils"
 
 	"google.golang.org/grpc"
diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go
index 903ecbb188..8558a23ea4 100644
--- a/internal/rpc/conversation/conversaion.go
+++ b/internal/rpc/conversation/conversaion.go
@@ -50,6 +50,7 @@ type conversationServer struct {
 	conversationDatabase           controller.ConversationDatabase
 	conversationNotificationSender *notification.ConversationNotificationSender
 }
+
 func (c *conversationServer) GetConversationNotReceiveMessageUserIDs(
 	ctx context.Context,
 	req *pbconversation.GetConversationNotReceiveMessageUserIDsReq,
diff --git a/pkg/authverify/token.go b/pkg/authverify/token.go
index b951bf219c..97bb033916 100644
--- a/pkg/authverify/token.go
+++ b/pkg/authverify/token.go
@@ -48,7 +48,8 @@ func CheckAccessV3(ctx context.Context, ownerUserID string) (err error) {
 }
 
 func IsAppManagerUid(ctx context.Context) bool {
-	return (len(config.Config.Manager.UserID) > 0 && utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.Manager.UserID)) || utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.IMAdmin.UserID)
+	return (len(config.Config.Manager.UserID) > 0 && utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.Manager.UserID)) ||
+		utils.IsContain(mcontext.GetOpUserID(ctx), config.Config.IMAdmin.UserID)
 }
 
 func CheckAdmin(ctx context.Context) error {
diff --git a/pkg/common/kafka/consumer_group.go b/pkg/common/kafka/consumer_group.go
index 908b8f088b..5245c6a6f7 100644
--- a/pkg/common/kafka/consumer_group.go
+++ b/pkg/common/kafka/consumer_group.go
@@ -18,12 +18,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"github.com/IBM/sarama"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"strings"
+
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 
 type MConsumerGroup struct {
diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go
index 4b032e9d6b..c5105ec513 100644
--- a/pkg/common/startrpc/start.go
+++ b/pkg/common/startrpc/start.go
@@ -18,8 +18,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/OpenIMSDK/tools/errs"
-	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 	"net"
 	"net/http"
 	"os"
@@ -29,11 +27,16 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
+	"github.com/OpenIMSDK/tools/errs"
+
+	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
+
 	grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"