feat: 同步前端更改

tnb-labs · Oct 29, 2023 · f757862 · f757862
1 parent 462b2f9
commit f757862
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 21 deletions.
diff --git a/app/http/controllers/info_controller.go b/app/http/controllers/info_controller.go
@@ -156,14 +156,16 @@ func (c *InfoController) CountInfo(ctx http.Context) http.Response {
 		if status == "active" {
 			raw := tools.Exec(`echo "\l" | su - postgres -c "psql"`)
 			databases := strings.Split(raw, "\n")
-			databases = databases[3 : len(databases)-1]
-			for _, db := range databases {
-				parts := strings.Split(db, "|")
-				if len(parts) != 9 || len(strings.TrimSpace(parts[0])) == 0 || strings.TrimSpace(parts[0]) == "template0" || strings.TrimSpace(parts[0]) == "template1" || strings.TrimSpace(parts[0]) == "postgres" {
-					continue
-				}
+			if len(databases) >= 4 {
+				databases = databases[3 : len(databases)-1]
+				for _, db := range databases {
+					parts := strings.Split(db, "|")
+					if len(parts) != 9 || len(strings.TrimSpace(parts[0])) == 0 || strings.TrimSpace(parts[0]) == "template0" || strings.TrimSpace(parts[0]) == "template1" || strings.TrimSpace(parts[0]) == "postgres" {
+						continue
+					}
 
-				databaseCount++
+					databaseCount++
+				}
 			}
 		}
 	}

diff --git a/app/http/controllers/plugins/postgresql15/postgresql15_controller.go b/app/http/controllers/plugins/postgresql15/postgresql15_controller.go
@@ -256,16 +256,23 @@ func (c *Postgresql15Controller) DatabaseList(ctx http.Context) http.Response {
 		return controllers.Error(ctx, http.StatusInternalServerError, "PostgreSQL 已停止运行")
 	}
 
-	raw := tools.Exec(`echo "\l" | su - postgres -c "psql"`)
-	databases := strings.Split(raw, "\n")
-	databases = databases[3 : len(databases)-1]
-
 	type database struct {
 		Name     string `json:"name"`
 		Owner    string `json:"owner"`
 		Encoding string `json:"encoding"`
 	}
 
+	raw := tools.Exec(`echo "\l" | su - postgres -c "psql"`)
+	databases := strings.Split(raw, "\n")
+	if len(databases) >= 4 {
+		databases = databases[3 : len(databases)-1]
+	} else {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []database{},
+		})
+	}
+
 	var databaseList []database
 	for _, db := range databases {
 		parts := strings.Split(db, "|")

diff --git a/app/http/controllers/plugins/postgresql16/postgresql16_controller.go b/app/http/controllers/plugins/postgresql16/postgresql16_controller.go
@@ -256,16 +256,23 @@ func (c *Postgresql16Controller) DatabaseList(ctx http.Context) http.Response {
 		return controllers.Error(ctx, http.StatusInternalServerError, "PostgreSQL 已停止运行")
 	}
 
-	raw := tools.Exec(`echo "\l" | su - postgres -c "psql"`)
-	databases := strings.Split(raw, "\n")
-	databases = databases[3 : len(databases)-1]
-
 	type database struct {
 		Name     string `json:"name"`
 		Owner    string `json:"owner"`
 		Encoding string `json:"encoding"`
 	}
 
+	raw := tools.Exec(`echo "\l" | su - postgres -c "psql"`)
+	databases := strings.Split(raw, "\n")
+	if len(databases) >= 4 {
+		databases = databases[3 : len(databases)-1]
+	} else {
+		return controllers.Success(ctx, http.Json{
+			"total": 0,
+			"items": []database{},
+		})
+	}
+
 	var databaseList []database
 	for _, db := range databases {
 		parts := strings.Split(db, "|")

diff --git a/app/http/controllers/plugins/toolbox/toolbox.go b/app/http/controllers/plugins/toolbox/toolbox.go
@@ -2,7 +2,6 @@ package toolbox
 
 import (
 	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/goravel/framework/contracts/http"
@@ -69,13 +68,14 @@ func (c *ToolBoxController) GetSWAP(ctx http.Context) http.Response {
 		return check
 	}
 
-	var total, size, used, free string
+	var total, used, free string
+	var size int64
 	if tools.Exists("/www/swap") {
 		s, _ := tools.FileSize("/www/swap")
-		size = strconv.Itoa(int(s / 1024 / 1024))
+		size = s / 1024 / 1024
 		total = tools.FormatBytes(float64(s))
 	} else {
-		size = "0.00 B"
+		size = 0
 		total = "0.00 B"
 	}
 
@@ -142,12 +142,25 @@ func (c *ToolBoxController) GetTimezone(ctx http.Context) http.Response {
 		return controllers.Error(ctx, http.StatusUnprocessableEntity, "找不到时区信息")
 	}
 
+	type zone struct {
+		Label string `json:"label"`
+		Value string `json:"value"`
+	}
+
 	zonesRaw := tools.Exec("LC_ALL=C timedatectl list-timezones")
 	zones := strings.Split(zonesRaw, "\n")
 
+	var zonesList []zone
+	for _, z := range zones {
+		zonesList = append(zonesList, zone{
+			Label: z,
+			Value: z,
+		})
+	}
+
 	return controllers.Success(ctx, http.Json{
-		"zone":  match[1],
-		"zones": zones,
+		"timezone":  match[1],
+		"timezones": zonesList,
 	})
 }