From 46c3b5a6ea70980a92a2d25562b62c55c6071a6a Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Wed, 11 Jan 2023 11:24:38 +0800
Subject: [PATCH] Error code standardization

---
 cmd/open_im_api/main.go                       |  1 -
 internal/api/auth/auth.go                     |  2 +-
 internal/api/conversation/conversation.go     |  8 +++----
 internal/api/friend/friend.go                 |  1 -
 internal/api/group/super_group.go             |  2 +-
 internal/api/manage/management_chat.go        |  2 +-
 internal/api/manage/management_user.go        |  2 +-
 internal/api/msg/del_msg.go                   |  2 +-
 internal/api/msg/extend_msg.go                |  2 +-
 internal/api/msg/get_max_min_seq.go           |  2 +-
 internal/api/msg/pull_msg.go                  |  2 +-
 internal/api/msg/send_msg.go                  |  2 +-
 internal/api/office/tag.go                    |  2 +-
 internal/api/office/work_moments.go           |  2 +-
 internal/api/organization/organization.go     |  2 +-
 internal/api/user/user.go                     |  2 +-
 internal/cms_api/admin/admin.go               |  2 +-
 internal/cms_api/friend/friend.go             |  2 +-
 internal/cms_api/group/group.go               |  2 +-
 internal/cms_api/message_cms/message.go       |  2 +-
 internal/cms_api/statistics/statistics.go     |  2 +-
 internal/cms_api/user/user.go                 |  2 +-
 internal/demo/register/onboarding_process.go  |  2 +-
 .../demo/register/register_import_friend.go   |  2 +-
 internal/msg_gateway/gate/batch_push.go       |  2 +-
 internal/msg_gateway/gate/logic.go            |  2 +-
 internal/msg_gateway/gate/relay_rpc_server.go |  2 +-
 internal/msg_gateway/gate/ws_server.go        | 22 +++++++++----------
 .../logic/online_history_msg_handler.go       |  2 +-
 internal/push/logic/push_rpc_server.go        |  2 +-
 internal/push/logic/push_to_client.go         |  2 +-
 internal/rpc/admin_cms/admin_cms.go           |  2 +-
 internal/rpc/auth/auth.go                     |  2 +-
 internal/rpc/conversation/conversaion.go      |  2 +-
 internal/rpc/organization/organization.go     |  2 +-
 internal/rpc/user/user.go                     |  2 +-
 36 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go
index 7cf22888d..1dc3ab6fb 100644
--- a/cmd/open_im_api/main.go
+++ b/cmd/open_im_api/main.go
@@ -15,7 +15,6 @@ import (
 	"Open_IM/internal/api/user"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	"Open_IM/pkg/utils"
 	"flag"
 	"fmt"
diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go
index ec2503675..a2b0248f0 100644
--- a/internal/api/auth/auth.go
+++ b/internal/api/auth/auth.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/auth"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/conversation/conversation.go b/internal/api/conversation/conversation.go
index cfda0abb8..a063a7eb0 100644
--- a/internal/api/conversation/conversation.go
+++ b/internal/api/conversation/conversation.go
@@ -4,7 +4,7 @@ import (
 	api "Open_IM/pkg/base_info"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbConversation "Open_IM/pkg/proto/conversation"
 	pbUser "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
@@ -312,17 +312,17 @@ func SetRecvMsgOpt(c *gin.Context) {
 	c.JSON(http.StatusOK, resp)
 }
 
-//Deprecated
+// Deprecated
 func SetReceiveMessageOpt(c *gin.Context) {
 
 }
 
-//Deprecated
+// Deprecated
 func GetReceiveMessageOpt(c *gin.Context) {
 
 }
 
-//Deprecated
+// Deprecated
 func GetAllConversationMessageOpt(c *gin.Context) {
 
 }
diff --git a/internal/api/friend/friend.go b/internal/api/friend/friend.go
index 2e896ea4e..ea892d471 100644
--- a/internal/api/friend/friend.go
+++ b/internal/api/friend/friend.go
@@ -6,7 +6,6 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	rpc "Open_IM/pkg/proto/friend"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/group/super_group.go b/internal/api/group/super_group.go
index 9911ee7b4..dc38bc94e 100644
--- a/internal/api/group/super_group.go
+++ b/internal/api/group/super_group.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/group"
 	"Open_IM/pkg/utils"
 	"context"
diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go
index 78e441d82..f89280ea4 100644
--- a/internal/api/manage/management_chat.go
+++ b/internal/api/manage/management_chat.go
@@ -13,7 +13,7 @@ import (
 	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbChat "Open_IM/pkg/proto/msg"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go
index eb2f221dd..e307d1beb 100644
--- a/internal/api/manage/management_user.go
+++ b/internal/api/manage/management_user.go
@@ -12,7 +12,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbRelay "Open_IM/pkg/proto/relay"
 	rpc "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/msg/del_msg.go b/internal/api/msg/del_msg.go
index 0dc5d2003..7bd7bfaef 100644
--- a/internal/api/msg/del_msg.go
+++ b/internal/api/msg/del_msg.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/msg"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/msg/extend_msg.go b/internal/api/msg/extend_msg.go
index b6920825d..d217073bb 100644
--- a/internal/api/msg/extend_msg.go
+++ b/internal/api/msg/extend_msg.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
 	"context"
diff --git a/internal/api/msg/get_max_min_seq.go b/internal/api/msg/get_max_min_seq.go
index 5b5a7a551..6609f6721 100644
--- a/internal/api/msg/get_max_min_seq.go
+++ b/internal/api/msg/get_max_min_seq.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbChat "Open_IM/pkg/proto/msg"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
 	"context"
diff --git a/internal/api/msg/pull_msg.go b/internal/api/msg/pull_msg.go
index 9e27619bd..56bd4c2f7 100644
--- a/internal/api/msg/pull_msg.go
+++ b/internal/api/msg/pull_msg.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	"Open_IM/pkg/proto/msg"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/msg/send_msg.go b/internal/api/msg/send_msg.go
index 5b4654fce..0fedf6faf 100644
--- a/internal/api/msg/send_msg.go
+++ b/internal/api/msg/send_msg.go
@@ -7,7 +7,7 @@ import (
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"context"
 
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	"github.com/gin-gonic/gin"
 	"net/http"
 	"strings"
diff --git a/internal/api/office/tag.go b/internal/api/office/tag.go
index d16d514e0..7c4f5a606 100644
--- a/internal/api/office/tag.go
+++ b/internal/api/office/tag.go
@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbOffice "Open_IM/pkg/proto/office"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/office/work_moments.go b/internal/api/office/work_moments.go
index 7a8a8d7d7..8a8c52920 100644
--- a/internal/api/office/work_moments.go
+++ b/internal/api/office/work_moments.go
@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbOffice "Open_IM/pkg/proto/office"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go
index b5b806b4c..fb0b479e7 100644
--- a/internal/api/organization/organization.go
+++ b/internal/api/organization/organization.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	rpc "Open_IM/pkg/proto/organization"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/api/user/user.go b/internal/api/user/user.go
index 42d935ab5..f289a4f49 100644
--- a/internal/api/user/user.go
+++ b/internal/api/user/user.go
@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	cacheRpc "Open_IM/pkg/proto/cache"
 	pbRelay "Open_IM/pkg/proto/relay"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
diff --git a/internal/cms_api/admin/admin.go b/internal/cms_api/admin/admin.go
index ca0e880aa..754c77b76 100644
--- a/internal/cms_api/admin/admin.go
+++ b/internal/cms_api/admin/admin.go
@@ -5,7 +5,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbAdmin "Open_IM/pkg/proto/admin_cms"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/cms_api/friend/friend.go b/internal/cms_api/friend/friend.go
index 0aee0cd61..ef5240079 100644
--- a/internal/cms_api/friend/friend.go
+++ b/internal/cms_api/friend/friend.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbAdmin "Open_IM/pkg/proto/admin_cms"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/cms_api/group/group.go b/internal/cms_api/group/group.go
index b53bc6bc1..b18289b65 100644
--- a/internal/cms_api/group/group.go
+++ b/internal/cms_api/group/group.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
diff --git a/internal/cms_api/message_cms/message.go b/internal/cms_api/message_cms/message.go
index 758e9dc29..6b194a2f4 100644
--- a/internal/cms_api/message_cms/message.go
+++ b/internal/cms_api/message_cms/message.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbAdminCMS "Open_IM/pkg/proto/admin_cms"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/cms_api/statistics/statistics.go b/internal/cms_api/statistics/statistics.go
index 76aad968e..2f96d7ddd 100644
--- a/internal/cms_api/statistics/statistics.go
+++ b/internal/cms_api/statistics/statistics.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	admin "Open_IM/pkg/proto/admin_cms"
 	"Open_IM/pkg/utils"
 	"context"
diff --git a/internal/cms_api/user/user.go b/internal/cms_api/user/user.go
index 7bf70a5f7..e6c374aa2 100644
--- a/internal/cms_api/user/user.go
+++ b/internal/cms_api/user/user.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbAdminCms "Open_IM/pkg/proto/admin_cms"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
 	pb "Open_IM/pkg/proto/user"
diff --git a/internal/demo/register/onboarding_process.go b/internal/demo/register/onboarding_process.go
index ea3426559..754c8db80 100644
--- a/internal/demo/register/onboarding_process.go
+++ b/internal/demo/register/onboarding_process.go
@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	groupRpc "Open_IM/pkg/proto/group"
 
 	organizationRpc "Open_IM/pkg/proto/organization"
diff --git a/internal/demo/register/register_import_friend.go b/internal/demo/register/register_import_friend.go
index 8475ec78c..ed4f42252 100644
--- a/internal/demo/register/register_import_friend.go
+++ b/internal/demo/register/register_import_friend.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/config"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbFriend "Open_IM/pkg/proto/friend"
 	"Open_IM/pkg/utils"
 	"context"
diff --git a/internal/msg_gateway/gate/batch_push.go b/internal/msg_gateway/gate/batch_push.go
index 4ea7b5658..c7d57102b 100644
--- a/internal/msg_gateway/gate/batch_push.go
+++ b/internal/msg_gateway/gate/batch_push.go
@@ -4,7 +4,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbChat "Open_IM/pkg/proto/msg"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go
index 4715def1e..b2e6d86cc 100644
--- a/internal/msg_gateway/gate/logic.go
+++ b/internal/msg_gateway/gate/logic.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbChat "Open_IM/pkg/proto/msg"
 	push "Open_IM/pkg/proto/push"
 	pbRtc "Open_IM/pkg/proto/rtc"
diff --git a/internal/msg_gateway/gate/relay_rpc_server.go b/internal/msg_gateway/gate/relay_rpc_server.go
index 00376a552..bc47a1d93 100644
--- a/internal/msg_gateway/gate/relay_rpc_server.go
+++ b/internal/msg_gateway/gate/relay_rpc_server.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbRelay "Open_IM/pkg/proto/relay"
 	sdk_ws "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go
index e442443f9..bd33541d8 100644
--- a/internal/msg_gateway/gate/ws_server.go
+++ b/internal/msg_gateway/gate/ws_server.go
@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbRelay "Open_IM/pkg/proto/relay"
 	"Open_IM/pkg/utils"
 	"bytes"
@@ -422,19 +422,19 @@ func (ws *WServer) getUserAllCons(uid string) map[int]*UserConn {
 	return nil
 }
 
-//func (ws *WServer) getUserUid(conn *UserConn) (uid string, platform int) {
-//	rwLock.RLock()
-//	defer rwLock.RUnlock()
+//	func (ws *WServer) getUserUid(conn *UserConn) (uid string, platform int) {
+//		rwLock.RLock()
+//		defer rwLock.RUnlock()
 //
-//	if stringMap, ok := ws.wsConnToUser[conn]; ok {
-//		for k, v := range stringMap {
-//			platform = k
-//			uid = v
+//		if stringMap, ok := ws.wsConnToUser[conn]; ok {
+//			for k, v := range stringMap {
+//				platform = k
+//				uid = v
+//			}
+//			return uid, platform
 //		}
-//		return uid, platform
+//		return "", 0
 //	}
-//	return "", 0
-//}
 func (ws *WServer) headerCheck(w http.ResponseWriter, r *http.Request, operationID string) (isPass, compression bool) {
 	status := http.StatusUnauthorized
 	query := r.URL.Query()
diff --git a/internal/msg_transfer/logic/online_history_msg_handler.go b/internal/msg_transfer/logic/online_history_msg_handler.go
index af22e9259..32d70df4f 100644
--- a/internal/msg_transfer/logic/online_history_msg_handler.go
+++ b/internal/msg_transfer/logic/online_history_msg_handler.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	kfk "Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbMsg "Open_IM/pkg/proto/msg"
 	pbPush "Open_IM/pkg/proto/push"
 	"Open_IM/pkg/utils"
diff --git a/internal/push/logic/push_rpc_server.go b/internal/push/logic/push_rpc_server.go
index 296d23512..2f32beeeb 100644
--- a/internal/push/logic/push_rpc_server.go
+++ b/internal/push/logic/push_rpc_server.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbPush "Open_IM/pkg/proto/push"
 	"Open_IM/pkg/utils"
 	"context"
diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go
index 2430972ee..5ed0bec53 100644
--- a/internal/push/logic/push_to_client.go
+++ b/internal/push/logic/push_to_client.go
@@ -13,7 +13,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbPush "Open_IM/pkg/proto/push"
 	pbRelay "Open_IM/pkg/proto/relay"
 	pbRtc "Open_IM/pkg/proto/rtc"
diff --git a/internal/rpc/admin_cms/admin_cms.go b/internal/rpc/admin_cms/admin_cms.go
index 7521bafe9..86816ef16 100644
--- a/internal/rpc/admin_cms/admin_cms.go
+++ b/internal/rpc/admin_cms/admin_cms.go
@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbAdminCMS "Open_IM/pkg/proto/admin_cms"
 	server_api_params "Open_IM/pkg/proto/sdk_ws"
 
diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go
index d2ba6bab3..02d6a0ffb 100644
--- a/internal/rpc/auth/auth.go
+++ b/internal/rpc/auth/auth.go
@@ -6,7 +6,7 @@ import (
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbAuth "Open_IM/pkg/proto/auth"
 	pbRelay "Open_IM/pkg/proto/relay"
 	"Open_IM/pkg/utils"
diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go
index 819bd8796..e9b16387b 100644
--- a/internal/rpc/conversation/conversaion.go
+++ b/internal/rpc/conversation/conversaion.go
@@ -8,7 +8,7 @@ import (
 	rocksCache "Open_IM/pkg/common/db/rocks_cache"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbConversation "Open_IM/pkg/proto/conversation"
 	"Open_IM/pkg/utils"
 	"context"
diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go
index 9bf1f88f9..c4547d5a0 100644
--- a/internal/rpc/organization/organization.go
+++ b/internal/rpc/organization/organization.go
@@ -9,7 +9,7 @@ import (
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbAuth "Open_IM/pkg/proto/auth"
 	groupRpc "Open_IM/pkg/proto/group"
 	rpc "Open_IM/pkg/proto/organization"
diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go
index 92fdabf20..481614d4c 100644
--- a/internal/rpc/user/user.go
+++ b/internal/rpc/user/user.go
@@ -10,7 +10,7 @@ import (
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/common/token_verify"
-	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	"Open_IM/pkg/getcdv3"
 	pbConversation "Open_IM/pkg/proto/conversation"
 	pbFriend "Open_IM/pkg/proto/friend"
 	sdkws "Open_IM/pkg/proto/sdk_ws"