TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-25 06:26:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

部分API支持用户平台调用

Browse Source
This commit is contained in:
GoEdgeLab
2022-01-05 20:12:37 +08:00
parent 94d01de693
commit f1190623f1
4 changed files with 83 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,14 @@ func (this *ServerService) CreateServer(ctx context.Context, req *pb.CreateServe
}
// 服务分组
for _, groupId := range req.ServerGroupIds {
err := models.SharedServerGroupDAO.CheckUserGroup(tx, userId, groupId)
if err != nil {
return nil, err
}
}
// 增加默认分组
config, err := models.SharedSysSettingDAO.ReadUserServerConfig(tx)
if err == nil && config.GroupId > 0 && !lists.ContainsInt64(req.ServerGroupIds, config.GroupId) {
req.ServerGroupIds = append(req.ServerGroupIds, config.GroupId)
@@ -698,6 +706,7 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
AuditingResult: auditingResult,
CreatedAt: int64(server.CreatedAt),
DnsName: server.DnsName,
UserPlanId: int64(server.UserPlanId),
NodeCluster: &pb.NodeCluster{
Id: int64(server.ClusterId),
Name: clusterName,
@@ -1092,14 +1101,14 @@ func (this *ServerService) CountAllEnabledServersWithNodeClusterId(ctx context.C
// CountAllEnabledServersWithServerGroupId 计算使用某个分组的服务数量
func (this *ServerService) CountAllEnabledServersWithServerGroupId(ctx context.Context, req *pb.CountAllEnabledServersWithServerGroupIdRequest) (*pb.RPCCountResponse, error) {
// 校验请求
_, err := this.ValidateAdmin(ctx, 0)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
tx := this.NullTx()
count, err := models.SharedServerDAO.CountAllEnabledServersWithGroupId(tx, req.ServerGroupId)
count, err := models.SharedServerDAO.CountAllEnabledServersWithGroupId(tx, req.ServerGroupId, userId)
if err != nil {
return nil, err
}

41
internal/rpc/services/service_server_group.go
View File

@@ -16,14 +16,14 @@ type ServerGroupService struct {
// CreateServerGroup 创建分组
func (this *ServerGroupService) CreateServerGroup(ctx context.Context, req *pb.CreateServerGroupRequest) (*pb.CreateServerGroupResponse, error) {
// 校验请求
_, err := this.ValidateAdmin(ctx, 0)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
tx := this.NullTx()
groupId, err := models.SharedServerGroupDAO.CreateGroup(tx, req.Name)
groupId, err := models.SharedServerGroupDAO.CreateGroup(tx, req.Name, userId)
if err != nil {
return nil, err
}
@@ -33,13 +33,21 @@ func (this *ServerGroupService) CreateServerGroup(ctx context.Context, req *pb.C
// UpdateServerGroup 修改分组
func (this *ServerGroupService) UpdateServerGroup(ctx context.Context, req *pb.UpdateServerGroupRequest) (*pb.RPCSuccess, error) {
// 校验请求
_, err := this.ValidateAdmin(ctx, 0)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
tx := this.NullTx()
// 检查用户权限
if userId > 0 {
err = models.SharedServerGroupDAO.CheckUserGroup(tx, userId, req.ServerGroupId)
if err != nil {
return nil, err
}
}
err = models.SharedServerGroupDAO.UpdateGroup(tx, req.ServerGroupId, req.Name)
if err != nil {
return nil, err
@@ -51,13 +59,21 @@ func (this *ServerGroupService) UpdateServerGroup(ctx context.Context, req *pb.U
// DeleteServerGroup 删除分组
func (this *ServerGroupService) DeleteServerGroup(ctx context.Context, req *pb.DeleteServerGroupRequest) (*pb.RPCSuccess, error) {
// 校验请求
_, err := this.ValidateAdmin(ctx, 0)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
tx := this.NullTx()
// 检查用户权限
if userId > 0 {
err = models.SharedServerGroupDAO.CheckUserGroup(tx, userId, req.ServerGroupId)
if err != nil {
return nil, err
}
}
err = models.SharedServerGroupDAO.DisableServerGroup(tx, req.ServerGroupId)
if err != nil {
return nil, err
@@ -69,14 +85,14 @@ func (this *ServerGroupService) DeleteServerGroup(ctx context.Context, req *pb.D
// FindAllEnabledServerGroups 查询所有分组
func (this *ServerGroupService) FindAllEnabledServerGroups(ctx context.Context, req *pb.FindAllEnabledServerGroupsRequest) (*pb.FindAllEnabledServerGroupsResponse, error) {
// 校验请求
_, err := this.ValidateAdmin(ctx, 0)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
tx := this.NullTx()
groups, err := models.SharedServerGroupDAO.FindAllEnabledGroups(tx)
groups, err := models.SharedServerGroupDAO.FindAllEnabledGroups(tx, userId)
if err != nil {
return nil, err
}
@@ -93,14 +109,14 @@ func (this *ServerGroupService) FindAllEnabledServerGroups(ctx context.Context,
// UpdateServerGroupOrders 修改分组排序
func (this *ServerGroupService) UpdateServerGroupOrders(ctx context.Context, req *pb.UpdateServerGroupOrdersRequest) (*pb.RPCSuccess, error) {
// 校验请求
_, err := this.ValidateAdmin(ctx, 0)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
tx := this.NullTx()
err = models.SharedServerGroupDAO.UpdateGroupOrders(tx, req.ServerGroupIds)
err = models.SharedServerGroupDAO.UpdateGroupOrders(tx, req.ServerGroupIds, userId)
if err != nil {
return nil, err
}
@@ -110,7 +126,7 @@ func (this *ServerGroupService) UpdateServerGroupOrders(ctx context.Context, req
// FindEnabledServerGroup 查找单个分组信息
func (this *ServerGroupService) FindEnabledServerGroup(ctx context.Context, req *pb.FindEnabledServerGroupRequest) (*pb.FindEnabledServerGroupResponse, error) {
// 校验请求
_, err := this.ValidateAdmin(ctx, 0)
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
return nil, err
}
@@ -127,6 +143,13 @@ func (this *ServerGroupService) FindEnabledServerGroup(ctx context.Context, req
}, nil
}
// 检查用户权限
if userId > 0 && int64(group.UserId) != userId {
return &pb.FindEnabledServerGroupResponse{
ServerGroup: nil,
}, nil
}
return &pb.FindEnabledServerGroupResponse{
ServerGroup: &pb.ServerGroup{
Id: int64(group.Id),