diff --git a/backend/app/repo/app_install.go b/backend/app/repo/app_install.go index 79b526cff..cc0d61141 100644 --- a/backend/app/repo/app_install.go +++ b/backend/app/repo/app_install.go @@ -113,6 +113,7 @@ type RootInfo struct { Name string `json:"name"` Port int64 `json:"port"` Password string `json:"password"` + UserPassword string `json:"userPassword"` ContainerName string `json:"containerName"` Param string `json:"param"` Env string `json:"env"` @@ -146,6 +147,10 @@ func (a *AppInstallRepo) LoadBaseInfo(key string, name string) (*RootInfo, error if ok { info.Password = password } + userPassword, ok := envMap["PANEL_DB_USER_PASSWORD"].(string) + if ok { + info.UserPassword = userPassword + } info.Port = int64(appInstall.HttpPort) info.ID = appInstall.ID info.ContainerName = appInstall.ContainerName diff --git a/backend/app/service/app_install.go b/backend/app/service/app_install.go index 2d81c0e9c..1d6ff022d 100644 --- a/backend/app/service/app_install.go +++ b/backend/app/service/app_install.go @@ -3,9 +3,6 @@ package service import ( "encoding/json" "fmt" - "github.com/1Panel-dev/1Panel/backend/utils/env" - "github.com/1Panel-dev/1Panel/backend/utils/nginx" - "github.com/joho/godotenv" "io/ioutil" "math" "os" @@ -14,6 +11,10 @@ import ( "strconv" "strings" + "github.com/1Panel-dev/1Panel/backend/utils/env" + "github.com/1Panel-dev/1Panel/backend/utils/nginx" + "github.com/joho/godotenv" + "github.com/1Panel-dev/1Panel/backend/app/dto/request" "github.com/1Panel-dev/1Panel/backend/app/dto/response" "github.com/1Panel-dev/1Panel/backend/buserr" @@ -648,7 +649,7 @@ func updateInstallInfoInDB(appKey, appName, param string, isRestart bool, value }, commonRepo.WithByID(appInstall.ID)) } if param == "user-password" { - oldVal = fmt.Sprintf("\"PANEL_DB_USER_PASSWORD\":\"%v\"", appInstall.Password) + oldVal = fmt.Sprintf("\"PANEL_DB_USER_PASSWORD\":\"%v\"", appInstall.UserPassword) newVal = fmt.Sprintf("\"PANEL_DB_USER_PASSWORD\":\"%v\"", value) _ = appInstallRepo.BatchUpdateBy(map[string]interface{}{ "param": strings.ReplaceAll(appInstall.Param, oldVal, newVal),