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

审核中服务增加提交审核时间

Browse Source
This commit is contained in:
GoEdgeLab
2021-12-01 17:06:16 +08:00
parent 2ad19634d7
commit e2bc2ca6c3
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,7 +425,7 @@ func (this *ServerService) FindServerNames(ctx context.Context, req *pb.FindServ
}
}
serverNamesJSON, isAuditing, auditingServerNamesJSON, auditingResultJSON, err := models.SharedServerDAO.FindServerServerNames(tx, req.ServerId)
serverNamesJSON, isAuditing, auditingAt, auditingServerNamesJSON, auditingResultJSON, err := models.SharedServerDAO.FindServerServerNames(tx, req.ServerId)
if err != nil {
return nil, err
}
@@ -444,6 +444,7 @@ func (this *ServerService) FindServerNames(ctx context.Context, req *pb.FindServ
return &pb.FindServerNamesResponse{
ServerNamesJSON: serverNamesJSON,
IsAuditing: isAuditing,
AuditingAt: auditingAt,
AuditingServerNamesJSON: auditingServerNamesJSON,
AuditingResult: auditingResult,
}, nil
@@ -457,12 +458,16 @@ func (this *ServerService) UpdateServerNames(ctx context.Context, req *pb.Update
return nil, err
}
if req.ServerId <= 0 {
return nil, errors.New("invalid serverId")
}
tx := this.NullTx()
// 检查用户
if userId > 0 {
err = models.SharedServerDAO.CheckUserServer(tx, userId, req.ServerId)
if err != nil {
return nil, err
}
}
// 是否需要审核
if userId > 0 {
globalConfig, err := models.SharedSysSettingDAO.ReadGlobalConfig(tx)
@@ -677,6 +682,7 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
ExcludeNodes: []byte(server.ExcludeNodes),
ServerNamesJSON: []byte(server.ServerNames),
IsAuditing: server.IsAuditing == 1,
AuditingAt: int64(server.AuditingAt),
AuditingServerNamesJSON: []byte(server.AuditingServerNames),
AuditingResult: auditingResult,
CreatedAt: int64(server.CreatedAt),