From c0a0f4c8016d13f24af81a820a212c388ef0723e Mon Sep 17 00:00:00 2001
From: cui <cuiweixie@gmail.com>
Date: Wed, 27 Aug 2025 10:08:51 +0800
Subject: [PATCH] refactor: use maps (#10154)

---
 agent/app/service/app_utils.go                             | 7 ++++---
 agent/app/service/runtime.go                               | 5 ++---
 agent/app/service/runtime_utils.go                         | 5 ++---
 .../cloud_storage/client/helper/webdav/auth_digest.go      | 7 ++++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/agent/app/service/app_utils.go b/agent/app/service/app_utils.go
index b956ad21a..f2d8678e3 100644
--- a/agent/app/service/app_utils.go
+++ b/agent/app/service/app_utils.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"maps"
 	"math"
 	"net/http"
 	"os"
@@ -1044,11 +1045,11 @@ func copyData(task *task.Task, app model.App, appDetail model.AppDetail, appInst
 		return
 	}
 	envPath := path.Join(appDir, ".env")
-	envParams := make(map[string]string, len(req.Params))
+	var envParams map[string]string
 	if fileOp.Stat(envPath) {
 		envs, _ := gotenv.Read(envPath)
-		for k, v := range envs {
-			envParams[k] = v
+		if envParams = maps.Clone(envs); envParams == nil {
+			envParams = make(map[string]string)
 		}
 	}
 	handleMap(req.Params, envParams)
diff --git a/agent/app/service/runtime.go b/agent/app/service/runtime.go
index 6c474baed..414cd2d6b 100644
--- a/agent/app/service/runtime.go
+++ b/agent/app/service/runtime.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	fcgiclient "github.com/tomasen/fcgi_client"
+	"maps"
 	"os"
 	"path"
 	"path/filepath"
@@ -1092,9 +1093,7 @@ func (r *RuntimeService) UpdatePHPContainer(req request.PHPContainerConfig) erro
 	}
 	newMap := make(map[string]string)
 	handleMap(create.Params, newMap)
-	for k, v := range newMap {
-		envs[k] = v
-	}
+	maps.Copy(envs, newMap)
 	envs["PANEL_APP_PORT_HTTP"] = runtime.Port
 	envStr, err := gotenv.Marshal(envs)
 	if err != nil {
diff --git a/agent/app/service/runtime_utils.go b/agent/app/service/runtime_utils.go
index 8e87adbd5..5b73891dd 100644
--- a/agent/app/service/runtime_utils.go
+++ b/agent/app/service/runtime_utils.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"maps"
 	"os"
 	"os/exec"
 	"path"
@@ -522,9 +523,7 @@ func handleParams(create request.RuntimeCreate, projectDir string) (composeConte
 
 	newMap := make(map[string]string)
 	handleMap(create.Params, newMap)
-	for k, v := range newMap {
-		env[k] = v
-	}
+	maps.Copy(env, newMap)
 
 	envStr, err := gotenv.Marshal(env)
 	if err != nil {
diff --git a/agent/utils/cloud_storage/client/helper/webdav/auth_digest.go b/agent/utils/cloud_storage/client/helper/webdav/auth_digest.go
index 31129ba0a..0e7026edc 100644
--- a/agent/utils/cloud_storage/client/helper/webdav/auth_digest.go
+++ b/agent/utils/cloud_storage/client/helper/webdav/auth_digest.go
@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"maps"
 	"net/http"
 	"strings"
 )
@@ -46,9 +47,9 @@ func (d *DigestAuth) Close() error {
 }
 
 func (d *DigestAuth) Clone() Authenticator {
-	parts := make(map[string]string, len(d.digestParts))
-	for k, v := range d.digestParts {
-		parts[k] = v
+	var parts map[string]string
+	if parts = maps.Clone(parts); parts == nil {
+		parts = make(map[string]string)
 	}
 	return &DigestAuth{user: d.user, pw: d.pw, digestParts: parts}
 }