mirror of
https://github.com/lejianwen/rustdesk-api.git
synced 2025-09-15 14:28:34 +08:00
feat(api): Add /device-group/accessible for 1.3.8
This commit is contained in:
parent
448e7460a9
commit
d1ec9b4916
@ -45,7 +45,7 @@ func (g *Group) Users(c *gin.Context) {
|
||||
userList = service.AllService.UserService.ListByGroupId(u.GroupId, q.Page, q.PageSize)
|
||||
}
|
||||
|
||||
var data []*apiResp.UserPayload
|
||||
data := make([]*apiResp.UserPayload, 0, len(userList.Users))
|
||||
for _, user := range userList.Users {
|
||||
up := &apiResp.UserPayload{}
|
||||
up.FromUser(user)
|
||||
@ -88,14 +88,14 @@ func (g *Group) Peers(c *gin.Context) {
|
||||
users = service.AllService.UserService.ListIdAndNameByGroupId(u.GroupId)
|
||||
}
|
||||
|
||||
namesById := make(map[uint]string)
|
||||
userIds := make([]uint, 0)
|
||||
namesById := make(map[uint]string, len(users))
|
||||
userIds := make([]uint, 0, len(users))
|
||||
for _, user := range users {
|
||||
namesById[user.Id] = user.Username
|
||||
userIds = append(userIds, user.Id)
|
||||
}
|
||||
peerList := service.AllService.PeerService.ListByUserIds(userIds, q.Page, q.PageSize)
|
||||
var data []*apiResp.GroupPeerPayload
|
||||
data := make([]*apiResp.GroupPeerPayload, 0, len(peerList.Peers))
|
||||
for _, peer := range peerList.Peers {
|
||||
uname, ok := namesById[peer.UserId]
|
||||
if !ok {
|
||||
@ -103,6 +103,7 @@ func (g *Group) Peers(c *gin.Context) {
|
||||
}
|
||||
pp := &apiResp.GroupPeerPayload{}
|
||||
pp.FromPeer(peer, uname)
|
||||
//pp.DeviceGroupName = uname
|
||||
data = append(data, pp)
|
||||
|
||||
}
|
||||
@ -111,3 +112,24 @@ func (g *Group) Peers(c *gin.Context) {
|
||||
Data: data,
|
||||
})
|
||||
}
|
||||
|
||||
// Device
|
||||
// @Tags 群组
|
||||
// @Summary 设备
|
||||
// @Description 机器
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param page query int false "页码"
|
||||
// @Param pageSize query int false "每页数量"
|
||||
// @Param status query int false "状态"
|
||||
// @Param accessible query string false "accessible"
|
||||
// @Success 200 {object} response.DataResponse
|
||||
// @Failure 500 {object} response.Response
|
||||
// @Router /device-group/accessible [get]
|
||||
// @Security BearerAuth
|
||||
func (g *Group) Device(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, response.DataResponse{
|
||||
Total: 0,
|
||||
Data: nil,
|
||||
})
|
||||
}
|
||||
|
||||
@ -32,12 +32,13 @@ https://github.com/rustdesk/rustdesk/blob/master/flutter/lib/common/hbbs/hbbs.da
|
||||
}
|
||||
*/
|
||||
type GroupPeerPayload struct {
|
||||
Id string `json:"id"`
|
||||
Info *PeerPayloadInfo `json:"info"`
|
||||
Status int `json:"status"`
|
||||
User string `json:"user"`
|
||||
UserName string `json:"user_name"`
|
||||
Note string `json:"note"`
|
||||
Id string `json:"id"`
|
||||
Info *PeerPayloadInfo `json:"info"`
|
||||
Status int `json:"status"`
|
||||
User string `json:"user"`
|
||||
UserName string `json:"user_name"`
|
||||
Note string `json:"note"`
|
||||
DeviceGroupName string `json:"device_group_name"`
|
||||
}
|
||||
type PeerPayloadInfo struct {
|
||||
DeviceName string `json:"device_name"`
|
||||
|
||||
@ -79,6 +79,8 @@ func ApiInit(g *gin.Engine) {
|
||||
gr := &api.Group{}
|
||||
frg.GET("/users", gr.Users)
|
||||
frg.GET("/peers", gr.Peers)
|
||||
// /api/device-group/accessible?current=1&pageSize=100
|
||||
frg.GET("/device-group/accessible", gr.Device)
|
||||
}
|
||||
|
||||
{
|
||||
@ -88,6 +90,7 @@ func ApiInit(g *gin.Engine) {
|
||||
//更新地址
|
||||
frg.POST("/ab", ab.UpAb)
|
||||
}
|
||||
|
||||
PersonalRoutes(frg)
|
||||
//访问静态文件
|
||||
g.StaticFS("/upload", http.Dir(global.Config.Gin.ResourcesPath+"/public/upload"))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user