diff --git a/assets b/assets index 2f4930b..1ffe6a8 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 2f4930b39afae20f94f87ec49b2bef03a90d49bf +Subproject commit 1ffe6a8a524822b90fafde7f267ad85d54dc6206 diff --git a/service/admin/response.go b/service/admin/response.go index b58e005..125f524 100644 --- a/service/admin/response.go +++ b/service/admin/response.go @@ -124,10 +124,10 @@ type ListGroupResponse struct { } type HomepageSummary struct { - MetricsSummary *MetricsSummary `json:"metrics_summary"` - SiteURls []string `json:"site_urls"` - Version *Version `json:"version"` - StoragePolicies []*StoragePolicySpace `json:"storage_policies"` + MetricsSummary *MetricsSummary `json:"metrics_summary"` + SiteURls []string `json:"site_urls"` + Version *Version `json:"version"` + StoragePolicies []*StoragePolicySpace `json:"storage_policies"` } type MetricsSummary struct { diff --git a/service/admin/site.go b/service/admin/site.go index 48cf158..9461af3 100644 --- a/service/admin/site.go +++ b/service/admin/site.go @@ -105,16 +105,16 @@ func (s *SummaryService) Summary(c *gin.Context) (*HomepageSummary, error) { // 收集存储策略空间使用情况 res.StoragePolicies = make([]*StoragePolicySpace, 0, len(policyResult.Policies)) entityClient := dep.FileClient() - + for _, policy := range policyResult.Policies { // 获取该存储策略的已使用空间 _, usedSpace, err := entityClient.CountEntityByStoragePolicyID(c, policy.ID) if err != nil { continue } - + res.StoragePolicies = append(res.StoragePolicies, &StoragePolicySpace{ - ID: int64(policy.ID), + ID: int64(policy.ID), Name: policy.Name, Type: policy.Type, Used: int64(usedSpace),