From 0f0099accb46bdc908f9cc6d5d49c46f2ef4d453 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 21 Feb 2025 12:01:49 +0800
Subject: [PATCH] fix: Fix the issue of loading errors for editing container
 port data (#7945)

Refs #7938
---
 backend/app/service/backup_mysql.go      | 7 +++++--
 backend/app/service/backup_postgresql.go | 7 +++++--
 backend/app/service/container.go         | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/app/service/backup_mysql.go b/backend/app/service/backup_mysql.go
index 40a1d90ce..14c8007e5 100644
--- a/backend/app/service/backup_mysql.go
+++ b/backend/app/service/backup_mysql.go
@@ -2,13 +2,14 @@ package service
 
 import (
 	"fmt"
-	"github.com/1Panel-dev/1Panel/backend/constant"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/1Panel-dev/1Panel/backend/constant"
+
 	"github.com/1Panel-dev/1Panel/backend/buserr"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -169,8 +170,9 @@ func handleMysqlRecover(req dto.CommonRecover, isRollback bool) error {
 					Timeout: 300,
 				}); err != nil {
 					global.LOG.Errorf("rollback mysql db %s from %s failed, err: %v", req.DetailName, rollbackFile, err)
+				} else {
+					global.LOG.Infof("rollback mysql db %s from %s successful", req.DetailName, rollbackFile)
 				}
-				global.LOG.Infof("rollback mysql db %s from %s successful", req.DetailName, rollbackFile)
 				_ = os.RemoveAll(rollbackFile)
 			} else {
 				_ = os.RemoveAll(rollbackFile)
@@ -186,6 +188,7 @@ func handleMysqlRecover(req dto.CommonRecover, isRollback bool) error {
 
 		Timeout: 300,
 	}); err != nil {
+		global.LOG.Errorf("recover mysql db %s from %s failed, err: %v", req.DetailName, req.File, err)
 		return err
 	}
 	isOk = true
diff --git a/backend/app/service/backup_postgresql.go b/backend/app/service/backup_postgresql.go
index ee2d7852f..b50fa1bd7 100644
--- a/backend/app/service/backup_postgresql.go
+++ b/backend/app/service/backup_postgresql.go
@@ -2,13 +2,14 @@ package service
 
 import (
 	"fmt"
-	"github.com/1Panel-dev/1Panel/backend/constant"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/1Panel-dev/1Panel/backend/constant"
+
 	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/utils/common"
 	pgclient "github.com/1Panel-dev/1Panel/backend/utils/postgresql/client"
@@ -157,8 +158,9 @@ func handlePostgresqlRecover(req dto.CommonRecover, isRollback bool) error {
 					Timeout: 300,
 				}); err != nil {
 					global.LOG.Errorf("rollback postgresql db %s from %s failed, err: %v", req.DetailName, rollbackFile, err)
+				} else {
+					global.LOG.Infof("rollback postgresql db %s from %s successful", req.DetailName, rollbackFile)
 				}
-				global.LOG.Infof("rollback postgresql db %s from %s successful", req.DetailName, rollbackFile)
 				_ = os.RemoveAll(rollbackFile)
 			} else {
 				_ = os.RemoveAll(rollbackFile)
@@ -171,6 +173,7 @@ func handlePostgresqlRecover(req dto.CommonRecover, isRollback bool) error {
 		Username:   dbInfo.Username,
 		Timeout:    300,
 	}); err != nil {
+		global.LOG.Errorf("recover postgresql db %s from %s failed, err: %v", req.DetailName, req.File, err)
 		return err
 	}
 	isOk = true
diff --git a/backend/app/service/container.go b/backend/app/service/container.go
index b38da965d..a99490a5f 100644
--- a/backend/app/service/container.go
+++ b/backend/app/service/container.go
@@ -1262,12 +1262,12 @@ func loadContainerPortForInfo(itemPorts []types.Port) []dto.PortHelper {
 	var exposedPorts []dto.PortHelper
 	samePortMap := make(map[string]dto.PortHelper)
 	ports := transPortToStr(itemPorts)
-	var itemPort dto.PortHelper
 	for _, item := range ports {
 		itemStr := strings.Split(item, "->")
 		if len(itemStr) < 2 {
 			continue
 		}
+		var itemPort dto.PortHelper
 		lastIndex := strings.LastIndex(itemStr[0], ":")
 		if lastIndex == -1 {
 			itemPort.HostPort = itemStr[0]