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

cms

Browse Source
This commit is contained in:
wangchuxiao
2022-01-24 01:40:49 +08:00
parent d58bcd136a
commit 1607853393
21 changed files with 6352 additions and 2696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cms_api/group/group.go
+2 -8
View File
@@ -1,21 +1,15 @@
package group
import (
_ "Open_IM_CMS/pkg/req_resp"
"Open_IM_CMS/test"
"net/http"
"github.com/gin-gonic/gin"
)
func SearchGroups(c *gin.Context) {
fake := test.GetSearchGroupsResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fake})
}
func SearchGroupsMember(c *gin.Context) {
fake := test.GetSearchMemberResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fake})
}
func CreateGroup(c *gin.Context) {
internal/cms_api/message/message.go
+2 -8
View File
@@ -1,10 +1,6 @@
package message
import (
"net/http"
"Open_IM_CMS/test"
"github.com/gin-gonic/gin"
)
@@ -13,13 +9,11 @@ func Broadcast(c *gin.Context) {
}
func SearchMessageByUser(c *gin.Context) {
fake := test.GetSearchUserMsgFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fake})
}
func SearchMessageByGroup(c *gin.Context) {
fake := test.GetSearchGroupMsgFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fake})
}
func MassSendMassage(c *gin.Context) {
internal/cms_api/organization/organization.go
+3 -36
View File
@@ -1,52 +1,19 @@
package organization
import (
"Open_IM_CMS/pkg/common/config"
"Open_IM_CMS/pkg/errno"
"Open_IM_CMS/pkg/etcdv3"
commonProto "Open_IM_CMS/pkg/proto/common"
proto "Open_IM_CMS/pkg/proto/organization"
"Open_IM_CMS/pkg/req_resp"
"Open_IM_CMS/test"
"context"
"fmt"
"net/http"
"strings"
"github.com/gin-gonic/gin"
)
func GetStaffs(c *gin.Context) {
var (
req req_resp.GetStaffsResponse
resp req_resp.GetStaffsResponse
reqPb commonProto.Pagination
respPb *proto.GetStaffsResp
)
fmt.Println(resp, req)
fakeData := test.GetStaffsResponseFake()
etcdConn := etcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCMSApiOrganizationName)
client := proto.NewOrganizationClient(etcdConn)
fmt.Println(client, reqPb)
respPb, err := client.GetStaffs(context.Background(), &reqPb)
fmt.Println(respPb, err)
fmt.Println(etcdConn)
req_resp.RespHttp200(c, errno.RespOK, fakeData)
}
func GetOrganizations(c *gin.Context) {
var (
req req_resp.GetOrganizationsResponse
resp req_resp.GetStaffsResponse
)
fmt.Println(resp, req)
fakeData := test.GetOrganizationsResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fakeData})
}
func GetSquads(c *gin.Context) {
fakeData := test.GetSquadResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fakeData})
}
func AlterStaff(c *gin.Context) {
internal/cms_api/router.go
+2 -2
View File
@@ -8,10 +8,10 @@ import (
"Open_IM/internal/cms_api/organization"
"Open_IM/internal/cms_api/statistics"
"Open_IM/internal/cms_api/user"
"github.com/gin-gonic/gin"
)
func NewGinRouter() *gin.Engine {
gin.SetMode(gin.ReleaseMode)
baseRouter := gin.Default()
@@ -70,7 +70,7 @@ func NewGinRouter() *gin.Engine {
groupRouterGroup.POST("/withdraw_message", group.Withdraw)
groupRouterGroup.POST("/search_group_message", group.SearchMessage)
}
userRouterGroup := router.Group("/users")
userRouterGroup := router.Group("/user")
{
userRouterGroup.POST("/resign", user.ResignUser)
userRouterGroup.GET("/get_user", user.GetUser)
internal/cms_api/statistics/statistics.go
+5 -60
View File
@@ -1,80 +1,25 @@
package statistics
import (
"net/http"
"Open_IM/pkg/req_resp"
"Open_IM/test"
"github.com/gin-gonic/gin"
)
func MessagesStatistics(c *gin.Context) {
var (
req req_resp.StatisticsRequest
//resp req_resp.MessageStatisticsResponse
)
if err := c.ShouldBindUri(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{})
return
}
if _, err := test.RpcFake(); err != nil {
c.JSON(http.StatusOK, gin.H{})
return
}
fakeData := test.GetUserStatisticsResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fakeData})
}
func UsersStatistics(c *gin.Context) {
var (
req req_resp.StatisticsRequest
//resp req_resp.MessageStatisticsResponse
)
if err := c.ShouldBindUri(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{})
return
}
if _, err := test.RpcFake(); err != nil {
c.JSON(http.StatusOK, gin.H{})
return
}
fakeData := test.GetUserStatisticsResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fakeData})
}
func GroupsStatistics(c *gin.Context) {
var (
req req_resp.StatisticsRequest
//resp req_resp.MessageStatisticsResponse
)
if err := c.ShouldBindUri(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{})
return
}
if _, err := test.RpcFake(); err != nil {
c.JSON(http.StatusOK, gin.H{})
return
}
fakeData := test.GetUserStatisticsResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fakeData})
}
func GetActiveUser(c *gin.Context) {
if _, err := test.RpcFake(); err != nil {
c.JSON(http.StatusOK, gin.H{})
return
}
fakeData := test.GetActiveUserResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fakeData})
}
func GetActiveGroup(c *gin.Context) {
if _, err := test.RpcFake(); err != nil {
c.JSON(http.StatusOK, gin.H{})
return
}
fakeData := test.GetActiveGroupResponseFake()
c.JSON(http.StatusOK, gin.H{"code": "0", "data": fakeData})
}
internal/cms_api/user/user.go
+175 -35
View File
@@ -1,76 +1,216 @@
package user
import (
jsonData "Open_IM/internal/utils"
api "Open_IM/pkg/base_info"
"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"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
rpc "Open_IM/pkg/proto/user"
commonPb "Open_IM/pkg/proto/sdk_ws"
pb "Open_IM/pkg/proto/user"
"Open_IM/pkg/utils"
"context"
"github.com/gin-gonic/gin"
"fmt"
"net/http"
"strings"
"github.com/gin-gonic/gin"
)
func GetUser(c *gin.Context) {
var (
req cms_api_struct.RequestPagination
resp cms_api_struct.GetUsersResponse
reqPb rpc.GetUserInfoReq
respPb *rpc.GetUserInfoResp
req cms_api_struct.GetUserRequest
resp cms_api_struct.GetUserResponse
reqPb pb.GetUserReq
respPb *pb.GetUserResp
)
if err := c.ShouldBindQuery(&req); err != nil {
log.NewError("0", "BindJSON failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, nil)
return
}
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)
respPb, err := client.GetUser(context.Background(), &reqPb)
if err != nil {
log.NewError("s", "GetUserInfo failed ", err.Error())
openIMHttp.RespHttp200(c, err.(constant.ErrInfo), nil)
return
}
// resp.UserId = resp.UserId
// resp.Nickname = resp.UserId
// resp.ProfilePhoto = resp.ProfilePhoto
// resp.UserResponse =
utils.CopyStructFields(&resp, respPb)
openIMHttp.RespHttp200(c, constant.OK, resp)
}
if err := c.BindJSON(&req); err != nil {
func GetUsers(c *gin.Context) {
var (
req cms_api_struct.GetUsersRequest
resp cms_api_struct.GetUsersResponse
reqPb pb.GetUsersReq
respPb *pb.GetUsersResp
)
reqPb.Pagination = &commonPb.RequestPagination{}
if err := c.ShouldBindQuery(&req); err != nil {
log.NewError("0", "BindJSON failed ", err.Error())
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.OpenImUserName)
client := pb.NewUserClient(etcdConn)
respPb, err := client.GetUsers(context.Background(), &reqPb)
for _, v := range respPb.User {
resp.Users = append(resp.Users, &cms_api_struct.UserResponse{
ProfilePhoto: v.ProfilePhoto,
Nickname: v.Nickname,
UserId: v.UserID,
CreateTime: v.CreateTime,
})
}
if err != nil {
openIMHttp.RespHttp200(c, err.(constant.ErrInfo), resp)
}
fmt.Println(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
}
utils.CopyStructFields(req, &req)
utils.CopyStructFields(&reqPb, &req)
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
client := rpc.NewUserClient(etcdConn)
respPb, err := client.GetUserInfo(context.Background(), &reqPb)
client := pb.NewUserClient(etcdConn)
_, err := client.ResignUser(context.Background(), &reqPb)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call rpc server failed"})
return
openIMHttp.RespHttp200(c, constant.ErrDB, resp)
}
//for _, v := range RpcResp.UserInfoList {
// publicUserInfoList = append(publicUserInfoList,
// &open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender, AppMangerLevel: v.AppMangerLevel})
//}
//resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList}
//resp.Data = jsonData.JsonDataList(resp.UserInfoList)
//log.NewInfo(req.OperationID, "GetUserInfo api return ", resp)
c.JSON(http.StatusOK, resp)
openIMHttp.RespHttp200(c, constant.OK, resp)
}
func ResignUser(c *gin.Context) {
}
func AlterUser(c *gin.Context) {
var (
req cms_api_struct.AlterUserRequest
resp cms_api_struct.AlterUserResponse
reqPb pb.AlterUserReq
respPb *pb.AlterUserResp
)
if err := c.ShouldBind(&req); err != nil {
log.NewError("0", "BindJSON failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
return
}
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)
respPb, err := client.AlterUser(context.Background(), &reqPb)
fmt.Println(respPb)
if err != nil {
openIMHttp.RespHttp200(c, err.(constant.ErrInfo), resp)
}
openIMHttp.RespHttp200(c, constant.OK, resp)
}
func AddUser(c *gin.Context) {
var (
req cms_api_struct.AddUserRequest
resp cms_api_struct.AddUserResponse
reqPb pb.AddUserReq
respPb *pb.AddUserResp
)
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
}
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
client := pb.NewUserClient(etcdConn)
respPb, err := client.AddUser(context.Background(), &reqPb)
fmt.Println(respPb)
if err != nil {
}
openIMHttp.RespHttp200(c, constant.OK, resp)
}
func BlockUser(c *gin.Context) {
var (
req cms_api_struct.BlockUserRequest
resp cms_api_struct.BlockUserResponse
reqPb pb.BlockUserReq
respPb *pb.BlockUserResp
)
if err := c.ShouldBind(&req); err != nil {
log.NewError("0", "BindJSON failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
return
}
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)
respPb, err := client.BlockUser(context.Background(), &reqPb)
if err != nil {
openIMHttp.RespHttp200(c, err.(constant.ErrInfo), resp)
}
fmt.Println(respPb)
openIMHttp.RespHttp200(c, constant.OK, resp)
}
func UnblockUser(c *gin.Context) {
var (
req cms_api_struct.UnblockUserRequest
resp cms_api_struct.UnBlockUserResponse
reqPb pb.UnBlockUserReq
respPb *pb.UnBlockUserResp
)
utils.CopyStructFields(&reqPb, req)
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
}
etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName)
client := pb.NewUserClient(etcdConn)
respPb, err := client.UnBlockUser(context.Background(), &reqPb)
if err != nil {
openIMHttp.RespHttp200(c, err.(constant.ErrInfo), resp)
}
fmt.Println(respPb)
openIMHttp.RespHttp200(c, constant.OK, resp)
}
func GetBlockUsers(c *gin.Context) {
var (
req cms_api_struct.GetBlockUsersRequest
resp cms_api_struct.GetOrganizationsResponse
reqPb pb.GetBlockUsersReq
respPb *pb.GetBlockUsersResp
)
if err := c.ShouldBindQuery(&req); err != nil {
log.NewError("0", "BindJSON failed ", err.Error())
openIMHttp.RespHttp200(c, constant.ErrArgs, resp)
return
}
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)
respPb, err := client.GetBlockUsers(context.Background(), &reqPb)
if err != nil {
openIMHttp.RespHttp200(c, err.(constant.ErrInfo), resp)
}
fmt.Println(respPb)
openIMHttp.RespHttp200(c, constant.OK, resp)
}