TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-03 15:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

服务列表中分组信息中增加UserId字段

Browse Source
This commit is contained in:
GoEdgeLab
2022-04-13 15:01:45 +08:00
parent 1c334e0724
commit bc69e29f0b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/rpc/services/service_server.go
View File

@@ -609,13 +609,17 @@ func (this *ServerService) CountAllEnabledServersMatch(ctx context.Context, req
// ListEnabledServersMatch 列出单页服务 // ListEnabledServersMatch 列出单页服务
func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.ListEnabledServersMatchRequest) (*pb.ListEnabledServersMatchResponse, error) { func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.ListEnabledServersMatchRequest) (*pb.ListEnabledServersMatchResponse, error) {
// 校验请求 // 校验请求
_, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil { if err != nil {
return nil, err return nil, err
} }
tx := this.NullTx() tx := this.NullTx()
if userId > 0 {
req.UserId = userId
}
servers, err := models.SharedServerDAO.ListEnabledServersMatch(tx, req.Offset, req.Size, req.ServerGroupId, req.Keyword, req.UserId, req.NodeClusterId, req.AuditingFlag, utils.SplitStrings(req.ProtocolFamily, ",")) servers, err := models.SharedServerDAO.ListEnabledServersMatch(tx, req.Offset, req.Size, req.ServerGroupId, req.Keyword, req.UserId, req.NodeClusterId, req.AuditingFlag, utils.SplitStrings(req.ProtocolFamily, ","))
if err != nil { if err != nil {
return nil, err return nil, err
@@ -644,8 +648,9 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
continue continue
} }
pbGroups = append(pbGroups, &pb.ServerGroup{ pbGroups = append(pbGroups, &pb.ServerGroup{
Id: int64(group.Id), Id: int64(group.Id),
Name: group.Name, Name: group.Name,
UserId: int64(group.UserId),
}) })
} }
} }