rpome

# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go

cmd/open_im_api/docs/docs.go

@@ -155,13 +155,6 @@ const docTemplate = `{
                 "summary": "用户注册",
                 "operationId": "UserRegister",
                 "parameters": [
-                    {
-                        "type": "string",
-                        "description": "im token",
-                        "name": "token",
-                        "in": "header",
-                        "required": true
-                    },
                     {
                         "description": "secret为openIM密钥, 详细见服务端config.yaml secret字段 \u003cbr\u003e platform为平台ID \u003cbr\u003e ex为拓展字段 \u003cbr\u003e gender为性别, 0为女, 1为男",
                         "name": "req",
@@ -209,13 +202,6 @@ const docTemplate = `{
                 "summary": "用户登录",
                 "operationId": "UserToken",
                 "parameters": [
-                    {
-                        "type": "string",
-                        "description": "im token",
-                        "name": "token",
-                        "in": "header",
-                        "required": true
-                    },
                     {
                         "description": "secret为openIM密钥, 详细见服务端config.yaml secret字段 \u003cbr\u003e platform为平台ID",
                         "name": "req",
@@ -4596,7 +4582,6 @@ const docTemplate = `{
         "Open_IM_internal_api_manage.OANotificationElem": {
             "type": "object",
             "required": [
-                "notificationFaceURL",
                 "notificationName",
                 "notificationType",
                 "text"
@@ -5946,13 +5931,21 @@ const docTemplate = `{
         "base_info.GetGroupAllMemberReq": {
             "type": "object",
             "required": [
+                "count",
                 "groupID",
+                "offset",
                 "operationID"
             ],
             "properties": {
+                "count": {
+                    "type": "integer"
+                },
                 "groupID": {
                     "type": "string"
                 },
+                "offset": {
+                    "type": "integer"
+                },
                 "operationID": {
                     "type": "string"
                 }
@@ -6521,7 +6514,11 @@ const docTemplate = `{
             ],
             "properties": {
                 "roleLevel": {
-                    "type": "integer"
+                    "type": "integer",
+                    "enum": [
+                        1,
+                        3
+                    ]
                 },
                 "userID": {
                     "type": "string"
@@ -6652,6 +6649,12 @@ const docTemplate = `{
                 "groupID": {
                     "type": "string"
                 },
+                "inviterUserID": {
+                    "type": "string"
+                },
+                "joinSource": {
+                    "type": "integer"
+                },
                 "operationID": {
                     "type": "string"
                 },
@@ -6751,6 +6754,9 @@ const docTemplate = `{
                 "sessionType"
             ],
             "properties": {
+                "businessOperationID": {
+                    "type": "string"
+                },
                 "contentType": {
                     "type": "integer"
                 },
@@ -6760,6 +6766,9 @@ const docTemplate = `{
                 "isOnlineOnly": {
                     "type": "boolean"
                 },
+                "notOfflinePush": {
+                    "type": "boolean"
+                },
                 "offlinePushInfo": {
                     "$ref": "#/definitions/server_api_params.OfflinePushInfo"
                 },
@@ -6798,6 +6807,9 @@ const docTemplate = `{
                 "sessionType"
             ],
             "properties": {
+                "businessOperationID": {
+                    "type": "string"
+                },
                 "contentType": {
                     "type": "integer"
                 },
@@ -6807,6 +6819,9 @@ const docTemplate = `{
                 "isOnlineOnly": {
                     "type": "boolean"
                 },
+                "notOfflinePush": {
+                    "type": "boolean"
+                },
                 "offlinePushInfo": {
                     "$ref": "#/definitions/server_api_params.OfflinePushInfo"
                 },
@@ -7063,7 +7078,6 @@ const docTemplate = `{
             "required": [
                 "fromUserID",
                 "operationID",
-                "remark",
                 "toUserID"
             ],
             "properties": {
@@ -7129,6 +7143,9 @@ const docTemplate = `{
                 "operationID"
             ],
             "properties": {
+                "applyMemberFriend": {
+                    "type": "integer"
+                },
                 "ex": {
                     "type": "string"
                 },
@@ -7144,6 +7161,9 @@ const docTemplate = `{
                 "introduction": {
                     "type": "string"
                 },
+                "lookMemberInfo": {
+                    "type": "integer"
+                },
                 "needVerification": {
                     "type": "integer"
                 },
@@ -7747,7 +7767,6 @@ const docTemplate = `{
         "internal_api_manage.OANotificationElem": {
             "type": "object",
             "required": [
-                "notificationFaceURL",
                 "notificationName",
                 "notificationType",
                 "text"
@@ -8231,6 +8250,9 @@ const docTemplate = `{
         "server_api_params.GroupInfo": {
             "type": "object",
             "properties": {
+                "applyMemberFriend": {
+                    "type": "integer"
+                },
                 "createTime": {
                     "type": "integer"
                 },
@@ -8255,6 +8277,9 @@ const docTemplate = `{
                 "introduction": {
                     "type": "string"
                 },
+                "lookMemberInfo": {
+                    "type": "integer"
+                },
                 "memberCount": {
                     "type": "integer"
                 },
@@ -8264,6 +8289,12 @@ const docTemplate = `{
                 "notification": {
                     "type": "string"
                 },
+                "notificationUpdateTime": {
+                    "type": "integer"
+                },
+                "notificationUserID": {
+                    "type": "string"
+                },
                 "ownerUserID": {
                     "type": "string"
                 },
@@ -8287,6 +8318,9 @@ const docTemplate = `{
                 "groupID": {
                     "type": "string"
                 },
+                "inviterUserID": {
+                    "type": "string"
+                },
                 "joinSource": {
                     "type": "integer"
                 },
@@ -8331,6 +8365,12 @@ const docTemplate = `{
                 "handleUserID": {
                     "type": "string"
                 },
+                "inviterUserID": {
+                    "type": "string"
+                },
+                "joinSource": {
+                    "type": "integer"
+                },
                 "reqMsg": {
                     "type": "string"
                 },

cmd/open_im_api/docs/swagger.json

@@ -147,13 +147,6 @@
                 "summary": "用户注册",
                 "operationId": "UserRegister",
                 "parameters": [
-                    {
-                        "type": "string",
-                        "description": "im token",
-                        "name": "token",
-                        "in": "header",
-                        "required": true
-                    },
                     {
                         "description": "secret为openIM密钥, 详细见服务端config.yaml secret字段 \u003cbr\u003e platform为平台ID \u003cbr\u003e ex为拓展字段 \u003cbr\u003e gender为性别, 0为女, 1为男",
                         "name": "req",
@@ -201,13 +194,6 @@
                 "summary": "用户登录",
                 "operationId": "UserToken",
                 "parameters": [
-                    {
-                        "type": "string",
-                        "description": "im token",
-                        "name": "token",
-                        "in": "header",
-                        "required": true
-                    },
                     {
                         "description": "secret为openIM密钥, 详细见服务端config.yaml secret字段 \u003cbr\u003e platform为平台ID",
                         "name": "req",
@@ -4588,7 +4574,6 @@
         "Open_IM_internal_api_manage.OANotificationElem": {
             "type": "object",
             "required": [
-                "notificationFaceURL",
                 "notificationName",
                 "notificationType",
                 "text"
@@ -5938,13 +5923,21 @@
         "base_info.GetGroupAllMemberReq": {
             "type": "object",
             "required": [
+                "count",
                 "groupID",
+                "offset",
                 "operationID"
             ],
             "properties": {
+                "count": {
+                    "type": "integer"
+                },
                 "groupID": {
                     "type": "string"
                 },
+                "offset": {
+                    "type": "integer"
+                },
                 "operationID": {
                     "type": "string"
                 }
@@ -6513,7 +6506,11 @@
             ],
             "properties": {
                 "roleLevel": {
-                    "type": "integer"
+                    "type": "integer",
+                    "enum": [
+                        1,
+                        3
+                    ]
                 },
                 "userID": {
                     "type": "string"
@@ -6644,6 +6641,12 @@
                 "groupID": {
                     "type": "string"
                 },
+                "inviterUserID": {
+                    "type": "string"
+                },
+                "joinSource": {
+                    "type": "integer"
+                },
                 "operationID": {
                     "type": "string"
                 },
@@ -6743,6 +6746,9 @@
                 "sessionType"
             ],
             "properties": {
+                "businessOperationID": {
+                    "type": "string"
+                },
                 "contentType": {
                     "type": "integer"
                 },
@@ -6752,6 +6758,9 @@
                 "isOnlineOnly": {
                     "type": "boolean"
                 },
+                "notOfflinePush": {
+                    "type": "boolean"
+                },
                 "offlinePushInfo": {
                     "$ref": "#/definitions/server_api_params.OfflinePushInfo"
                 },
@@ -6790,6 +6799,9 @@
                 "sessionType"
             ],
             "properties": {
+                "businessOperationID": {
+                    "type": "string"
+                },
                 "contentType": {
                     "type": "integer"
                 },
@@ -6799,6 +6811,9 @@
                 "isOnlineOnly": {
                     "type": "boolean"
                 },
+                "notOfflinePush": {
+                    "type": "boolean"
+                },
                 "offlinePushInfo": {
                     "$ref": "#/definitions/server_api_params.OfflinePushInfo"
                 },
@@ -7055,7 +7070,6 @@
             "required": [
                 "fromUserID",
                 "operationID",
-                "remark",
                 "toUserID"
             ],
             "properties": {
@@ -7121,6 +7135,9 @@
                 "operationID"
             ],
             "properties": {
+                "applyMemberFriend": {
+                    "type": "integer"
+                },
                 "ex": {
                     "type": "string"
                 },
@@ -7136,6 +7153,9 @@
                 "introduction": {
                     "type": "string"
                 },
+                "lookMemberInfo": {
+                    "type": "integer"
+                },
                 "needVerification": {
                     "type": "integer"
                 },
@@ -7739,7 +7759,6 @@
         "internal_api_manage.OANotificationElem": {
             "type": "object",
             "required": [
-                "notificationFaceURL",
                 "notificationName",
                 "notificationType",
                 "text"
@@ -8223,6 +8242,9 @@
         "server_api_params.GroupInfo": {
             "type": "object",
             "properties": {
+                "applyMemberFriend": {
+                    "type": "integer"
+                },
                 "createTime": {
                     "type": "integer"
                 },
@@ -8247,6 +8269,9 @@
                 "introduction": {
                     "type": "string"
                 },
+                "lookMemberInfo": {
+                    "type": "integer"
+                },
                 "memberCount": {
                     "type": "integer"
                 },
@@ -8256,6 +8281,12 @@
                 "notification": {
                     "type": "string"
                 },
+                "notificationUpdateTime": {
+                    "type": "integer"
+                },
+                "notificationUserID": {
+                    "type": "string"
+                },
                 "ownerUserID": {
                     "type": "string"
                 },
@@ -8279,6 +8310,9 @@
                 "groupID": {
                     "type": "string"
                 },
+                "inviterUserID": {
+                    "type": "string"
+                },
                 "joinSource": {
                     "type": "integer"
                 },
@@ -8323,6 +8357,12 @@
                 "handleUserID": {
                     "type": "string"
                 },
+                "inviterUserID": {
+                    "type": "string"
+                },
+                "joinSource": {
+                    "type": "integer"
+                },
                 "reqMsg": {
                     "type": "string"
                 },

cmd/open_im_api/docs/swagger.yaml

@@ -38,7 +38,6 @@ definitions:
       videoElem:
         $ref: '#/definitions/Open_IM_internal_api_manage.VideoElem'
     required:
-    - notificationFaceURL
     - notificationName
     - notificationType
     - text
@@ -910,12 +909,18 @@ definitions:
     type: object
   base_info.GetGroupAllMemberReq:
     properties:
+      count:
+        type: integer
       groupID:
         type: string
+      offset:
+        type: integer
       operationID:
         type: string
     required:
+    - count
     - groupID
+    - offset
     - operationID
     type: object
   base_info.GetGroupAllMemberResp:
@@ -1285,6 +1290,9 @@ definitions:
   base_info.GroupAddMemberInfo:
     properties:
       roleLevel:
+        enum:
+        - 1
+        - 3
         type: integer
       userID:
         type: string
@@ -1372,6 +1380,10 @@ definitions:
     properties:
       groupID:
         type: string
+      inviterUserID:
+        type: string
+      joinSource:
+        type: integer
       operationID:
         type: string
       reqMessage:
@@ -1436,12 +1448,16 @@ definitions:
     type: object
   base_info.ManagementBatchSendMsgReq:
     properties:
+      businessOperationID:
+        type: string
       contentType:
         type: integer
       groupID:
         type: string
       isOnlineOnly:
         type: boolean
+      notOfflinePush:
+        type: boolean
       offlinePushInfo:
         $ref: '#/definitions/server_api_params.OfflinePushInfo'
       operationID:
@@ -1468,12 +1484,16 @@ definitions:
     type: object
   base_info.ManagementSendMsgReq:
     properties:
+      businessOperationID:
+        type: string
       contentType:
         type: integer
       groupID:
         type: string
       isOnlineOnly:
         type: boolean
+      notOfflinePush:
+        type: boolean
       offlinePushInfo:
         $ref: '#/definitions/server_api_params.OfflinePushInfo'
       operationID:
@@ -1657,7 +1677,6 @@ definitions:
     required:
     - fromUserID
     - operationID
-    - remark
     - toUserID
     type: object
   base_info.SetFriendRemarkResp:
@@ -1689,6 +1708,8 @@ definitions:
     type: object
   base_info.SetGroupInfoReq:
     properties:
+      applyMemberFriend:
+        type: integer
       ex:
         type: string
       faceURL:
@@ -1699,6 +1720,8 @@ definitions:
         type: string
       introduction:
         type: string
+      lookMemberInfo:
+        type: integer
       needVerification:
         type: integer
       notification:
@@ -2134,7 +2157,6 @@ definitions:
       videoElem:
         $ref: '#/definitions/internal_api_manage.VideoElem'
     required:
-    - notificationFaceURL
     - notificationName
     - notificationType
     - text
@@ -2428,6 +2450,8 @@ definitions:
     type: object
   server_api_params.GroupInfo:
     properties:
+      applyMemberFriend:
+        type: integer
       createTime:
         type: integer
       creatorUserID:
@@ -2444,12 +2468,18 @@ definitions:
         type: integer
       introduction:
         type: string
+      lookMemberInfo:
+        type: integer
       memberCount:
         type: integer
       needVerification:
         type: integer
       notification:
         type: string
+      notificationUpdateTime:
+        type: integer
+      notificationUserID:
+        type: string
       ownerUserID:
         type: string
       status:
@@ -2465,6 +2495,8 @@ definitions:
         type: string
       groupID:
         type: string
+      inviterUserID:
+        type: string
       joinSource:
         type: integer
       joinTime:
@@ -2494,6 +2526,10 @@ definitions:
         type: integer
       handleUserID:
         type: string
+      inviterUserID:
+        type: string
+      joinSource:
+        type: integer
       reqMsg:
         type: string
       reqTime:
@@ -2702,11 +2738,6 @@ paths:
       description: 用户注册
       operationId: UserRegister
       parameters:
-      - description: im token
-        in: header
-        name: token
-        required: true
-        type: string
       - description: secret为openIM密钥, 详细见服务端config.yaml secret字段 <br> platform为平台ID
           <br> ex为拓展字段 <br> gender为性别, 0为女, 1为男
         in: body
@@ -2739,11 +2770,6 @@ paths:
       description: 获取用户的token
       operationId: UserToken
       parameters:
-      - description: im token
-        in: header
-        name: token
-        required: true
-        type: string
       - description: secret为openIM密钥, 详细见服务端config.yaml secret字段 <br> platform为平台ID
         in: body
         name: req

cmd/open_im_api/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	_ "Open_IM/cmd/open_im_api/docs"
 	apiAuth "Open_IM/internal/api/auth"
+	clientInit "Open_IM/internal/api/client_init"
 	"Open_IM/internal/api/conversation"
 	"Open_IM/internal/api/friend"
 	"Open_IM/internal/api/group"
@@ -17,13 +18,15 @@ import (
 	"Open_IM/pkg/utils"
 	"flag"
 	"fmt"
+
 	//_ "github.com/razeencheng/demo-go/swaggo-gin/docs"
-	swaggerFiles "github.com/swaggo/files"
-	ginSwagger "github.com/swaggo/gin-swagger"
 	"io"
 	"os"
 	"strconv"
 
+	swaggerFiles "github.com/swaggo/files"
+	ginSwagger "github.com/swaggo/gin-swagger"
+
 	"github.com/gin-gonic/gin"
 	//"syscall"
 	"Open_IM/pkg/common/constant"
@@ -41,10 +44,9 @@ func main() {
 	gin.SetMode(gin.ReleaseMode)
 	f, _ := os.Create("../logs/api.log")
 	gin.DefaultWriter = io.MultiWriter(f)
-	gin.SetMode(gin.DebugMode)
+	//	gin.SetMode(gin.DebugMode)
 	r := gin.Default()
 	r.Use(utils.CorsHandler())
-
 	log.Info("load  config: ", config.Config)
 	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 	// user routing group, which handles user registration and login services
@@ -52,7 +54,7 @@ func main() {
 	{
 		userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) //1
 		userRouterGroup.POST("/set_global_msg_recv_opt", user.SetGlobalRecvMessageOpt)
-		userRouterGroup.POST("/get_users_info", user.GetUsersInfo)                  //1
+		userRouterGroup.POST("/get_users_info", user.GetUsersPublicInfo)            //1
 		userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo)           //1
 		userRouterGroup.POST("/get_users_online_status", user.GetUsersOnlineStatus) //1
 		userRouterGroup.POST("/get_users_info_from_cache", user.GetUsersInfoFromCache)
@@ -61,6 +63,7 @@ func main() {
 		userRouterGroup.POST("/get_all_users_uid", manage.GetAllUsersUid) //1
 		userRouterGroup.POST("/account_check", manage.AccountCheck)       //1
 		//	userRouterGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) //1
+		userRouterGroup.POST("/get_users", user.GetUsers)
 	}
 	//friend routing group
 	friendRouterGroup := r.Group("/friend")
@@ -92,9 +95,9 @@ func main() {
 		groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner)                          //1
 		groupRouterGroup.POST("/get_recv_group_applicationList", group.GetRecvGroupApplicationList) //1
 		groupRouterGroup.POST("/get_user_req_group_applicationList", group.GetUserReqGroupApplicationList)
-		groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo)                   //1
+		groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) //1
-		groupRouterGroup.POST("/kick_group", group.KickGroupMember)                      //1
+		groupRouterGroup.POST("/kick_group", group.KickGroupMember)    //1
-		groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)        //no use
+		//	groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)        //no use
 		groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList) //1
 		groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo)      //1
 		groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup)          //1
@@ -106,6 +109,8 @@ func main() {
 		groupRouterGroup.POST("/cancel_mute_group", group.CancelMuteGroup)
 		groupRouterGroup.POST("/set_group_member_nickname", group.SetGroupMemberNickname)
 		groupRouterGroup.POST("/set_group_member_info", group.SetGroupMemberInfo)
+		groupRouterGroup.POST("/get_group_abstract_info", group.GetGroupAbstractInfo)
+		//groupRouterGroup.POST("/get_group_all_member_list_by_split", group.GetGroupAllMemberListBySplit)
 	}
 	superGroupRouterGroup := r.Group("/super_group")
 	{
@@ -132,6 +137,8 @@ func main() {
 		thirdGroup.POST("/get_rtc_invitation_info", apiThird.GetRTCInvitationInfo)
 		thirdGroup.POST("/get_rtc_invitation_start_app", apiThird.GetRTCInvitationInfoStartApp)
 		thirdGroup.POST("/fcm_update_token", apiThird.FcmUpdateToken)
+		thirdGroup.POST("/aws_storage_credential", apiThird.AwsStorageCredential)
+		thirdGroup.POST("/set_app_badge", apiThird.SetAppBadge)
 	}
 	//Message
 	chatGroup := r.Group("/msg")
@@ -201,6 +208,12 @@ func main() {
 
 	}
 
+	initGroup := r.Group("/init")
+	{
+		initGroup.POST("/set_client_config", clientInit.SetClientInitConfig)
+		initGroup.POST("/get_client_config", clientInit.GetClientInitConfig)
+	}
+
 	go apiThird.MinioInit()
 	defaultPorts := config.Config.Api.GinPort
 	ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10002 as port")
@@ -213,6 +226,6 @@ func main() {
 	fmt.Println("start api server, address: ", address)
 	err := r.Run(address)
 	if err != nil {
-		log.Error("", "run failed ", *ginPort, err.Error())
+		log.Error("", "api run failed ", *ginPort, err.Error())
 	}
 }

cmd/open_im_cms_api/main.go

@@ -8,6 +8,7 @@ import (
 	"strconv"
 
 	"Open_IM/pkg/common/config"
+
 	"github.com/gin-gonic/gin"
 )
 

cmd/open_im_cron_task/Makefile

@@ -1,7 +1,7 @@
 .PHONY: all build run gotool install clean help
 
-BINARY_NAME=open_im_statistics
+BINARY_NAME=open_im_cron_task
-BIN_DIR=../../../bin/
+BIN_DIR=../../bin/
 
 all: gotool build
 

cmd/open_im_cron_task/main.go

@@ -0,0 +1,11 @@
+package main
+
+import (
+	"Open_IM/internal/cron_task"
+	"fmt"
+)
+
+func main() {
+	fmt.Println("start cronTask")
+	cronTask.StartCronTask()
+}

cmd/open_im_demo/main.go

@@ -12,6 +12,7 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -31,6 +32,7 @@ func main() {
 		authRouterGroup.POST("/password", register.SetPassword)
 		authRouterGroup.POST("/login", register.Login)
 		authRouterGroup.POST("/reset_password", register.ResetPassword)
+		authRouterGroup.POST("/check_login", register.CheckLoginLimit)
 	}
 	demoRouterGroup := r.Group("/auth")
 	{
@@ -39,9 +41,26 @@ func main() {
 		demoRouterGroup.POST("/password", register.SetPassword)
 		demoRouterGroup.POST("/login", register.Login)
 		demoRouterGroup.POST("/reset_password", register.ResetPassword)
+		demoRouterGroup.POST("/check_login", register.CheckLoginLimit)
+	}
+
+	//deprecated
+	cmsRouterGroup := r.Group("/cms_admin")
+	{
+		cmsRouterGroup.POST("/generate_invitation_code", register.GenerateInvitationCode)
+		cmsRouterGroup.POST("/query_invitation_code", register.QueryInvitationCode)
+		cmsRouterGroup.POST("/get_invitation_codes", register.GetInvitationCodes)
+
+		cmsRouterGroup.POST("/query_user_ip_limit_login", register.QueryUserIDLimitLogin)
+		cmsRouterGroup.POST("/add_user_ip_limit_login", register.AddUserIPLimitLogin)
+		cmsRouterGroup.POST("/remove_user_ip_limit_login", register.RemoveUserIPLimitLogin)
+
+		cmsRouterGroup.POST("/query_ip_register", register.QueryIPRegister)
+		cmsRouterGroup.POST("/add_ip_limit", register.AddIPLimit)
+		cmsRouterGroup.POST("/remove_ip_Limit", register.RemoveIPLimit)
 	}
 	defaultPorts := config.Config.Demo.Port
-	ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 42233 as port")
+	ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10004 as port")
 	flag.Parse()
 	fmt.Println("start demo api server, port: ", *ginPort)
 	address := "0.0.0.0:" + strconv.Itoa(*ginPort)
@@ -51,6 +70,7 @@ func main() {
 	address = config.Config.CmsApi.ListenIP + ":" + strconv.Itoa(*ginPort)
 	fmt.Println("start demo api server address: ", address)
 	go register.OnboardingProcessRoutine()
+	go register.ImportFriendRoutine()
 	err := r.Run(address)
 	if err != nil {
 		log.Error("", "run failed ", *ginPort, err.Error())

cmd/open_im_msg_transfer/main.go

@@ -2,8 +2,10 @@ package main
 
 import (
 	"Open_IM/internal/msg_transfer/logic"
+	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
+	"flag"
 	"fmt"
 	"sync"
 )
@@ -11,9 +13,10 @@ import (
 func main() {
 	var wg sync.WaitGroup
 	wg.Add(1)
+	rpcPort := flag.Int("port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "MessageTransferPrometheusPort default listen port")
 	log.NewPrivateLog(constant.LogFileName)
 	logic.Init()
 	fmt.Println("start msg_transfer server")
-	logic.Run()
+	logic.Run(*rpcPort)
 	wg.Wait()
 }

cmd/rpc/open_im_message_cms/Makefile

@@ -1,23 +0,0 @@
-.PHONY: all build run gotool install clean help
-
-BINARY_NAME=open_im_message_cms
-BIN_DIR=../../../bin/
-
-all: gotool build
-
-build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
-
-run:
-	@go run ./
-
-gotool:
-	go fmt ./
-	go vet ./
-
-install:
-	make build
-	mv ${BINARY_NAME} ${BIN_DIR}
-
-clean:
-	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

cmd/rpc/open_im_message_cms/main.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	rpcMessageCMS "Open_IM/internal/rpc/message_cms"
-	"Open_IM/pkg/common/config"
-	"flag"
-	"fmt"
-)
-
-func main() {
-	defaultPorts := config.Config.RpcPort.OpenImMessageCmsPort[0]
-	rpcPort := flag.Int("port", defaultPorts, "rpc listening port")
-	flag.Parse()
-	fmt.Println("start msg cms rpc server, port: ", *rpcPort)
-	rpcServer := rpcMessageCMS.NewMessageCMSServer(*rpcPort)
-	rpcServer.Run()
-}

cmd/rpc/open_im_statistics/main.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"Open_IM/internal/rpc/statistics"
-	"Open_IM/pkg/common/config"
-	"flag"
-	"fmt"
-)
-
-func main() {
-	defaultPorts := config.Config.RpcPort.OpenImStatisticsPort
-	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
-	flag.Parse()
-	fmt.Println("start statistics rpc server, port: ", *rpcPort)
-	rpcServer := statistics.NewStatisticsServer(*rpcPort)
-	rpcServer.Run()
-}

config/config.yaml

@@ -2,7 +2,7 @@
 # The class cannot be named by Pascal or camel case.
 # If it is not used, the corresponding structure will not be set,
 # and it will not be read naturally.
-serverversion: 2.3.0-rc2
+serverversion: 2.3.1
 #---------------Infrastructure configuration---------------------#
 etcd:
   etcdSchema: openim  #默认即可
@@ -17,9 +17,9 @@ mysql:
   dbMysqlDatabaseName: openIM_v2 #默认即可
   dbTableName: eMsg #默认即可
   dbMsgTableNum: 1
-  dbMaxOpenConns: 20
+  dbMaxOpenConns: 100
   dbMaxIdleConns: 10
-  dbMaxLifeTime: 120
+  dbMaxLifeTime: 5
 
 mongo:
   dbUri: ""#当dbUri值不为空则直接使用该值
@@ -32,6 +32,7 @@ mongo:
   dbPassword:  #mongo密码，建议先不设置
   dbMaxPoolSize: 100
   dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改
+  chatRecordsClearTime: "* * * * *" # 每天凌晨3点清除消息，该配置和linux定时任务一样， 清理操作建议设置在用户活跃少的时候 # 0 3 * * *
 
 redis:
   dbAddress: [ 127.0.0.1:16379 ] #redis地址 单机时，填写一个地址即可，使用redis集群时候，填写集群中多个节点地址（主从地址都可以填写，增加容灾能力），默认即可
@@ -45,16 +46,16 @@ redis:
 kafka:
   ws2mschat:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
-    topic: "ws2ms_chat"
+    topic: "ws2ms_chat" #用于mongo和mysql保存消息
-  ws2mschatoffline:
+#  ws2mschatoffline:
-    addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
+#    addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
-    topic: "ws2ms_chat_offline"
+#    topic: "ws2ms_chat_offline" #原为离线用户消息处理，目前暂时弃用
   msgtomongo:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
     topic: "msg_to_mongo"
   ms2pschat:
     addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可
-    topic: "ms2ps_chat"
+    topic: "ms2ps_chat" #消息push
   consumergroupid:
     msgToTransfer: mongo
     msgToMongo: mongo_ex
@@ -72,7 +73,7 @@ kafka:
 serverip: 0.0.0.0
 
 #作为rpc时，注册到etcd的地址，单机默认即可，如果是集群部署，需要修改（具体使用内网地址还是外网地址，要依情况而定，目的是api/gateway能访问到）
-rpcRegisterIP: 127.0.0.1
+rpcRegisterIP:
 #默认即可
 listenIP: 0.0.0.0
 
@@ -87,9 +88,7 @@ endpoints:
   rpc_group: openim_rpc_group
   rpc_msg: openim_rpc_msg
   rpc_user: openim_rpc_user
-  rpc_statistic: openim_rpc_statistic
   rpc_admin_cms: openim_rpc_admin_cms
-  rpc_message_cms: openim_rpc_admin_cms
   rpc_office: openim_rpc_office
 
 api:
@@ -101,6 +100,9 @@ cmsapi:
 sdk:
   openImSdkWsPort: [ 10003 ] #jssdk服务端口，默认即可，项目中使用jssdk才需开放此端口或做nginx转发
   dataDir: [ ../db/sdk/ ]
+  openImWsAddress: ws://127.0.0.1:10001
+  openImApiAddress: http://127.0.0.1:10002
+
 #对象存储服务，以下配置二选一，目前支持两种，腾讯云和minio，二者配置好其中一种即可（如果使用minio参考https://doc.rentsoft.cn/#/qa/minio搭建minio服务器）
 credential: #腾讯cos，发送图片、视频、文件时需要，请自行申请后替换，必须修改
   tencent:
@@ -119,6 +121,7 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申
     accessKeyID: user12345
     secretAccessKey: key12345
     storageTime: 50 #文件在minio中保存的时间
+    isDistributedMod: false # 是否分布式多硬盘部署 默认docker-compose中为false
   ali: # ali oss
     regionID: "oss-cn-beijing"
     accessKeyID: ""
@@ -129,6 +132,15 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申
     finalHost: "http://bucket1.oss-cn-beijing.aliyuncs.com"
     stsDurationSeconds: 3600
     OssRoleArn: "acs:ram::xxx:role/xxx"
+  aws:
+    accessKeyID: 1                            #AssumeRole用户关联的accessKeyID
+    accessKeySecret: 2     #AssumeRole用户关联的accessKeySecrect
+    region: ap-southeast-1                                        #分区
+    bucket: ouyang                                                #桶
+    finalHost:  ouyang.s3.ap-southeast-1.amazonaws.com            #对外Host
+    roleArn: arn:aws:iam::192209831083:role/AWS_S3_FOR_OUYANG     #RoleArn
+    externalId: AssumeRoleExtend                                  #角色扩展Id
+    roleSessionName: Required-AWS-ID-OPENIM                       #角色SESSION名称
 
 dtm:
   serverURL: 127.0.0.1:10007
@@ -141,13 +153,12 @@ rpcport: #rpc服务端口 默认即可
   openImGroupPort: [ 10150 ]
   openImAuthPort: [ 10160 ]
   openImPushPort: [ 10170 ]
-  openImStatisticsPort: [ 10180 ]
-  openImMessageCmsPort: [ 10190 ]
   openImAdminCmsPort: [ 10200 ]
   openImOfficePort: [ 10210 ]
   openImOrganizationPort: [ 10220 ]
   openImConversationPort: [ 10230 ]
-  openImCachePort: [10240]
+  openImCachePort: [ 10240 ]
+  openImRealTimeCommPort: [ 11300 ]
   c2c:
     callbackBeforeSendMsg:
       switch: false
@@ -166,8 +177,6 @@ rpcregistername: #rpc注册服务名，默认即可
   openImRelayName: Relay
   openImGroupName: Group
   openImAuthName: Auth
-  openImStatisticsName: Statistics
-  openImMessageCMSName: MessageCMS
   openImAdminCMSName: AdminCMS
   openImOfficeName: Office
   openImOrganizationName: Organization
@@ -250,7 +259,7 @@ singleMessageHasReadReceiptEnable: true
 tokenpolicy:
   accessSecret: "open_im_server" #token生成相关，默认即可
   # Token effective time day as a unit
-  accessExpire: 3650 #token过期时间（天） 默认即可
+  accessExpire: 90 #token过期时间（天） 默认即可
 messageverify:
   friendVerify: false
 
@@ -297,6 +306,9 @@ callback:
   callbackUserOffline:
     enable: false
     callbackTimeOut: 2
+  callbackUserKickOff:
+    enable: false
+    callbackTimeOut: 2
   callbackOfflinePush:
     enable: false
     callbackTimeOut: 2
@@ -719,6 +731,7 @@ demo:
     verificationCodeTemplateCode: 2902877
     enable: true
   superCode: 666666 #超级验证码，建议修改掉，收不到短信验证码时可以用此替代
+  needInvitationCode: false
   #  second
   codeTTL: 60
   useSuperCode: true
@@ -730,6 +743,28 @@ demo:
     smtpPort: 25   #需开放此端口 出口方向
   testDepartMentID: 001
   imAPIURL: http://127.0.0.1:10002
+  onboardProcess: false # 是否开启注册流程
+  createOrganizationUserAndJoinDepartment: false
+  joinDepartmentIDList: [] # 用户注册进来默认加的部门ID列表 不填就随机
+  joinDepartmentGroups: false # 注册是否加部门群
+  oaNotification: false # 注册是否发送OA通知
 
 rtc:
   signalTimeout: 35
+
+prometheus:
+  enable: false
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  adminCmsPrometheusPort: [ 20200 ]
+  officePrometheusPort: [ 20210 ]
+  organizationPrometheusPort: [ 20220 ]
+  conversationPrometheusPort: [ 20230 ]
+  cachePrometheusPort: [ 20240 ]
+  realTimeCommPrometheusPort: [ 21300 ]
+  messageTransferPrometheusPort: [ 21400 ]

deploy_k8s/admin_cms/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: admin-cms
-          image: openim/admin_cms:v2.2.0
+          image: openim/admin_cms:v2.3.0release
           # imagePullPolicy: Always #每次启动都重新拉取镜像
           ports:
             - containerPort: 10200
@@ -23,6 +23,9 @@ spec:
             - name: config
               mountPath: /Open-IM-Server/config
               readOnly: true
+          env:
+            - name: CONFIG_NAME
+              value: "/Open-IM-Server"    
       volumes:
         - name: config
           configMap:

deploy_k8s/api/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: api
-        image: openim/api:v2.2.0
+        image: openim/api:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10002
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"        
       volumes:
         - name: config
           configMap:

deploy_k8s/auth/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: auth
-        image: openim/auth:v2.2.0
+        image: openim/auth:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10160
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"        
       volumes:
         - name: config
           configMap:

deploy_k8s/cache/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cache
-        image: openim/cache:v2.2.0
+        image: openim/cache:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10240
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"     
       volumes:
         - name: config
           configMap:

deploy_k8s/cms_api/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: cms-api
-        image: openim/cms_api:v2.2.0
+        image: openim/cms_api:v2.3.0release
         imagePullPolicy: Always
         ports:
         - containerPort: 10006
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"     
       volumes:
         - name: config
           configMap:

deploy_k8s/conversation/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: conversation
-          image: openim/conversation:v2.2.0
+          image: openim/conversation:v2.3.0release
           # imagePullPolicy: Always
           ports:
             - containerPort: 10230
@@ -23,6 +23,10 @@ spec:
             - name: config
               mountPath: /Open-IM-Server/config
               readOnly: true
+          env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server" 
+          
       volumes:
         - name: config
           configMap:

deploy_k8s/demo/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: demo
-        image: openim/demo:v2.2.0
+        image: openim/demo:v2.3.0release
         imagePullPolicy: Always
         ports:
         - containerPort: 10004
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"     
       volumes:
         - name: config
           configMap:

deploy_k8s/friend/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: friend
-        image: openim/friend:v2.2.0
+        image: openim/friend:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10120
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"     
       volumes:
         - name: config
           configMap:

deploy_k8s/group/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: group
-        image: openim/group:v2.2.0
+        image: openim/group:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10150
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"     
       volumes:
         - name: config
           configMap:

deploy_k8s/message_cms/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: message-cms
-        image: openim/message_cms:v2.2.0
+        image: openim/message_cms:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10190
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"     
       volumes:
         - name: config
           configMap:

deploy_k8s/msg/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg
-        image: openim/msg:v2.2.0
+        image: openim/msg:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10130
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
       volumes:
         - name: config
           configMap:

deploy_k8s/msg_gateway/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: msg-gateway
-        image: openim/msg_gateway:v2.2.0
+        image: openim/msg_gateway:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - name: rpc-port
@@ -26,6 +26,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
       volumes:
         - name: config
           configMap:

deploy_k8s/msg_transfer/deployment.yaml

@@ -15,12 +15,15 @@ spec:
     spec:
       containers:
       - name: msg-transfer
-        image: openim/msg_transfer:v2.2.0
+        image: openim/msg_transfer:v2.3.0release
         # imagePullPolicy: Always
         volumeMounts:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
       volumes:
         - name: config
           configMap:

deploy_k8s/office/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: office
-        image: openim/office:v2.2.0
+        image: openim/office:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10210
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
       volumes:
         - name: config
           configMap:

deploy_k8s/organization/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: organization
-        image: openim/organization:v2.2.0
+        image: openim/organization:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10220
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
       volumes:
         - name: config
           configMap:

deploy_k8s/push/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: push
-        image: openim/push:v2.2.0
+        image: openim/push:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10170
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
       volumes:
         - name: config
           configMap:

deploy_k8s/sdk_server/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: sdk-server
-        image: openim/sdk_server:v2.2.0
+        image: openim/sdk_server:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10003
@@ -25,8 +25,11 @@ spec:
             readOnly: true
           - name: local-db
             mountPath: /db/sdk
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
         command: ["/Open-IM-Server/main"]
-        args: ["-openIM_api_port", "10002", "-openIM_ws_port", "10001", "-sdk_ws_port", "10003", "-openIM_log_level", "6"]
+        args: ["-openIM_ws_address", "ws_addr", "-sdk_ws_port", "10001", "-openIM_api_address", "api_address", "-openIM_log_level", "6"]
       volumes:
         - name: config
           configMap:

deploy_k8s/statistics/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: statistics
-        image: openim/statistics:v2.2.0
+        image: openim/statistics:v2.3.0release
         # imagePullPolicy: Always
         ports:
         - containerPort: 10180
@@ -23,6 +23,9 @@ spec:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
       volumes:
         - name: config
           configMap:

deploy_k8s/user/deployment.yaml

@@ -15,12 +15,15 @@ spec:
     spec:
       containers:
       - name: user
-        image: openim/user:v2.2.0
+        image: openim/user:v2.3.0release
         # imagePullPolicy: Always
         volumeMounts:
           - name: config
             mountPath: /Open-IM-Server/config
             readOnly: true
+        env:
+          - name: CONFIG_NAME
+            value: "/Open-IM-Server"         
       volumes:
         - name: config
           configMap:

docker-compose.yaml

@@ -112,21 +112,10 @@ services:
       MINIO_ROOT_PASSWORD: key12345
     restart: always
     command: minio server /data --console-address ':9090'
-  #
+
-  #  dtm:
-  #    image: yedf/dtm
-  #    ports:
-  #      - 36789:36789
-  #      - 36790:36790
-  #    environment:
-  #      STORE_DRIVER: mysql
-  #      STORE_HOST: localhost
-  #      STORE_USER: root
-  #      STORE_PASSWORD: ''
-  #      STORE_PORT: 3306
 
   open_im_server:
-    image: openim/open_im_server:v2.3.0-rc2
+    image: openim/open_im_server:v2.3.2
     container_name: open_im_server
     volumes:
       - ./logs:/Open-IM-Server/logs
@@ -147,3 +136,39 @@ services:
       options:
         max-size: "1g"
         max-file: "2"
+
+  prometheus:
+    image: prom/prometheus
+    volumes:
+      - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml
+      # - ./components/prometheus_data:/prometheus
+    container_name: prometheus
+    ports:
+    - 9091:9091
+    depends_on:
+    - open_im_server
+    command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml"
+    network_mode: "host" 
+
+  grafana:
+    image: grafana/grafana
+    volumes:
+    # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json
+    # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
+    - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
+    - ./docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini
+    - ./docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json
+    container_name: grafana
+    ports:
+    - 10007:10007
+    depends_on:
+    - prometheus
+    network_mode: "host" 
+
+  node-exporter:
+    image: quay.io/prometheus/node-exporter
+    container_name: node-exporter
+    restart: always
+    ports:
+      - "9100:9100"
+    # command: --collector.ENTER-THE-NAME-OF-COLLECTOR

docker-compose_cfg/datasource-compose.yaml

@@ -0,0 +1,13 @@
+#more datasource-compose.yaml 
+apiVersion: 1
+
+datasources:
+- name: Prometheus
+  type: prometheus
+  access: proxy
+  orgId: 1
+  url: http://127.0.0.1:9091
+  basicAuth: false
+  isDefault: true
+  version: 1
+  editable: true

docker-compose_cfg/prometheus-compose.yml

@@ -0,0 +1,28 @@
+#more prometheus-compose.yml 
+global:
+  scrape_interval:     15s 
+  evaluation_interval: 15s 
+  external_labels:
+    monitor: 'openIM-monitor'
+
+scrape_configs:
+    - job_name: 'prometheus'
+      static_configs:
+      - targets: ['localhost:9091']
+
+    - job_name: 'openIM-server'
+      metrics_path: /metrics
+      static_configs:
+      - targets: ['localhost:10006']
+        labels:
+          group: 'cms-api'
+      - targets: ['localhost:21400']
+        labels:
+          group: 'msg-transfer'
+
+
+    - job_name: 'node'  
+      scrape_interval: 8s
+      static_configs:
+      - targets: ['localhost:9100']
+     

go.mod

@@ -11,6 +11,10 @@ require (
 	github.com/alibabacloud-go/sts-20150401 v1.1.0
 	github.com/alibabacloud-go/tea v1.1.17
 	github.com/antonfisher/nested-logrus-formatter v1.3.0
+	github.com/aws/aws-sdk-go-v2 v1.16.7
+	github.com/aws/aws-sdk-go-v2/config v1.15.14
+	github.com/aws/aws-sdk-go-v2/credentials v1.12.9
+	github.com/aws/aws-sdk-go-v2/service/sts v1.16.9
 	github.com/bwmarrin/snowflake v0.3.0
 	github.com/dtm-labs/rockscache v0.0.11
 	github.com/fatih/structs v1.1.0
@@ -34,7 +38,9 @@ require (
 	github.com/olivere/elastic/v7 v7.0.23
 	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.13.0 // indirect
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
+	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.2
 	github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe
@@ -43,6 +49,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.428
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.428
 	github.com/tencentyun/qcloud-cos-sts-sdk v0.0.0-20210325043845-84a0811633ca
+	github.com/xuri/excelize/v2 v2.6.0
 	go.etcd.io/etcd/api/v3 v3.5.4
 	go.etcd.io/etcd/client/v3 v3.5.4
 	go.mongodb.org/mongo-driver v1.8.3
@@ -50,13 +57,13 @@ require (
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.19.1 // indirect
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
-	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb
+	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
 	golang.org/x/net v0.0.0-20220622184535-263ec571b305
 	golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 // indirect
 	golang.org/x/tools v0.1.11 // indirect
 	google.golang.org/api v0.59.0
 	google.golang.org/grpc v1.45.0
-	google.golang.org/protobuf v1.28.0
+	google.golang.org/protobuf v1.28.1
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/ini.v1 v1.66.2 // indirect

go.sum

@@ -99,10 +99,33 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
 github.com/antonfisher/nested-logrus-formatter v1.3.0 h1:8zixYquU1Odk+vzAaAQPAdRh1ZjmUXNQ1T+dUBvlhVo=
 github.com/antonfisher/nested-logrus-formatter v1.3.0/go.mod h1:6WTfyWFkBc9+zyBaKIqRrg/KwMqBbodBjgbHjDz7zjA=
 github.com/aws/aws-sdk-go v1.38.3/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go-v2 v1.16.7 h1:zfBwXus3u14OszRxGcqCDS4MfMCv10e8SMJ2r8Xm0Ns=
+github.com/aws/aws-sdk-go-v2 v1.16.7/go.mod h1:6CpKuLXg2w7If3ABZCl/qZ6rEgwtjZTn4eAf4RcEyuw=
+github.com/aws/aws-sdk-go-v2/config v1.15.14 h1:+BqpqlydTq4c2et9Daury7gE+o67P4lbk7eybiCBNc4=
+github.com/aws/aws-sdk-go-v2/config v1.15.14/go.mod h1:CQBv+VVv8rR5z2xE+Chdh5m+rFfsqeY4k0veEZeq6QM=
+github.com/aws/aws-sdk-go-v2/credentials v1.12.9 h1:DloAJr0/jbvm0iVRFDFh8GlWxrOd9XKyX82U+dfVeZs=
+github.com/aws/aws-sdk-go-v2/credentials v1.12.9/go.mod h1:2Vavxl1qqQXJ8MUcQZTsIEW8cwenFCWYXtLRPba3L/o=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.8 h1:VfBdn2AxwMbFyJN/lF/xuT3SakomJ86PZu3rCxb5K0s=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.8/go.mod h1:oL1Q3KuCq1D4NykQnIvtRiBGLUXhcpY5pl6QZB2XEPU=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.14 h1:2C0pYHcUBmdzPj+EKNC4qj97oK6yjrUhc1KoSodglvk=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.14/go.mod h1:kdjrMwHwrC3+FsKhNcCMJ7tUVj/8uSD5CZXeQ4wV6fM=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.8 h1:2J+jdlBJWEmTyAwC82Ym68xCykIvnSnIN18b8xHGlcc=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.8/go.mod h1:ZIV8GYoC6WLBW5KGs+o4rsc65/ozd+eQ0L31XF5VDwk=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.15 h1:QquxR7NH3ULBsKC+NoTpilzbKKS+5AELfNREInbhvas=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.15/go.mod h1:Tkrthp/0sNBShQQsamR7j/zY4p19tVTAs+nnqhH6R3c=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.8 h1:oKnAXxSF2FUvfgw8uzU/v9OTYorJJZ8eBmWhr9TWVVQ=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.8/go.mod h1:rDVhIMAX9N2r8nWxDUlbubvvaFMnfsm+3jAV7q+rpM4=
+github.com/aws/aws-sdk-go-v2/service/sso v1.11.12 h1:760bUnTX/+d693FT6T6Oa7PZHfEQT9XMFZeM5IQIB0A=
+github.com/aws/aws-sdk-go-v2/service/sso v1.11.12/go.mod h1:MO4qguFjs3wPGcCSpQ7kOFTwRvb+eu+fn+1vKleGHUk=
+github.com/aws/aws-sdk-go-v2/service/sts v1.16.9 h1:yOfILxyjmtr2ubRkRJldlHDFBhf5vw4CzhbwWIBmimQ=
+github.com/aws/aws-sdk-go-v2/service/sts v1.16.9/go.mod h1:O1IvkYxr+39hRf960Us6j0x1P8pDqhTX+oXM5kQNl/Y=
+github.com/aws/smithy-go v1.12.0 h1:gXpeZel/jPoWQ7OEmLIgCUnhkFftqNfwWUwAHSlp1v0=
+github.com/aws/smithy-go v1.12.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
 github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
@@ -180,9 +203,11 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -273,8 +298,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -405,6 +431,7 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4=
 github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
@@ -423,6 +450,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -467,22 +496,39 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU=
+github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
+github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
+github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
+github.com/richardlehane/msoleps v1.0.1 h1:RfrALnSNXzmXLbGct/P2b4xkFz4e8Gmj/0Vj9M9xC1o=
+github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
@@ -548,6 +594,12 @@ github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyh
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
 github.com/xdg/scram v1.0.3/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.3/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8 h1:3X7aE0iLKJ5j+tz58BpvIZkXNV7Yq4jC93Z/rbN2Fxk=
+github.com/xuri/efp v0.0.0-20220407160117-ad0f7a785be8/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.6.0 h1:m/aXAzSAqxgt74Nfd+sNzpzVKhTGl7+S9nbG4A57mF4=
+github.com/xuri/excelize/v2 v2.6.0/go.mod h1:Q1YetlHesXEKwGFfeJn7PfEZz2IvHb6wdOeYjBxVcVs=
+github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 h1:OAmKAfT06//esDdpi/DZ8Qsdt4+M5+ltca05dA5bG2M=
+github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -602,6 +654,7 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -616,8 +669,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk=
+golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
-golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -688,9 +741,13 @@ golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1
 golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220622184535-263ec571b305 h1:dAgbJ2SP4jD6XYfMNLVj0BF21jo2PjChrtGaAvF5M3I=
 golang.org/x/net v0.0.0-20220622184535-263ec571b305/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -711,6 +768,7 @@ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 h1:B333XXssMuKQeBwiNODx4TupZy7bf4sxFZnN2ZOcvUE=
 golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -723,6 +781,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -791,6 +851,7 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU=
 golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1017,6 +1078,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=

internal/api/auth/auth.go

@@ -3,6 +3,7 @@ package apiAuth
 import (
 	api "Open_IM/pkg/base_info"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
@@ -10,10 +11,11 @@ import (
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
-	"github.com/fatih/structs"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"strings"
+
+	"github.com/fatih/structs"
+	"github.com/gin-gonic/gin"
 )
 
 // @Summary 用户注册
@@ -47,9 +49,9 @@ func UserRegister(c *gin.Context) {
 	//copier.Copy(req.UserInfo, &params)
 	req.OperationID = params.OperationID
 	log.NewInfo(req.OperationID, "UserRegister args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -65,7 +67,13 @@ func UserRegister(c *gin.Context) {
 	if reply.CommonResp.ErrCode != 0 {
 		errMsg := req.OperationID + " " + " UserRegister failed " + reply.CommonResp.ErrMsg + req.String()
 		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		if reply.CommonResp.ErrCode == constant.RegisterLimit {
+			c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterLimit, "errMsg": "用户注册被限制"})
+		} else if reply.CommonResp.ErrCode == constant.InvitationError {
+			c.JSON(http.StatusOK, gin.H{"errCode": constant.InvitationError, "errMsg": "邀请码错误"})
+		} else {
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		}
 		return
 	}
 
@@ -110,11 +118,11 @@ func UserToken(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": errMsg})
 		return
 	}
-	req := &rpc.UserTokenReq{Platform: params.Platform, FromUserID: params.UserID, OperationID: params.OperationID}
+	req := &rpc.UserTokenReq{Platform: params.Platform, FromUserID: params.UserID, OperationID: params.OperationID, LoginIp: params.LoginIp}
 	log.NewInfo(req.OperationID, "UserToken args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -206,9 +214,9 @@ func ForceLogout(c *gin.Context) {
 	}
 
 	log.NewInfo(req.OperationID, "ForceLogout args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/client_init/init_config.go

@@ -0,0 +1,75 @@
+package clientInit
+
+import (
+	api "Open_IM/pkg/base_info"
+	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/utils"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/jinzhu/gorm"
+)
+
+func SetClientInitConfig(c *gin.Context) {
+	var req api.SetClientInitConfigReq
+	var resp api.SetClientInitConfigResp
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError("0", utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
+	err, _ := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
+	if err != nil {
+		errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	m := make(map[string]interface{})
+	if req.DiscoverPageURL != nil {
+		m["discover_page_url"] = *req.DiscoverPageURL
+	}
+	if len(m) > 0 {
+		err := imdb.SetClientInitConfig(m)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+			return
+		}
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
+	c.JSON(http.StatusOK, resp)
+}
+
+func GetClientInitConfig(c *gin.Context) {
+	var req api.GetClientInitConfigReq
+	var resp api.GetClientInitConfigResp
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError("0", utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
+	err, _ := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
+	if err != nil {
+		errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	config, err := imdb.GetClientInitConfig()
+	if err != nil {
+		if !gorm.IsRecordNotFoundError(err) {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+			return
+		}
+	}
+	resp.Data.DiscoverPageURL = config.DiscoverPageURL
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp ", resp)
+	c.JSON(http.StatusOK, resp)
+
+}

internal/api/conversation/conversation.go

@@ -26,15 +26,15 @@ func SetConversation(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.Conversation = &pbUser.Conversation{}
+	reqPb.Conversation = &pbConversation.Conversation{}
 	err := utils.CopyStructFields(&reqPb, req)
 	err = utils.CopyStructFields(reqPb.Conversation, req.Conversation)
 	if err != nil {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -69,9 +69,9 @@ func ModifyConversationField(c *gin.Context) {
 	if err != nil {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImConversationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImConversationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -104,9 +104,9 @@ func BatchSetConversations(c *gin.Context) {
 	if err := utils.CopyStructFields(&reqPb, req); err != nil {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -154,9 +154,9 @@ func GetAllConversations(c *gin.Context) {
 	if err := utils.CopyStructFields(&reqPb, req); err != nil {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -204,9 +204,9 @@ func GetConversation(c *gin.Context) {
 	if err := utils.CopyStructFields(&reqPb, req); err != nil {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -254,9 +254,9 @@ func GetConversations(c *gin.Context) {
 	if err := utils.CopyStructFields(&reqPb, req); err != nil {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -292,9 +292,9 @@ func SetRecvMsgOpt(c *gin.Context) {
 	if err := utils.CopyStructFields(&reqPb, req); err != nil {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/friend/friend.go

@@ -48,7 +48,7 @@ func AddBlack(c *gin.Context) {
 	}
 	log.NewInfo(params.OperationID, "AddBlacklist args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	client := rpc.NewFriendClient(etcdConn)
 	RpcResp, err := client.AddBlacklist(context.Background(), req)
 	if err != nil {
@@ -93,9 +93,9 @@ func ImportFriend(c *gin.Context) {
 	}
 
 	log.NewInfo(req.OperationID, "ImportFriend args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -156,9 +156,9 @@ func AddFriend(c *gin.Context) {
 
 	log.NewInfo(req.CommID.OperationID, "AddFriend args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -213,9 +213,9 @@ func AddFriendResponse(c *gin.Context) {
 	utils.CopyStructFields(req, &params)
 	log.NewInfo(req.CommID.OperationID, "AddFriendResponse args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -268,9 +268,9 @@ func DeleteFriend(c *gin.Context) {
 
 	log.NewInfo(req.CommID.OperationID, "DeleteFriend args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -322,9 +322,9 @@ func GetBlacklist(c *gin.Context) {
 
 	log.NewInfo(req.CommID.OperationID, "GetBlacklist args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -383,9 +383,9 @@ func SetFriendRemark(c *gin.Context) {
 
 	log.NewInfo(req.CommID.OperationID, "SetFriendComment args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -436,9 +436,9 @@ func RemoveBlack(c *gin.Context) {
 	}
 
 	log.NewInfo(req.CommID.OperationID, "RemoveBlacklist args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -490,9 +490,9 @@ func IsFriend(c *gin.Context) {
 
 	log.NewInfo(req.CommID.OperationID, "IsFriend args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -545,9 +545,9 @@ func GetFriendList(c *gin.Context) {
 
 	log.NewInfo(req.CommID.OperationID, "GetFriendList args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -601,9 +601,9 @@ func GetFriendApplyList(c *gin.Context) {
 
 	log.NewInfo(req.CommID.OperationID, "GetFriendApplyList args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -657,9 +657,9 @@ func GetSelfFriendApplyList(c *gin.Context) {
 
 	log.NewInfo(req.CommID.OperationID, "GetSelfApplyList args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.CommID.OperationID)
 	if etcdConn == nil {
-		errMsg := req.CommID.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.CommID.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/group/group.go

@@ -11,7 +11,9 @@ import (
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
+
 	"github.com/golang/protobuf/ptypes/wrappers"
+	"google.golang.org/grpc"
 
 	"github.com/gin-gonic/gin"
 
@@ -56,9 +58,9 @@ func KickGroupMember(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "KickGroupMember args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -119,9 +121,9 @@ func GetGroupMembersInfo(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "GetGroupMembersInfo args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -163,9 +165,9 @@ func GetGroupMemberList(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "GetGroupMemberList args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -220,24 +222,25 @@ func GetGroupAllMemberList(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "GetGroupAllMember args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
+	maxSizeOption := grpc.MaxCallRecvMsgSize(1024 * 1024 * constant.GroupRPCRecvSize)
 	client := rpc.NewGroupClient(etcdConn)
-	RpcResp, err := client.GetGroupAllMember(context.Background(), req)
+	RpcResp, err := client.GetGroupAllMember(context.Background(), req, maxSizeOption)
 	if err != nil {
-		log.NewError(req.OperationID, "GetGroupAllMember failed ", err.Error(), req.String())
+		log.NewError(req.OperationID, "GetGroupAllMember failed err", err.Error(), req.String())
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
 
 	memberListResp := api.GetGroupAllMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, MemberList: RpcResp.MemberList}
 	memberListResp.Data = jsonData.JsonDataList(memberListResp.MemberList)
-	log.NewInfo(req.OperationID, "GetGroupAllMember api return ", memberListResp)
+	log.NewInfo(req.OperationID, "GetGroupAllMember api return ", len(memberListResp.MemberList))
 	c.JSON(http.StatusOK, memberListResp)
 }
 
@@ -275,9 +278,9 @@ func GetJoinedGroupList(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "GetJoinedGroupList args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -317,12 +320,7 @@ func InviteUserToGroup(c *gin.Context) {
 	}
 	req := &rpc.InviteUserToGroupReq{}
 	utils.CopyStructFields(req, &params)
-	if len(req.InvitedUserIDList) > constant.MaxNotificationNum {
+
-		errMsg := req.OperationID + " too many, Limit: " + utils.IntToString(constant.MaxNotificationNum)
-		log.NewError(req.OperationID, errMsg, len(req.InvitedUserIDList))
-		c.JSON(http.StatusRequestEntityTooLarge, gin.H{"errCode": 400, "errMsg": errMsg})
-		return
-	}
 	var ok bool
 	var errInfo string
 	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
@@ -335,9 +333,9 @@ func InviteUserToGroup(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "InviteUserToGroup args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -382,7 +380,13 @@ func CreateGroup(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
-	//
+
+	if len(params.MemberList) > constant.MaxNotificationNum {
+		errMsg := params.OperationID + " too many members " + utils.Int32ToString(int32(len(params.MemberList)))
+		log.Error(params.OperationID, errMsg)
+		c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": errMsg})
+		return
+	}
 	req := &rpc.CreateGroupReq{GroupInfo: &open_im_sdk.GroupInfo{}}
 	utils.CopyStructFields(req.GroupInfo, &params)
 
@@ -405,9 +409,9 @@ func CreateGroup(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "CreateGroup args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -461,9 +465,9 @@ func GetRecvGroupApplicationList(c *gin.Context) {
 	}
 	log.NewInfo(req.OperationID, "GetGroupApplicationList args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -513,9 +517,9 @@ func GetUserReqGroupApplicationList(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, "GetGroupsInfo args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -567,9 +571,9 @@ func GetGroupsInfo(c *gin.Context) {
 	}
 
 	log.NewInfo(req.OperationID, "GetGroupsInfo args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -637,9 +641,9 @@ func ApplicationGroupResponse(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "ApplicationGroupResponse args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -690,9 +694,9 @@ func JoinGroup(c *gin.Context) {
 	}
 
 	log.NewInfo(req.OperationID, "JoinGroup args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -744,9 +748,9 @@ func QuitGroup(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "QuitGroup args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -798,9 +802,9 @@ func SetGroupInfo(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "SetGroupInfo args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -865,9 +869,9 @@ func TransferGroupOwner(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, "TransferGroupOwner args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -919,9 +923,9 @@ func DismissGroup(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -973,9 +977,9 @@ func MuteGroupMember(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -1027,9 +1031,9 @@ func CancelMuteGroupMember(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -1081,9 +1085,9 @@ func MuteGroup(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -1135,9 +1139,9 @@ func CancelMuteGroup(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -1179,9 +1183,9 @@ func SetGroupMemberNickname(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -1249,10 +1253,10 @@ func SetGroupMemberInfo(c *gin.Context) {
 	if req.RoleLevel != nil {
 		reqPb.RoleLevel = &wrappers.Int32Value{Value: *req.RoleLevel}
 	}
-
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", reqPb.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -1267,6 +1271,52 @@ func SetGroupMemberInfo(c *gin.Context) {
 
 	resp.ErrMsg = respPb.CommonResp.ErrMsg
 	resp.ErrCode = respPb.CommonResp.ErrCode
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", resp)
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api return ", resp)
 	c.JSON(http.StatusOK, resp)
 }
+
+func GetGroupAbstractInfo(c *gin.Context) {
+	var (
+		req  api.GetGroupAbstractInfoReq
+		resp api.GetGroupAbstractInfoResp
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError("0", "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	ok, opUserID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	if etcdConn == nil {
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := rpc.NewGroupClient(etcdConn)
+	respPb, err := client.GetGroupAbstractInfo(context.Background(), &rpc.GetGroupAbstractInfoReq{
+		GroupID:     req.GroupID,
+		OpUserID:    opUserID,
+		OperationID: req.OperationID,
+	})
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", respPb.String())
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), " failed ", err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	resp.ErrMsg = respPb.CommonResp.ErrMsg
+	resp.ErrCode = respPb.CommonResp.ErrCode
+	resp.GroupMemberNumber = respPb.GroupMemberNumber
+	resp.GroupMemberListHash = respPb.GroupMemberListHash
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api return ", resp)
+	c.JSON(http.StatusOK, resp)
+	return
+}

internal/api/group/super_group.go

@@ -31,9 +31,9 @@ func GetJoinedSuperGroupList(c *gin.Context) {
 		return
 	}
 	reqPb := rpc.GetJoinedSuperGroupListReq{OperationID: req.OperationID, OpUserID: opUserID, UserID: req.FromUserID}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -67,9 +67,9 @@ func GetSuperGroupsInfo(c *gin.Context) {
 		return
 	}
 	reqPb := rpc.GetSuperGroupsInfoReq{OperationID: req.OperationID, OpUserID: opUserID, GroupIDList: req.GroupIDList}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/manage/management_chat.go

@@ -10,20 +10,21 @@ import (
 	api "Open_IM/pkg/base_info"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
+	"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"
 	pbChat "Open_IM/pkg/proto/msg"
-	"Open_IM/pkg/proto/sdk_ws"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
+	"net/http"
+	"strings"
+
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
 	"github.com/golang/protobuf/proto"
 	"github.com/mitchellh/mapstructure"
-	"net/http"
-	"strings"
 )
 
 var validate *validator.Validate
@@ -50,6 +51,8 @@ func newUserSendMsgReq(params *api.ManagementSendMsgReq) *pbChat.SendMsgReq {
 	case constant.Video:
 		fallthrough
 	case constant.File:
+		fallthrough
+	case constant.AdvancedRevoke:
 		newContent = utils.StructToJsonString(params.Content)
 	case constant.Revoke:
 		newContent = params.Content["revokeMsgClientID"].(string)
@@ -145,6 +148,8 @@ func ManagementSendMsg(c *gin.Context) {
 		data = CustomElem{}
 	case constant.Revoke:
 		data = RevokeElem{}
+	case constant.AdvancedRevoke:
+		data = MessageRevoked{}
 	case constant.OANotification:
 		data = OANotificationElem{}
 		params.SessionType = constant.NotificationChatType
@@ -189,7 +194,7 @@ func ManagementSendMsg(c *gin.Context) {
 			c.JSON(http.StatusBadRequest, gin.H{"errCode": 405, "errMsg": "recvID is a null string", "sendTime": 0, "MsgID": ""})
 			return
 		}
-	case constant.GroupChatType:
+	case constant.GroupChatType, constant.SuperGroupChatType:
 		if len(params.GroupID) == 0 {
 			log.NewError(params.OperationID, "groupID is a null string")
 			c.JSON(http.StatusBadRequest, gin.H{"errCode": 405, "errMsg": "groupID is a null string", "sendTime": 0, "MsgID": ""})
@@ -202,32 +207,33 @@ func ManagementSendMsg(c *gin.Context) {
 	pbData := newUserSendMsgReq(&params)
 	log.Info(params.OperationID, "", "api ManagementSendMsg call start..., [data: %s]", pbData.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
 	if etcdConn == nil {
-		errMsg := params.OperationID + "getcdv3.GetConn == nil"
+		errMsg := params.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(params.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
 	client := pbChat.NewMsgClient(etcdConn)
 	log.Info(params.OperationID, "", "api ManagementSendMsg call, api call rpc...")
+	var status int32
 	RpcResp, err := client.SendMsg(context.Background(), pbData)
 	if err != nil || (RpcResp != nil && RpcResp.ErrCode != 0) {
-		resp, err2 := client.SetSendMsgFailedFlag(context.Background(), &pbChat.SetSendMsgFailedFlagReq{OperationID: params.OperationID})
+		status = constant.MsgSendFailed
-		if err2 != nil {
+	} else {
-			log.NewError(params.OperationID, utils.GetSelfFuncName(), err.Error())
+		status = constant.MsgSendSuccessed
-		}
-		if resp != nil && resp.ErrCode != 0 {
-			log.NewError(params.OperationID, utils.GetSelfFuncName(), resp.ErrCode, resp.ErrMsg)
-		}
-		if err != nil {
-			log.NewError(params.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
-			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call UserSendMsg  rpc server failed"})
-			return
-		}
 	}
+
+	respSetSendMsgStatus, err2 := client.SetSendMsgStatus(context.Background(), &pbChat.SetSendMsgStatusReq{OperationID: params.OperationID, Status: status})
+	if err2 != nil {
+		log.NewError(params.OperationID, utils.GetSelfFuncName(), err2.Error())
+	}
+	if respSetSendMsgStatus != nil && respSetSendMsgStatus.ErrCode != 0 {
+		log.NewError(params.OperationID, utils.GetSelfFuncName(), respSetSendMsgStatus.ErrCode, respSetSendMsgStatus.ErrMsg)
+	}
+
 	log.Info(params.OperationID, "", "api ManagementSendMsg call end..., [data: %s] [reply: %s]", pbData.String(), RpcResp.String())
-	resp := api.ManagementSendMsgResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, ResultList: server_api_params.UserSendMsgResp{ServerMsgID: RpcResp.ServerMsgID, ClientMsgID: RpcResp.ClientMsgID, SendTime: RpcResp.SendTime}}
+	resp := api.ManagementSendMsgResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, ResultList: open_im_sdk.UserSendMsgResp{ServerMsgID: RpcResp.ServerMsgID, ClientMsgID: RpcResp.ClientMsgID, SendTime: RpcResp.SendTime}}
 	log.Info(params.OperationID, "ManagementSendMsg return", resp)
 	c.JSON(http.StatusOK, resp)
 }
@@ -314,24 +320,43 @@ func ManagementBatchSendMsg(c *gin.Context) {
 	}
 	log.NewInfo(params.OperationID, "Ws call success to ManagementSendMsgReq", params)
 	var msgSendFailedFlag bool
-
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
 	if etcdConn == nil {
-		errMsg := params.OperationID + "getcdv3.GetConn == nil"
+		errMsg := params.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(params.OperationID, errMsg)
-		//resp.Data.FailedIDList = params.RecvIDList
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": "rpc server error: etcdConn == nil"})
 		return
 	}
 	client := pbChat.NewMsgClient(etcdConn)
+	respSetSendMsgStatus, err := client.SetSendMsgStatus(context.Background(), &pbChat.SetSendMsgStatusReq{OperationID: params.OperationID, Status: constant.MsgIsSending})
+	if err != nil {
+		log.NewError(params.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	if respSetSendMsgStatus.ErrCode != 0 {
+		log.NewError(params.OperationID, utils.GetSelfFuncName(), "rpc failed", respSetSendMsgStatus)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": respSetSendMsgStatus.ErrMsg})
+		return
+	}
+
 	req := &api.ManagementSendMsgReq{
 		ManagementSendMsg: params.ManagementSendMsg,
 	}
 	pbData := newUserSendMsgReq(req)
-	for _, recvID := range params.RecvIDList {
+	var recvList []string
+	if params.IsSendAll {
+		recvList, err = im_mysql_model.SelectAllUserID()
+		if err != nil {
+			log.NewError(params.OperationID, utils.GetSelfFuncName(), err.Error())
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		}
+	} else {
+		recvList = params.RecvIDList
+	}
+	for _, recvID := range recvList {
 		pbData.MsgData.RecvID = recvID
 		log.Info(params.OperationID, "", "api ManagementSendMsg call start..., ", pbData.String())
-
 		rpcResp, err := client.SendMsg(context.Background(), pbData)
 		if err != nil {
 			log.NewError(params.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
@@ -352,14 +377,18 @@ func ManagementBatchSendMsg(c *gin.Context) {
 			RecvID:      recvID,
 		})
 	}
+	var status int32
 	if msgSendFailedFlag {
-		resp, err2 := client.SetSendMsgFailedFlag(context.Background(), &pbChat.SetSendMsgFailedFlagReq{OperationID: params.OperationID})
+		status = constant.MsgSendFailed
-		if err2 != nil {
+	} else {
-			log.NewError(params.OperationID, utils.GetSelfFuncName(), err2.Error())
+		status = constant.MsgSendSuccessed
-		}
+	}
-		if resp != nil && resp.ErrCode != 0 {
+	respSetSendMsgStatus, err2 := client.SetSendMsgStatus(context.Background(), &pbChat.SetSendMsgStatusReq{OperationID: params.OperationID, Status: status})
-			log.NewError(params.OperationID, utils.GetSelfFuncName(), resp.ErrCode, resp.ErrMsg)
+	if err2 != nil {
-		}
+		log.NewError(params.OperationID, utils.GetSelfFuncName(), err2.Error())
+	}
+	if respSetSendMsgStatus != nil && resp.ErrCode != 0 {
+		log.NewError(params.OperationID, utils.GetSelfFuncName(), resp.ErrCode, resp.ErrMsg)
 	}
 
 	log.NewInfo(params.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
@@ -374,9 +403,9 @@ func CheckMsgIsSendSuccess(c *gin.Context) {
 		log.Error(c.PostForm("operationID"), "json unmarshal err", err.Error(), c.PostForm("content"))
 		return
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -473,3 +502,10 @@ type OANotificationElem struct {
 	FileElem            FileElem    `mapstructure:"fileElem" json:"fileElem"`
 	Ex                  string      `mapstructure:"ex" json:"ex"`
 }
+type MessageRevoked struct {
+	RevokerID       string `mapstructure:"notificationName" json:"revokerID" validate:"required"`
+	RevokerRole     int32  `mapstructure:"notificationName" json:"revokerRole" validate:"required"`
+	ClientMsgID     string `mapstructure:"notificationName" json:"clientMsgID" validate:"required"`
+	RevokerNickname string `mapstructure:"notificationName" json:"revokerNickname"`
+	SessionType     int32  `mapstructure:"notificationName" json:"sessionType" validate:"required"`
+}

internal/api/manage/management_user.go

@@ -17,54 +17,12 @@ import (
 	rpc "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
 	"context"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"strings"
+
+	"github.com/gin-gonic/gin"
 )
 
-func DeleteUser(c *gin.Context) {
-	params := api.DeleteUsersReq{}
-	if err := c.BindJSON(&params); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
-		return
-	}
-	req := &rpc.DeleteUsersReq{}
-	utils.CopyStructFields(req, &params)
-
-	var ok bool
-	var errInfo string
-	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
-	if !ok {
-		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
-		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-
-	log.NewInfo(params.OperationID, "DeleteUser args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
-	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := rpc.NewUserClient(etcdConn)
-
-	RpcResp, err := client.DeleteUsers(context.Background(), req)
-	if err != nil {
-		log.NewError(req.OperationID, "call delete users rpc server failed", err.Error())
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call delete users rpc server failed"})
-		return
-	}
-	resp := api.DeleteUsersResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, FailedUserIDList: RpcResp.FailedUserIDList}
-	if len(RpcResp.FailedUserIDList) == 0 {
-		resp.FailedUserIDList = []string{}
-	}
-	log.NewInfo(req.OperationID, "DeleteUser api return", resp)
-	c.JSON(http.StatusOK, resp)
-}
-
 // @Summary 获取所有用户uid列表
 // @Description 获取所有用户uid列表
 // @Tags 用户相关
@@ -97,9 +55,9 @@ func GetAllUsersUid(c *gin.Context) {
 	}
 
 	log.NewInfo(params.OperationID, "GetAllUsersUid args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -152,9 +110,9 @@ func AccountCheck(c *gin.Context) {
 	}
 
 	log.NewInfo(params.OperationID, "AccountCheck args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -198,7 +156,7 @@ func GetUsersOnlineStatus(c *gin.Context) {
 	var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
 	var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
 	flag := false
-	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
+	grpcCons := getcdv3.GetDefaultGatewayConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), params.OperationID)
 	for _, v := range grpcCons {
 		client := pbRelay.NewRelayClient(v)
 		reply, err := client.GetUsersOnlineStatus(context.Background(), req)

internal/api/msg/del_msg.go

@@ -54,9 +54,9 @@ func DelMsg(c *gin.Context) {
 		return
 	}
 
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
 	if grpcConn == nil {
-		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -79,11 +79,11 @@ func DelSuperGroupMsg(c *gin.Context) {
 		resp api.DelSuperGroupMsgResp
 	)
 	rpcReq := &rpc.DelSuperGroupMsgReq{}
-	utils.CopyStructFields(req, &req)
 	if err := c.BindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
+	utils.CopyStructFields(rpcReq, &req)
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
 	var ok bool
 	var errInfo string
@@ -130,9 +130,9 @@ func DelSuperGroupMsg(c *gin.Context) {
 		c.JSON(http.StatusOK, resp)
 	}
 	log.Info(req.OperationID, "", "api DelSuperGroupMsg call start..., [data: %s]", pbData.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -140,8 +140,8 @@ func DelSuperGroupMsg(c *gin.Context) {
 	client := rpc.NewMsgClient(etcdConn)
 
 	log.Info(req.OperationID, "", "api DelSuperGroupMsg call, api call rpc...")
-	if req.IsAllDelete  {
+	if req.IsAllDelete {
-		RpcResp, err := client.DelSuperGroupMsg(context.Background(),rpcReq)
+		RpcResp, err := client.DelSuperGroupMsg(context.Background(), rpcReq)
 		if err != nil {
 			log.NewError(req.OperationID, "call delete DelSuperGroupMsg rpc server failed", err.Error())
 			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call DelSuperGroupMsg  rpc server failed"})
@@ -152,7 +152,7 @@ func DelSuperGroupMsg(c *gin.Context) {
 		resp.ErrMsg = RpcResp.ErrMsg
 		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
 		c.JSON(http.StatusOK, resp)
-	}else{
+	} else {
 		RpcResp, err := client.SendMsg(context.Background(), &pbData)
 		if err != nil {
 			log.NewError(req.OperationID, "call delete UserSendMsg rpc server failed", err.Error())
@@ -203,9 +203,9 @@ func ClearMsg(c *gin.Context) {
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -251,9 +251,9 @@ func SetMsgMinSeq(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + " getcdv3.GetConn == nil"
+		errMsg := req.OperationID + " getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/msg/get_max_min_seq.go

@@ -35,9 +35,9 @@ func GetSeq(c *gin.Context) {
 	pbData := sdk_ws.GetMaxAndMinSeqReq{}
 	pbData.UserID = params.SendID
 	pbData.OperationID = params.OperationID
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, pbData.OperationID)
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, pbData.OperationID)
 	if grpcConn == nil {
-		errMsg := pbData.OperationID + " getcdv3.GetConn == nil"
+		errMsg := pbData.OperationID + " getcdv3.GetDefaultConn == nil"
 		log.NewError(pbData.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/msg/pull_msg.go

@@ -51,9 +51,9 @@ func PullMsgBySeqList(c *gin.Context) {
 	pbData.OperationID = params.OperationID
 	pbData.SeqList = params.SeqList
 
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, pbData.OperationID)
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, pbData.OperationID)
 	if grpcConn == nil {
-		errMsg := pbData.OperationID + "getcdv3.GetConn == nil"
+		errMsg := pbData.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(pbData.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/msg/send_msg.go

@@ -71,9 +71,9 @@ func SendMsg(c *gin.Context) {
 	pbData := newUserSendMsgReq(token, &params)
 	log.Info(params.OperationID, "", "api SendMsg call start..., [data: %s]", pbData.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, params.OperationID)
 	if etcdConn == nil {
-		errMsg := params.OperationID + "getcdv3.GetConn == nil"
+		errMsg := params.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(params.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/office/tag.go

@@ -54,9 +54,9 @@ func GetUserTags(c *gin.Context) {
 
 	reqPb.UserID = userID
 	reqPb.OperationID = req.OperationID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -119,9 +119,9 @@ func CreateTag(c *gin.Context) {
 	}
 
 	reqPb.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -179,9 +179,9 @@ func DeleteTag(c *gin.Context) {
 	}
 
 	reqPb.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -239,9 +239,9 @@ func SetTag(c *gin.Context) {
 	}
 
 	reqPb.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -299,9 +299,9 @@ func SendMsg2Tag(c *gin.Context) {
 	}
 
 	reqPb.SendID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -361,9 +361,9 @@ func GetTagSendLogs(c *gin.Context) {
 		PageNumber: req.PageNumber,
 		ShowNumber: req.ShowNumber,
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -428,9 +428,9 @@ func GetUserTagByID(c *gin.Context) {
 	reqPb.UserID = userID
 	reqPb.OperationID = req.OperationID
 	reqPb.TagID = req.TagID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/office/work_moments.go

@@ -56,9 +56,9 @@ func CreateOneWorkMoment(c *gin.Context) {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
 	reqPb.WorkMoment.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -120,9 +120,9 @@ func DeleteOneWorkMoment(c *gin.Context) {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
 	reqPb.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -183,9 +183,9 @@ func LikeOneWorkMoment(c *gin.Context) {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
 	reqPb.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -245,9 +245,9 @@ func CommentOneWorkMoment(c *gin.Context) {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
 	reqPb.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -305,9 +305,9 @@ func DeleteComment(c *gin.Context) {
 		return
 	}
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -366,9 +366,9 @@ func GetWorkMomentByID(c *gin.Context) {
 	reqPb.OperationID = req.OperationID
 	reqPb.OpUserID = userID
 	reqPb.WorkMomentID = req.WorkMomentID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -436,9 +436,9 @@ func GetUserWorkMoments(c *gin.Context) {
 	}
 	reqPb.OpUserID = opUserID
 	reqPb.UserID = req.UserID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -548,9 +548,9 @@ func GetUserFriendWorkMoments(c *gin.Context) {
 		ShowNumber: req.ShowNumber,
 	}
 	reqPb.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -649,9 +649,9 @@ func SetUserWorkMomentsLevel(c *gin.Context) {
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
 	reqPb.UserID = userID
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/organization/organization.go

@@ -48,9 +48,9 @@ func CreateDepartment(c *gin.Context) {
 	}
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -103,9 +103,9 @@ func UpdateDepartment(c *gin.Context) {
 	}
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -156,9 +156,9 @@ func GetSubDepartment(c *gin.Context) {
 	}
 
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -212,9 +212,9 @@ func DeleteDepartment(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -266,9 +266,9 @@ func CreateOrganizationUser(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -319,9 +319,9 @@ func UpdateOrganizationUser(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -372,9 +372,9 @@ func CreateDepartmentMember(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -425,9 +425,9 @@ func GetUserInDepartment(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -479,9 +479,9 @@ func UpdateUserInDepartment(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -532,9 +532,9 @@ func DeleteOrganizationUser(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -584,9 +584,9 @@ func GetDepartmentMember(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -637,9 +637,9 @@ func DeleteUserInDepartment(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return

internal/api/third/aws_storage_credential.go

@@ -0,0 +1,76 @@
+package apiThird
+
+import (
+	api "Open_IM/pkg/base_info"
+	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/utils"
+	"context"
+	"net/http"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	awsConfig "github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go-v2/service/sts"
+	"github.com/gin-gonic/gin"
+)
+
+func AwsStorageCredential(c *gin.Context) {
+	var (
+		req  api.AwsStorageCredentialReq
+		resp api.AwsStorageCredentialResp
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
+	var ok bool
+	var errInfo string
+	ok, _, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	//原始帐号信息
+	awsSourceConfig, err := awsConfig.LoadDefaultConfig(context.TODO(), awsConfig.WithRegion(config.Config.Credential.Aws.Region),
+		awsConfig.WithCredentialsProvider(credentials.StaticCredentialsProvider{
+			Value: aws.Credentials{
+				AccessKeyID:     config.Config.Credential.Aws.AccessKeyID,
+				SecretAccessKey: config.Config.Credential.Aws.AccessKeySecret,
+				Source:          "Open IM OSS",
+			},
+		}))
+	if err != nil {
+		errMsg := req.OperationID + " " + "Init AWS S3 Credential failed " + err.Error() + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	//帐号转化
+	awsStsClient := sts.NewFromConfig(awsSourceConfig)
+	StsRole, err := awsStsClient.AssumeRole(context.Background(), &sts.AssumeRoleInput{
+		RoleArn:         aws.String(config.Config.Credential.Aws.RoleArn),
+		DurationSeconds: aws.Int32(constant.AwsDurationTimes),
+		RoleSessionName: aws.String(config.Config.Credential.Aws.RoleSessionName),
+		ExternalId:      aws.String(config.Config.Credential.Aws.ExternalId),
+	})
+	if err != nil {
+		errMsg := req.OperationID + " " + "AWS S3 AssumeRole failed " + err.Error() + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	resp.CosData.AccessKeyId = string(*StsRole.Credentials.AccessKeyId)
+	resp.CosData.SecretAccessKey = string(*StsRole.Credentials.SecretAccessKey)
+	resp.CosData.SessionToken = string(*StsRole.Credentials.SessionToken)
+	resp.CosData.Bucket = config.Config.Credential.Aws.Bucket
+	resp.CosData.RegionID = config.Config.Credential.Aws.Region
+	resp.CosData.FinalHost = config.Config.Credential.Aws.FinalHost
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
+}

internal/api/third/fcm_update_token.go

@@ -1,6 +1,7 @@
 package apiThird
 
 import (
+	api "Open_IM/pkg/base_info"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
@@ -10,18 +11,10 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-/**
- * FCM第三方上报Token
- */
-type FcmUpdateTokenReq struct {
-	OperationID string `json:"operationID"`
-	Platform    int    `json:"platform" binding:"required,min=1,max=2"` //only for ios + android
-	FcmToken    string `json:"fcmToken"`
-}
-
 func FcmUpdateToken(c *gin.Context) {
 	var (
-		req FcmUpdateTokenReq
+		req  api.FcmUpdateTokenReq
+		resp api.FcmUpdateTokenResp
 	)
 	if err := c.Bind(&req); err != nil {
 		log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
@@ -34,7 +27,9 @@ func FcmUpdateToken(c *gin.Context) {
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		resp.ErrCode = 500
+		resp.ErrMsg = errMsg
+		c.JSON(http.StatusInternalServerError, resp)
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req, UserId)
@@ -43,10 +38,12 @@ func FcmUpdateToken(c *gin.Context) {
 	if err != nil {
 		errMsg := req.OperationID + " " + "SetFcmToken failed " + err.Error() + " token:" + c.Request.Header.Get("token")
 		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		resp.ErrCode = 500
+		resp.ErrMsg = errMsg
+		c.JSON(http.StatusInternalServerError, resp)
 		return
 	}
 	//逻辑处理完毕
-	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": ""})
+	c.JSON(http.StatusOK, resp)
 	return
 }

internal/api/third/minio_init.go

@@ -32,6 +32,7 @@ func MinioInit() {
 	}
 	opts := &minio.Options{
 		Creds: credentials.NewStaticV4(config.Config.Credential.Minio.AccessKeyID, config.Config.Credential.Minio.SecretAccessKey, ""),
+		//Region: config.Config.Credential.Minio.Location,
 	}
 	if minioUrl.Scheme == "http" {
 		opts.Secure = false
@@ -46,8 +47,10 @@ func MinioInit() {
 		return
 	}
 	opt := minio.MakeBucketOptions{
-		Region:        config.Config.Credential.Minio.Location,
+		Region: config.Config.Credential.Minio.Location,
-		ObjectLocking: false,
+	}
+	if config.Config.Credential.Minio.IsDistributedMod == true {
+		opt.ObjectLocking = true
 	}
 	err = MinioClient.MakeBucket(context.Background(), config.Config.Credential.Minio.Bucket, opt)
 	if err != nil {
@@ -78,6 +81,9 @@ func MinioInit() {
 			return
 		}
 	}
+	policy, err := MinioClient.GetBucketPolicy(context.Background(), config.Config.Credential.Minio.Bucket)
+	log.NewInfo("", utils.GetSelfFuncName(), policy)
+
 	// 自动化桶public的代码
 	policyJsonString := fmt.Sprintf(`{"Version": "2012-10-17","Statement": [{"Action": ["s3:GetObject","s3:PutObject"],
 		"Effect": "Allow","Principal": {"AWS": ["*"]},"Resource": ["arn:aws:s3:::%s/*"],"Sid": ""}]}`, config.Config.Credential.Minio.Bucket)

internal/api/third/minio_storage_credential.go

@@ -15,6 +15,8 @@ import (
 	_ "github.com/minio/minio-go/v7"
 	cr "github.com/minio/minio-go/v7/pkg/credentials"
 	"net/http"
+	"strconv"
+	"strings"
 )
 
 // @Summary minio上传文件(web api)
@@ -145,13 +147,13 @@ func MinioStorageCredential(c *gin.Context) {
 	}
 	li, err := cr.NewSTSAssumeRole(endpoint, stsOpts)
 	if err != nil {
-		log.NewError("", utils.GetSelfFuncName(), "NewSTSAssumeRole failed", err.Error(), stsOpts, config.Config.Credential.Minio.Endpoint)
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "NewSTSAssumeRole failed", err.Error(), stsOpts, config.Config.Credential.Minio.Endpoint)
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	v, err := li.Get()
 	if err != nil {
-		log.NewError("0", utils.GetSelfFuncName(), "li.Get error", err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "li.Get error", err.Error())
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
@@ -161,6 +163,7 @@ func MinioStorageCredential(c *gin.Context) {
 	resp.BucketName = config.Config.Credential.Minio.Bucket
 	resp.StsEndpointURL = config.Config.Credential.Minio.Endpoint
 	resp.StorageTime = config.Config.Credential.Minio.StorageTime
+	resp.IsDistributedMod = config.Config.Credential.Minio.IsDistributedMod
 	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
 }
 
@@ -175,6 +178,7 @@ func UploadUpdateApp(c *gin.Context) {
 		return
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
+
 	var yamlName string
 	if req.Yaml == nil {
 		yamlName = ""
@@ -217,6 +221,13 @@ func UploadUpdateApp(c *gin.Context) {
 	c.JSON(http.StatusOK, resp)
 }
 
+func version2Int(version string) (int, error) {
+	versions := strings.Split(version, ".")
+	s := strings.Join(versions, "")
+	versionInt, err := strconv.Atoi(s)
+	return versionInt, err
+}
+
 func GetDownloadURL(c *gin.Context) {
 	var (
 		req  api.GetDownloadURLReq
@@ -237,7 +248,13 @@ func GetDownloadURL(c *gin.Context) {
 	}
 	log.Debug(req.OperationID, utils.GetSelfFuncName(), "app: ", app)
 	if app != nil {
-		if app.Version != req.Version && app.Version != "" {
+		appVersion, err := version2Int(app.Version)
+		reqVersion, err := version2Int(req.Version)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), "req version", req.Version, "app version", app.Version)
+		}
+		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "req version:", reqVersion, "app version:", appVersion)
+		if appVersion > reqVersion && app.Version != "" {
 			resp.Data.HasNewVersion = true
 			if app.ForceUpdate == true {
 				resp.Data.ForceUpdate = true

internal/api/third/set_app_badge.go

@@ -0,0 +1,50 @@
+package apiThird
+
+import (
+	api "Open_IM/pkg/base_info"
+	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/token_verify"
+	"Open_IM/pkg/utils"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func SetAppBadge(c *gin.Context) {
+	var (
+		req  api.SetAppBadgeReq
+		resp api.SetAppBadgeResp
+	)
+	if err := c.Bind(&req); err != nil {
+		log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
+
+	var ok bool
+	var errInfo, opUserID string
+	ok, opUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": errMsg})
+		return
+	}
+	if !token_verify.CheckAccess(opUserID, req.FromUserID) {
+		log.NewError(req.OperationID, "CheckAccess false ", opUserID, req.FromUserID)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "no permission"})
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req, opUserID)
+	err := db.DB.SetUserBadgeUnreadCountSum(req.FromUserID, int(req.AppUnreadCount))
+	if err != nil {
+		errMsg := req.OperationID + " " + "SetUserBadgeUnreadCountSum failed " + err.Error() + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		resp.ErrCode = 500
+		resp.ErrMsg = errMsg
+		c.JSON(http.StatusInternalServerError, resp)
+		return
+	}
+	c.JSON(http.StatusOK, resp)
+	return
+}

internal/api/user/user.go

@@ -14,9 +14,10 @@ import (
 	rpc "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
 	"context"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"strings"
+
+	"github.com/gin-gonic/gin"
 )
 
 func GetUsersInfoFromCache(c *gin.Context) {
@@ -38,9 +39,9 @@ func GetUsersInfoFromCache(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -86,9 +87,9 @@ func GetFriendIDListFromCache(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -128,9 +129,9 @@ func GetBlackIDListFromCache(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -159,7 +160,7 @@ func GetBlackIDListFromCache(c *gin.Context) {
 // @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误"
 // @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等"
 // @Router /user/get_users_info [post]
-func GetUsersInfo(c *gin.Context) {
+func GetUsersPublicInfo(c *gin.Context) {
 	params := api.GetUsersInfoReq{}
 	if err := c.BindJSON(&params); err != nil {
 		log.NewError("0", "BindJSON failed ", err.Error())
@@ -181,9 +182,9 @@ func GetUsersInfo(c *gin.Context) {
 
 	log.NewInfo(params.OperationID, "GetUserInfo args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -239,9 +240,9 @@ func UpdateUserInfo(c *gin.Context) {
 		return
 	}
 	log.NewInfo(params.OperationID, "UpdateUserInfo args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -290,9 +291,9 @@ func SetGlobalRecvMessageOpt(c *gin.Context) {
 		return
 	}
 	log.NewInfo(params.OperationID, "SetGlobalRecvMessageOpt args ", req.String())
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -324,9 +325,9 @@ func SetGlobalRecvMessageOpt(c *gin.Context) {
 func GetSelfUserInfo(c *gin.Context) {
 	params := api.GetSelfUserInfoReq{}
 	if err := c.BindJSON(&params); err != nil {
-		errMsg := "BindJSON failed " + err.Error()
+		errMsg := " BindJSON failed " + err.Error()
-		log.NewError("0", "BindJSON failed ", errMsg)
+		log.NewError("0", errMsg)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		c.JSON(http.StatusOK, gin.H{"errCode": 1001, "errMsg": errMsg})
 		return
 	}
 	req := &rpc.GetUserInfoReq{}
@@ -338,17 +339,17 @@ func GetSelfUserInfo(c *gin.Context) {
 	ok, req.OpUserID, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
 	if !ok {
 		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
-		log.NewError(req.OperationID, errMsg)
+		log.NewError(params.OperationID, errMsg)
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		c.JSON(http.StatusOK, gin.H{"errCode": 1001, "errMsg": errMsg})
 		return
 	}
 
-	req.UserIDList = append(req.UserIDList, req.OpUserID)
+	req.UserIDList = append(req.UserIDList, params.UserID)
 	log.NewInfo(params.OperationID, "GetUserInfo args ", req.String())
 
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID)
 	if etcdConn == nil {
-		errMsg := req.OperationID + "getcdv3.GetConn == nil"
+		errMsg := req.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(req.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -366,11 +367,10 @@ func GetSelfUserInfo(c *gin.Context) {
 		log.NewInfo(req.OperationID, "GetUserInfo api return ", resp)
 		c.JSON(http.StatusOK, resp)
 	} else {
-		resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}}
+		resp := api.GetSelfUserInfoResp{CommResp: api.CommResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}
 		log.NewInfo(req.OperationID, "GetUserInfo api return ", resp)
 		c.JSON(http.StatusOK, resp)
 	}
-
 }
 
 // @Summary 获取用户在线状态
@@ -415,7 +415,7 @@ func GetUsersOnlineStatus(c *gin.Context) {
 	var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
 	var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult
 	flag := false
-	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
+	grpcCons := getcdv3.GetDefaultGatewayConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), params.OperationID)
 	for _, v := range grpcCons {
 		log.Debug(params.OperationID, "get node ", *v, v.Target())
 		client := pbRelay.NewRelayClient(v)
@@ -456,3 +456,59 @@ func GetUsersOnlineStatus(c *gin.Context) {
 	log.NewInfo(req.OperationID, "GetUsersOnlineStatus api return", resp)
 	c.JSON(http.StatusOK, resp)
 }
+
+func GetUsers(c *gin.Context) {
+	var (
+		req   api.GetUsersReq
+		resp  api.GetUsersResp
+		reqPb rpc.GetUsersReq
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError(req.OperationID, "Bind failed ", err.Error(), req)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	var ok bool
+	var errInfo string
+	ok, _, errInfo = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID)
+	if !ok {
+		errMsg := req.OperationID + " " + "GetUserIDFromToken failed " + errInfo + " token:" + c.Request.Header.Get("token")
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
+	reqPb.OperationID = req.OperationID
+	reqPb.UserID = req.UserID
+	reqPb.UserName = req.UserName
+	reqPb.Content = req.Content
+	reqPb.Pagination = &open_im_sdk.RequestPagination{ShowNumber: req.ShowNumber, PageNumber: req.PageNumber}
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
+	if etcdConn == nil {
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
+		log.NewError(reqPb.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := rpc.NewUserClient(etcdConn)
+	respPb, err := client.GetUsers(context.Background(), &reqPb)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), reqPb.String())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	for _, v := range respPb.UserList {
+		user := api.CMSUser{}
+		utils.CopyStructFields(&user, v.User)
+		user.IsBlock = v.IsBlock
+		resp.Data.UserList = append(resp.Data.UserList, &user)
+	}
+	resp.CommResp.ErrCode = respPb.CommonResp.ErrCode
+	resp.CommResp.ErrMsg = respPb.CommonResp.ErrMsg
+	resp.Data.TotalNum = respPb.TotalNums
+	resp.Data.CurrentPage = respPb.Pagination.CurrentPage
+	resp.Data.ShowNumber = respPb.Pagination.ShowNumber
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+	c.JSON(http.StatusOK, resp)
+	return
+}

internal/cms_api/admin/admin.go

@@ -3,20 +3,21 @@ package admin
 import (
 	apiStruct "Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	openIMHttp "Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbAdmin "Open_IM/pkg/proto/admin_cms"
+	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 (
@@ -63,16 +64,16 @@ func AdminLogin(c *gin.Context) {
 		reqPb pbAdmin.AdminLoginReq
 	)
 	if err := c.BindJSON(&req); err != nil {
-		log.NewInfo("0", utils.GetSelfFuncName(), err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.Secret = req.Secret
 	reqPb.AdminID = req.AdminName
 	reqPb.OperationID = utils.OperationIDGenerator()
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -81,9 +82,103 @@ func AdminLogin(c *gin.Context) {
 	respPb, err := client.AdminLogin(context.Background(), &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "rpc failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
+	resp.FaceURL = respPb.FaceURL
+	resp.UserName = respPb.UserName
 	resp.Token = respPb.Token
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
+}
+
+func AddUserRegisterAddFriendIDList(c *gin.Context) {
+	var (
+		req apiStruct.AddUserRegisterAddFriendIDListRequest
+		// resp apiStruct.AddUserRegisterAddFriendIDListResponse
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	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)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := pbAdmin.NewAdminCMSClient(etcdConn)
+	respPb, err := client.AddUserRegisterAddFriendIDList(context.Background(), &pbAdmin.AddUserRegisterAddFriendIDListReq{OperationID: req.OperationID, UserIDList: req.UserIDList})
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "rpc failed", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp:", respPb.String())
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg})
+}
+
+func ReduceUserRegisterAddFriendIDList(c *gin.Context) {
+	var (
+		req apiStruct.ReduceUserRegisterAddFriendIDListRequest
+		// resp apiStruct.ReduceUserRegisterAddFriendIDListResponse
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
+	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)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := pbAdmin.NewAdminCMSClient(etcdConn)
+	respPb, err := client.ReduceUserRegisterAddFriendIDList(context.Background(), &pbAdmin.ReduceUserRegisterAddFriendIDListReq{OperationID: req.OperationID, UserIDList: req.UserIDList, Operation: req.Operation})
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "rpc failed", err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg})
+}
+
+func GetUserRegisterAddFriendIDList(c *gin.Context) {
+	var (
+		req  apiStruct.GetUserRegisterAddFriendIDListRequest
+		resp apiStruct.GetUserRegisterAddFriendIDListResponse
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req)
+	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)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	client := pbAdmin.NewAdminCMSClient(etcdConn)
+	respPb, err := client.GetUserRegisterAddFriendIDList(context.Background(), &pbAdmin.GetUserRegisterAddFriendIDListReq{OperationID: req.OperationID, Pagination: &pbCommon.RequestPagination{
+		PageNumber: int32(req.PageNumber),
+		ShowNumber: int32(req.ShowNumber),
+	}})
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "rpc failed", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	resp.Users = respPb.UserInfoList
+	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
+	resp.CurrentPage = int(respPb.Pagination.CurrentPage)
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
 }

internal/cms_api/friend/friend.go

@@ -0,0 +1,63 @@
+package friend
+
+import (
+	"Open_IM/pkg/cms_api_struct"
+	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/grpc-etcdv3/getcdv3"
+	pbAdmin "Open_IM/pkg/proto/admin_cms"
+	pbCommon "Open_IM/pkg/proto/sdk_ws"
+	"Open_IM/pkg/utils"
+	"context"
+	"net/http"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+)
+
+func GetUserFriends(c *gin.Context) {
+	var (
+		req   cms_api_struct.GetFriendsReq
+		resp  cms_api_struct.GetFriendsResp
+		reqPb pbAdmin.GetUserFriendsReq
+	)
+	if err := c.BindJSON(&req); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
+	reqPb.Pagination = &pbCommon.RequestPagination{}
+	utils.CopyStructFields(&reqPb.Pagination, req)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
+	if etcdConn == nil {
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
+		log.NewError(reqPb.OperationID, errMsg)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		return
+	}
+	reqPb.OperationID = req.OperationID
+	reqPb.UserID = req.UserID
+	reqPb.FriendUserName = req.FriendUserName
+	reqPb.FriendUserID = req.FriendUserID
+
+	client := pbAdmin.NewAdminCMSClient(etcdConn)
+	respPb, err := client.GetUserFriends(context.Background(), &reqPb)
+	if err != nil {
+		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetUserInfo failed ", err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
+		return
+	}
+	for _, v := range respPb.FriendInfoList {
+		friend := &cms_api_struct.FriendInfo{}
+		utils.CopyStructFields(friend, v)
+		friend.Nickname = v.FriendUser.Nickname
+		friend.UserID = v.FriendUser.UserID
+		resp.FriendInfoList = append(resp.FriendInfoList, friend)
+	}
+	resp.FriendNums = respPb.FriendNums
+	resp.CurrentPage = int(respPb.Pagination.CurrentPage)
+	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
+}

internal/cms_api/group/group.go

@@ -3,8 +3,6 @@ package group
 import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	openIMHttp "Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
@@ -18,308 +16,49 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func GetGroupById(c *gin.Context) {
-	var (
-		req   cms_api_struct.GetGroupByIdRequest
-		resp  cms_api_struct.GetGroupByIdResponse
-		reqPb pbGroup.GetGroupByIdReq
-	)
-	if err := c.ShouldBindQuery(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupId = req.GroupId
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	respPb, err := client.GetGroupById(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetGroupById failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	resp.GroupName = respPb.CMSGroup.GroupInfo.GroupName
-	resp.GroupID = respPb.CMSGroup.GroupInfo.GroupID
-	resp.CreateTime = (utils.UnixSecondToTime(int64(respPb.CMSGroup.GroupInfo.CreateTime))).String()
-	resp.ProfilePhoto = respPb.CMSGroup.GroupInfo.FaceURL
-	resp.GroupMasterName = respPb.CMSGroup.GroupMasterName
-	resp.GroupMasterId = respPb.CMSGroup.GroupMasterId
-	resp.IsBanChat = constant.GroupIsBanChat(respPb.CMSGroup.GroupInfo.Status)
-	log.NewInfo("", utils.GetSelfFuncName(), "req: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-}
-
 func GetGroups(c *gin.Context) {
 	var (
 		req   cms_api_struct.GetGroupsRequest
 		resp  cms_api_struct.GetGroupsResponse
 		reqPb pbGroup.GetGroupsReq
 	)
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	reqPb.Pagination = &commonPb.RequestPagination{}
 	utils.CopyStructFields(&reqPb.Pagination, req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
+	reqPb.GroupID = req.GroupID
+	reqPb.GroupName = req.GroupName
 	client := pbGroup.NewGroupClient(etcdConn)
 	respPb, err := client.GetGroups(context.Background(), &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetUserInfo failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
 	for _, v := range respPb.CMSGroups {
-		resp.Groups = append(resp.Groups, cms_api_struct.GroupResponse{
+		groupResp := cms_api_struct.GroupResponse{}
-			GroupName:        v.GroupInfo.GroupName,
+		utils.CopyStructFields(&groupResp, v.GroupInfo)
-			GroupID:          v.GroupInfo.GroupID,
+		groupResp.GroupOwnerName = v.GroupOwnerUserName
-			GroupMasterName:  v.GroupMasterName,
+		groupResp.GroupOwnerID = v.GroupOwnerUserID
-			GroupMasterId:    v.GroupMasterId,
+		resp.Groups = append(resp.Groups, groupResp)
-			CreateTime:       (utils.UnixSecondToTime(int64(v.GroupInfo.CreateTime))).String(),
-			IsBanChat:        constant.GroupIsBanChat(v.GroupInfo.Status),
-			IsBanPrivateChat: false,
-			ProfilePhoto:     v.GroupInfo.FaceURL,
-		})
 	}
 	resp.GroupNums = int(respPb.GroupNum)
-	resp.CurrentPage = int(respPb.Pagination.PageNumber)
+	resp.CurrentPage = int(respPb.Pagination.CurrentPage)
 	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
-	log.NewInfo("", utils.GetSelfFuncName(), "resp: ", resp)
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
-}
-
-func GetGroupByName(c *gin.Context) {
-	var (
-		req   cms_api_struct.GetGroupRequest
-		resp  cms_api_struct.GetGroupResponse
-		reqPb pbGroup.GetGroupReq
-	)
-	if err := c.ShouldBindQuery(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupName = req.GroupName
-	reqPb.Pagination = &commonPb.RequestPagination{}
-	utils.CopyStructFields(&reqPb.Pagination, req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	respPb, err := client.GetGroup(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetGroup failed", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrServer, nil)
-		return
-	}
-	for _, v := range respPb.CMSGroups {
-		resp.Groups = append(resp.Groups, cms_api_struct.GroupResponse{
-			GroupName:        v.GroupInfo.GroupName,
-			GroupID:          v.GroupInfo.GroupID,
-			GroupMasterName:  v.GroupMasterName,
-			GroupMasterId:    v.GroupMasterId,
-			CreateTime:       (utils.UnixSecondToTime(int64(v.GroupInfo.CreateTime))).String(),
-			IsBanChat:        constant.GroupIsBanChat(v.GroupInfo.Status),
-			IsBanPrivateChat: false,
-			ProfilePhoto:     v.GroupInfo.FaceURL,
-		})
-	}
-	resp.CurrentPage = int(respPb.Pagination.PageNumber)
-	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
-	resp.GroupNums = int(respPb.GroupNums)
-	log.NewInfo("", utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-}
-
-func CreateGroup(c *gin.Context) {
-	var (
-		req   cms_api_struct.CreateGroupRequest
-		_     cms_api_struct.CreateGroupResponse
-		reqPb pbGroup.CreateGroupReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupInfo = &commonPb.GroupInfo{}
-	reqPb.GroupInfo.GroupName = req.GroupName
-	reqPb.GroupInfo.CreatorUserID = req.GroupMasterId
-	reqPb.OwnerUserID = req.GroupMasterId
-	reqPb.OpUserID = req.GroupMasterId
-	for _, v := range req.GroupMembers {
-		reqPb.InitMemberList = append(reqPb.InitMemberList, &pbGroup.GroupAddMemberInfo{
-			UserID:    v,
-			RoleLevel: 1,
-		})
-	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.CreateGroup(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "CreateGroup failed", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrServer, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
-func BanGroupChat(c *gin.Context) {
-	var (
-		req   cms_api_struct.BanGroupChatRequest
-		reqPb pbGroup.OperateGroupStatusReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupId = req.GroupId
-	reqPb.Status = constant.GroupBanChat
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.OperateGroupStatus(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BanGroupChat failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-
-}
-
-func BanPrivateChat(c *gin.Context) {
-	var (
-		req   cms_api_struct.BanPrivateChatRequest
-		reqPb pbGroup.OperateGroupStatusReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupId = req.GroupId
-	reqPb.Status = constant.GroupBanPrivateChat
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.OperateGroupStatus(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "OperateGroupStatus failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
-func OpenGroupChat(c *gin.Context) {
-	var (
-		req   cms_api_struct.BanPrivateChatRequest
-		reqPb pbGroup.OperateGroupStatusReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupId = req.GroupId
-	reqPb.Status = constant.GroupOk
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.OperateGroupStatus(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "OperateGroupStatus failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
-func OpenPrivateChat(c *gin.Context) {
-	var (
-		req   cms_api_struct.BanPrivateChatRequest
-		reqPb pbGroup.OperateGroupStatusReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "OpenPrivateChat failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupId = req.GroupId
-	reqPb.Status = constant.GroupOk
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.OperateGroupStatus(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "OperateGroupStatus failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
 }
 
 func GetGroupMembers(c *gin.Context) {
@@ -328,9 +67,9 @@ func GetGroupMembers(c *gin.Context) {
 		reqPb pbGroup.GetGroupMembersCMSReq
 		resp  cms_api_struct.GetGroupMembersResponse
 	)
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
+		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
@@ -339,11 +78,11 @@ func GetGroupMembers(c *gin.Context) {
 		PageNumber: int32(req.PageNumber),
 		ShowNumber: int32(req.ShowNumber),
 	}
-	reqPb.GroupId = req.GroupId
+	reqPb.GroupID = req.GroupID
 	reqPb.UserName = req.UserName
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -352,7 +91,7 @@ func GetGroupMembers(c *gin.Context) {
 	respPb, err := client.GetGroupMembersCMS(context.Background(), &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetGroupMembersCMS failed:", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
 	resp.ResponsePagination = cms_api_struct.ResponsePagination{
@@ -360,220 +99,11 @@ func GetGroupMembers(c *gin.Context) {
 		ShowNumber:  int(respPb.Pagination.ShowNumber),
 	}
 	resp.MemberNums = int(respPb.MemberNums)
-	for _, groupMembers := range respPb.Members {
+	for _, groupMember := range respPb.Members {
-		resp.GroupMembers = append(resp.GroupMembers, cms_api_struct.GroupMemberResponse{
+		memberResp := cms_api_struct.GroupMemberResponse{}
-			MemberPosition: int(groupMembers.RoleLevel),
+		utils.CopyStructFields(&memberResp, groupMember)
-			MemberNickName: groupMembers.Nickname,
+		resp.GroupMembers = append(resp.GroupMembers, memberResp)
-			MemberId:       groupMembers.UserID,
-			JoinTime:       utils.UnixSecondToTime(int64(groupMembers.JoinTime)).String(),
-		})
 	}
 	log.NewInfo("", utils.GetSelfFuncName(), "req: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
-}
-
-func AddGroupMembers(c *gin.Context) {
-	var (
-		req   cms_api_struct.RemoveGroupMembersRequest
-		resp  cms_api_struct.RemoveGroupMembersResponse
-		reqPb pbGroup.AddGroupMembersCMSReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationId, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationId = utils.OperationIDGenerator()
-	log.NewInfo("", utils.GetSelfFuncName(), "req: ", req)
-	reqPb.UserIds = req.Members
-	reqPb.GroupId = req.GroupId
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationId)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationId + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationId, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	respPb, err := client.AddGroupMembersCMS(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationId, utils.GetSelfFuncName(), "AddGroupMembersCMS failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	resp.Success = respPb.Success
-	resp.Failed = respPb.Failed
-	log.NewInfo("", utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-}
-
-func RemoveGroupMembers(c *gin.Context) {
-	var (
-		req   cms_api_struct.RemoveGroupMembersRequest
-		resp  cms_api_struct.RemoveGroupMembersResponse
-		reqPb pbGroup.RemoveGroupMembersCMSReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.UserIds = req.Members
-	reqPb.GroupId = req.GroupId
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	respPb, err := client.RemoveGroupMembersCMS(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "RemoveGroupMembersCMS failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	resp.Success = respPb.Success
-	resp.Failed = respPb.Failed
-	log.NewInfo("", utils.GetSelfFuncName(), "req: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-}
-
-func DeleteGroup(c *gin.Context) {
-	var (
-		req   cms_api_struct.DeleteGroupRequest
-		_     cms_api_struct.DeleteGroupResponse
-		reqPb pbGroup.DeleteGroupReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupId = req.GroupId
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.DeleteGroup(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "DeleteGroup failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
-func SetGroupMaster(c *gin.Context) {
-	var (
-		req   cms_api_struct.SetGroupMasterRequest
-		_     cms_api_struct.SetGroupMasterResponse
-		reqPb pbGroup.OperateUserRoleReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupId = req.GroupId
-	reqPb.UserId = req.UserId
-	reqPb.RoleLevel = constant.GroupOwner
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.OperateUserRole(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "DeleteGroup failed", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrServer, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
-func SetGroupOrdinaryUsers(c *gin.Context) {
-	var (
-		req   cms_api_struct.SetGroupMemberRequest
-		_     cms_api_struct.AdminLoginResponse
-		reqPb pbGroup.OperateUserRoleReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.GroupId = req.GroupId
-	reqPb.UserId = req.UserId
-	reqPb.RoleLevel = constant.GroupOrdinaryUsers
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.OperateUserRole(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "DeleteGroup failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
-func AlterGroupInfo(c *gin.Context) {
-	var (
-		req   cms_api_struct.AlterGroupInfoRequest
-		_     cms_api_struct.SetGroupMasterResponse
-		reqPb pbGroup.SetGroupInfoReq
-	)
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OpUserID = c.MustGet("userID").(string)
-	reqPb.GroupInfoForSet = &commonPb.GroupInfoForSet{
-		GroupID:      req.GroupID,
-		GroupName:    req.GroupName,
-		Introduction: req.Introduction,
-		Notification: req.Notification,
-		FaceURL:      req.ProfilePhoto,
-		//		GroupType:    int32(req.GroupType),
-	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbGroup.NewGroupClient(etcdConn)
-	_, err := client.SetGroupInfo(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "DeleteGroup failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
 }

internal/cms_api/message_cms/message.go

@@ -3,96 +3,27 @@ package messageCMS
 import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
-	openIMHttp "Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbMessage "Open_IM/pkg/proto/message_cms"
+	pbAdminCMS "Open_IM/pkg/proto/admin_cms"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
 	"net/http"
 	"strings"
 
-	"Open_IM/pkg/common/constant"
-
 	"github.com/gin-gonic/gin"
 )
 
-func BroadcastMessage(c *gin.Context) {
-	var (
-		reqPb pbMessage.BoradcastMessageReq
-	)
-	reqPb.OperationID = utils.OperationIDGenerator()
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbMessage.NewMessageCMSClient(etcdConn)
-	_, err := client.BoradcastMessage(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetChatLogs rpc failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
-func MassSendMassage(c *gin.Context) {
-	var (
-		reqPb pbMessage.MassSendMessageReq
-	)
-	reqPb.OperationID = utils.OperationIDGenerator()
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbMessage.NewMessageCMSClient(etcdConn)
-	_, err := client.MassSendMessage(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetChatLogs rpc failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
-func WithdrawMessage(c *gin.Context) {
-	var (
-		reqPb pbMessage.WithdrawMessageReq
-	)
-	reqPb.OperationID = utils.OperationIDGenerator()
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pbMessage.NewMessageCMSClient(etcdConn)
-	_, err := client.WithdrawMessage(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetChatLogs rpc failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
 func GetChatLogs(c *gin.Context) {
 	var (
-		req   cms_api_struct.GetChatLogsRequest
+		req   cms_api_struct.GetChatLogsReq
-		resp  cms_api_struct.GetChatLogsResponse
+		resp  cms_api_struct.GetChatLogsResp
-		reqPb pbMessage.GetChatLogsReq
+		reqPb pbAdminCMS.GetChatLogsReq
 	)
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.Bind(&req); err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.Pagination = &pbCommon.RequestPagination{
@@ -101,39 +32,28 @@ func GetChatLogs(c *gin.Context) {
 	}
 	utils.CopyStructFields(&reqPb, &req)
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	client := pbMessage.NewMessageCMSClient(etcdConn)
+	client := pbAdminCMS.NewAdminCMSClient(etcdConn)
 	respPb, err := client.GetChatLogs(context.Background(), &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetChatLogs rpc failed", err.Error())
-		openIMHttp.RespHttp200(c, err, resp)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
-	//utils.CopyStructFields(&resp, &respPb)
+	for _, v := range respPb.ChatLogs {
-	for _, chatLog := range respPb.ChatLogs {
+		chatLog := cms_api_struct.ChatLog{}
-		resp.ChatLogs = append(resp.ChatLogs, cms_api_struct.ChatLog{
+		utils.CopyStructFields(&chatLog, v)
-			SessionType:      int(chatLog.SessionType),
+		resp.ChatLogs = append(resp.ChatLogs, &chatLog)
-			ContentType:      int(chatLog.ContentType),
-			SenderNickName:   chatLog.SenderNickName,
-			SenderId:         chatLog.SenderId,
-			SearchContent:    chatLog.SearchContent,
-			WholeContent:     chatLog.WholeContent,
-			ReceiverNickName: chatLog.ReciverNickName,
-			ReceiverID:       chatLog.ReciverId,
-			GroupName:        chatLog.GroupName,
-			GroupId:          chatLog.GroupId,
-			Date:             chatLog.Date,
-		})
 	}
 	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
 	resp.CurrentPage = int(respPb.Pagination.CurrentPage)
 	resp.ChatLogsNum = int(respPb.ChatLogsNum)
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
 }

internal/cms_api/middleware/jwt_auth.go

@@ -1,23 +1,23 @@
 package middleware
 
 import (
-	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/utils"
+	"net/http"
+
 	"github.com/gin-gonic/gin"
 )
 
 func JWTAuth() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		ok, userID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), "")
-		log.NewInfo("0", utils.GetSelfFuncName(), "userID: ", userID)
+		// log.NewInfo("0", utils.GetSelfFuncName(), "userID: ", userID)
 		c.Set("userID", userID)
 		if !ok {
 			log.NewError("", "GetUserIDFromToken false ", c.Request.Header.Get("token"))
 			c.Abort()
-			http.RespHttp200(c, constant.ErrParseToken, nil)
+			c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": errInfo})
 			return
 		} else {
 			log.NewInfo("0", utils.GetSelfFuncName(), "failed: ", errInfo)

internal/cms_api/organization/organization.go

@@ -1,49 +0,0 @@
-package organization
-
-import (
-	"github.com/gin-gonic/gin"
-)
-
-func GetStaffs(c *gin.Context) {
-
-}
-
-func GetOrganizations(c *gin.Context) {
-
-}
-
-func GetSquads(c *gin.Context) {
-
-}
-
-func AlterStaff(c *gin.Context) {
-
-}
-
-func AddOrganization(c *gin.Context) {
-
-}
-
-func InquireOrganization(g *gin.Context) {
-
-}
-
-func AlterOrganization(c *gin.Context) {
-
-}
-
-func DeleteOrganization(g *gin.Context) {
-
-}
-
-func GetOrganizationSquads(c *gin.Context) {
-
-}
-
-func AlterStaffsInfo(c *gin.Context) {
-
-}
-
-func AddChildOrganization(c *gin.Context) {
-
-}

internal/cms_api/prome.go

@@ -0,0 +1,14 @@
+package cms_api
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+)
+
+func prometheusHandler() gin.HandlerFunc {
+	h := promhttp.Handler()
+
+	return func(c *gin.Context) {
+		h.ServeHTTP(c.Writer, c.Request)
+	}
+}

internal/cms_api/router.go

@@ -2,12 +2,14 @@ package cms_api
 
 import (
 	"Open_IM/internal/cms_api/admin"
+	"Open_IM/internal/cms_api/friend"
 	"Open_IM/internal/cms_api/group"
 	messageCMS "Open_IM/internal/cms_api/message_cms"
 	"Open_IM/internal/cms_api/middleware"
-	"Open_IM/internal/cms_api/organization"
 	"Open_IM/internal/cms_api/statistics"
 	"Open_IM/internal/cms_api/user"
+	"Open_IM/internal/demo/register"
+	"Open_IM/pkg/common/config"
 
 	"github.com/gin-gonic/gin"
 )
@@ -15,81 +17,61 @@ import (
 func NewGinRouter() *gin.Engine {
 	gin.SetMode(gin.ReleaseMode)
 	baseRouter := gin.Default()
+	if config.Config.Prometheus.Enable {
+		baseRouter.GET("/metrics", prometheusHandler())
+	}
 	router := baseRouter.Group("/cms")
 	router.Use(middleware.CorsHandler())
 	adminRouterGroup := router.Group("/admin")
 	{
 		adminRouterGroup.POST("/login", admin.AdminLogin)
+		adminRouterGroup.Use(middleware.JWTAuth())
+		adminRouterGroup.POST("/add_user_register_add_friend_id", admin.AddUserRegisterAddFriendIDList)
+		adminRouterGroup.POST("/reduce_user_register_reduce_friend_id", admin.ReduceUserRegisterAddFriendIDList)
+		adminRouterGroup.POST("/get_user_register_reduce_friend_id_list", admin.GetUserRegisterAddFriendIDList)
+
+		adminRouterGroup.POST("/generate_invitation_code", register.GenerateInvitationCode)
+		adminRouterGroup.POST("/query_invitation_code", register.QueryInvitationCode)
+		adminRouterGroup.POST("/get_invitation_codes", register.GetInvitationCodes)
+
+		adminRouterGroup.POST("/query_user_ip_limit_login", register.QueryUserIDLimitLogin)
+		adminRouterGroup.POST("/add_user_ip_limit_login", register.AddUserIPLimitLogin)
+		adminRouterGroup.POST("/remove_user_ip_limit_login", register.RemoveUserIPLimitLogin)
+
+		adminRouterGroup.POST("/query_ip_register", register.QueryIPRegister)
+		adminRouterGroup.POST("/add_ip_limit", register.AddIPLimit)
+		adminRouterGroup.POST("/remove_ip_Limit", register.RemoveIPLimit)
 	}
 	r2 := router.Group("")
 	r2.Use(middleware.JWTAuth())
 	statisticsRouterGroup := r2.Group("/statistics")
 	{
-		statisticsRouterGroup.GET("/get_messages_statistics", statistics.GetMessagesStatistics)
+		statisticsRouterGroup.POST("/get_messages_statistics", statistics.GetMessagesStatistics)
-		statisticsRouterGroup.GET("/get_user_statistics", statistics.GetUserStatistics)
+		statisticsRouterGroup.POST("/get_user_statistics", statistics.GetUserStatistics)
-		statisticsRouterGroup.GET("/get_group_statistics", statistics.GetGroupStatistics)
+		statisticsRouterGroup.POST("/get_group_statistics", statistics.GetGroupStatistics)
-		statisticsRouterGroup.GET("/get_active_user", statistics.GetActiveUser)
+		statisticsRouterGroup.POST("/get_active_user", statistics.GetActiveUser)
-		statisticsRouterGroup.GET("/get_active_group", statistics.GetActiveGroup)
+		statisticsRouterGroup.POST("/get_active_group", statistics.GetActiveGroup)
-	}
-	organizationRouterGroup := r2.Group("/organization")
-	{
-		organizationRouterGroup.GET("/get_staffs", organization.GetStaffs)
-		organizationRouterGroup.GET("/get_organizations", organization.GetOrganizations)
-		organizationRouterGroup.GET("/get_squad", organization.GetSquads)
-		organizationRouterGroup.POST("/add_organization", organization.AddOrganization)
-		organizationRouterGroup.POST("/alter_staff", organization.AlterStaff)
-		organizationRouterGroup.GET("/inquire_organization", organization.InquireOrganization)
-		organizationRouterGroup.POST("/alter_organization", organization.AlterOrganization)
-		organizationRouterGroup.POST("/delete_organization", organization.DeleteOrganization)
-		organizationRouterGroup.POST("/get_organization_squad", organization.GetOrganizationSquads)
-		organizationRouterGroup.PATCH("/alter_corps_info", organization.AlterStaffsInfo)
-		organizationRouterGroup.POST("/add_child_org", organization.AddChildOrganization)
 	}
 	groupRouterGroup := r2.Group("/group")
 	{
-		groupRouterGroup.GET("/get_group_by_id", group.GetGroupById)
+		groupRouterGroup.POST("/get_groups", group.GetGroups)
-		groupRouterGroup.GET("/get_groups", group.GetGroups)
+		groupRouterGroup.POST("/get_group_members", group.GetGroupMembers)
-		groupRouterGroup.GET("/get_group_by_name", group.GetGroupByName)
-		groupRouterGroup.GET("/get_group_members", group.GetGroupMembers)
-		groupRouterGroup.POST("/create_group", group.CreateGroup)
-		groupRouterGroup.POST("/add_members", group.AddGroupMembers)
-		groupRouterGroup.POST("/remove_members", group.RemoveGroupMembers)
-		groupRouterGroup.POST("/ban_group_private_chat", group.BanPrivateChat)
-		groupRouterGroup.POST("/open_group_private_chat", group.OpenPrivateChat)
-		groupRouterGroup.POST("/ban_group_chat", group.BanGroupChat)
-		groupRouterGroup.POST("/open_group_chat", group.OpenGroupChat)
-		groupRouterGroup.POST("/delete_group", group.DeleteGroup)
-		groupRouterGroup.POST("/get_members_in_group", group.GetGroupMembers)
-		groupRouterGroup.POST("/set_group_master", group.SetGroupMaster)
-		groupRouterGroup.POST("/set_group_ordinary_user", group.SetGroupOrdinaryUsers)
-		groupRouterGroup.POST("/alter_group_info", group.AlterGroupInfo)
 	}
 	userRouterGroup := r2.Group("/user")
 	{
-		userRouterGroup.POST("/resign", user.ResignUser)
-		userRouterGroup.GET("/get_user", user.GetUserById)
-		userRouterGroup.POST("/alter_user", user.AlterUser)
-		userRouterGroup.GET("/get_users", user.GetUsers)
 		userRouterGroup.POST("/add_user", user.AddUser)
 		userRouterGroup.POST("/unblock_user", user.UnblockUser)
 		userRouterGroup.POST("/block_user", user.BlockUser)
-		userRouterGroup.GET("/get_block_users", user.GetBlockUsers)
+		userRouterGroup.POST("/get_block_users", user.GetBlockUsers)
-		userRouterGroup.GET("/get_block_user", user.GetBlockUserById)
-		userRouterGroup.POST("/delete_user", user.DeleteUser)
-		userRouterGroup.GET("/get_users_by_name", user.GetUsersByName)
-	}
-	friendRouterGroup := r2.Group("/friend")
-	{
-		friendRouterGroup.POST("/get_friends_by_id")
-		friendRouterGroup.POST("/set_friend")
-		friendRouterGroup.POST("/remove_friend")
 	}
 	messageCMSRouterGroup := r2.Group("/message")
 	{
-		messageCMSRouterGroup.GET("/get_chat_logs", messageCMS.GetChatLogs)
+		messageCMSRouterGroup.POST("/get_chat_logs", messageCMS.GetChatLogs)
-		messageCMSRouterGroup.POST("/broadcast_message", messageCMS.BroadcastMessage)
-		messageCMSRouterGroup.POST("/mass_send_message", messageCMS.MassSendMassage)
-		messageCMSRouterGroup.POST("/withdraw_message", messageCMS.WithdrawMessage)
 	}
+	friendCMSRouterGroup := r2.Group("/friend")
+	{
+		friendCMSRouterGroup.POST("/get_friends", friend.GetUserFriends)
+	}
+
 	return baseRouter
 }

internal/cms_api/statistics/statistics.go

@@ -3,15 +3,14 @@ package statistics
 import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	openIMHttp "Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pb "Open_IM/pkg/proto/statistics"
+	admin "Open_IM/pkg/proto/admin_cms"
 	"Open_IM/pkg/utils"
 	"context"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -20,38 +19,40 @@ func GetMessagesStatistics(c *gin.Context) {
 	var (
 		req   cms_api_struct.GetMessageStatisticsRequest
 		resp  cms_api_struct.GetMessageStatisticsResponse
-		reqPb pb.GetMessageStatisticsReq
+		reqPb admin.GetMessageStatisticsReq
 	)
-	reqPb.StatisticsReq = &pb.StatisticsReq{}
+	reqPb.StatisticsReq = &admin.StatisticsReq{}
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
-		log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb.StatisticsReq, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImStatisticsName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	client := pb.NewUserClient(etcdConn)
+	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetMessageStatistics(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetMessageStatistics(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetMessageStatistics failed", err.Error())
-		openIMHttp.RespHttp200(c, err, resp)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
-	// utils.CopyStructFields(&resp, respPb)
+
 	resp.GroupMessageNum = int(respPb.GroupMessageNum)
 	resp.PrivateMessageNum = int(respPb.PrivateMessageNum)
 	for _, v := range respPb.PrivateMessageNumList {
 		resp.PrivateMessageNumList = append(resp.PrivateMessageNumList, struct {
 			Date       string "json:\"date\""
-			MessageNum int    "json:\"message_num\""
+			MessageNum int    "json:\"messageNum\""
 		}{
 			Date:       v.Date,
 			MessageNum: int(v.Num),
@@ -60,53 +61,54 @@ func GetMessagesStatistics(c *gin.Context) {
 	for _, v := range respPb.GroupMessageNumList {
 		resp.GroupMessageNumList = append(resp.GroupMessageNumList, struct {
 			Date       string "json:\"date\""
-			MessageNum int    "json:\"message_num\""
+			MessageNum int    "json:\"messageNum\""
 		}{
 			Date:       v.Date,
 			MessageNum: int(v.Num),
 		})
 	}
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
 }
 
 func GetUserStatistics(c *gin.Context) {
 	var (
 		req   cms_api_struct.GetUserStatisticsRequest
 		resp  cms_api_struct.GetUserStatisticsResponse
-		reqPb pb.GetUserStatisticsReq
+		reqPb admin.GetUserStatisticsReq
 	)
-	reqPb.StatisticsReq = &pb.StatisticsReq{}
+	reqPb.StatisticsReq = &admin.StatisticsReq{}
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
-		log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb.StatisticsReq, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImStatisticsName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	client := pb.NewUserClient(etcdConn)
+	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetUserStatistics(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetUserStatistics(ctx, &reqPb)
 	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetUserStatistics failed", err.Error())
+		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetUserStatistics failed", err.Error(), reqPb.String())
-		openIMHttp.RespHttp200(c, err, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
-	// utils.CopyStructFields(&resp, respPb)
 	resp.ActiveUserNum = int(respPb.ActiveUserNum)
 	resp.IncreaseUserNum = int(respPb.IncreaseUserNum)
 	resp.TotalUserNum = int(respPb.TotalUserNum)
 	for _, v := range respPb.ActiveUserNumList {
 		resp.ActiveUserNumList = append(resp.ActiveUserNumList, struct {
 			Date          string "json:\"date\""
-			ActiveUserNum int    "json:\"active_user_num\""
+			ActiveUserNum int    "json:\"activeUserNum\""
 		}{
 			Date:          v.Date,
 			ActiveUserNum: int(v.Num),
@@ -115,7 +117,7 @@ func GetUserStatistics(c *gin.Context) {
 	for _, v := range respPb.IncreaseUserNumList {
 		resp.IncreaseUserNumList = append(resp.IncreaseUserNumList, struct {
 			Date            string "json:\"date\""
-			IncreaseUserNum int    "json:\"increase_user_num\""
+			IncreaseUserNum int    "json:\"increaseUserNum\""
 		}{
 			Date:            v.Date,
 			IncreaseUserNum: int(v.Num),
@@ -124,43 +126,45 @@ func GetUserStatistics(c *gin.Context) {
 	for _, v := range respPb.TotalUserNumList {
 		resp.TotalUserNumList = append(resp.TotalUserNumList, struct {
 			Date         string "json:\"date\""
-			TotalUserNum int    "json:\"total_user_num\""
+			TotalUserNum int    "json:\"totalUserNum\""
 		}{
 			Date:         v.Date,
 			TotalUserNum: int(v.Num),
 		})
 	}
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
 }
 
 func GetGroupStatistics(c *gin.Context) {
 	var (
 		req   cms_api_struct.GetGroupStatisticsRequest
 		resp  cms_api_struct.GetGroupStatisticsResponse
-		reqPb pb.GetGroupStatisticsReq
+		reqPb admin.GetGroupStatisticsReq
 	)
-	reqPb.StatisticsReq = &pb.StatisticsReq{}
+	reqPb.StatisticsReq = &admin.StatisticsReq{}
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
+		log.NewError(req.OperationID, "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb.StatisticsReq, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImStatisticsName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	client := pb.NewUserClient(etcdConn)
+	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetGroupStatistics(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetGroupStatistics(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetGroupStatistics failed", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
 	// utils.CopyStructFields(&resp, respPb)
@@ -170,7 +174,7 @@ func GetGroupStatistics(c *gin.Context) {
 		resp.IncreaseGroupNumList = append(resp.IncreaseGroupNumList,
 			struct {
 				Date             string "json:\"date\""
-				IncreaseGroupNum int    "json:\"increase_group_num\""
+				IncreaseGroupNum int    "json:\"increaseGroupNum\""
 			}{
 				Date:             v.Date,
 				IncreaseGroupNum: int(v.Num),
@@ -180,7 +184,7 @@ func GetGroupStatistics(c *gin.Context) {
 		resp.TotalGroupNumList = append(resp.TotalGroupNumList,
 			struct {
 				Date          string "json:\"date\""
-				TotalGroupNum int    "json:\"total_group_num\""
+				TotalGroupNum int    "json:\"totalGroupNum\""
 			}{
 				Date:          v.Date,
 				TotalGroupNum: int(v.Num),
@@ -188,77 +192,81 @@ func GetGroupStatistics(c *gin.Context) {
 
 	}
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
 }
 
 func GetActiveUser(c *gin.Context) {
 	var (
 		req   cms_api_struct.GetActiveUserRequest
 		resp  cms_api_struct.GetActiveUserResponse
-		reqPb pb.GetActiveUserReq
+		reqPb admin.GetActiveUserReq
 	)
-	reqPb.StatisticsReq = &pb.StatisticsReq{}
+	reqPb.StatisticsReq = &admin.StatisticsReq{}
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
+		log.NewError(req.OperationID, "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb.StatisticsReq, req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImStatisticsName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	client := pb.NewUserClient(etcdConn)
+	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetActiveUser(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetActiveUser(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetActiveUser failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
 	utils.CopyStructFields(&resp.ActiveUserList, respPb.Users)
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
 }
 
 func GetActiveGroup(c *gin.Context) {
 	var (
 		req   cms_api_struct.GetActiveGroupRequest
 		resp  cms_api_struct.GetActiveGroupResponse
-		reqPb pb.GetActiveGroupReq
+		reqPb admin.GetActiveGroupReq
 	)
-	reqPb.StatisticsReq = &pb.StatisticsReq{}
+	reqPb.StatisticsReq = &admin.StatisticsReq{}
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
-		log.NewError("0", utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb.StatisticsReq, req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImStatisticsName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
-	client := pb.NewUserClient(etcdConn)
+	client := admin.NewAdminCMSClient(etcdConn)
-	respPb, err := client.GetActiveGroup(context.Background(), &reqPb)
+	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*100)
+	defer cancel()
+	respPb, err := client.GetActiveGroup(ctx, &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetActiveGroup failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
 	for _, group := range respPb.Groups {
 		resp.ActiveGroupList = append(resp.ActiveGroupList, struct {
-			GroupName  string "json:\"group_name\""
+			GroupName  string "json:\"groupName\""
-			GroupId    string "json:\"group_id\""
+			GroupId    string "json:\"groupID\""
-			MessageNum int    "json:\"message_num\""
+			MessageNum int    "json:\"messageNum\""
 		}{
 			GroupName:  group.GroupName,
 			GroupId:    group.GroupId,
@@ -266,5 +274,5 @@ func GetActiveGroup(c *gin.Context) {
 		})
 	}
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
 }

internal/cms_api/user/user.go

@@ -3,196 +3,18 @@ package user
 import (
 	"Open_IM/pkg/cms_api_struct"
 	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/constant"
-	openIMHttp "Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
 	pb "Open_IM/pkg/proto/user"
 	"Open_IM/pkg/utils"
 	"context"
-	"fmt"
 	"net/http"
 	"strings"
 
 	"github.com/gin-gonic/gin"
 )
 
-func GetUserById(c *gin.Context) {
-	var (
-		req   cms_api_struct.GetUserRequest
-		resp  cms_api_struct.GetUserResponse
-		reqPb pb.GetUserByIdReq
-	)
-	if err := c.ShouldBindQuery(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	utils.CopyStructFields(&reqPb, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-
-	client := pb.NewUserClient(etcdConn)
-	respPb, err := client.GetUserById(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	if respPb.User.UserId == "" {
-		openIMHttp.RespHttp200(c, constant.OK, nil)
-		return
-	}
-	utils.CopyStructFields(&resp, respPb.User)
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-}
-
-func GetUsersByName(c *gin.Context) {
-	var (
-		req   cms_api_struct.GetUsersByNameRequest
-		resp  cms_api_struct.GetUsersByNameResponse
-		reqPb pb.GetUsersByNameReq
-	)
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	if err := c.ShouldBindQuery(&req); err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.UserName = req.UserName
-	reqPb.Pagination = &commonPb.RequestPagination{
-		PageNumber: int32(req.PageNumber),
-		ShowNumber: int32(req.ShowNumber),
-	}
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pb.NewUserClient(etcdConn)
-	respPb, err := client.GetUsersByName(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "rpc", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	utils.CopyStructFields(&resp.Users, respPb.Users)
-	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
-	resp.CurrentPage = int(respPb.Pagination.CurrentPage)
-	resp.UserNums = respPb.UserNums
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-}
-
-func GetUsers(c *gin.Context) {
-	var (
-		req   cms_api_struct.GetUsersRequest
-		resp  cms_api_struct.GetUsersResponse
-		reqPb pb.GetUsersReq
-	)
-	reqPb.Pagination = &commonPb.RequestPagination{}
-	if err := c.ShouldBindQuery(&req); err != nil {
-		log.NewError("0", "ShouldBindQuery failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	utils.CopyStructFields(&reqPb.Pagination, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pb.NewUserClient(etcdConn)
-	respPb, err := client.GetUsers(context.Background(), &reqPb)
-	if err != nil {
-		openIMHttp.RespHttp200(c, err, resp)
-		return
-	}
-	utils.CopyStructFields(&resp.Users, respPb.User)
-	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
-	resp.CurrentPage = int(respPb.Pagination.CurrentPage)
-	resp.UserNums = respPb.UserNums
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-
-}
-
-func ResignUser(c *gin.Context) {
-	var (
-		req   cms_api_struct.ResignUserRequest
-		resp  cms_api_struct.ResignUserResponse
-		reqPb pb.ResignUserReq
-	)
-	if err := c.ShouldBind(&req); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
-		c.JSON(http.StatusBadRequest, gin.H{"errCode": http.StatusBadRequest, "errMsg": err.Error()})
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	utils.CopyStructFields(&reqPb, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pb.NewUserClient(etcdConn)
-	_, err := client.ResignUser(context.Background(), &reqPb)
-	if err != nil {
-		openIMHttp.RespHttp200(c, err, resp)
-	}
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-}
-
-func AlterUser(c *gin.Context) {
-	var (
-		req   cms_api_struct.AlterUserRequest
-		resp  cms_api_struct.AlterUserResponse
-		reqPb pb.AlterUserReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	utils.CopyStructFields(&reqPb, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pb.NewUserClient(etcdConn)
-	_, err := client.AlterUser(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, "microserver failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
-}
-
 func AddUser(c *gin.Context) {
 	var (
 		req   cms_api_struct.AddUserRequest
@@ -200,13 +22,13 @@ func AddUser(c *gin.Context) {
 	)
 	if err := c.BindJSON(&req); err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
 	if etcdConn == nil {
 		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
@@ -214,44 +36,43 @@ func AddUser(c *gin.Context) {
 		return
 	}
 	client := pb.NewUserClient(etcdConn)
-	_, err := client.AddUser(context.Background(), &reqPb)
+	respPb, err := client.AddUser(context.Background(), &reqPb)
 	if err != nil {
-		openIMHttp.RespHttp200(c, err, nil)
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), reqPb.String())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg})
 }
 
 func BlockUser(c *gin.Context) {
 	var (
 		req   cms_api_struct.BlockUserRequest
-		resp  cms_api_struct.BlockUserResponse
 		reqPb pb.BlockUserReq
 	)
 	if err := c.BindJSON(&req); err != nil {
-		fmt.Println(err)
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
-		log.NewError("0", "BindJSON failed ", err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
-		openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
 	client := pb.NewUserClient(etcdConn)
-	fmt.Println(reqPb)
+	respPb, err := client.BlockUser(context.Background(), &reqPb)
-	_, err := client.BlockUser(context.Background(), &reqPb)
 	if err != nil {
-		openIMHttp.RespHttp200(c, err, resp)
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), reqPb.String())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg})
 }
 
 func UnblockUser(c *gin.Context) {
@@ -260,29 +81,30 @@ func UnblockUser(c *gin.Context) {
 		resp  cms_api_struct.UnBlockUserResponse
 		reqPb pb.UnBlockUserReq
 	)
-	if err := c.ShouldBind(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
+		log.NewError(req.OperationID, "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
 	}
 	client := pb.NewUserClient(etcdConn)
-	_, err := client.UnBlockUser(context.Background(), &reqPb)
+	respPb, err := client.UnBlockUser(context.Background(), &reqPb)
 	if err != nil {
-		openIMHttp.RespHttp200(c, err, resp)
+		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), err.Error(), reqPb.String())
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg})
 }
 
 func GetBlockUsers(c *gin.Context) {
@@ -293,18 +115,18 @@ func GetBlockUsers(c *gin.Context) {
 		respPb *pb.GetBlockUsersResp
 	)
 	reqPb.Pagination = &commonPb.RequestPagination{}
-	if err := c.ShouldBindQuery(&req); err != nil {
+	if err := c.BindJSON(&req); err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
 		return
 	}
 	reqPb.OperationID = utils.OperationIDGenerator()
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
 	utils.CopyStructFields(&reqPb.Pagination, &req)
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "blockUsers", reqPb.Pagination, req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
 	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
+		errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(reqPb.OperationID, errMsg)
 		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
 		return
@@ -313,17 +135,18 @@ func GetBlockUsers(c *gin.Context) {
 	respPb, err := client.GetBlockUsers(context.Background(), &reqPb)
 	if err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetBlockUsers rpc", err.Error())
-		openIMHttp.RespHttp200(c, err, resp)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
 		return
 	}
 	for _, v := range respPb.BlockUsers {
 		resp.BlockUsers = append(resp.BlockUsers, cms_api_struct.BlockUser{
 			UserResponse: cms_api_struct.UserResponse{
-				UserId:       v.User.UserId,
+				UserID:      v.UserInfo.UserID,
-				ProfilePhoto: v.User.ProfilePhoto,
+				FaceURL:     v.UserInfo.FaceURL,
-				Nickname:     v.User.Nickname,
+				Nickname:    v.UserInfo.Nickname,
-				IsBlock:      v.User.IsBlock,
+				PhoneNumber: v.UserInfo.PhoneNumber,
-				CreateTime:   v.User.CreateTime,
+				Email:       v.UserInfo.Email,
+				Gender:      int(v.UserInfo.Gender),
 			},
 			BeginDisableTime: v.BeginDisableTime,
 			EndDisableTime:   v.EndDisableTime,
@@ -333,70 +156,5 @@ func GetBlockUsers(c *gin.Context) {
 	resp.CurrentPage = int(respPb.Pagination.CurrentPage)
 	resp.UserNums = respPb.UserNums
 	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp})
-}
-
-func GetBlockUserById(c *gin.Context) {
-	var (
-		req   cms_api_struct.GetBlockUserRequest
-		resp  cms_api_struct.GetBlockUserResponse
-		reqPb pb.GetBlockUserByIdReq
-	)
-	if err := c.ShouldBindQuery(&req); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.UserId = req.UserId
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pb.NewUserClient(etcdConn)
-	respPb, err := client.GetBlockUserById(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, "GetBlockUserById rpc failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	resp.EndDisableTime = respPb.BlockUser.EndDisableTime
-	resp.BeginDisableTime = respPb.BlockUser.BeginDisableTime
-	utils.CopyStructFields(&resp, respPb.BlockUser.User)
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
-	openIMHttp.RespHttp200(c, constant.OK, resp)
-}
-
-func DeleteUser(c *gin.Context) {
-	var (
-		req   cms_api_struct.DeleteUserRequest
-		reqPb pb.DeleteUserReq
-	)
-	if err := c.BindJSON(&req); err != nil {
-		log.NewError("0", "BindJSON failed ", err.Error())
-		openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
-		return
-	}
-	reqPb.OperationID = utils.OperationIDGenerator()
-	log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req)
-	reqPb.UserId = req.UserId
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID)
-	if etcdConn == nil {
-		errMsg := reqPb.OperationID + "getcdv3.GetConn == nil"
-		log.NewError(reqPb.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
-		return
-	}
-	client := pb.NewUserClient(etcdConn)
-	_, err := client.DeleteUser(context.Background(), &reqPb)
-	if err != nil {
-		log.NewError(reqPb.OperationID, "DeleteUser rpc failed ", err.Error())
-		openIMHttp.RespHttp200(c, err, nil)
-		return
-	}
-	openIMHttp.RespHttp200(c, constant.OK, nil)
 }

internal/cron_task/clear_msg.go

@@ -0,0 +1,164 @@
+package cronTask
+
+import (
+	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/db"
+	"Open_IM/pkg/common/log"
+	server_api_params "Open_IM/pkg/proto/sdk_ws"
+	"Open_IM/pkg/utils"
+	goRedis "github.com/go-redis/redis/v8"
+	"github.com/golang/protobuf/proto"
+	"math"
+)
+
+const oldestList = 0
+const newestList = -1
+
+func ResetUserGroupMinSeq(operationID, groupID string, userIDList []string) error {
+	var delMsgIDList [][2]interface{}
+	minSeq, err := deleteMongoMsg(operationID, groupID, oldestList, &delMsgIDList)
+	if err != nil {
+		log.NewError(operationID, utils.GetSelfFuncName(), groupID, "deleteMongoMsg failed")
+		return utils.Wrap(err, "")
+	}
+	if minSeq == 0 {
+		return nil
+	}
+	log.NewDebug(operationID, utils.GetSelfFuncName(), "delMsgIDList:", delMsgIDList, "minSeq", minSeq)
+	for _, userID := range userIDList {
+		userMinSeq, err := db.DB.GetGroupUserMinSeq(groupID, userID)
+		if err != nil && err != goRedis.Nil {
+			log.NewError(operationID, utils.GetSelfFuncName(), "GetGroupUserMinSeq failed", groupID, userID, err.Error())
+			continue
+		}
+		if userMinSeq > uint64(minSeq) {
+			err = db.DB.SetGroupUserMinSeq(groupID, userID, userMinSeq)
+		} else {
+			err = db.DB.SetGroupUserMinSeq(groupID, userID, uint64(minSeq))
+		}
+		if err != nil {
+			log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupID, userID, userMinSeq, minSeq)
+		}
+	}
+	return nil
+}
+
+func DeleteMongoMsgAndResetRedisSeq(operationID, userID string) error {
+	var delMsgIDList [][2]interface{}
+	minSeq, err := deleteMongoMsg(operationID, userID, oldestList, &delMsgIDList)
+	if err != nil {
+		return utils.Wrap(err, "")
+	}
+	if minSeq == 0 {
+		return nil
+	}
+	log.NewDebug(operationID, utils.GetSelfFuncName(), "delMsgIDMap: ", delMsgIDList, "minSeq", minSeq)
+	err = db.DB.SetUserMinSeq(userID, minSeq)
+	return err
+}
+
+func delMongoMsgs(operationID string, delMsgIDList *[][2]interface{}) error {
+	if len(*delMsgIDList) > 0 {
+		var IDList []string
+		for _, v := range *delMsgIDList {
+			IDList = append(IDList, v[0].(string))
+		}
+		err := db.DB.DelMongoMsgs(IDList)
+		if err != nil {
+			return utils.Wrap(err, "DelMongoMsgs failed")
+		}
+	}
+	return nil
+}
+
+// recursion
+func deleteMongoMsg(operationID string, ID string, index int64, delMsgIDList *[][2]interface{}) (uint32, error) {
+	// 从最旧的列表开始找
+	msgs, err := db.DB.GetUserMsgListByIndex(ID, index)
+	if err != nil || msgs.UID == "" {
+		if err != nil {
+			log.NewError(operationID, utils.GetSelfFuncName(), "GetUserMsgListByIndex failed", err.Error(), index, ID)
+		}
+		return getDelMaxSeqByIDList(*delMsgIDList), delMongoMsgs(operationID, delMsgIDList)
+	}
+	if len(msgs.Msg) > db.GetSingleGocMsgNum() {
+		log.NewWarn(operationID, utils.GetSelfFuncName(), "msgs too large", len(msgs.Msg), msgs.UID)
+	}
+	log.NewDebug(operationID, utils.GetSelfFuncName(), "get msgs: ", msgs.UID)
+	for i, msg := range msgs.Msg {
+		// 找到列表中不需要删除的消息了
+		if utils.GetCurrentTimestampByMill() < msg.SendTime+int64(config.Config.Mongo.DBRetainChatRecords)*24*60*60*1000 {
+			if err := delMongoMsgs(operationID, delMsgIDList); err != nil {
+				return 0, err
+			}
+			minSeq := getDelMaxSeqByIDList(*delMsgIDList)
+			if i > 0 {
+				msgPb := &server_api_params.MsgData{}
+				err = proto.Unmarshal(msg.Msg, msgPb)
+				if err != nil {
+					log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), ID, index)
+				} else {
+					err = db.DB.ReplaceMsgToBlankByIndex(msgs.UID, i-1)
+					if err != nil {
+						log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), msgs.UID, i)
+						return minSeq, nil
+					}
+					minSeq = msgPb.Seq
+				}
+			}
+			return minSeq, nil
+		}
+	}
+	if len(msgs.Msg) > 0 {
+		msgPb := &server_api_params.MsgData{}
+		err = proto.Unmarshal(msgs.Msg[len(msgs.Msg)-1].Msg, msgPb)
+		if err != nil {
+			log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), len(msgs.Msg)-1, msgs.UID)
+			return 0, utils.Wrap(err, "proto.Unmarshal failed")
+		}
+		*delMsgIDList = append(*delMsgIDList, [2]interface{}{msgs.UID, msgPb.Seq})
+	}
+	// 没有找到 代表需要全部删除掉 继续递归查找下一个比较旧的列表
+	seq, err := deleteMongoMsg(operationID, utils.GetSelfFuncName(), index+1, delMsgIDList)
+	if err != nil {
+		return 0, utils.Wrap(err, "deleteMongoMsg failed")
+	}
+	return seq, nil
+}
+
+func getDelMaxSeqByIDList(delMsgIDList [][2]interface{}) uint32 {
+	if len(delMsgIDList) == 0 {
+		return 0
+	}
+	return delMsgIDList[len(delMsgIDList)-1][1].(uint32)
+}
+
+func checkMaxSeqWithMongo(operationID, ID string, diffusionType int) error {
+	var maxSeq uint64
+	var err error
+	if diffusionType == constant.WriteDiffusion {
+		maxSeq, err = db.DB.GetUserMaxSeq(ID)
+	} else {
+		maxSeq, err = db.DB.GetGroupMaxSeq(ID)
+	}
+	if err != nil {
+		if err == goRedis.Nil {
+			return nil
+		}
+		return utils.Wrap(err, "GetUserMaxSeq failed")
+	}
+	msg, err := db.DB.GetNewestMsg(ID)
+	if err != nil {
+		return utils.Wrap(err, "GetNewestMsg failed")
+	}
+	msgPb := &server_api_params.MsgData{}
+	err = proto.Unmarshal(msg.Msg, msgPb)
+	if err != nil {
+		return utils.Wrap(err, "")
+	}
+	if math.Abs(float64(msgPb.Seq-uint32(maxSeq))) > 10 {
+		log.NewWarn(operationID, utils.GetSelfFuncName(), maxSeq, msgPb.Seq, "redis maxSeq is different with msg.Seq")
+	}
+	return nil
+}

internal/cron_task/cron_task.go

@@ -0,0 +1,77 @@
+package cronTask
+
+import (
+	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	rocksCache "Open_IM/pkg/common/db/rocks_cache"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/utils"
+	"fmt"
+	"github.com/robfig/cron/v3"
+	"time"
+)
+
+const cronTaskOperationID = "cronTaskOperationID-"
+
+func StartCronTask() {
+	log.NewPrivateLog("cron")
+	log.NewInfo(utils.OperationIDGenerator(), "start cron task")
+	c := cron.New()
+	fmt.Println("config", config.Config.Mongo.ChatRecordsClearTime)
+	_, err := c.AddFunc(config.Config.Mongo.ChatRecordsClearTime, func() {
+		operationID := getCronTaskOperationID()
+		log.NewInfo(operationID, "====================== start del cron task ======================")
+		userIDList, err := im_mysql_model.SelectAllUserID()
+		if err == nil {
+			log.NewDebug(operationID, utils.GetSelfFuncName(), "userIDList: ", userIDList)
+			for _, userID := range userIDList {
+				if err := DeleteMongoMsgAndResetRedisSeq(operationID, userID); err != nil {
+					log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), userID)
+				}
+				if err := checkMaxSeqWithMongo(operationID, userID, constant.WriteDiffusion); err != nil {
+					log.NewError(operationID, utils.GetSelfFuncName(), userID, err)
+				}
+			}
+		} else {
+			log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
+		}
+
+		workingGroupIDList, err := im_mysql_model.GetGroupIDListByGroupType(constant.WorkingGroup)
+		if err == nil {
+			for _, groupID := range workingGroupIDList {
+				userIDList, err = rocksCache.GetGroupMemberIDListFromCache(groupID)
+				if err != nil {
+					log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupID)
+					continue
+				}
+				log.NewDebug(operationID, utils.GetSelfFuncName(), "groupID:", groupID, "userIDList:", userIDList)
+				if err := ResetUserGroupMinSeq(operationID, groupID, userIDList); err != nil {
+					log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), groupID, userIDList)
+				}
+				if err := checkMaxSeqWithMongo(operationID, groupID, constant.ReadDiffusion); err != nil {
+					log.NewError(operationID, utils.GetSelfFuncName(), groupID, err)
+				}
+			}
+		} else {
+			log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
+			return
+		}
+
+		log.NewInfo(operationID, "====================== start del cron finished ======================")
+	})
+	if err != nil {
+		fmt.Println("start cron failed", err.Error())
+		panic(err)
+	}
+
+	c.Start()
+	fmt.Println("start cron task success")
+	for {
+		time.Sleep(time.Second)
+	}
+}
+
+func getCronTaskOperationID() string {
+	return cronTaskOperationID + utils.OperationIDGenerator()
+}

internal/cron_task/test/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "Open_IM/pkg/common/db"
+
+func main() {
+	db.DB.BatchInsertChat()
+}

internal/demo/register/check_login.go

@@ -0,0 +1,85 @@
+package register
+
+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/utils"
+	"errors"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type CheckLoginLimitReq struct {
+	OperationID string `json:"operationID"`
+	UserID      string `json:"userID"`
+}
+
+type CheckLoginLimitResp struct {
+}
+
+func CheckLoginLimit(c *gin.Context) {
+	req := CheckLoginLimitReq{}
+	if err := c.BindJSON(&req); err != nil {
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
+		return
+	}
+	ip := c.Request.Header.Get("X-Forward-For")
+	if ip == "" {
+		ip = c.ClientIP()
+	}
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "IP: ", ip)
+	user, err := imdb.GetUserIPLimit(req.UserID)
+	if err != nil && !errors.Is(gorm.ErrRecordNotFound, err) {
+		errMsg := req.OperationID + " imdb.GetUserByUserID failed " + err.Error() + req.UserID
+		log.NewError(req.OperationID, errMsg)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": errMsg})
+		return
+	}
+
+	if err := imdb.UpdateIpReocord(req.UserID, ip); err != nil {
+		log.NewError(req.OperationID, err.Error(), req.UserID, ip)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": err.Error()})
+		return
+	}
+
+	var Limited bool
+	var LimitError error
+	Limited, LimitError = imdb.IsLimitLoginIp(ip)
+	if LimitError != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), LimitError, ip)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": LimitError})
+		return
+	}
+	if Limited {
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), Limited, ip, req.UserID)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.LoginLimit, "errMsg": "ip limited Login"})
+		return
+	}
+	Limited, LimitError = imdb.IsLimitUserLoginIp(user.UserID, ip)
+	if LimitError != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), LimitError, ip)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": LimitError})
+		return
+	}
+	if Limited {
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), Limited, ip, req.UserID)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.LoginLimit, "errMsg": "user ip limited Login"})
+		return
+	}
+	Limited, LimitError = imdb.UserIsBlock(user.UserID)
+	if LimitError != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), LimitError, user.UserID)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": LimitError})
+		return
+	}
+	if Limited {
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), Limited, ip, req.UserID)
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.LoginLimit, "errMsg": "user is block"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": ""})
+}

internal/demo/register/invitation_code.go

@@ -0,0 +1,123 @@
+package register
+
+import (
+	apiStruct "Open_IM/pkg/base_info"
+	"Open_IM/pkg/common/constant"
+	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/utils"
+	"net/http"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+type InvitationCode struct {
+	InvitationCode string    `json:"invitationCode"`
+	CreateTime     time.Time `json:"createTime"`
+	UserID         string    `json:"userID"`
+	LastTime       time.Time `json:"lastTime"`
+	Status         int32     `json:"status"`
+}
+
+type GenerateInvitationCodeReq struct {
+	CodesNum    int    `json:"codesNum" binding:"required"`
+	CodeLen     int    `json:"codeLen" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+type GenerateInvitationCodeResp struct {
+	Codes []string `json:"codes"`
+}
+
+func GenerateInvitationCode(c *gin.Context) {
+	req := GenerateInvitationCodeReq{}
+	resp := GenerateInvitationCodeResp{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
+		return
+	}
+	var err error
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	resp.Codes, err = imdb.BatchCreateInvitationCodes(req.CodesNum, req.CodeLen)
+	if err != nil {
+		log.NewError(req.OperationID, "BatchCreateInvitationCodes failed", req.CodesNum, req.CodeLen)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB, "errMsg": "Verification code error!"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
+}
+
+type QueryInvitationCodeReq struct {
+	Code        string `json:"code"  binding:"required"`
+	OperationID string `json:"operationID"  binding:"required"`
+}
+
+type QueryInvitationCodeResp struct {
+	InvitationCode
+}
+
+func QueryInvitationCode(c *gin.Context) {
+	req := QueryInvitationCodeReq{}
+	resp := QueryInvitationCodeResp{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	invitation, err := imdb.GetInvitationCode(req.Code)
+	if err != nil {
+		log.NewError(req.OperationID, "GetInvitationCode failed", req.Code)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB, "errMsg": "Verification code error!"})
+		return
+	}
+	resp.UserID = invitation.UserID
+	resp.CreateTime = invitation.CreateTime
+	resp.Status = invitation.Status
+	resp.LastTime = invitation.LastTime
+	resp.InvitationCode.InvitationCode = invitation.InvitationCode
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp:", resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
+}
+
+type GetInvitationCodesReq struct {
+	Status      int32  `json:"status"`
+	OperationID string `json:"operationID"  binding:"required"`
+	apiStruct.Pagination
+}
+
+type GetInvitationCodesResp struct {
+	apiStruct.Pagination
+	Codes    []InvitationCode `json:"codes"`
+	CodeNums int64            `json:"codeNums"`
+}
+
+func GetInvitationCodes(c *gin.Context) {
+	req := GetInvitationCodesReq{}
+	resp := GetInvitationCodesResp{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	codes, count, err := imdb.GetInvitationCodes(req.ShowNumber, req.PageNumber, req.Status)
+	if err != nil {
+		log.NewError(req.OperationID, "GetInvitationCode failed", req.ShowNumber, req.PageNumber, req.Status)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB, "errMsg": "Verification code error!"})
+		return
+	}
+	resp.Pagination.PageNumber = req.PageNumber
+	resp.Pagination.ShowNumber = req.ShowNumber
+	for _, v := range codes {
+		resp.Codes = append(resp.Codes, InvitationCode{
+			InvitationCode: v.InvitationCode,
+			CreateTime:     v.CreateTime,
+			UserID:         v.UserID,
+			LastTime:       v.LastTime,
+			Status:         v.Status,
+		})
+	}
+	resp.CodeNums = count
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp:", resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
+}

internal/demo/register/ip_limit.go

@@ -0,0 +1,225 @@
+package register
+
+import (
+	//api "Open_IM/pkg/base_info"
+	"Open_IM/pkg/common/constant"
+	"Open_IM/pkg/common/db"
+	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/utils"
+
+	"github.com/gin-gonic/gin"
+
+	//"github.com/jinzhu/gorm"
+	"net/http"
+	"time"
+)
+
+type QueryIPRegisterReq struct {
+	OperationID string `json:"operationID"`
+	IP          string `json:"ip"`
+}
+
+type QueryIPRegisterResp struct {
+	IP          string   `json:"ip"`
+	RegisterNum int      `json:"num"`
+	Status      int      `json:"status"`
+	UserIDList  []string `json:"userIDList"`
+}
+
+func QueryIPRegister(c *gin.Context) {
+	req := QueryIPRegisterReq{}
+	resp := QueryIPRegisterResp{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	userIDList, err := imdb.GetRegisterUserNum(req.IP)
+	if err != nil {
+		log.NewError(req.OperationID, "GetInvitationCode failed", req.IP)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": "GetRegisterUserNum error!"})
+		return
+	}
+	resp.IP = req.IP
+	resp.RegisterNum = len(userIDList)
+	resp.UserIDList = userIDList
+	ipLimit, err := imdb.QueryIPLimits(req.IP)
+	if err != nil {
+		log.NewError(req.OperationID, "QueryIPLimits failed", req.IP, err.Error())
+	} else {
+		if ipLimit != nil {
+			if ipLimit.Ip != "" {
+				resp.Status = 1
+			}
+		}
+
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp:", resp)
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
+}
+
+type AddIPLimitReq struct {
+	OperationID string `json:"operationID"`
+	IP          string `json:"ip"`
+	LimitTime   int32  `json:"limitTime"`
+}
+
+type AddIPLimitResp struct {
+}
+
+func AddIPLimit(c *gin.Context) {
+	req := AddIPLimitReq{}
+	//resp := AddIPLimitResp{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	if err := imdb.InsertOneIntoIpLimits(db.IpLimit{
+		Ip:            req.IP,
+		LimitRegister: 1,
+		LimitLogin:    1,
+		CreateTime:    time.Now(),
+		LimitTime:     utils.UnixSecondToTime(int64(req.LimitTime)),
+	}); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.IP, req.LimitTime)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": "InsertOneIntoIpLimits error!"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": ""})
+}
+
+type RemoveIPLimitReq struct {
+	OperationID string `json:"operationID"`
+	IP          string `json:"ip"`
+}
+
+type RemoveIPLimitResp struct {
+}
+
+func RemoveIPLimit(c *gin.Context) {
+	req := RemoveIPLimitReq{}
+	//resp := AddIPLimitResp{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrArgs, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	if err := imdb.DeleteOneFromIpLimits(req.IP); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.IP)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": "InsertOneIntoIpLimits error!"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": ""})
+}
+
+// ===========================================sk ==========================
+
+type QueryUserIDIPLimitLoginReq struct {
+	UserID      string `json:"userID" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+//type QueryUserIDIPLimitLoginResp struct {
+//	UserIpLimit []db.UserIpLimit `json:"userIpLimit"`
+//}
+
+func QueryUserIDLimitLogin(c *gin.Context) {
+	req := QueryUserIDIPLimitLoginReq{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	resp, err := imdb.GetIpLimitsLoginByUserID(req.UserID)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": "GetIpLimitsByUserID error!"})
+		return
+	}
+	if len(resp) > 0 {
+		log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp:", resp)
+		c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": resp})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "data": gin.H{"limit": resp}})
+}
+
+type AddUserIPLimitLoginReq struct {
+	UserID      string `json:"userID" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+	IP          string `json:"ip"`
+}
+
+type AddUserIPLimitLoginResp struct {
+}
+
+// 添加ip 特定用户才能登录 user_ip_limits 表
+func AddUserIPLimitLogin(c *gin.Context) {
+	req := AddUserIPLimitLoginReq{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	userIp := db.UserIpLimit{UserID: req.UserID, Ip: req.IP}
+	err := imdb.UpdateUserInfo(db.User{
+		UserID: req.UserID,
+		// LoginLimit: 1,
+	})
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB, "errMsg": "InsertUserIpLimitsLogin error!"})
+		return
+	}
+	err = imdb.InsertUserIpLimitsLogin(&userIp)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB, "errMsg": "InsertUserIpLimitsLogin error!"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": ""})
+}
+
+type RemoveUserIPLimitReq struct {
+	UserID      string `json:"userID" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+	IP          string `json:"ip"`
+}
+
+type RemoveUserIPLimitResp struct {
+}
+
+// 删除ip 特定用户才能登录 user_ip_limits 表
+func RemoveUserIPLimitLogin(c *gin.Context) {
+	req := RemoveUserIPLimitReq{}
+	if err := c.BindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
+		return
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req)
+	err := imdb.DeleteUserIpLimitsLogin(req.UserID, req.IP)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB, "errMsg": "DeleteUserIpLimitsLogin error!"})
+		return
+	}
+	ips, err := imdb.GetIpLimitsLoginByUserID(req.UserID)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID)
+		c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB, "errMsg": "GetIpLimitsLoginByUserID error!"})
+		return
+	}
+	if len(ips) == 0 {
+		err := imdb.UpdateUserInfoByMap(db.User{
+			UserID: req.UserID,
+		}, map[string]interface{}{"login_limit": 0})
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID)
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": constant.ErrDB, "errMsg": "UpdateUserInfo error!"})
+			return
+		}
+	}
+	c.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": ""})
+}

internal/demo/register/login.go

@@ -10,8 +10,9 @@ import (
 	"Open_IM/pkg/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"net/http"
+
+	"github.com/gin-gonic/gin"
 )
 
 type ParamsLogin struct {
@@ -56,12 +57,22 @@ func Login(c *gin.Context) {
 	} else {
 		userID = r.Account
 	}
+	ip := c.Request.Header.Get("X-Forward-For")
+	if ip == "" {
+		ip = c.ClientIP()
+	}
 	url := fmt.Sprintf("http://%s:%d/auth/user_token", utils.ServerIP, config.Config.Api.GinPort[0])
 	openIMGetUserToken := api.UserTokenReq{}
 	openIMGetUserToken.OperationID = params.OperationID
 	openIMGetUserToken.Platform = params.Platform
 	openIMGetUserToken.Secret = config.Config.Secret
 	openIMGetUserToken.UserID = userID
+	openIMGetUserToken.LoginIp = ip
+	loginIp := c.Request.Header.Get("X-Forward-For")
+	if loginIp == "" {
+		loginIp = c.ClientIP()
+	}
+	openIMGetUserToken.LoginIp = loginIp
 	openIMGetUserTokenResp := api.UserTokenResp{}
 	bMsg, err := http2.Post(url, openIMGetUserToken, 2)
 	if err != nil {
@@ -72,7 +83,11 @@ func Login(c *gin.Context) {
 	err = json.Unmarshal(bMsg, &openIMGetUserTokenResp)
 	if err != nil || openIMGetUserTokenResp.ErrCode != 0 {
 		log.NewError(params.OperationID, "request get user token", account, "err", "")
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.GetIMTokenErr, "errMsg": ""})
+		if openIMGetUserTokenResp.ErrCode == constant.LoginLimit {
+			c.JSON(http.StatusOK, gin.H{"errCode": constant.LoginLimit, "errMsg": "用户登录被限制"})
+		} else {
+			c.JSON(http.StatusOK, gin.H{"errCode": constant.GetIMTokenErr, "errMsg": ""})
+		}
 		return
 	}
 	c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "", "data": openIMGetUserTokenResp.UserToken})

internal/demo/register/onboarding_process.go

@@ -9,16 +9,18 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	groupRpc "Open_IM/pkg/proto/group"
+
 	organizationRpc "Open_IM/pkg/proto/organization"
 	commonPb "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
 	"errors"
 	"fmt"
-	"github.com/golang/protobuf/proto"
 	"math/rand"
 	"strings"
 	"time"
+
+	"github.com/golang/protobuf/proto"
 )
 
 type OnboardingProcessReq struct {
@@ -47,26 +49,44 @@ func OnboardingProcessRoutine() {
 
 func onboardingProcess(operationID, userID, userName, faceURL, phoneNumber, email string) {
 	log.NewInfo(operationID, utils.GetSelfFuncName(), userName, userID, faceURL)
-	if err := createOrganizationUser(operationID, userID, userName, phoneNumber, email); err != nil {
-		log.NewError(operationID, utils.GetSelfFuncName(), "createOrganizationUser failed", err.Error())
-	}
-	departmentID, err := imdb.GetRandomDepartmentID()
 
-	if err := joinTestDepartment(operationID, userID, departmentID); err != nil {
+	var joinDepartmentIDList []string
-		log.NewError(operationID, utils.GetSelfFuncName(), "joinTestDepartment failed", err.Error())
+	if len(config.Config.Demo.JoinDepartmentIDList) == 0 {
+		departmentID, err := imdb.GetRandomDepartmentID()
+		if err != nil {
+			log.NewError(utils.GetSelfFuncName(), "GetRandomDepartmentID failed", err.Error())
+			return
+		}
+		joinDepartmentIDList = []string{departmentID}
+	} else {
+		joinDepartmentIDList = config.Config.Demo.JoinDepartmentIDList
 	}
-	log.NewInfo(operationID, utils.GetSelfFuncName(), "random departmentID", departmentID)
+	if config.Config.Demo.CreateOrganizationUserAndJoinDepartment && len(joinDepartmentIDList) > 0 {
-	if err != nil {
+		if err := createOrganizationUser(operationID, userID, userName, phoneNumber, email); err != nil {
-		log.NewError(utils.GetSelfFuncName(), "GetRandomDepartmentID failed", err.Error())
+			log.NewError(operationID, utils.GetSelfFuncName(), "createOrganizationUser failed", err.Error())
-		return
+		}
+		for _, departmentID := range joinDepartmentIDList {
+			if err := joinTestDepartment(operationID, userID, departmentID); err != nil {
+				log.NewError(operationID, utils.GetSelfFuncName(), "joinTestDepartment failed", err.Error())
+			}
+		}
 	}
-	groupIDList, err := GetDepartmentGroupIDList(operationID, departmentID)
+
-	if err != nil {
+	if config.Config.Demo.JoinDepartmentGroups {
-		log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
+		for _, departmentID := range joinDepartmentIDList {
+			groupIDList, err := GetDepartmentGroupIDList(operationID, departmentID)
+			if err != nil {
+				log.NewError(operationID, utils.GetSelfFuncName(), err.Error())
+			}
+			log.Debug(operationID, utils.GetSelfFuncName(), "getjoinGroupIDListdepartmentID", groupIDList)
+			joinGroups(operationID, userID, userName, faceURL, groupIDList)
+			log.NewInfo(operationID, utils.GetSelfFuncName(), "fineshed")
+		}
+	}
+
+	if config.Config.Demo.OaNotification {
+		oaNotification(operationID, userID)
 	}
-	joinGroups(operationID, userID, userName, faceURL, groupIDList)
-	log.NewInfo(operationID, utils.GetSelfFuncName(), "fineshed")
-	oaNotification(operationID, userID)
 }
 
 func createOrganizationUser(operationID, userID, userName, phoneNumber, email string) error {
@@ -74,9 +94,9 @@ func createOrganizationUser(operationID, userID, userName, phoneNumber, email st
 		log.NewInfo(operationID, utils.GetSelfFuncName(), userID)
 	}()
 	log.NewInfo(operationID, utils.GetSelfFuncName(), "start createOrganizationUser")
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, operationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, operationID)
 	if etcdConn == nil {
-		errMsg := operationID + "getcdv3.GetConn == nil"
+		errMsg := operationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(operationID, errMsg)
 		return errors.New(errMsg)
 	}
@@ -113,9 +133,9 @@ func joinTestDepartment(operationID, userID, departmentID string) error {
 	defer func() {
 		log.NewInfo(operationID, utils.GetSelfFuncName(), userID)
 	}()
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, operationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, operationID)
 	if etcdConn == nil {
-		errMsg := operationID + "getcdv3.GetConn == nil"
+		errMsg := operationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(operationID, errMsg)
 		return errors.New(errMsg)
 	}
@@ -145,9 +165,9 @@ func GetDepartmentGroupIDList(operationID, departmentID string) ([]string, error
 	defer func() {
 		log.NewInfo(operationID, utils.GetSelfFuncName(), departmentID)
 	}()
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, operationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName, operationID)
 	if etcdConn == nil {
-		errMsg := operationID + "getcdv3.GetConn == nil"
+		errMsg := operationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(operationID, errMsg)
 		return nil, errors.New(errMsg)
 	}
@@ -184,9 +204,9 @@ func joinGroups(operationID, userID, userName, faceURL string, groupIDList []str
 	defer func() {
 		log.NewInfo(operationID, utils.GetSelfFuncName(), userID, groupIDList)
 	}()
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, operationID)
+	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, operationID)
 	if etcdConn == nil {
-		errMsg := operationID + "getcdv3.GetConn == nil"
+		errMsg := operationID + "getcdv3.GetDefaultConn == nil"
 		log.NewError(operationID, errMsg)
 		return
 	}

internal/demo/register/register_import_friend.go

@@ -0,0 +1,52 @@
+package register
+
+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"
+	pbFriend "Open_IM/pkg/proto/friend"
+	"Open_IM/pkg/utils"
+	"context"
+	"strings"
+)
+
+var ChImportFriend chan *pbFriend.ImportFriendReq
+
+func init() {
+	ChImportFriend = make(chan *pbFriend.ImportFriendReq, 1000)
+}
+
+func ImportFriendRoutine() {
+	for {
+		req := <-ChImportFriend
+		go func() {
+			friendUserIDList, err := imdb.GetRegisterAddFriendList(0, 0)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), req, err.Error())
+				return
+			}
+			log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "ImportFriendRoutine IDList", friendUserIDList)
+			if len(friendUserIDList) == 0 {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "len==0")
+				return
+			}
+			req.FriendUserIDList = friendUserIDList
+			etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImFriendName, req.OperationID)
+			if etcdConn == nil {
+				errMsg := req.OperationID + "getcdv3.GetConn == nil"
+				log.NewError(req.OperationID, errMsg)
+				return
+			}
+			client := pbFriend.NewFriendClient(etcdConn)
+			rpcResp, err := client.ImportFriend(context.Background(), req)
+			if err != nil {
+				log.NewError(req.OperationID, "ImportFriend failed ", err.Error(), req.String())
+				return
+			}
+			if rpcResp.CommonResp.ErrCode != 0 {
+				log.NewError(req.OperationID, "ImportFriend failed ", rpcResp)
+			}
+		}()
+	}
+}

internal/demo/register/send_code.go

@@ -8,12 +8,12 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/utils"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"gopkg.in/gomail.v2"
 	"math/rand"
 	"net/http"
-
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"gopkg.in/gomail.v2"
 )
 
 var sms SMS
@@ -34,11 +34,12 @@ func init() {
 }
 
 type paramsVerificationCode struct {
-	Email       string `json:"email"`
+	Email          string `json:"email"`
-	PhoneNumber string `json:"phoneNumber"`
+	PhoneNumber    string `json:"phoneNumber"`
-	OperationID string `json:"operationID" binding:"required"`
+	OperationID    string `json:"operationID" binding:"required"`
-	UsedFor     int    `json:"usedFor"`
+	UsedFor        int    `json:"usedFor"`
-	AreaCode    string `json:"areaCode"`
+	AreaCode       string `json:"areaCode"`
+	InvitationCode string `json:"invitationCode"`
 }
 
 func SendVerificationCode(c *gin.Context) {
@@ -72,6 +73,15 @@ func SendVerificationCode(c *gin.Context) {
 			c.JSON(http.StatusOK, gin.H{"errCode": constant.HasRegistered, "errMsg": "The phone number has been registered"})
 			return
 		}
+		//需要邀请码
+		if config.Config.Demo.NeedInvitationCode {
+			err = im_mysql_model.CheckInvitationCode(params.InvitationCode)
+			if err != nil {
+				log.NewError(params.OperationID, "邀请码错误", params)
+				c.JSON(http.StatusOK, gin.H{"errCode": constant.InvitationError, "errMsg": "邀请码错误"})
+				return
+			}
+		}
 		accountKey = accountKey + "_" + constant.VerificationCodeForRegisterSuffix
 		ok, err := db.DB.JudgeAccountEXISTS(accountKey)
 		if ok || err != nil {

internal/demo/register/set_password.go

@@ -5,16 +5,19 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
-	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	http2 "Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
+	"Open_IM/pkg/common/token_verify"
+	pbFriend "Open_IM/pkg/proto/friend"
 	"Open_IM/pkg/utils"
 	"encoding/json"
-	"github.com/gin-gonic/gin"
 	"math/big"
 	"net/http"
 	"strconv"
 	"time"
+
+	"github.com/gin-gonic/gin"
 )
 
 type ParamsSetPassword struct {
@@ -29,6 +32,9 @@ type ParamsSetPassword struct {
 	FaceURL          string `json:"faceURL"`
 	OperationID      string `json:"operationID" binding:"required"`
 	AreaCode         string `json:"areaCode"`
+	InvitationCode   string `json:"invitationCode"`
+	Gender           int32  `json:"gender"`
+	Birth            int32  `json:"birth"`
 }
 
 func SetPassword(c *gin.Context) {
@@ -38,11 +44,34 @@ func SetPassword(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
 		return
 	}
+	ip := c.Request.Header.Get("X-Forward-For")
+	if ip == "" {
+		ip = c.ClientIP()
+	}
+	log.NewDebug(params.OperationID, utils.GetSelfFuncName(), "ip:", ip)
+
+	ok, opUserID, _ := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), params.OperationID)
+	if !ok || !utils.IsContain(opUserID, config.Config.Manager.AppManagerUid) {
+		Limited, LimitError := imdb.IsLimitRegisterIp(ip)
+		if LimitError != nil {
+			log.Error(params.OperationID, utils.GetSelfFuncName(), LimitError, ip)
+			c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.ErrDB.ErrCode, "errMsg": LimitError.Error()})
+			return
+		}
+		if Limited {
+			log.NewInfo(params.OperationID, utils.GetSelfFuncName(), "is limited", ip, "params:", params)
+			c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.RegisterLimit, "errMsg": "limited"})
+			return
+		}
+	}
+	openIMRegisterReq := api.UserRegisterReq{}
 	var account string
 	if params.Email != "" {
 		account = params.Email
+		openIMRegisterReq.Email = params.Email
 	} else if params.PhoneNumber != "" {
 		account = params.PhoneNumber
+		openIMRegisterReq.PhoneNumber = params.PhoneNumber
 	} else {
 		account = params.UserID
 	}
@@ -61,6 +90,13 @@ func SetPassword(c *gin.Context) {
 				return
 			}
 		}
+		if config.Config.Demo.NeedInvitationCode && params.InvitationCode != "" {
+			err := imdb.CheckInvitationCode(params.InvitationCode)
+			if err != nil {
+				c.JSON(http.StatusOK, gin.H{"errCode": constant.InvitationError, "errMsg": "InvitationCode error"})
+				return
+			}
+		}
 	}
 	//userID := utils.Base64Encode(account)
 	var userID string
@@ -72,15 +108,15 @@ func SetPassword(c *gin.Context) {
 	} else {
 		userID = params.UserID
 	}
-
 	url := config.Config.Demo.ImAPIURL + "/auth/user_register"
-	openIMRegisterReq := api.UserRegisterReq{}
 	openIMRegisterReq.OperationID = params.OperationID
 	openIMRegisterReq.Platform = params.Platform
 	openIMRegisterReq.UserID = userID
 	openIMRegisterReq.Nickname = params.Nickname
 	openIMRegisterReq.Secret = config.Config.Secret
 	openIMRegisterReq.FaceURL = params.FaceURL
+	openIMRegisterReq.Gender = params.Gender
+	openIMRegisterReq.Birth = uint32(params.Birth)
 	openIMRegisterResp := api.UserRegisterResp{}
 	log.NewDebug(params.OperationID, utils.GetSelfFuncName(), "register req:", openIMRegisterReq)
 	bMsg, err := http2.Post(url, openIMRegisterReq, 2)
@@ -94,20 +130,35 @@ func SetPassword(c *gin.Context) {
 		log.NewError(params.OperationID, "request openIM register error", account, "err", "resp: ", openIMRegisterResp.ErrCode)
 		if err != nil {
 			log.NewError(params.OperationID, utils.GetSelfFuncName(), err.Error())
+			c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": "register limit"})
+			return
+		}
+		if openIMRegisterResp.ErrCode != 0 {
+			c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": "register failed: " + openIMRegisterResp.ErrMsg})
+			return
 		}
-		c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": "register failed: " + openIMRegisterResp.ErrMsg})
-		return
 	}
 	log.Info(params.OperationID, "begin store mysql", account, params.Password, "info", params.FaceURL, params.Nickname)
-	err = im_mysql_model.SetPassword(account, params.Password, params.Ex, userID, params.AreaCode)
+	err = imdb.SetPassword(account, params.Password, params.Ex, userID, params.AreaCode, ip)
 	if err != nil {
 		log.NewError(params.OperationID, "set phone number password error", account, "err", err.Error())
 		c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": err.Error()})
 		return
 	}
-	log.Info(params.OperationID, "end setPassword", account, params.Password)
+	if config.Config.Demo.NeedInvitationCode && params.InvitationCode != "" {
+		//判断一下验证码的使用情况
+		LockSucc := imdb.TryLockInvitationCode(params.InvitationCode, userID)
+		if LockSucc {
+			imdb.FinishInvitationCode(params.InvitationCode, userID)
+		}
+	}
+	if err := imdb.InsertIpRecord(userID, ip); err != nil {
+		log.NewError(params.OperationID, utils.GetSelfFuncName(), userID, ip, err.Error())
+	}
+
+	log.Info(params.OperationID, "end  setuserInfo", account, params.Password)
 	// demo onboarding
-	if params.UserID == "" {
+	if params.UserID == "" && config.Config.Demo.OnboardProcess {
 		select {
 		case Ch <- OnboardingProcessReq{
 			OperationID: params.OperationID,
@@ -121,6 +172,18 @@ func SetPassword(c *gin.Context) {
 			log.NewWarn(params.OperationID, utils.GetSelfFuncName(), "to ch timeOut")
 		}
 	}
+
+	// register add friend
+	select {
+	case ChImportFriend <- &pbFriend.ImportFriendReq{
+		OperationID: params.OperationID,
+		FromUserID:  userID,
+		OpUserID:    config.Config.Manager.AppManagerUid[0],
+	}:
+	case <-time.After(time.Second * 2):
+		log.NewWarn(params.OperationID, utils.GetSelfFuncName(), "to ChImportFriend timeOut")
+	}
+
 	c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "", "data": openIMRegisterResp.UserToken})
 	return
 }

internal/msg_gateway/gate/batch_push.go

@@ -89,9 +89,9 @@ func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, u
 	rpcReq.SeqList = seqList
 	rpcReq.UserID = userID
 	rpcReq.OperationID = operationID
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, rpcReq.OperationID)
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, rpcReq.OperationID)
 	if grpcConn == nil {
-		errMsg := "getcdv3.GetConn == nil"
+		errMsg := "getcdv3.GetDefaultConn == nil"
 		log.NewError(rpcReq.OperationID, errMsg)
 		return nil
 	}

internal/msg_gateway/gate/callback.go

@@ -59,3 +59,28 @@ func callbackUserOffline(operationID, userID string, platformID int) cbApi.Commo
 	}
 	return callbackResp
 }
+
+func callbackUserKickOff(operationID string, userID string, platformID int) cbApi.CommonCallbackResp {
+	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
+	if !config.Config.Callback.CallbackUserKickOff.Enable {
+		return callbackResp
+	}
+	callbackUserKickOffReq := cbApi.CallbackUserKickOffReq{
+		UserStatusCallbackReq: cbApi.UserStatusCallbackReq{
+			UserStatusBaseCallback: cbApi.UserStatusBaseCallback{
+				CallbackCommand: constant.CallbackUserKickOffCommand,
+				OperationID:     operationID,
+				PlatformID:      int32(platformID),
+				Platform:        constant.PlatformIDToName(platformID),
+			},
+			UserID: userID,
+		},
+		Seq: int(time.Now().UnixNano() / 1e6),
+	}
+	callbackUserKickOffResp := &cbApi.CallbackUserKickOffResp{CommonCallbackResp: callbackResp}
+	if err := http.PostReturn(config.Config.Callback.CallbackUrl, callbackUserKickOffReq, callbackUserKickOffResp, config.Config.Callback.CallbackUserOffline.CallbackTimeOut); err != nil {
+		callbackResp.ErrCode = http2.StatusInternalServerError
+		callbackResp.ErrMsg = err.Error()
+	}
+	return callbackResp
+}

internal/msg_gateway/gate/logic.go

@@ -72,9 +72,9 @@ func (ws *WServer) getSeqReq(conn *UserConn, m *Req) {
 		rpcReq.UserID = m.SendID
 		rpcReq.OperationID = m.OperationID
 		log.Debug(m.OperationID, "Ws call success to getMaxAndMinSeq", m.SendID, m.ReqIdentifier, m.MsgIncr, data.(sdk_ws.GetMaxAndMinSeqReq).GroupIDList)
-		grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, rpcReq.OperationID)
+		grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, rpcReq.OperationID)
 		if grpcConn == nil {
-			errMsg := rpcReq.OperationID + "getcdv3.GetConn == nil"
+			errMsg := rpcReq.OperationID + "getcdv3.GetDefaultConn == nil"
 			nReply.ErrCode = 500
 			nReply.ErrMsg = errMsg
 			log.NewError(rpcReq.OperationID, errMsg)
@@ -127,9 +127,9 @@ func (ws *WServer) pullMsgBySeqListReq(conn *UserConn, m *Req) {
 		rpcReq.OperationID = m.OperationID
 		rpcReq.GroupSeqList = data.(sdk_ws.PullMessageBySeqListReq).GroupSeqList
 		log.NewInfo(m.OperationID, "Ws call success to pullMsgBySeqListReq middle", m.SendID, m.ReqIdentifier, m.MsgIncr, data.(sdk_ws.PullMessageBySeqListReq).SeqList)
-		grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
+		grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
 		if grpcConn == nil {
-			errMsg := rpcReq.OperationID + "getcdv3.GetConn == nil"
+			errMsg := rpcReq.OperationID + "getcdv3.GetDefaultConn == nil"
 			nReply.ErrCode = 500
 			nReply.ErrMsg = errMsg
 			log.NewError(rpcReq.OperationID, errMsg)
@@ -153,6 +153,7 @@ func (ws *WServer) pullMsgBySeqListReq(conn *UserConn, m *Req) {
 		ws.pullMsgBySeqListResp(conn, m, nReply)
 	}
 }
+
 func (ws *WServer) pullMsgBySeqListResp(conn *UserConn, m *Req, pb *sdk_ws.PullMessageBySeqListResp) {
 	log.NewInfo(m.OperationID, "pullMsgBySeqListResp come  here ", pb.String())
 	c, _ := proto.Marshal(pb)
@@ -166,10 +167,9 @@ func (ws *WServer) pullMsgBySeqListResp(conn *UserConn, m *Req, pb *sdk_ws.PullM
 	}
 	log.NewInfo(m.OperationID, "pullMsgBySeqListResp all data  is ", mReply.ReqIdentifier, mReply.MsgIncr, mReply.ErrCode, mReply.ErrMsg,
 		len(mReply.Data))
-
 	ws.sendMsg(conn, mReply)
-
 }
+
 func (ws *WServer) sendMsgReq(conn *UserConn, m *Req) {
 	sendMsgAllCountLock.Lock()
 	sendMsgAllCount++
@@ -186,9 +186,9 @@ func (ws *WServer) sendMsgReq(conn *UserConn, m *Req) {
 			MsgData:     &data,
 		}
 		log.NewInfo(m.OperationID, "Ws call success to sendMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, data.String())
-		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
+		etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
 		if etcdConn == nil {
-			errMsg := m.OperationID + "getcdv3.GetConn == nil"
+			errMsg := m.OperationID + "getcdv3.GetDefaultConn == nil"
 			nReply.ErrCode = 500
 			nReply.ErrMsg = errMsg
 			log.NewError(m.OperationID, errMsg)
@@ -237,9 +237,9 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) {
 	isPass, errCode, errMsg, pData := ws.argsValidate(m, constant.WSSendSignalMsg, m.OperationID)
 	if isPass {
 		signalResp := pbRtc.SignalResp{}
-		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRealTimeCommName, m.OperationID)
+		etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRealTimeCommName, m.OperationID)
 		if etcdConn == nil {
-			errMsg := m.OperationID + "getcdv3.GetConn == nil"
+			errMsg := m.OperationID + "getcdv3.GetDefaultConn == nil"
 			log.NewError(m.OperationID, errMsg)
 			ws.sendSignalMsgResp(conn, 204, errMsg, m, &signalResp)
 			return
@@ -267,9 +267,9 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) {
 			}
 			log.NewInfo(m.OperationID, utils.GetSelfFuncName(), "pbData: ", pbData)
 			log.NewInfo(m.OperationID, "Ws call success to sendSignalMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, msgData)
-			etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
+			etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, m.OperationID)
 			if etcdConn == nil {
-				errMsg := m.OperationID + "getcdv3.GetConn == nil"
+				errMsg := m.OperationID + "getcdv3.GetDefaultConn == nil"
 				log.NewError(m.OperationID, errMsg)
 				ws.sendSignalMsgResp(conn, 200, errMsg, m, &signalResp)
 				return

internal/msg_gateway/gate/relay_rpc_server.go

@@ -66,6 +66,7 @@ func (r *RPCServer) run() {
 	err = getcdv3.RegisterEtcd4Unique(r.etcdSchema, strings.Join(r.etcdAddr, ","), rpcRegisterIP, r.rpcPort, r.rpcRegisterName, 10)
 	if err != nil {
 		log.Error("", "register push message rpc to etcd err", "", "err", err.Error(), r.etcdSchema, strings.Join(r.etcdAddr, ","), rpcRegisterIP, r.rpcPort, r.rpcRegisterName)
+		panic(utils.Wrap(err, "register msg_gataway module  rpc to etcd err"))
 	}
 	r.target = getcdv3.GetTarget(r.etcdSchema, rpcRegisterIP, r.rpcPort, r.rpcRegisterName)
 	err = srv.Serve(listener)
@@ -291,19 +292,20 @@ func (r *RPCServer) encodeWsData(wsData *sdk_ws.MsgData, operationID string) (by
 func (r *RPCServer) KickUserOffline(_ context.Context, req *pbRelay.KickUserOfflineReq) (*pbRelay.KickUserOfflineResp, error) {
 	log.NewInfo(req.OperationID, "KickUserOffline is arriving", req.String())
 	for _, v := range req.KickUserIDList {
+		log.NewWarn(req.OperationID, "SetTokenKicked ", v, req.PlatformID, req.OperationID)
+		SetTokenKicked(v, int(req.PlatformID), req.OperationID)
 		oldConnMap := ws.getUserAllCons(v)
 		if conn, ok := oldConnMap[int(req.PlatformID)]; ok { // user->map[platform->conn]
 			log.NewWarn(req.OperationID, "send kick msg, close connection ", req.PlatformID, v)
 			ws.sendKickMsg(conn, &UserConn{})
 			conn.Close()
 		}
-		log.NewWarn(req.OperationID, "SetTokenKicked ", v, req.PlatformID, req.OperationID)
-		SetTokenKicked(v, int(req.PlatformID), req.OperationID)
 	}
 	return &pbRelay.KickUserOfflineResp{}, nil
 }
 
 func (r *RPCServer) MultiTerminalLoginCheck(ctx context.Context, req *pbRelay.MultiTerminalLoginCheckReq) (*pbRelay.MultiTerminalLoginCheckResp, error) {
+
 	ws.MultiTerminalLoginCheckerWithLock(req.UserID, int(req.PlatformID), req.Token, req.OperationID)
 	return &pbRelay.MultiTerminalLoginCheckResp{}, nil
 }

internal/msg_gateway/gate/ws_server.go

@@ -12,9 +12,10 @@ import (
 	"bytes"
 	"context"
 	"encoding/gob"
+	"strings"
+
 	go_redis "github.com/go-redis/redis/v8"
 	"github.com/pkg/errors"
-	"strings"
 
 	//"gopkg.in/errgo.v2/errors"
 	"net/http"
@@ -119,29 +120,40 @@ func (ws *WServer) SetWriteTimeoutWriteMsg(conn *UserConn, a int, msg []byte, ti
 }
 
 func (ws *WServer) MultiTerminalLoginRemoteChecker(userID string, platformID int32, token string, operationID string) {
-	grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
+	grpcCons := getcdv3.GetDefaultGatewayConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), operationID)
+	log.NewInfo(operationID, utils.GetSelfFuncName(), "args  grpcCons: ", userID, platformID, grpcCons)
 	for _, v := range grpcCons {
 		if v.Target() == rpcSvr.target {
 			log.Debug(operationID, "Filter out this node ", rpcSvr.target)
 			continue
 		}
+		log.Debug(operationID, "call this node ", v.Target(), rpcSvr.target)
 		client := pbRelay.NewRelayClient(v)
 		req := &pbRelay.MultiTerminalLoginCheckReq{OperationID: operationID, PlatformID: platformID, UserID: userID, Token: token}
 		log.NewInfo(operationID, "MultiTerminalLoginCheckReq ", client, req.String())
 		resp, err := client.MultiTerminalLoginCheck(context.Background(), req)
 		if err != nil {
 			log.Error(operationID, "MultiTerminalLoginCheck failed ", err.Error())
+			continue
 		}
 		if resp.ErrCode != 0 {
 			log.Error(operationID, "MultiTerminalLoginCheck errCode, errMsg: ", resp.ErrCode, resp.ErrMsg)
+			continue
 		}
+		log.Debug(operationID, "MultiTerminalLoginCheck resp ", resp.String())
 	}
 }
 
 func (ws *WServer) MultiTerminalLoginCheckerWithLock(uid string, platformID int, token string, operationID string) {
 	rwLock.Lock()
 	defer rwLock.Unlock()
+	log.NewInfo(operationID, utils.GetSelfFuncName(), " rpc args: ", uid, platformID, token)
 	switch config.Config.MultiLoginPolicy {
+	case constant.PCAndOther:
+		if constant.PlatformNameToClass(constant.PlatformIDToName(platformID)) == constant.TerminalPC {
+			return
+		}
+		fallthrough
 	case constant.AllLoginButSameTermKick:
 		if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn]
 			if oldConn, ok := oldConnMap[platformID]; ok {
@@ -192,11 +204,16 @@ func (ws *WServer) MultiTerminalLoginCheckerWithLock(uid string, platformID int,
 
 func (ws *WServer) MultiTerminalLoginChecker(uid string, platformID int, newConn *UserConn, token string, operationID string) {
 	switch config.Config.MultiLoginPolicy {
+	case constant.PCAndOther:
+		if constant.PlatformNameToClass(constant.PlatformIDToName(platformID)) == constant.TerminalPC {
+			return
+		}
+		fallthrough
 	case constant.AllLoginButSameTermKick:
 		if oldConnMap, ok := ws.wsUserToConn[uid]; ok { // user->map[platform->conn]
 			if oldConn, ok := oldConnMap[platformID]; ok {
 				log.NewDebug(operationID, uid, platformID, "kick old conn")
-				//	ws.sendKickMsg(oldConn, newConn)
+				ws.sendKickMsg(oldConn, newConn)
 				m, err := db.DB.GetTokenMapByUidPid(uid, constant.PlatformIDToName(platformID))
 				if err != nil && err != go_redis.Nil {
 					log.NewError(operationID, "get token from redis err", err.Error(), uid, constant.PlatformIDToName(platformID))
@@ -229,8 +246,12 @@ func (ws *WServer) MultiTerminalLoginChecker(uid string, platformID int, newConn
 				if err != nil {
 					log.NewError(operationID, "conn close err", err.Error(), uid, platformID)
 				}
+				callbackResp := callbackUserKickOff(operationID, uid, platformID)
+				if callbackResp.ErrCode != 0 {
+					log.NewError(operationID, utils.GetSelfFuncName(), "callbackUserOffline failed", callbackResp)
+				}
 			} else {
-				log.NewWarn(operationID, "abnormal uid-conn  ", uid, platformID, oldConnMap[platformID])
+				log.Debug(operationID, "normal uid-conn  ", uid, platformID, oldConnMap[platformID])
 			}
 
 		} else {
@@ -263,12 +284,12 @@ func (ws *WServer) sendKickMsg(oldConn, newConn *UserConn) {
 func (ws *WServer) addUserConn(uid string, platformID int, conn *UserConn, token string, operationID string) {
 	rwLock.Lock()
 	defer rwLock.Unlock()
-	log.Info(operationID, utils.GetSelfFuncName(), " args: ", uid, platformID, conn, token)
+	log.Info(operationID, utils.GetSelfFuncName(), " args: ", uid, platformID, conn, token, "ip: ", conn.RemoteAddr().String())
 	callbackResp := callbackUserOnline(operationID, uid, platformID, token)
 	if callbackResp.ErrCode != 0 {
 		log.NewError(operationID, utils.GetSelfFuncName(), "callbackUserOnline resp:", callbackResp)
 	}
-	//go ws.MultiTerminalLoginRemoteChecker(uid, int32(platformID), token, operationID)
+	go ws.MultiTerminalLoginRemoteChecker(uid, int32(platformID), token, operationID)
 	ws.MultiTerminalLoginChecker(uid, platformID, conn, token, operationID)
 	if oldConnMap, ok := ws.wsUserToConn[uid]; ok {
 		oldConnMap[platformID] = conn
@@ -347,7 +368,11 @@ func (ws *WServer) getUserAllCons(uid string) map[int]*UserConn {
 	rwLock.RLock()
 	defer rwLock.RUnlock()
 	if connMap, ok := ws.wsUserToConn[uid]; ok {
-		return connMap
+		newConnMap := make(map[int]*UserConn)
+		for k, v := range connMap {
+			newConnMap[k] = v
+		}
+		return newConnMap
 	}
 	return nil
 }

internal/msg_transfer/logic/init.go

@@ -6,7 +6,11 @@ import (
 	"Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/statistics"
 	"fmt"
+	"net/http"
+	"strconv"
 	"sync"
+
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 const OnlineTopicBusy = 1
@@ -36,8 +40,8 @@ var (
 func Init() {
 	cmdCh = make(chan Cmd2Value, 10000)
 	w = new(sync.Mutex)
-	persistentCH.Init()
+	persistentCH.Init()   // ws2mschat save mysql
-	historyCH.Init(cmdCh)
+	historyCH.Init(cmdCh) //
 	historyMongoCH.Init()
 	onlineTopicStatus = OnlineTopicVacancy
 	//offlineHistoryCH.Init(cmdCh)
@@ -46,7 +50,7 @@ func Init() {
 	producer = kafka.NewKafkaProducer(config.Config.Kafka.Ms2pschat.Addr, config.Config.Kafka.Ms2pschat.Topic)
 	producerToMongo = kafka.NewKafkaProducer(config.Config.Kafka.MsgToMongo.Addr, config.Config.Kafka.MsgToMongo.Topic)
 }
-func Run() {
+func Run(promethuesPort int) {
 	//register mysqlConsumerHandler to
 	if config.Config.ChatPersistenceMysql {
 		go persistentCH.persistentConsumerGroup.RegisterHandleAndConsumer(&persistentCH)
@@ -56,6 +60,10 @@ func Run() {
 	go historyCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyCH)
 	go historyMongoCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyMongoCH)
 	//go offlineHistoryCH.historyConsumerGroup.RegisterHandleAndConsumer(&offlineHistoryCH)
+	if config.Config.Prometheus.Enable {
+		http.Handle("/metrics", promhttp.Handler())
+		http.ListenAndServe(":"+strconv.Itoa(promethuesPort), nil)
+	}
 }
 func SetOnlineTopicStatus(status int) {
 	w.Lock()

internal/msg_transfer/logic/online_history_msg_handler.go

@@ -407,7 +407,7 @@ func (och *OnlineHistoryRedisConsumerHandler) ConsumeClaim(sess sarama.ConsumerG
 					rwLock.Unlock()
 					split := 1000
 					triggerID = utils.OperationIDGenerator()
-					log.NewWarn(triggerID, "timer trigger msg consumer start", len(ccMsg))
+					log.Debug(triggerID, "timer trigger msg consumer start", len(ccMsg))
 					for i := 0; i < len(ccMsg)/split; i++ {
 						//log.Debug()
 						och.msgDistributionCh <- Cmd2Value{Cmd: ConsumerMsgs, Value: TriggerChannelValue{
@@ -419,9 +419,8 @@ func (och *OnlineHistoryRedisConsumerHandler) ConsumeClaim(sess sarama.ConsumerG
 					}
 					//sess.MarkMessage(ccMsg[len(cMsg)-1], "")
 
-					log.NewWarn(triggerID, "timer trigger msg consumer end", len(cMsg))
+					log.Debug(triggerID, "timer trigger msg consumer end", len(cMsg))
 				}
-
 			}
 		}
 
@@ -519,7 +518,7 @@ func sendMessageToPush(message *pbMsg.MsgDataToMQ, pushToUserID string) {
 	log.Info(message.OperationID, "msg_transfer send message to push", "message", message.String())
 	rpcPushMsg := pbPush.PushMsgReq{OperationID: message.OperationID, MsgData: message.MsgData, PushToUserID: pushToUserID}
 	mqPushMsg := pbMsg.PushMsgDataToMQ{OperationID: message.OperationID, MsgData: message.MsgData, PushToUserID: pushToUserID}
-	grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImPushName, message.OperationID)
+	grpcConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImPushName, message.OperationID)
 	if grpcConn == nil {
 		log.Error(rpcPushMsg.OperationID, "rpc dial failed", "push data", rpcPushMsg.String())
 		pid, offset, err := producer.SendMessage(&mqPushMsg, mqPushMsg.PushToUserID, rpcPushMsg.OperationID)

internal/msg_transfer/logic/online_msg_to_mongo_handler.go

@@ -34,6 +34,7 @@ func (mc *OnlineHistoryMongoConsumerHandler) handleChatWs2Mongo(cMsg *sarama.Con
 		log.Error("msg_transfer Unmarshal msg err", "", "msg", string(msg), "err", err.Error())
 		return
 	}
+	log.Info(msgFromMQ.TriggerID, "BatchInsertChat2DB userID: ", msgFromMQ.AggregationID, "msgFromMQ.LastSeq: ", msgFromMQ.LastSeq)
 	err = db.DB.BatchInsertChat2DB(msgFromMQ.AggregationID, msgFromMQ.MessageList, msgFromMQ.TriggerID, msgFromMQ.LastSeq)
 	if err != nil {
 		log.NewError(msgFromMQ.TriggerID, "single data insert to mongo err", err.Error(), msgFromMQ.MessageList, msgFromMQ.AggregationID, msgFromMQ.TriggerID)

internal/msg_transfer/logic/persistent_msg_handler.go

@@ -14,8 +14,16 @@ import (
 	"Open_IM/pkg/common/log"
 	pbMsg "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
+
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+var (
+	msgInsertMysqlProcessed prometheus.Counter
 )
 
 type PersistentConsumerHandler struct {
@@ -29,7 +37,12 @@ func (pc *PersistentConsumerHandler) Init() {
 	pc.persistentConsumerGroup = kfk.NewMConsumerGroup(&kfk.MConsumerGroupConfig{KafkaVersion: sarama.V2_0_0_0,
 		OffsetsInitial: sarama.OffsetNewest, IsReturnErr: false}, []string{config.Config.Kafka.Ws2mschat.Topic},
 		config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.ConsumerGroupID.MsgToMySql)
-
+	if config.Config.Prometheus.Enable {
+		msgInsertMysqlProcessed = promauto.NewCounter(prometheus.CounterOpts{
+			Name: "insert_mysql_msg_total",
+			Help: "The total number of msg insert mysql events",
+		})
+	}
 }
 
 func (pc *PersistentConsumerHandler) handleChatWs2Mysql(cMsg *sarama.ConsumerMessage, msgKey string, _ sarama.ConsumerGroupSession) {
@@ -65,6 +78,12 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(cMsg *sarama.ConsumerMes
 				log.NewError(msgFromMQ.OperationID, "Message insert failed", "err", err.Error(), "msg", msgFromMQ.String())
 				return
 			}
+			msgInsertMysqlProcessed.Inc()
+			msgInsertMysqlProcessed.Add(1)
+			if config.Config.Prometheus.Enable {
+				log.NewDebug(msgFromMQ.OperationID, utils.GetSelfFuncName(), "inc msgInsertMysqlProcessed", msgInsertMysqlProcessed.Desc())
+				msgInsertMysqlProcessed.Inc()
+			}
 		}
 
 	}

internal/push/fcm/push.go

@@ -5,13 +5,14 @@ import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	"Open_IM/pkg/tools"
 	"context"
+	go_redis "github.com/go-redis/redis/v8"
+	"path/filepath"
+	"strconv"
+
 	firebase "firebase.google.com/go"
 	"firebase.google.com/go/messaging"
 	"google.golang.org/api/option"
-	"path/filepath"
-	"strconv"
 )
 
 const SinglePushCountLimit = 400
@@ -46,45 +47,83 @@ func newFcmClient() *Fcm {
 	return &Fcm{FcmMsgCli: fcmMsgClient}
 }
 
-func (f *Fcm) Push(accounts []string, alert, detailContent, operationID string, opts push.PushOpts) (string, error) {
+func (f *Fcm) Push(accounts []string, title, detailContent, operationID string, opts push.PushOpts) (string, error) {
 	// accounts->registrationToken
-	Tokens := make([]string, 0)
+	allTokens := make(map[string][]string, 0)
 	for _, account := range accounts {
-		IosfcmToken, IosErr := db.DB.GetFcmToken(account, 1)
+		var personTokens []string
-		AndroidfcmToken, AndroidErr := db.DB.GetFcmToken(account, 2)
+		for _, v := range push.PushTerminal {
-
+			Token, err := db.DB.GetFcmToken(account, v)
-		if IosErr == nil {
+			if err == nil {
-			Tokens = append(Tokens, IosfcmToken)
+				personTokens = append(personTokens, Token)
-		}
+			}
-		if AndroidErr == nil {
-			Tokens = append(Tokens, AndroidfcmToken)
 		}
+		allTokens[account] = personTokens
 	}
 	Success := 0
 	Fail := 0
-	result := tools.NewSplitter(SinglePushCountLimit, Tokens).GetSplitResult()
+	notification := &messaging.Notification{}
-	Msg := new(messaging.MulticastMessage)
+	notification.Body = detailContent
-	Msg.Notification = &messaging.Notification{}
+	notification.Title = title
-	Msg.Notification.Body = detailContent
+	var messages []*messaging.Message
-	Msg.Notification.Title = alert
 	ctx := context.Background()
-	for _, v := range result {
+	for uid, personTokens := range allTokens {
-		Msg.Tokens = v.Item
+		apns := &messaging.APNSConfig{Payload: &messaging.APNSPayload{Aps: &messaging.Aps{Sound: opts.IOSPushSound}}}
-		//SendMulticast sends the given multicast message to all the FCM registration tokens specified.
+		messageCount := len(messages)
-		//The tokens array in MulticastMessage may contain up to 500 tokens.
+		if messageCount >= SinglePushCountLimit {
-		//SendMulticast uses the `SendAll()` function to send the given message to all the target recipients.
+			response, err := f.FcmMsgCli.SendAll(ctx, messages)
-		//The responses list obtained from the return value corresponds to the order of the input tokens.
+			if err != nil {
-		//An error from SendMulticast indicates a total failure -- i.e.
+				Fail = Fail + messageCount
-		//the message could not be sent to any of the recipients.
+				log.Info(operationID, "some token push err", err.Error(), messageCount)
-		//Partial failures are indicated by a `BatchResponse` return value.
+			} else {
-		response, err := f.FcmMsgCli.SendMulticast(ctx, Msg)
+				Success = Success + response.SuccessCount
-		if err != nil {
+				Fail = Fail + response.FailureCount
-			Fail = Fail + len(v.Item)
+			}
-			log.Info(operationID, "some token push err", err.Error(), len(v.Item))
+			messages = messages[0:0]
-			continue
+		}
+		if opts.IOSBadgeCount {
+			unreadCountSum, err := db.DB.IncrUserBadgeUnreadCountSum(uid)
+			if err == nil {
+				apns.Payload.Aps.Badge = &unreadCountSum
+			} else {
+				log.Error(operationID, "IncrUserBadgeUnreadCountSum redis err", err.Error(), uid)
+				Fail++
+				continue
+			}
+		} else {
+			unreadCountSum, err := db.DB.GetUserBadgeUnreadCountSum(uid)
+			if err == nil && unreadCountSum != 0 {
+				apns.Payload.Aps.Badge = &unreadCountSum
+			} else if err == go_redis.Nil || unreadCountSum == 0 {
+				zero := 1
+				apns.Payload.Aps.Badge = &zero
+			} else {
+				log.Error(operationID, "GetUserBadgeUnreadCountSum redis err", err.Error(), uid)
+				Fail++
+				continue
+			}
+		}
+		for _, token := range personTokens {
+			temp := &messaging.Message{
+				Data:         map[string]string{"ex": opts.Data},
+				Token:        token,
+				Notification: notification,
+				APNS:         apns,
+			}
+			messages = append(messages, temp)
+		}
+
+	}
+	messageCount := len(messages)
+	if messageCount > 0 {
+		response, err := f.FcmMsgCli.SendAll(ctx, messages)
+		if err != nil {
+			Fail = Fail + messageCount
+			log.Info(operationID, "some token push err", err.Error(), messageCount)
+		} else {
+			Success = Success + response.SuccessCount
+			Fail = Fail + response.FailureCount
 		}
-		Success = Success + response.SuccessCount
-		Fail = Fail + response.FailureCount
 	}
 	return strconv.Itoa(Success) + " Success," + strconv.Itoa(Fail) + " Fail", nil
 }

internal/push/getui/push.go

@@ -83,6 +83,7 @@ type Alert struct {
 type Android struct {
 	Ups struct {
 		Notification Notification `json:"notification"`
+		Options      Options      `json:"options"`
 	} `json:"ups"`
 }
 
@@ -92,6 +93,21 @@ type Notification struct {
 	ClickType string `json:"click_type"`
 }
 
+type Options struct {
+	HW struct {
+		DefaultSound bool   `json:"/message/android/notification/default_sound"`
+		ChannelID    string `json:"/message/android/notification/channel_id"`
+		Sound        string `json:"/message/android/notification/sound"`
+		Importance   string `json:"/message/android/notification/importance"`
+	} `json:"HW"`
+	XM struct {
+		ChannelID string `json:"/extra.channel_id"`
+	} `json:"XM"`
+	VV struct {
+		Classification int `json:"/classification"`
+	} `json:"VV"`
+}
+
 type PushResp struct {
 }
 
@@ -99,7 +115,7 @@ func newGetuiClient() *Getui {
 	return &Getui{}
 }
 
-func (g *Getui) Push(userIDList []string, alert, detailContent, operationID string, opts push.PushOpts) (resp string, err error) {
+func (g *Getui) Push(userIDList []string, title, detailContent, operationID string, opts push.PushOpts) (resp string, err error) {
 	token, err := db.DB.GetGetuiToken()
 	log.NewDebug(operationID, utils.GetSelfFuncName(), "token：", token)
 	if err != nil {
@@ -119,20 +135,36 @@ func (g *Getui) Push(userIDList []string, alert, detailContent, operationID stri
 		}{Alias: []string{userIDList[0]}},
 	}
 	pushReq.PushMessage.Notification = Notification{
-		Title:     alert,
+		Title:     title,
-		Body:      alert,
+		Body:      detailContent,
 		ClickType: "startapp",
 	}
 	pushReq.PushChannel.Ios.Aps.Sound = "default"
 	pushReq.PushChannel.Ios.Aps.Alert = Alert{
-		Title: alert,
+		Title: title,
-		Body:  alert,
+		Body:  title,
 	}
 	pushReq.PushChannel.Android.Ups.Notification = Notification{
-		Title:     alert,
+		Title:     title,
-		Body:      alert,
+		Body:      title,
 		ClickType: "startapp",
 	}
+	pushReq.PushChannel.Android.Ups.Options = Options{
+		HW: struct {
+			DefaultSound bool   `json:"/message/android/notification/default_sound"`
+			ChannelID    string `json:"/message/android/notification/channel_id"`
+			Sound        string `json:"/message/android/notification/sound"`
+			Importance   string `json:"/message/android/notification/importance"`
+		}{ChannelID: "RingRing4", Sound: "/raw/ring001", Importance: "NORMAL"},
+		XM: struct {
+			ChannelID string `json:"/extra.channel_id"`
+		}{ChannelID: "high_system"},
+		VV: struct {
+			Classification int "json:\"/classification\""
+		}{
+			Classification: 1,
+		},
+	}
 	pushResp := PushResp{}
 	err = g.request(PushURL, pushReq, token, &pushResp, operationID)
 	switch err {
@@ -179,7 +211,7 @@ func (g *Getui) request(url string, content interface{}, token string, returnStr
 		return err
 	}
 	client := &http.Client{}
-	log.Debug(operationID, utils.GetSelfFuncName(), "json:", string(con))
+	log.Debug(operationID, utils.GetSelfFuncName(), "json:", string(con), "token:", token)
 	req, err := http.NewRequest("POST", config.Config.Push.Getui.PushUrl+url, bytes.NewBuffer(con))
 	if err != nil {
 		return err
@@ -197,7 +229,7 @@ func (g *Getui) request(url string, content interface{}, token string, returnStr
 	if err != nil {
 		return err
 	}
-	log.NewInfo(operationID, "getui", utils.GetSelfFuncName(), "resp, ", string(result))
+	log.NewDebug(operationID, "getui", utils.GetSelfFuncName(), "resp, ", string(result))
 	commonResp := GetuiCommonResp{}
 	commonResp.Data = returnStruct
 	if err := json.Unmarshal(result, &commonResp); err != nil {

internal/push/jpush/push.go

@@ -33,7 +33,7 @@ func (j *JPush) SetAlias(cid, alias string) (resp string, err error) {
 	return resp, nil
 }
 
-func (j *JPush) Push(accounts []string, alert, detailContent, operationID string, opts push.PushOpts) (string, error) {
+func (j *JPush) Push(accounts []string, title, detailContent, operationID string, opts push.PushOpts) (string, error) {
 
 	var pf requestBody.Platform
 	pf.SetAll()
@@ -47,7 +47,7 @@ func (j *JPush) Push(accounts []string, alert, detailContent, operationID string
 	}
 	no.IOSEnableMutableContent()
 	no.SetExtras(extras)
-	no.SetAlert(alert)
+	no.SetAlert(title)
 	var me requestBody.Message
 	me.SetMsgContent(detailContent)
 	var o requestBody.Options

internal/push/logic/callback.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	cbApi "Open_IM/pkg/call_back_struct"
+	"Open_IM/pkg/common/callback"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/http"
@@ -27,12 +28,13 @@ func callbackOfflinePush(operationID string, userIDList []string, msg *commonPb.
 			UserIDList: userIDList,
 		},
 		OfflinePushInfo: msg.OfflinePushInfo,
+		ClientMsgID:     msg.ClientMsgID,
 		SendID:          msg.SendID,
 		GroupID:         msg.GroupID,
 		ContentType:     msg.ContentType,
 		SessionType:     msg.SessionType,
 		AtUserIDList:    msg.AtUserIDList,
-		Content:         string(msg.Content),
+		Content:         callback.GetContent(msg),
 	}
 	resp := &cbApi.CallbackBeforePushResp{CommonCallbackResp: &callbackResp}
 	if err := http.PostReturn(config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackOfflinePush.CallbackTimeOut); err != nil {
@@ -46,8 +48,13 @@ func callbackOfflinePush(operationID string, userIDList []string, msg *commonPb.
 			return callbackResp
 		}
 	}
-	if resp.ErrCode == constant.CallbackHandleSuccess && resp.ActionCode == constant.ActionAllow && len(resp.UserIDList) != 0 {
+	if resp.ErrCode == constant.CallbackHandleSuccess && resp.ActionCode == constant.ActionAllow {
-		*offlinePushUserIDList = resp.UserIDList
+		if len(resp.UserIDList) != 0 {
+			*offlinePushUserIDList = resp.UserIDList
+		}
+		if resp.OfflinePushInfo != nil {
+			msg.OfflinePushInfo = resp.OfflinePushInfo
+		}
 	}
 	log.NewDebug(operationID, utils.GetSelfFuncName(), offlinePushUserIDList, resp.UserIDList)
 	return callbackResp
@@ -69,12 +76,13 @@ func callbackOnlinePush(operationID string, userIDList []string, msg *commonPb.M
 			UserIDList: userIDList,
 		},
 		OfflinePushInfo: msg.OfflinePushInfo,
+		ClientMsgID:     msg.ClientMsgID,
 		SendID:          msg.SendID,
 		GroupID:         msg.GroupID,
 		ContentType:     msg.ContentType,
 		SessionType:     msg.SessionType,
 		AtUserIDList:    msg.AtUserIDList,
-		Content:         string(msg.Content),
+		Content:         callback.GetContent(msg),
 	}
 	resp := &cbApi.CallbackBeforePushResp{CommonCallbackResp: &callbackResp}
 	if err := http.PostReturn(config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackOnlinePush.CallbackTimeOut); err != nil {
@@ -92,6 +100,7 @@ func callbackOnlinePush(operationID string, userIDList []string, msg *commonPb.M
 }
 
 func callbackBeforeSuperGroupOnlinePush(operationID string, groupID string, msg *commonPb.MsgData, pushToUserList *[]string) cbApi.CommonCallbackResp {
+	log.Debug(operationID, utils.GetSelfFuncName(), groupID, msg.String(), pushToUserList)
 	callbackResp := cbApi.CommonCallbackResp{OperationID: operationID}
 	if !config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.Enable {
 		return callbackResp
@@ -104,12 +113,13 @@ func callbackBeforeSuperGroupOnlinePush(operationID string, groupID string, msg
 			Platform:        constant.PlatformIDToName(int(msg.SenderPlatformID)),
 		},
 		OfflinePushInfo: msg.OfflinePushInfo,
+		ClientMsgID:     msg.ClientMsgID,
 		SendID:          msg.SendID,
 		GroupID:         groupID,
 		ContentType:     msg.ContentType,
 		SessionType:     msg.SessionType,
 		AtUserIDList:    msg.AtUserIDList,
-		Content:         string(msg.Content),
+		Content:         callback.GetContent(msg),
 	}
 	resp := &cbApi.CallbackBeforeSuperGroupOnlinePushResp{CommonCallbackResp: &callbackResp}
 	if err := http.PostReturn(config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.CallbackTimeOut); err != nil {

internal/push/logic/init.go

@@ -21,17 +21,15 @@ import (
 var (
 	rpcServer     RPCServer
 	pushCh        PushConsumerHandler
-	pushTerminal  []int32
 	producer      *kafka.Producer
 	offlinePusher pusher.OfflinePusher
 	successCount  uint64
 )
 
 func Init(rpcPort int) {
-
 	rpcServer.Init(rpcPort)
 	pushCh.Init()
-	pushTerminal = []int32{constant.IOSPlatformID, constant.AndroidPlatformID}
+
 }
 func init() {
 	producer = kafka.NewKafkaProducer(config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.Ws2mschat.Topic)

internal/push/logic/push_handler.go

@@ -13,6 +13,7 @@ import (
 	"Open_IM/pkg/common/log"
 	pbChat "Open_IM/pkg/proto/msg"
 	pbPush "Open_IM/pkg/proto/push"
+	"Open_IM/pkg/utils"
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
 )
@@ -43,6 +44,11 @@ func (ms *PushConsumerHandler) handleMs2PsChat(msg []byte) {
 		MsgData:      msgFromMQ.MsgData,
 		PushToUserID: msgFromMQ.PushToUserID,
 	}
+	sec := msgFromMQ.MsgData.SendTime / 1000
+	nowSec := utils.GetCurrentTimestampBySecond()
+	if nowSec-sec > 10 {
+		return
+	}
 	switch msgFromMQ.MsgData.SessionType {
 	case constant.SuperGroupChatType:
 		MsgToSuperGroupUser(pbData)
@@ -59,6 +65,7 @@ func (ms *PushConsumerHandler) ConsumeClaim(sess sarama.ConsumerGroupSession,
 	for msg := range claim.Messages() {
 		log.NewDebug("", "kafka get info to mysql", "msgTopic", msg.Topic, "msgPartition", msg.Partition, "msg", string(msg.Value))
 		ms.msgHandle[msg.Topic](msg.Value)
+		sess.MarkMessage(msg, "")
 	}
 	return nil
 }

internal/push/logic/push_rpc_server.go

@@ -55,6 +55,7 @@ func (r *RPCServer) run() {
 	err = getcdv3.RegisterEtcd(r.etcdSchema, strings.Join(r.etcdAddr, ","), rpcRegisterIP, r.rpcPort, r.rpcRegisterName, 10)
 	if err != nil {
 		log.Error("", "register push module  rpc to etcd err", err.Error(), r.etcdSchema, strings.Join(r.etcdAddr, ","), rpcRegisterIP, r.rpcPort, r.rpcRegisterName)
+		panic(utils.Wrap(err, "register push module  rpc to etcd err"))
 	}
 	err = srv.Serve(listener)
 	if err != nil {

internal/push/logic/push_to_client.go

@@ -8,21 +8,20 @@ package logic
 
 import (
 	"Open_IM/internal/push"
+	utils2 "Open_IM/internal/utils"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
-	pbCache "Open_IM/pkg/proto/cache"
 	pbPush "Open_IM/pkg/proto/push"
 	pbRelay "Open_IM/pkg/proto/relay"
 	pbRtc "Open_IM/pkg/proto/rtc"
 	"Open_IM/pkg/utils"
 	"context"
-	"encoding/json"
-	"github.com/golang/protobuf/proto"
-	"google.golang.org/grpc"
 	"strings"
+
+	"github.com/golang/protobuf/proto"
 )
 
 type OpenIMContent struct {
@@ -37,16 +36,13 @@ type AtContent struct {
 	IsAtSelf   bool     `json:"isAtSelf"`
 }
 
-var grpcCons []*grpc.ClientConn
+//var grpcCons []*grpc.ClientConn
 
 func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 	var wsResult []*pbRelay.SingelMsgToUserResultList
 	isOfflinePush := utils.GetSwitchFromOptions(pushMsg.MsgData.Options, constant.IsOfflinePush)
 	log.Debug(pushMsg.OperationID, "Get msg from msg_transfer And push msg", pushMsg.String())
-	if len(grpcCons) == 0 {
+	grpcCons := getcdv3.GetDefaultGatewayConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), pushMsg.OperationID)
-		log.NewWarn(pushMsg.OperationID, "first GetConn4Unique ")
-		grpcCons = getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
-	}
 
 	var UIDList = []string{pushMsg.PushToUserID}
 	callbackResp := callbackOnlinePush(pushMsg.OperationID, UIDList, pushMsg.MsgData)
@@ -82,51 +78,16 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 			}
 		}
 		if pushMsg.MsgData.ContentType == constant.SignalingNotification {
-			if err := db.DB.HandleSignalInfo(pushMsg.OperationID, pushMsg.MsgData); err != nil {
+			isSend, err := db.DB.HandleSignalInfo(pushMsg.OperationID, pushMsg.MsgData, pushMsg.PushToUserID)
+			if err != nil {
 				log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), err.Error(), pushMsg.MsgData)
 				return
 			}
-		}
+			if !isSend {
-		customContent := OpenIMContent{
+				return
-			SessionType: int(pushMsg.MsgData.SessionType),
-			From:        pushMsg.MsgData.SendID,
-			To:          pushMsg.MsgData.RecvID,
-			Seq:         pushMsg.MsgData.Seq,
-		}
-		bCustomContent, _ := json.Marshal(customContent)
-		jsonCustomContent := string(bCustomContent)
-		var content string
-		if pushMsg.MsgData.OfflinePushInfo != nil {
-			content = pushMsg.MsgData.OfflinePushInfo.Title
-
-		} else {
-			switch pushMsg.MsgData.ContentType {
-			case constant.Text:
-				content = constant.ContentType2PushContent[constant.Text]
-			case constant.Picture:
-				content = constant.ContentType2PushContent[constant.Picture]
-			case constant.Voice:
-				content = constant.ContentType2PushContent[constant.Voice]
-			case constant.Video:
-				content = constant.ContentType2PushContent[constant.Video]
-			case constant.File:
-				content = constant.ContentType2PushContent[constant.File]
-			case constant.AtText:
-				a := AtContent{}
-				_ = utils.JsonStringToStruct(string(pushMsg.MsgData.Content), &a)
-				if utils.IsContain(pushMsg.PushToUserID, a.AtUserList) {
-					content = constant.ContentType2PushContent[constant.AtText] + constant.ContentType2PushContent[constant.Common]
-				} else {
-					content = constant.ContentType2PushContent[constant.GroupMsg]
-				}
-			case constant.SignalingNotification:
-				content = constant.ContentType2PushContent[constant.SignalMsg]
-			default:
-				content = constant.ContentType2PushContent[constant.Common]
-
 			}
 		}
-
+		var title, detailContent string
 		callbackResp := callbackOfflinePush(pushMsg.OperationID, UIDList, pushMsg.MsgData, &[]string{})
 		log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offline callback Resp")
 		if callbackResp.ErrCode != 0 {
@@ -136,6 +97,11 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 			log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offlinePush stop")
 			return
 		}
+		if pushMsg.MsgData.OfflinePushInfo != nil {
+			title = pushMsg.MsgData.OfflinePushInfo.Title
+			detailContent = pushMsg.MsgData.OfflinePushInfo.Desc
+		}
+
 		if offlinePusher == nil {
 			return
 		}
@@ -143,8 +109,36 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 		if err != nil {
 			log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error())
 		}
-		log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), UIDList, content, jsonCustomContent, "opts:", opts)
+		log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), UIDList, title, detailContent, "opts:", opts)
-		pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID, opts)
+		if title == "" {
+			switch pushMsg.MsgData.ContentType {
+			case constant.Text:
+				fallthrough
+			case constant.Picture:
+				fallthrough
+			case constant.Voice:
+				fallthrough
+			case constant.Video:
+				fallthrough
+			case constant.File:
+				title = constant.ContentType2PushContent[int64(pushMsg.MsgData.ContentType)]
+			case constant.AtText:
+				a := AtContent{}
+				_ = utils.JsonStringToStruct(string(pushMsg.MsgData.Content), &a)
+				if utils.IsContain(pushMsg.PushToUserID, a.AtUserList) {
+					title = constant.ContentType2PushContent[constant.AtText] + constant.ContentType2PushContent[constant.Common]
+				} else {
+					title = constant.ContentType2PushContent[constant.GroupMsg]
+				}
+			case constant.SignalingNotification:
+				title = constant.ContentType2PushContent[constant.SignalMsg]
+			default:
+				title = constant.ContentType2PushContent[constant.Common]
+
+			}
+			detailContent = title
+		}
+		pushResult, err := offlinePusher.Push(UIDList, title, detailContent, pushMsg.OperationID, opts)
 		if err != nil {
 			log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error())
 		} else {
@@ -156,7 +150,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 	var wsResult []*pbRelay.SingelMsgToUserResultList
 	isOfflinePush := utils.GetSwitchFromOptions(pushMsg.MsgData.Options, constant.IsOfflinePush)
-	log.Debug(pushMsg.OperationID, "Get super group msg from msg_transfer And push msg", pushMsg.String())
+	log.Debug(pushMsg.OperationID, "Get super group msg from msg_transfer And push msg", pushMsg.String(), config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.Enable)
 	var pushToUserIDList []string
 	if config.Config.Callback.CallbackBeforeSuperGroupOnlinePush.Enable {
 		callbackResp := callbackBeforeSuperGroupOnlinePush(pushMsg.OperationID, pushMsg.PushToUserID, pushMsg.MsgData, &pushToUserIDList)
@@ -171,33 +165,18 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 		log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "callback userIDList Resp", pushToUserIDList)
 	}
 	if len(pushToUserIDList) == 0 {
-		getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: pushMsg.OperationID, GroupID: pushMsg.MsgData.GroupID}
+		userIDList, err := utils2.GetGroupMemberUserIDList(pushMsg.MsgData.GroupID, pushMsg.OperationID)
-		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, pushMsg.OperationID)
-		if etcdConn == nil {
-			errMsg := pushMsg.OperationID + "getcdv3.GetConn == nil"
-			log.NewError(pushMsg.OperationID, errMsg)
-			return
-		}
-		client := pbCache.NewCacheClient(etcdConn)
-		cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq)
 		if err != nil {
-			log.NewError(pushMsg.OperationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error())
+			log.Error(pushMsg.OperationID, "GetGroupMemberUserIDList failed ", err.Error(), pushMsg.MsgData.GroupID)
 			return
 		}
-		if cacheResp.CommonResp.ErrCode != 0 {
+		pushToUserIDList = userIDList
-			log.NewError(pushMsg.OperationID, "GetGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String())
-			return
-		}
-		pushToUserIDList = cacheResp.UserIDList
 	}
 
-	if len(grpcCons) == 0 {
+	grpcCons := getcdv3.GetDefaultGatewayConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), pushMsg.OperationID)
-		log.NewWarn(pushMsg.OperationID, "first GetConn4Unique ")
-		grpcCons = getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImRelayName)
-	}
 
 	//Online push message
-	log.Debug("test", pushMsg.OperationID, "len  grpc", len(grpcCons), "data", pushMsg.String())
+	log.Debug(pushMsg.OperationID, "len  grpc", len(grpcCons), "data", pushMsg.String())
 	for _, v := range grpcCons {
 		msgClient := pbRelay.NewRelayClient(v)
 		reply, err := msgClient.SuperGroupOnlineBatchPushOneMsg(context.Background(), &pbRelay.OnlineBatchPushOneMsgReq{OperationID: pushMsg.OperationID, MsgData: pushMsg.MsgData, PushToUserIDList: pushToUserIDList})
@@ -221,45 +200,7 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 		}
 		onlineFailedUserIDList := utils.DifferenceString(onlineSuccessUserIDList, pushToUserIDList)
 		//Use offline push messaging
-		customContent := OpenIMContent{
+		var title, detailContent string
-			SessionType: int(pushMsg.MsgData.SessionType),
-			From:        pushMsg.MsgData.SendID,
-			To:          pushMsg.MsgData.RecvID,
-			Seq:         pushMsg.MsgData.Seq,
-		}
-		bCustomContent, _ := json.Marshal(customContent)
-		jsonCustomContent := string(bCustomContent)
-		var content string
-		if pushMsg.MsgData.OfflinePushInfo != nil {
-			content = pushMsg.MsgData.OfflinePushInfo.Title
-
-		} else {
-			switch pushMsg.MsgData.ContentType {
-			case constant.Text:
-				content = constant.ContentType2PushContent[constant.Text]
-			case constant.Picture:
-				content = constant.ContentType2PushContent[constant.Picture]
-			case constant.Voice:
-				content = constant.ContentType2PushContent[constant.Voice]
-			case constant.Video:
-				content = constant.ContentType2PushContent[constant.Video]
-			case constant.File:
-				content = constant.ContentType2PushContent[constant.File]
-			case constant.AtText:
-				a := AtContent{}
-				_ = utils.JsonStringToStruct(string(pushMsg.MsgData.Content), &a)
-				if utils.IsContain(pushMsg.PushToUserID, a.AtUserList) {
-					content = constant.ContentType2PushContent[constant.AtText] + constant.ContentType2PushContent[constant.Common]
-				} else {
-					content = constant.ContentType2PushContent[constant.GroupMsg]
-				}
-			case constant.SignalingNotification:
-				content = constant.ContentType2PushContent[constant.SignalMsg]
-			default:
-				content = constant.ContentType2PushContent[constant.Common]
-
-			}
-		}
 		if len(onlineFailedUserIDList) > 0 {
 			var offlinePushUserIDList []string
 			var needOfflinePushUserIDList []string
@@ -272,11 +213,16 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 				log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "offlinePush stop")
 				return
 			}
+			if pushMsg.MsgData.OfflinePushInfo != nil {
+				title = pushMsg.MsgData.OfflinePushInfo.Title
+				detailContent = pushMsg.MsgData.OfflinePushInfo.Desc
+			}
 			if len(offlinePushUserIDList) > 0 {
 				needOfflinePushUserIDList = offlinePushUserIDList
 			} else {
 				needOfflinePushUserIDList = onlineFailedUserIDList
 			}
+
 			if offlinePusher == nil {
 				return
 			}
@@ -284,8 +230,36 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {
 			if err != nil {
 				log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error())
 			}
-			log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), onlineFailedUserIDList, content, jsonCustomContent, "opts:", opts)
+			log.NewInfo(pushMsg.OperationID, utils.GetSelfFuncName(), onlineFailedUserIDList, title, detailContent, "opts:", opts)
-			pushResult, err := offlinePusher.Push(needOfflinePushUserIDList, content, jsonCustomContent, pushMsg.OperationID, opts)
+			if title == "" {
+				switch pushMsg.MsgData.ContentType {
+				case constant.Text:
+					fallthrough
+				case constant.Picture:
+					fallthrough
+				case constant.Voice:
+					fallthrough
+				case constant.Video:
+					fallthrough
+				case constant.File:
+					title = constant.ContentType2PushContent[int64(pushMsg.MsgData.ContentType)]
+				case constant.AtText:
+					a := AtContent{}
+					_ = utils.JsonStringToStruct(string(pushMsg.MsgData.Content), &a)
+					if utils.IsContain(pushMsg.PushToUserID, a.AtUserList) {
+						title = constant.ContentType2PushContent[constant.AtText] + constant.ContentType2PushContent[constant.Common]
+					} else {
+						title = constant.ContentType2PushContent[constant.GroupMsg]
+					}
+				case constant.SignalingNotification:
+					title = constant.ContentType2PushContent[constant.SignalMsg]
+				default:
+					title = constant.ContentType2PushContent[constant.Common]
+
+				}
+				detailContent = title
+			}
+			pushResult, err := offlinePusher.Push(needOfflinePushUserIDList, title, detailContent, pushMsg.OperationID, opts)
 			if err != nil {
 				log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error())
 			} else {
@@ -308,8 +282,13 @@ func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err err
 			opts.Signal.ClientMsgID = pushMsg.MsgData.ClientMsgID
 			log.NewDebug(pushMsg.OperationID, opts)
 		}
-
 	}
+	if pushMsg.MsgData.OfflinePushInfo != nil {
+		opts.IOSBadgeCount = pushMsg.MsgData.OfflinePushInfo.IOSBadgeCount
+		opts.IOSPushSound = pushMsg.MsgData.OfflinePushInfo.IOSPushSound
+		opts.Data = pushMsg.MsgData.OfflinePushInfo.Ex
+	}
+
 	return opts, nil
 }
 
@@ -321,7 +300,7 @@ func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err err
 //		sendMsgToKafka(m, m.SendID, "msgKey--sendID")
 //		sendMsgToKafka(m, m.RecvID, "msgKey--recvID")
 //	case constant.GroupChatType:
-//		etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName)
+//		etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName)
 //		client := pbGroup.NewGroupClient(etcdConn)
 //		req := &pbGroup.Req{
 //			GroupID:     m.RecvID,

internal/push/push_interface.go

@@ -1,11 +1,18 @@
 package push
 
+import "Open_IM/pkg/common/constant"
+
+var PushTerminal = []int{constant.IOSPlatformID, constant.AndroidPlatformID}
+
 type OfflinePusher interface {
-	Push(userIDList []string, alert, detailContent, operationID string, opts PushOpts) (resp string, err error)
+	Push(userIDList []string, title, detailContent, operationID string, opts PushOpts) (resp string, err error)
 }
 
 type PushOpts struct {
-	Signal Signal
+	Signal        Signal
+	IOSPushSound  string
+	IOSBadgeCount bool
+	Data          string
 }
 
 type Signal struct {

internal/rpc/admin_cms/admin_cms.go

@@ -3,18 +3,24 @@ package admin_cms
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	openIMHttp "Open_IM/pkg/common/http"
+	"Open_IM/pkg/common/db"
+	imdb "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"
 	pbAdminCMS "Open_IM/pkg/proto/admin_cms"
+	server_api_params "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
+	"errors"
 	"net"
 	"strconv"
 	"strings"
+	"sync"
+	"time"
 
 	"google.golang.org/grpc"
+	"gorm.io/gorm"
 )
 
 type adminCMSServer struct {
@@ -63,11 +69,11 @@ func (s *adminCMSServer) Run() {
 			log.Error("", "GetLocalIP failed ", err.Error())
 		}
 	}
-	log.NewInfo("", "rpcRegisterIP", rpcRegisterIP)
+	log.NewInfo("", "rpcRegisterIP ", rpcRegisterIP)
 	err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), rpcRegisterIP, s.rpcPort, s.rpcRegisterName, 10)
 	if err != nil {
 		log.NewError("0", "RegisterEtcd failed ", err.Error())
-		return
+		panic(utils.Wrap(err, "register admin module  rpc to etcd err"))
 	}
 	err = srv.Serve(listener)
 	if err != nil {
@@ -79,24 +85,594 @@ func (s *adminCMSServer) Run() {
 
 func (s *adminCMSServer) AdminLogin(_ context.Context, req *pbAdminCMS.AdminLoginReq) (*pbAdminCMS.AdminLoginResp, error) {
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
-	resp := &pbAdminCMS.AdminLoginResp{}
+	resp := &pbAdminCMS.AdminLoginResp{CommonResp: &pbAdminCMS.CommonResp{}}
 	for i, adminID := range config.Config.Manager.AppManagerUid {
 		if adminID == req.AdminID && config.Config.Manager.Secrets[i] == req.Secret {
 			token, expTime, err := token_verify.CreateToken(adminID, constant.SingleChatType)
-			log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "generate token success", "token: ", token, "expTime:", expTime)
 			if err != nil {
 				log.NewError(req.OperationID, utils.GetSelfFuncName(), "generate token failed", "adminID: ", adminID, err.Error())
-				return resp, openIMHttp.WrapError(constant.ErrTokenUnknown)
+				resp.CommonResp.ErrCode = constant.ErrTokenUnknown.ErrCode
+				resp.CommonResp.ErrMsg = err.Error()
+				return resp, nil
 			}
+			log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "generate token success", "token: ", token, "expTime:", expTime)
 			resp.Token = token
 			break
 		}
 	}
-
 	if resp.Token == "" {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "failed")
-		return resp, openIMHttp.WrapError(constant.ErrTokenMalformed)
+		resp.CommonResp.ErrCode = constant.ErrTokenUnknown.ErrCode
+		resp.CommonResp.ErrMsg = constant.ErrTokenMalformed.ErrMsg
+		return resp, nil
+	}
+	admin, err := imdb.GetUserByUserID(req.AdminID)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "failed", req.AdminID)
+		resp.CommonResp.ErrCode = constant.ErrTokenUnknown.ErrCode
+		resp.CommonResp.ErrMsg = constant.ErrTokenMalformed.ErrMsg
+		return resp, nil
+	}
+	resp.UserName = admin.Nickname
+	resp.FaceURL = admin.FaceURL
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
+	return resp, nil
+}
+
+func (s *adminCMSServer) AddUserRegisterAddFriendIDList(_ context.Context, req *pbAdminCMS.AddUserRegisterAddFriendIDListReq) (*pbAdminCMS.AddUserRegisterAddFriendIDListResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	resp := &pbAdminCMS.AddUserRegisterAddFriendIDListResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	if err := imdb.AddUserRegisterAddFriendIDList(req.UserIDList...); err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserIDList)
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", req.String())
+	return resp, nil
+}
+
+func (s *adminCMSServer) ReduceUserRegisterAddFriendIDList(_ context.Context, req *pbAdminCMS.ReduceUserRegisterAddFriendIDListReq) (*pbAdminCMS.ReduceUserRegisterAddFriendIDListResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	resp := &pbAdminCMS.ReduceUserRegisterAddFriendIDListResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	if req.Operation == 0 {
+		if err := imdb.ReduceUserRegisterAddFriendIDList(req.UserIDList...); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserIDList)
+			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+			resp.CommonResp.ErrMsg = err.Error()
+			return resp, nil
+		}
+	} else {
+		if err := imdb.DeleteAllRegisterAddFriendIDList(); err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserIDList)
+			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+			resp.CommonResp.ErrMsg = err.Error()
+			return resp, nil
+		}
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", req.String())
+	return resp, nil
+}
+
+func (s *adminCMSServer) GetUserRegisterAddFriendIDList(_ context.Context, req *pbAdminCMS.GetUserRegisterAddFriendIDListReq) (*pbAdminCMS.GetUserRegisterAddFriendIDListResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	resp := &pbAdminCMS.GetUserRegisterAddFriendIDListResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	userIDList, err := imdb.GetRegisterAddFriendList(req.Pagination.ShowNumber, req.Pagination.PageNumber)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	userList, err := imdb.GetUsersByUserIDList(userIDList)
+	if err != nil {
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), userList, userIDList)
+	resp.Pagination = &server_api_params.ResponsePagination{
+		CurrentPage: req.Pagination.PageNumber,
+		ShowNumber:  req.Pagination.ShowNumber,
+	}
+	utils.CopyStructFields(&resp.UserInfoList, userList)
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", req.String())
+	return resp, nil
+}
+
+func (s *adminCMSServer) GetChatLogs(_ context.Context, req *pbAdminCMS.GetChatLogsReq) (*pbAdminCMS.GetChatLogsResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "GetChatLogs", req.String())
+	resp := &pbAdminCMS.GetChatLogsResp{CommonResp: &pbAdminCMS.CommonResp{}, Pagination: &server_api_params.ResponsePagination{}}
+	time, err := utils.TimeStringToTime(req.SendTime)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "time string parse error", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrArgs.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	chatLog := db.ChatLog{
+		Content:     req.Content,
+		SendTime:    time,
+		ContentType: req.ContentType,
+		SessionType: req.SessionType,
+		RecvID:      req.RecvID,
+		SendID:      req.SendID,
+	}
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "chat_log: ", chatLog)
+	nums, err := imdb.GetChatLogCount(chatLog)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetChatLogCount", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	resp.ChatLogsNum = int32(nums)
+	chatLogs, err := imdb.GetChatLog(chatLog, req.Pagination.PageNumber, req.Pagination.ShowNumber)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetChatLog", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	for _, chatLog := range chatLogs {
+		pbChatLog := &pbAdminCMS.ChatLog{}
+		utils.CopyStructFields(pbChatLog, chatLog)
+		pbChatLog.SendTime = chatLog.SendTime.Unix()
+		pbChatLog.CreateTime = chatLog.CreateTime.Unix()
+		if chatLog.SenderNickname == "" {
+			sendUser, err := imdb.GetUserByUserID(chatLog.SendID)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserByUserID failed", err.Error())
+				continue
+			}
+			pbChatLog.SenderNickname = sendUser.Nickname
+		}
+		switch chatLog.SessionType {
+		case constant.SingleChatType:
+			recvUser, err := imdb.GetUserByUserID(chatLog.RecvID)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserByUserID failed", err.Error())
+				continue
+			}
+			pbChatLog.SenderNickname = recvUser.Nickname
+
+		case constant.GroupChatType, constant.SuperGroupChatType:
+			group, err := imdb.GetGroupInfoByGroupID(chatLog.RecvID)
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupById failed")
+				continue
+			}
+			pbChatLog.RecvID = group.GroupID
+			pbChatLog.GroupName = group.GroupName
+		}
+		resp.ChatLogs = append(resp.ChatLogs, pbChatLog)
+	}
+	resp.Pagination = &server_api_params.ResponsePagination{
+		CurrentPage: req.Pagination.PageNumber,
+		ShowNumber:  req.Pagination.ShowNumber,
+	}
+
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp output: ", resp.String())
+	return resp, nil
+}
+
+func (s *adminCMSServer) GetActiveGroup(_ context.Context, req *pbAdminCMS.GetActiveGroupReq) (*pbAdminCMS.GetActiveGroupResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req", req.String())
+	resp := &pbAdminCMS.GetActiveGroupResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "time: ", fromTime, toTime)
+	activeGroups, err := imdb.GetActiveGroups(fromTime, toTime, 12)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetActiveGroups failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	for _, activeGroup := range activeGroups {
+		resp.Groups = append(resp.Groups,
+			&pbAdminCMS.GroupResp{
+				GroupName:  activeGroup.Name,
+				GroupId:    activeGroup.Id,
+				MessageNum: int32(activeGroup.MessageNum),
+			})
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp.String())
+	return resp, nil
+}
+
+func (s *adminCMSServer) GetActiveUser(_ context.Context, req *pbAdminCMS.GetActiveUserReq) (*pbAdminCMS.GetActiveUserResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String())
+	resp := &pbAdminCMS.GetActiveUserResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "time: ", fromTime, toTime)
+	activeUsers, err := imdb.GetActiveUsers(fromTime, toTime, 12)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetActiveUsers failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	for _, activeUser := range activeUsers {
+		resp.Users = append(resp.Users,
+			&pbAdminCMS.UserResp{
+				UserID:     activeUser.ID,
+				NickName:   activeUser.Name,
+				MessageNum: int32(activeUser.MessageNum),
+			},
+		)
+	}
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp.String())
+	return resp, nil
+}
+
+func ParseTimeFromTo(from, to string) (time.Time, time.Time, error) {
+	var fromTime time.Time
+	var toTime time.Time
+	fromTime, err := utils.TimeStringToTime(from)
+	if err != nil {
+		return fromTime, toTime, err
+	}
+	toTime, err = utils.TimeStringToTime(to)
+	if err != nil {
+		return fromTime, toTime, err
+	}
+	return fromTime, toTime, nil
+}
+
+func isInOneMonth(from, to time.Time) bool {
+	return from.Month() == to.Month() && from.Year() == to.Year()
+}
+
+func GetRangeDate(from, to time.Time) [][2]time.Time {
+	interval := to.Sub(from)
+	var times [][2]time.Time
+	switch {
+	// today
+	case interval == 0:
+		times = append(times, [2]time.Time{
+			from, from.Add(time.Hour * 24),
+		})
+	// days
+	case isInOneMonth(from, to):
+		for i := 0; ; i++ {
+			fromTime := from.Add(time.Hour * 24 * time.Duration(i))
+			toTime := from.Add(time.Hour * 24 * time.Duration(i+1))
+			if toTime.After(to.Add(time.Hour * 24)) {
+				break
+			}
+			times = append(times, [2]time.Time{
+				fromTime, toTime,
+			})
+		}
+	// month
+	case !isInOneMonth(from, to):
+		if to.Sub(from) < time.Hour*24*30 {
+			for i := 0; ; i++ {
+				fromTime := from.Add(time.Hour * 24 * time.Duration(i))
+				toTime := from.Add(time.Hour * 24 * time.Duration(i+1))
+				if toTime.After(to.Add(time.Hour * 24)) {
+					break
+				}
+				times = append(times, [2]time.Time{
+					fromTime, toTime,
+				})
+			}
+		} else {
+			for i := 0; ; i++ {
+				if i == 0 {
+					fromTime := from
+					toTime := getFirstDateOfNextNMonth(fromTime, 1)
+					times = append(times, [2]time.Time{
+						fromTime, toTime,
+					})
+				} else {
+					fromTime := getFirstDateOfNextNMonth(from, i)
+					toTime := getFirstDateOfNextNMonth(fromTime, 1)
+					if toTime.After(to) {
+						toTime = to
+						times = append(times, [2]time.Time{
+							fromTime, toTime,
+						})
+						break
+					}
+					times = append(times, [2]time.Time{
+						fromTime, toTime,
+					})
+				}
+
+			}
+		}
+	}
+	return times
+}
+
+func getFirstDateOfNextNMonth(currentTime time.Time, n int) time.Time {
+	lastOfMonth := time.Date(currentTime.Year(), currentTime.Month(), 1, 0, 0, 0, 0, currentTime.Location()).AddDate(0, n, 0)
+	return lastOfMonth
+}
+
+func (s *adminCMSServer) GetGroupStatistics(_ context.Context, req *pbAdminCMS.GetGroupStatisticsReq) (*pbAdminCMS.GetGroupStatisticsResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String())
+	resp := &pbAdminCMS.GetGroupStatisticsResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupStatistics failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	increaseGroupNum, err := imdb.GetIncreaseGroupNum(fromTime, toTime.Add(time.Hour*24))
+
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum failed", err.Error(), fromTime, toTime)
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	totalGroupNum, err := imdb.GetTotalGroupNum()
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	resp.IncreaseGroupNum = increaseGroupNum
+	resp.TotalGroupNum = totalGroupNum
+	times := GetRangeDate(fromTime, toTime)
+	log.NewDebug(req.OperationID, "times:", times)
+	wg := &sync.WaitGroup{}
+	resp.IncreaseGroupNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times))
+	resp.TotalGroupNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times))
+	wg.Add(len(times))
+	for i, v := range times {
+		go func(wg *sync.WaitGroup, index int, v [2]time.Time) {
+			defer wg.Done()
+			num, err := imdb.GetIncreaseGroupNum(v[0], v[1])
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error())
+			}
+			resp.IncreaseGroupNumList[index] = &pbAdminCMS.DateNumList{
+				Date: v[0].String(),
+				Num:  num,
+			}
+			num, err = imdb.GetGroupNum(v[1])
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error())
+			}
+			resp.TotalGroupNumList[index] = &pbAdminCMS.DateNumList{
+				Date: v[0].String(),
+				Num:  num,
+			}
+		}(wg, i, v)
+	}
+	wg.Wait()
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
+	return resp, nil
+}
+
+func (s *adminCMSServer) GetMessageStatistics(_ context.Context, req *pbAdminCMS.GetMessageStatisticsReq) (*pbAdminCMS.GetMessageStatisticsResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String())
+	resp := &pbAdminCMS.GetMessageStatisticsResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To)
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "times: ", fromTime, toTime)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	privateMessageNum, err := imdb.GetPrivateMessageNum(fromTime, toTime.Add(time.Hour*24))
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetPrivateMessageNum failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	groupMessageNum, err := imdb.GetGroupMessageNum(fromTime, toTime.Add(time.Hour*24))
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMessageNum failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	log.NewDebug(req.OperationID, utils.GetSelfFuncName(), privateMessageNum, groupMessageNum)
+	resp.PrivateMessageNum = privateMessageNum
+	resp.GroupMessageNum = groupMessageNum
+	times := GetRangeDate(fromTime, toTime)
+	resp.GroupMessageNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times))
+	resp.PrivateMessageNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times))
+	wg := &sync.WaitGroup{}
+	wg.Add(len(times))
+	for i, v := range times {
+		go func(wg *sync.WaitGroup, index int, v [2]time.Time) {
+			defer wg.Done()
+
+			num, err := imdb.GetPrivateMessageNum(v[0], v[1])
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error())
+			}
+			resp.PrivateMessageNumList[index] = &pbAdminCMS.DateNumList{
+				Date: v[0].String(),
+				Num:  num,
+			}
+			num, err = imdb.GetGroupMessageNum(v[0], v[1])
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error())
+			}
+			resp.GroupMessageNumList[index] = &pbAdminCMS.DateNumList{
+				Date: v[0].String(),
+				Num:  num,
+			}
+		}(wg, i, v)
+	}
+	wg.Wait()
+	return resp, nil
+}
+
+func (s *adminCMSServer) GetUserStatistics(_ context.Context, req *pbAdminCMS.GetUserStatisticsReq) (*pbAdminCMS.GetUserStatisticsResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	resp := &pbAdminCMS.GetUserStatisticsResp{CommonResp: &pbAdminCMS.CommonResp{}}
+	fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To)
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	activeUserNum, err := imdb.GetActiveUserNum(fromTime, toTime.Add(time.Hour*24))
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetActiveUserNum failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	increaseUserNum, err := imdb.GetIncreaseUserNum(fromTime, toTime.Add(time.Hour*24))
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseUserNum failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	totalUserNum, err := imdb.GetTotalUserNum()
+	if err != nil {
+		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTotalUserNum failed", err.Error())
+		resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+		resp.CommonResp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	resp.ActiveUserNum = activeUserNum
+	resp.TotalUserNum = totalUserNum
+	resp.IncreaseUserNum = increaseUserNum
+	times := GetRangeDate(fromTime, toTime)
+	resp.TotalUserNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times))
+	resp.ActiveUserNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times))
+	resp.IncreaseUserNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times))
+	wg := &sync.WaitGroup{}
+	wg.Add(len(times))
+	for i, v := range times {
+		go func(wg *sync.WaitGroup, index int, v [2]time.Time) {
+			defer wg.Done()
+			num, err := imdb.GetActiveUserNum(v[0], v[1])
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error())
+			}
+			resp.ActiveUserNumList[index] = &pbAdminCMS.DateNumList{
+				Date: v[0].String(),
+				Num:  num,
+			}
+
+			num, err = imdb.GetTotalUserNumByDate(v[1])
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTotalUserNumByDate", v, err.Error())
+			}
+			resp.TotalUserNumList[index] = &pbAdminCMS.DateNumList{
+				Date: v[0].String(),
+				Num:  num,
+			}
+			num, err = imdb.GetIncreaseUserNum(v[0], v[1])
+			if err != nil {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseUserNum", v, err.Error())
+			}
+			resp.IncreaseUserNumList[index] = &pbAdminCMS.DateNumList{
+				Date: v[0].String(),
+				Num:  num,
+			}
+		}(wg, i, v)
+	}
+	wg.Wait()
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
+	return resp, nil
+}
+
+func (s *adminCMSServer) GetUserFriends(_ context.Context, req *pbAdminCMS.GetUserFriendsReq) (*pbAdminCMS.GetUserFriendsResp, error) {
+	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
+	resp := &pbAdminCMS.GetUserFriendsResp{CommonResp: &pbAdminCMS.CommonResp{}, Pagination: &server_api_params.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber}}
+	var friendList []*imdb.FriendUser
+	var err error
+	if req.FriendUserID != "" {
+		friend, err := imdb.GetFriendByIDCMS(req.UserID, req.FriendUserID)
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				log.NewError(req.OperationID, utils.GetSelfFuncName(), err, req.UserID, req.FriendUserID)
+				return resp, nil
+			}
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID, req.FriendUserID)
+			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+			resp.CommonResp.ErrMsg = err.Error()
+			return resp, nil
+		}
+		friendList = append(friendList, friend)
+		resp.FriendNums = 1
+	} else {
+		var count int64
+		friendList, count, err = imdb.GetUserFriendsCMS(req.UserID, req.FriendUserName, req.Pagination.PageNumber, req.Pagination.ShowNumber)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID, req.FriendUserName, req.Pagination.PageNumber, req.Pagination.ShowNumber)
+			resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
+			resp.CommonResp.ErrMsg = err.Error()
+			return resp, nil
+		}
+		resp.FriendNums = int32(count)
+	}
+	for _, v := range friendList {
+		friendInfo := &server_api_params.FriendInfo{}
+		userInfo := &server_api_params.UserInfo{UserID: v.FriendUserID, Nickname: v.Nickname}
+		utils.CopyStructFields(friendInfo, v)
+		friendInfo.FriendUser = userInfo
+		resp.FriendInfoList = append(resp.FriendInfoList, friendInfo)
 	}
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
 	return resp, nil
 }
+
+func (s *adminCMSServer) GenerateInvitationCode(_ context.Context, req *pbAdminCMS.GenerateInvitationCodeReq) (*pbAdminCMS.GenerateInvitationCodeResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) GetInvitationCodes(_ context.Context, req *pbAdminCMS.GetInvitationCodesReq) (*pbAdminCMS.GetInvitationCodesResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) QueryIPRegister(_ context.Context, req *pbAdminCMS.QueryIPRegisterReq) (*pbAdminCMS.QueryIPRegisterResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) AddIPLimit(_ context.Context, req *pbAdminCMS.AddIPLimitReq) (*pbAdminCMS.AddIPLimitResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) RemoveIPLimit(_ context.Context, req *pbAdminCMS.RemoveIPLimitReq) (*pbAdminCMS.RemoveIPLimitResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) QueryUserIDIPLimitLogin(_ context.Context, req *pbAdminCMS.QueryUserIDIPLimitLoginReq) (*pbAdminCMS.QueryUserIDIPLimitLoginResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) AddUserIPLimitLogin(_ context.Context, req *pbAdminCMS.AddUserIPLimitLoginReq) (*pbAdminCMS.AddUserIPLimitLoginResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) RemoveUserIPLimit(_ context.Context, req *pbAdminCMS.RemoveUserIPLimitReq) (*pbAdminCMS.RemoveUserIPLimitResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) GetClientInitConfig(_ context.Context, req *pbAdminCMS.GetClientInitConfigReq) (*pbAdminCMS.GetClientInitConfigResp, error) {
+	return nil, nil
+}
+
+func (s *adminCMSServer) SetClientInitConfig(_ context.Context, req *pbAdminCMS.SetClientInitConfigReq) (*pbAdminCMS.SetClientInitConfigResp, error) {
+	return nil, nil
+}