admin cms

internal/cms_api/message_cms/message.go

@@ -6,7 +6,7 @@ import (
 	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"
@@ -18,77 +18,11 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func BroadcastMessage(c *gin.Context) {
-	var (
-		reqPb pbMessage.BoradcastMessageReq
-	)
-	reqPb.OperationID = utils.OperationIDGenerator()
-	etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName, 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 := 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.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName, 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 := 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.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName, 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 := 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
-		resp  cms_api_struct.GetChatLogsResponse
-		reqPb pbMessage.GetChatLogsReq
+		req   cms_api_struct.GetChatLogsReq
+		resp  cms_api_struct.GetChatLogsResp
+		reqPb pbAdminCMS.GetChatLogsReq
 	)
 	if err := c.ShouldBindQuery(&req); err != nil {
 		log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error())
@@ -108,28 +42,17 @@ func GetChatLogs(c *gin.Context) {
 		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)
 		return
 	}
-	//utils.CopyStructFields(&resp, &respPb)
-	for _, chatLog := range respPb.ChatLogs {
-		resp.ChatLogs = append(resp.ChatLogs, cms_api_struct.ChatLog{
-			SessionType:      int(chatLog.SessionType),
-			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,
-		})
+	for _, v := range respPb.ChatLogs {
+		chatLog := pbCommon.MsgData{}
+		utils.CopyStructFields(&chatLog, v)
+		resp.ChatLogs = append(resp.ChatLogs, &chatLog)
 	}
 	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
 	resp.CurrentPage = int(respPb.Pagination.CurrentPage)

internal/cms_api/router.go

@@ -5,7 +5,6 @@ import (
 	"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"
 
@@ -35,20 +34,6 @@ func NewGinRouter() *gin.Engine {
 		statisticsRouterGroup.GET("/get_active_user", statistics.GetActiveUser)
 		statisticsRouterGroup.GET("/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)
@@ -65,24 +50,15 @@ func NewGinRouter() *gin.Engine {
 	}
 	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.GET("/get_block_user", user.GetBlockUserById)
-		userRouterGroup.POST("/delete_user", user.DeleteUser)
-		userRouterGroup.GET("/get_users_by_name", user.GetUsersByName)
 	}
 	messageCMSRouterGroup := r2.Group("/message")
 	{
 		messageCMSRouterGroup.GET("/get_chat_logs", messageCMS.GetChatLogs)
-		messageCMSRouterGroup.POST("/broadcast_message", messageCMS.BroadcastMessage)
-		messageCMSRouterGroup.POST("/mass_send_message", messageCMS.MassSendMassage)
-		messageCMSRouterGroup.POST("/withdraw_message", messageCMS.WithdrawMessage)
 	}
 	return baseRouter
 }

internal/cms_api/user/user.go

@@ -18,181 +18,6 @@ import (
 	"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.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 := 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.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 := 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.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 := 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.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 := 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.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 := 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
@@ -374,33 +199,3 @@ func GetBlockUserById(c *gin.Context) {
 	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.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 := 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)
-}