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

group rpc

Browse Source
This commit is contained in:
wangchuxiao
2022-01-26 18:43:01 +08:00
parent 3f911ab437
commit b992faa468
16 changed files with 1015 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cms_api/group/group.go
+70 -25
View File
@@ -28,15 +28,27 @@ func GetGroups(c *gin.Context) {
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
utils.CopyStructFields(&reqPb.Pagination, req)
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName)
client := pbGroup.NewGroupClient(etcdConn)
respPb, err := client.GetGroups(context.Background(), &reqPb)
fmt.Println(respPb)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
return
}
for _, v := range respPb.GroupInfo {
resp.Groups = append(resp.Groups, cms_api_struct.GroupResponse{
GroupName: v.GroupName,
GroupID: v.GroupID,
GroupMasterName: v.OwnerUserID,
GroupMasterId: v.OwnerUserID,
CreateTime: (utils.UnixSecondToTime(int64(v.CreateTime))).String(),
IsBanChat: false,
IsBanPrivateChat: false,
ProfilePhoto: v.FaceURL,
})
}
openIMHttp.RespHttp200(c, constant.OK, resp)
}
@@ -52,16 +64,28 @@ func GetGroup(c *gin.Context) {
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
utils.CopyStructFields(&reqPb, req)
reqPb.GroupName = req.GroupName
fmt.Println(reqPb)
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName)
client := pbGroup.NewGroupClient(etcdConn)
respPb, err := client.GetGroup(context.Background(), &reqPb)
fmt.Println(respPb)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
return
}
for _, v := range respPb.GroupInfo {
resp.Groups = append(resp.Groups, cms_api_struct.GroupResponse{
GroupName: v.GroupName,
GroupID: v.GroupID,
GroupMasterName: v.OwnerUserID,
GroupMasterId: v.OwnerUserID,
CreateTime: (utils.UnixSecondToTime(int64(v.CreateTime))).String(),
IsBanChat: false,
IsBanPrivateChat: false,
ProfilePhoto: v.FaceURL,
})
}
openIMHttp.RespHttp200(c, constant.OK, resp)
}
@@ -86,32 +110,67 @@ func CreateGroup(c *gin.Context) {
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
resp cms_api_struct.BanGroupChatResponse
reqPb pbGroup.BanGroupChatReq
)
if err := c.BindJSON(&req); err != nil {
log.NewError("0", "ShouldBindQuery failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
reqPb.GroupId = req.GroupId
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)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
return
}
openIMHttp.RespHttp200(c, constant.OK, nil)
}
func BanPrivateChat(c *gin.Context) {
var (
req cms_api_struct.BanPrivateChatRequest
resp cms_api_struct.BanPrivateChatResponse
reqPb pbGroup.BanPrivateChatReq
)
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
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)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrServer, nil)
return
}
openIMHttp.RespHttp200(c, constant.OK, nil)
}
func SearchGroupsMember(c *gin.Context) {
func GetGroupsMember(c *gin.Context) {
var (
req cms_api_struct.GetGroupMembersRequest
_ cms_api_struct.GetGroupMembersResponse
)
if err := c.BindJSON(&req); err != nil {
log.NewError("0", "BindJSON failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
}
func AddUsers(c *gin.Context) {
}
func InquireMember(c *gin.Context) {
@@ -121,30 +180,16 @@ func InquireGroup(c *gin.Context) {
}
func AddGroupMember(c *gin.Context) {
}
func AddMembers(c *gin.Context) {
}
func SetMaster(c *gin.Context) {
}
func BlockUser(c *gin.Context) {
}
func RemoveUser(c *gin.Context) {
}
func BanPrivateChat(c *gin.Context) {
}
func Withdraw(c *gin.Context) {
}
internal/cms_api/router.go
+3 -1
View File
@@ -55,7 +55,7 @@ func NewGinRouter() *gin.Engine {
messageRouterGroup.GET("/search_message_by_group", message.SearchMessageByGroup)
messageRouterGroup.POST("/withdraw_message", message.Withdraw)
}
groupRouterGroup := router.Group("/groups")
groupRouterGroup := router.Group("/group")
{
groupRouterGroup.GET("/get_groups", group.GetGroups)
groupRouterGroup.GET("/get_group", group.GetGroup)
@@ -70,6 +70,7 @@ func NewGinRouter() *gin.Engine {
groupRouterGroup.POST("/ban_private_chat", group.BanPrivateChat)
groupRouterGroup.POST("/withdraw_message", group.Withdraw)
groupRouterGroup.POST("/search_group_message", group.SearchMessage)
groupRouterGroup.POST("/ban_group_chat", group.BanGroupChat)
}
userRouterGroup := router.Group("/user")
{
@@ -81,6 +82,7 @@ func NewGinRouter() *gin.Engine {
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.GetBlockUser)
}
return baseRouter
}
internal/cms_api/user/user.go
+41 -7
View File
@@ -12,11 +12,9 @@ import (
"Open_IM/pkg/utils"
"context"
"fmt"
"github.com/gin-gonic/gin"
"net/http"
"strings"
"time"
"github.com/gin-gonic/gin"
)
func GetUser(c *gin.Context) {
@@ -129,7 +127,6 @@ func AddUser(c *gin.Context) {
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
fmt.Println(time.Now().String())
utils.CopyStructFields(&reqPb, &req)
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
client := pb.NewUserClient(etcdConn)
@@ -174,10 +171,10 @@ func UnblockUser(c *gin.Context) {
)
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()})
openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
return
}
fmt.Println(reqPb, req)
utils.CopyStructFields(&reqPb, &req)
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
client := pb.NewUserClient(etcdConn)
_, err := client.UnBlockUser(context.Background(), &reqPb)
@@ -210,9 +207,46 @@ func GetBlockUsers(c *gin.Context) {
openIMHttp.RespHttp200(c, constant.ErrServer, resp)
return
}
utils.CopyStructFields(&resp.BlockUsers, respPb.User)
for _, v := range respPb.BlockUsers{
resp.BlockUsers = append(resp.BlockUsers, cms_api_struct.BlockUser{
UserResponse: cms_api_struct.UserResponse{
UserId:v.User.UserId,
ProfilePhoto:v.User.ProfilePhoto,
Nickname: v.User.Nickname,
IsBlock: v.User.IsBlock,
CreateTime: v.User.CreateTime,
},
BeginDisableTime: v.BeginDisableTime,
EndDisableTime: v.EndDisableTime,
})
}
resp.BlockUserNum = int(respPb.BlockUserNum)
resp.ShowNumber = int(respPb.Pagination.ShowNumber)
resp.CurrentPage = int(respPb.Pagination.CurrentPage)
openIMHttp.RespHttp200(c, constant.OK, resp)
}
func GetBlockUser(c *gin.Context) {
var (
req cms_api_struct.GetBlockUserRequest
resp cms_api_struct.GetBlockUserResponse
reqPb pb.GetBlockUserReq
)
if err := c.ShouldBindQuery(&req); err != nil {
log.NewError("0", "BindJSON 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.OpenImUserName)
client := pb.NewUserClient(etcdConn)
respPb, err := client.GetBlockUser(context.Background(), &reqPb)
if err != nil {
openIMHttp.RespHttp200(c, constant.ErrServer, resp)
return
}
resp.EndDisableTime = respPb.BlockUser.EndDisableTime
resp.BeginDisableTime = respPb.BlockUser.BeginDisableTime
utils.CopyStructFields(&resp, respPb.BlockUser.User)
openIMHttp.RespHttp200(c, constant.OK, resp)
}
internal/rpc/group/group.go
+60 -6
View File
@@ -641,15 +641,24 @@ func (s *groupServer) TransferGroupOwner(_ context.Context, req *pbGroup.Transfe
func (s *groupServer) GetGroup(_ context.Context, req *pbGroup.GetGroupReq) (*pbGroup.GetGroupResp, error) {
log.NewInfo(req.OperationID, "GetGroup ", req.String())
group, err := imdb.GetGroupByName(req.GroupName)
resp := &pbGroup.GetGroupResp{
GroupInfo: []*open_im_sdk.GroupInfo{},
}
groups, err := imdb.GetGroupsByName(req.GroupName, req.Pagination.PageNumber, req.Pagination.ShowNumber)
if err != nil {
return nil, err
}
resp := &pbGroup.GetGroupResp{
GroupInfo: &open_im_sdk.GroupInfo{
},
for _, v:= range groups {
resp.GroupInfo = append(resp.GroupInfo, &open_im_sdk.GroupInfo{
GroupID: v.GroupID,
GroupName: v.GroupName,
FaceURL: v.FaceUrl,
OwnerUserID: v.CreatorUserID,
Status: v.Status,
CreatorUserID: v.CreatorUserID,
})
}
utils.CopyStructFields(resp.GroupInfo, group)
utils.CopyStructFields(resp.GroupInfo, groups)
return resp, nil
}
@@ -660,9 +669,54 @@ func (s *groupServer) GetGroups(_ context.Context, req *pbGroup.GetGroupsReq) (*
return nil, err
}
resp := &pbGroup.GetGroupsResp{
GroupInfo: []*open_im_sdk.GroupInfo,
GroupInfo: []*open_im_sdk.GroupInfo{},
}
for _, v:= range groups {
resp.GroupInfo = append(resp.GroupInfo, &open_im_sdk.GroupInfo{
GroupID: v.GroupID,
GroupName: v.GroupName,
FaceURL: v.FaceUrl,
OwnerUserID: v.CreatorUserID,
Status: v.Status,
CreatorUserID: v.CreatorUserID,
})
}
utils.CopyStructFields(resp.GroupInfo, groups)
return resp, nil
}
func (s *groupServer) BanGroupChat(_ context.Context, req *pbGroup.BanGroupChatReq) (*pbGroup.BanGroupChatResp, error){
log.NewInfo(req.OperationID, "BanGroupChat ", req.String())
resp := &pbGroup.BanGroupChatResp{}
if err := imdb.BanGroupChat(req.GroupId); err != nil {
return resp, err
}
return resp, nil
}
func (s *groupServer) BanPrivateChat(_ context.Context, req *pbGroup.BanPrivateChatReq) (*pbGroup.BanPrivateChatResp, error) {
log.NewInfo(req.OperationID, "BanPrivateChat ", req.String())
resp := &pbGroup.BanPrivateChatResp{}
if err := imdb.BanPrivateChat(req.GroupId); err != nil {
return resp, err
}
return resp, nil
}
func (s *groupServer) DeleteGroup(_ context.Context, req *pbGroup.DeleteGroupReq) (*pbGroup.DeleteGroupResp, error) {
log.NewInfo(req.OperationID, "DeleteGroup ", req.String())
resp := &pbGroup.DeleteGroupResp{}
if err := imdb.DeleteGroup(req.GroupId); err != nil {
return resp, err
}
return resp, nil
}
func (s *groupServer) SetMaster(_ context.Context, req *pbGroup.SetMasterReq) (*pbGroup.SetMasterResp, error) {
log.NewInfo(req.OperationID, "DeleteGroup ", req.String())
resp := &pbGroup.SetMasterResp{}
if err := imdb.SetGroupMaster(req.UserId, req.GroupId); err != nil {
return resp, err
}
return resp, nil
}
internal/rpc/user/user.go
+28 -12
View File
@@ -316,6 +316,7 @@ func (s *userServer) BlockUser(ctx context.Context, req *pbUser.BlockUserReq) (*
resp := &pbUser.BlockUserResp{}
err := imdb.BlockUser(req.UserId, req.EndDisableTime)
if err != nil {
fmt.Println(err)
return resp, constant.ErrDB
}
return resp, nil
@@ -323,7 +324,6 @@ func (s *userServer) BlockUser(ctx context.Context, req *pbUser.BlockUserReq) (*
func (s *userServer) UnBlockUser(ctx context.Context, req *pbUser.UnBlockUserReq) (*pbUser.UnBlockUserResp, error) {
log.NewInfo(req.OperationID, "UnBlockUser args ", req.String())
fmt.Println(req.UserId)
resp := &pbUser.UnBlockUserResp{}
err := imdb.UnBlockUser(req.UserId)
if err != nil {
@@ -332,10 +332,12 @@ func (s *userServer) UnBlockUser(ctx context.Context, req *pbUser.UnBlockUserReq
return resp, nil
}
//func (s *userServer) GetBlockUser(ctx context.Context, req *pbUser.GetBlockUserReq)
func (s *userServer) GetBlockUsers(ctx context.Context, req *pbUser.GetBlockUsersReq) (*pbUser.GetBlockUsersResp, error) {
log.NewInfo(req.OperationID, "GetBlockUsers args ", req.String())
resp := &pbUser.GetBlockUsersResp{}
blockUserIds, err := imdb.GetBlockUsersID(req.Pagination.ShowNumber, req.Pagination.PageNumber)
blockUsers, err := imdb.GetBlockUsers(req.Pagination.ShowNumber, req.Pagination.PageNumber)
if err != nil {
return resp, constant.ErrDB
}
@@ -344,21 +346,35 @@ func (s *userServer) GetBlockUsers(ctx context.Context, req *pbUser.GetBlockUser
return resp, constant.ErrDB
}
resp.BlockUserNum = int32(usersNum)
blockUsers, err := imdb.GetBlockUsers(blockUserIds)
if err != nil {
return resp, constant.ErrDB
}
for _, v := range blockUsers {
resp.User = append(resp.User, &pbUser.User{
ProfilePhoto: v.FaceURL,
Nickname: v.Nickname,
UserId: v.UserID,
CreateTime: v.CreateTime.String(),
IsBlock: true,
resp.BlockUsers = append(resp.BlockUsers, &pbUser.BlockUser{
User: &pbUser.User{
ProfilePhoto: v.User.FaceURL,
Nickname: v.User.Nickname,
UserId: v.User.UserID,
IsBlock: true,
},
BeginDisableTime: (v.BeginDisableTime).String(),
EndDisableTime: (v.EndDisableTime).String(),
})
}
resp.Pagination = &sdkws.ResponsePagination{}
resp.Pagination.ShowNumber = req.Pagination.ShowNumber
resp.Pagination.CurrentPage = req.Pagination.PageNumber
fmt.Println(resp)
return resp, nil
}
func (s *userServer) GetBlockUser(_ context.Context, req *pbUser.GetBlockUserReq) (*pbUser.GetBlockUserResp, error) {
log.NewInfo(req.OperationID, "GetBlockUser args ", req.String())
resp := &pbUser.GetBlockUserResp{}
user, err := imdb.GetBlockUserById(req.UserId)
if err != nil{
return resp, err
}
resp.BlockUser = &pbUser.BlockUser{}
resp.BlockUser.BeginDisableTime = (user.BeginDisableTime).String()
resp.BlockUser.EndDisableTime = (user.EndDisableTime).String()
return resp, nil
}