cicd: bump League Patch

openimsdk · Feb 19, 2024 · 2bde03a · 2bde03a
1 parent 7ebd88e
commit 2bde03a
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 16 deletions.
diff --git 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
@@ -18,27 +18,31 @@ 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"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation"
 	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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"