IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 15:45:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
wangchuxiao
2022-01-27 18:31:31 +08:00
parent 0ed393b1a5
commit fb396d9cf0
17 changed files with 2380 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cms_api/admin/admin.go
+4 -4
View File
@@ -7,18 +7,18 @@ import (
)
// register
func UserLogin(c *gin.Context) {
func AdminLogin(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"message": "someJSON", "status": 200})
}
func UserRegister(c *gin.Context) {
func AdminRegister(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"message": "someJSON", "status": 200})
}
func GetUserSettings(c *gin.Context) {
func GetAdminSettings(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"message": "someJSON", "status": 200})
}
func AlterUserSettings(c *gin.Context) {
func AlterAdminSettings(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{"message": "someJSON", "status": 200})
}
internal/cms_api/group/group.go
+95 -12
View File
@@ -18,6 +18,34 @@ 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("0", "ShouldBindQuery failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName)
client := pbGroup.NewGroupClient(etcdConn)
respPb, err := client.GetGroupById(context.Background(), &reqPb)
if err != nil {
log.NewError(utils.GetSelfFuncName(), "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
return
}
resp.GroupMasterId = respPb.GroupInfo.OwnerUserID
resp.GroupName = respPb.GroupInfo.GroupName
resp.GroupID = respPb.GroupInfo.GroupID
resp.CreateTime = (utils.UnixSecondToTime(int64(respPb.GroupInfo.CreateTime))).String()
resp.ProfilePhoto = respPb.GroupInfo.FaceURL
resp.GroupMasterName = respPb.GroupInfo.OwnerUserID
openIMHttp.RespHttp200(c, constant.OK, nil)
}
func GetGroups(c *gin.Context) {
var (
req cms_api_struct.GetGroupsRequest
@@ -57,7 +85,7 @@ func GetGroups(c *gin.Context) {
openIMHttp.RespHttp200(c, constant.OK, resp)
}
func GetGroup(c *gin.Context) {
func GetGroupByName(c *gin.Context) {
var (
req cms_api_struct.GetGroupRequest
resp cms_api_struct.GetGroupResponse
@@ -69,6 +97,8 @@ func GetGroup(c *gin.Context) {
return
}
reqPb.GroupName = req.GroupName
reqPb.Pagination = &commonPb.RequestPagination{}
utils.CopyStructFields(&reqPb.Pagination, req)
fmt.Println(reqPb)
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName)
client := pbGroup.NewGroupClient(etcdConn)
@@ -90,6 +120,8 @@ func GetGroup(c *gin.Context) {
ProfilePhoto: v.FaceURL,
})
}
resp.CurrentPage = int(respPb.Pagination.PageNumber)
resp.ShowNumber = int(respPb.Pagination.ShowNumber)
openIMHttp.RespHttp200(c, constant.OK, resp)
}
@@ -104,24 +136,30 @@ func CreateGroup(c *gin.Context) {
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
reqPb.GroupInfo = &commonPb.GroupInfo{}
reqPb.GroupInfo.GroupName = req.GroupName
reqPb.GroupInfo.CreatorUserID = ""
reqPb.GroupInfo.CreatorUserID = 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)
client := pbGroup.NewGroupClient(etcdConn)
respPb, err := client.CreateGroup(context.Background(), &reqPb)
_, err := client.CreateGroup(context.Background(), &reqPb)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
return
}
fmt.Println(respPb)
openIMHttp.RespHttp200(c, constant.OK, resp)
}
func BanGroupChat(c *gin.Context) {
var (
req cms_api_struct.BanGroupChatRequest
reqPb pbGroup.BanGroupChatReq
reqPb pbGroup.OperateGroupStatusReq
)
if err := c.BindJSON(&req); err != nil {
log.NewError("0", "ShouldBindQuery failed ", err.Error())
@@ -129,9 +167,10 @@ func BanGroupChat(c *gin.Context) {
return
}
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)
client := pbGroup.NewGroupClient(etcdConn)
_, err := client.BanGroupChat(context.Background(), &reqPb)
_, err := client.OperateGroupStatus(context.Background(), &reqPb)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
@@ -144,7 +183,7 @@ func BanGroupChat(c *gin.Context) {
func BanPrivateChat(c *gin.Context) {
var (
req cms_api_struct.BanPrivateChatRequest
reqPb pbGroup.BanPrivateChatReq
reqPb pbGroup.OperateGroupStatusReq
)
if err := c.BindJSON(&req); err != nil {
log.NewError("0", "BindJSON failed ", err.Error())
@@ -152,9 +191,10 @@ func BanPrivateChat(c *gin.Context) {
return
}
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)
client := pbGroup.NewGroupClient(etcdConn)
_, err := client.BanPrivateChat(context.Background(), &reqPb)
_, err := client.OperateGroupStatus(context.Background(), &reqPb)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
@@ -163,6 +203,53 @@ func BanPrivateChat(c *gin.Context) {
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("0", "BindJSON failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
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)
client := pbGroup.NewGroupClient(etcdConn)
_, err := client.OperateGroupStatus(context.Background(), &reqPb)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, 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("0", "BindJSON failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
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)
client := pbGroup.NewGroupClient(etcdConn)
_, err := client.OperateGroupStatus(context.Background(), &reqPb)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
return
}
openIMHttp.RespHttp200(c, constant.OK, nil)
}
func GetGroupsMember(c *gin.Context) {
var (
req cms_api_struct.GetGroupMembersRequest
@@ -175,10 +262,6 @@ func GetGroupsMember(c *gin.Context) {
}
}
func InquireMember(c *gin.Context) {
}
func InquireGroup(c *gin.Context) {
}
internal/cms_api/router.go
+14 -12
View File
@@ -20,16 +20,16 @@ func NewGinRouter() *gin.Engine {
router.Use(middleware.CorsHandler())
adminRouterGroup := router.Group("/admin")
{
adminRouterGroup.POST("/register", admin.UserRegister)
adminRouterGroup.POST("/login", admin.UserLogin)
adminRouterGroup.GET("/get_user_settings", admin.GetUserSettings)
adminRouterGroup.POST("/alter_user_settings", admin.AlterUserSettings)
adminRouterGroup.POST("/register", admin.AdminRegister)
adminRouterGroup.POST("/login", admin.AdminLogin)
adminRouterGroup.GET("/get_user_settings", admin.GetAdminSettings)
adminRouterGroup.POST("/alter_user_settings", admin.AlterAdminSettings)
}
statisticsRouterGroup := router.Group("/statistics")
{
statisticsRouterGroup.GET("/get_messages_statistics", statistics.MessagesStatistics)
statisticsRouterGroup.GET("/get_users_statistics", statistics.UsersStatistics)
statisticsRouterGroup.GET("/get_groups_statistics", statistics.GroupsStatistics)
statisticsRouterGroup.GET("/get_messages_statistics", statistics.GetMessagesStatistics)
statisticsRouterGroup.GET("/get_users_statistics", statistics.GetUsersStatistics)
statisticsRouterGroup.GET("/get_groups_statistics", statistics.GetGroupsStatistics)
statisticsRouterGroup.GET("/get_active_user", statistics.GetActiveUser)
statisticsRouterGroup.GET("/get_active_group", statistics.GetActiveGroup)
}
@@ -57,18 +57,20 @@ func NewGinRouter() *gin.Engine {
}
groupRouterGroup := router.Group("/group")
{
groupRouterGroup.GET("/get_group_by_id", group.GetGroupById)
groupRouterGroup.GET("/get_groups", group.GetGroups)
groupRouterGroup.GET("/get_group", group.GetGroup)
groupRouterGroup.GET("/search_groups_member", group.GetGroupsMember)
groupRouterGroup.GET("/get_group_by_name", group.GetGroupByName)
groupRouterGroup.GET("/get_group_members", group.GetGroupsMember)
groupRouterGroup.POST("/create_group", group.CreateGroup)
groupRouterGroup.GET("/inquire_group", group.InquireGroup)
groupRouterGroup.GET("/inquire_member_by_group", group.InquireMember)
groupRouterGroup.POST("/add_members", group.AddMembers)
groupRouterGroup.POST("/remove_user", group.RemoveUser)
groupRouterGroup.POST("/ban_private_chat", group.BanPrivateChat)
groupRouterGroup.POST("/remove_member", group.RemoveUser)
groupRouterGroup.POST("/ban_group_private_chat", group.BanPrivateChat)
groupRouterGroup.POST("/open_group_private_chat", group.OpenPrivateChat)
groupRouterGroup.POST("/withdraw_message", group.Withdraw)
groupRouterGroup.POST("/search_group_message", group.SearchMessage)
groupRouterGroup.POST("/ban_group_chat", group.BanGroupChat)
groupRouterGroup.POST("/open_group_chat", group.OpenGroupChat)
}
userRouterGroup := router.Group("/user")
{
internal/cms_api/statistics/statistics.go
+12 -6
View File
@@ -1,18 +1,24 @@
package statistics
import (
"Open_IM/pkg/cms_api_struct"
"github.com/gin-gonic/gin"
statisticsPb "Open_IM/pkg/proto/statistics"
)
func MessagesStatistics(c *gin.Context) {
func GetMessagesStatistics(c *gin.Context) {
var (
req cms_api_struct.GetGroupMembersRequest
resp cms_api_struct.GetGroupMembersResponse
reqPb statisticsPb.GetMessageStatisticsReq
)
}
func GetUsersStatistics(c *gin.Context) {
}
func UsersStatistics(c *gin.Context) {
}
func GroupsStatistics(c *gin.Context) {
func GetGroupsStatistics(c *gin.Context) {
}