fix: 解决单位转换导致的内存限制问题 (1Panel-dev#4055)

Refs 1Panel-dev#4040
L1nyz-tel · Mar 4, 2024 · 9418153 · 9418153
1 parent e9cc7bf
commit 9418153
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/backend/app/dto/container.go b/backend/app/dto/container.go
@@ -38,8 +38,8 @@ type ContainerInfo struct {
 }
 
 type ResourceLimit struct {
-	CPU    int `json:"cpu"`
-	Memory int `json:"memory"`
+	CPU    int    `json:"cpu"`
+	Memory uint64 `json:"memory"`
 }
 
 type ContainerOperate struct {

diff --git a/backend/app/service/container.go b/backend/app/service/container.go
@@ -337,7 +337,7 @@ func (u *ContainerService) LoadResourceLimit() (*dto.ResourceLimit, error) {
 
 	data := dto.ResourceLimit{
 		CPU:    cpuCounts,
-		Memory: int(memoryInfo.Total),
+		Memory: memoryInfo.Total,
 	}
 	return &data, nil
 }