Browse Source

Merge branch 'V20221130' of openi.pcl.ac.cn:OpenI/aiforge into V20221130

tags/v1.22.12.1^2
zhoupzh 3 years ago
parent
commit
510ebc2a6e
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      routers/api/v1/api.go
  2. +1
    -1
      routers/api/v1/repo/cloudbrain_dashboard.go

+ 1
- 1
routers/api/v1/api.go View File

@@ -614,6 +614,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/download_invitation_detail", operationReq, repo_ext.DownloadInvitationDetail)

//cloudbrain board
m.Get("/cloudbrainboard/cloudbrain/resource_queues", repo.GetResourceQueues)
m.Group("/cloudbrainboard", func() {
m.Get("/downloadAll", repo.DownloadCloudBrainBoard)
m.Group("/cloudbrain", func() {
@@ -631,7 +632,6 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/overview_resource", repo.GetCloudbrainResourceOverview)
m.Get("/resource_usage_statistic", repo.GetDurationRateStatistic)
m.Get("/resource_usage_rate_detail", repo.GetCloudbrainResourceUsageDetail)
m.Get("/resource_queues", repo.GetResourceQueues)
m.Get("/apitest_for_statistic", repo.CloudbrainDurationStatisticForTest)
})
}, operationReq)


+ 1
- 1
routers/api/v1/repo/cloudbrain_dashboard.go View File

@@ -1915,7 +1915,7 @@ func CloudbrainUpdateAiCenter(ctx *context.Context) {
func GetResourceQueues(ctx *context.Context) {
resourceQueues, err := models.GetCanUseCardInfo()
if err != nil {
log.Info("GetCanUseCardInfo err: %v", err)
log.Error("GetCanUseCardInfo err: %v", err)
return
}
Resource := make([]*models.ResourceQueue, 0)


Loading…
Cancel
Save