From 94ed160eeead94ecdaa8d64ac2ae3dfcf2eeff18 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Sun, 21 Aug 2022 21:59:28 +0800
Subject: [PATCH] fix bug
---
internal/cms_api/admin/admin.go | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/internal/cms_api/admin/admin.go b/internal/cms_api/admin/admin.go
index 007569e1d..c71689c57 100644
--- a/internal/cms_api/admin/admin.go
+++ b/internal/cms_api/admin/admin.go
@@ -11,13 +11,15 @@ import (
pbCommon "Open_IM/pkg/proto/sdk_ws"
"Open_IM/pkg/utils"
"context"
- "github.com/minio/minio-go/v7"
- "github.com/minio/minio-go/v7/pkg/credentials"
"net/http"
"strings"
- "github.com/gin-gonic/gin"
+ "github.com/minio/minio-go/v7"
+ "github.com/minio/minio-go/v7/pkg/credentials"
+
url2 "net/url"
+
+ "github.com/gin-gonic/gin"
)
var (
@@ -100,7 +102,7 @@ func AddUserRegisterAddFriendIDList(c *gin.Context) {
return
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
- etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID)
+ etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID)
if etcdConn == nil {
errMsg := req.OperationID + "getcdv3.GetConn == nil"
log.NewError(req.OperationID, errMsg)
@@ -128,7 +130,7 @@ func ReduceUserRegisterAddFriendIDList(c *gin.Context) {
return
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
- etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID)
+ etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID)
if etcdConn == nil {
errMsg := req.OperationID + "getcdv3.GetConn == nil"
log.NewError(req.OperationID, errMsg)
@@ -156,7 +158,7 @@ func GetUserRegisterAddFriendIDList(c *gin.Context) {
return
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
- etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID)
+ etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID)
if etcdConn == nil {
errMsg := req.OperationID + "getcdv3.GetConn == nil"
log.NewError(req.OperationID, errMsg)