cms dev

internal/cms_api/message_cms/message.go

@@ -1,4 +1,4 @@
-package message
+package messageCMS
 
 import (
 	"Open_IM/pkg/cms_api_struct"
@@ -7,6 +7,7 @@ import (
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbMessage "Open_IM/pkg/proto/message_cms"
+	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
 	"strings"
@@ -17,6 +18,17 @@ import (
 )
 
 func BroadcastMessage(c *gin.Context) {
+	var (
+		reqPb pbMessage.BoradcastMessageReq
+	)
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName)
+	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.RespHttp200S(c, err, nil)
+		return
+	}
 	openIMHttp.RespHttp200(c, constant.OK, nil)
 }
 
@@ -39,13 +51,17 @@ func GetChatLogs(c *gin.Context) {
 		openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
 		return
 	}
+	reqPb.Pagination = &pbCommon.RequestPagination{
+		PageNumber: int32(req.PageNumber),
+		ShowNumber: int32(req.ShowNumber),
+	}
 	utils.CopyStructFields(&reqPb, &req)
-	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImStatisticsName)
-	client := pbMessage.NewMessageClient(etcdConn)
+	etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMessageCMSName)
+	client := pbMessage.NewMessageCMSClient(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, constant.ErrServer, resp)
+		openIMHttp.RespHttp200S(c, constant.ErrServer, resp)
 		return
 	}
 	utils.CopyStructFields(&resp, &respPb)

internal/cms_api/router.go

@@ -3,7 +3,7 @@ package cms_api
 import (
 	"Open_IM/internal/cms_api/admin"
 	"Open_IM/internal/cms_api/group"
-	"Open_IM/internal/cms_api/message"
+	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"
@@ -46,12 +46,6 @@ func NewGinRouter() *gin.Engine {
 		organizationRouterGroup.PATCH("/alter_corps_info", organization.AlterStaffsInfo)
 		organizationRouterGroup.POST("/add_child_org", organization.AddChildOrganization)
 	}
-	messageRouterGroup := router.Group("/message")
-	{
-		messageRouterGroup.POST("/broadcast_message", message.BroadcastMessage)
-		messageRouterGroup.POST("/mass_send_message", message.MassSendMassage)
-		messageRouterGroup.POST("/withdraw_message", message.WithdrawMessage)
-	}
 	groupRouterGroup := router.Group("/group")
 	{
 		groupRouterGroup.GET("/get_group_by_id", group.GetGroupById)
@@ -89,5 +83,12 @@ func NewGinRouter() *gin.Engine {
 		friendRouterGroup.POST("/set_friend")
 		friendRouterGroup.POST("/remove_friend")
 	}
+	messageCMSRouterGroup := router.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

@@ -70,7 +70,6 @@ func GetUsersByName(c *gin.Context) {
 		openIMHttp.RespHttp200(c, constant.ErrServer, nil)
 		return
 	}
-	fmt.Println(respPb)
 	utils.CopyStructFields(&resp.Users, respPb.Users)
 	resp.ShowNumber = int(respPb.Pagination.ShowNumber)
 	resp.CurrentPage = int(respPb.Pagination.CurrentPage)