From 6c5ddc5386debb0c0028fae0d3ca39f35c96e32f Mon Sep 17 00:00:00 2001 From: ssongliu Date: Wed, 15 Feb 2023 18:05:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20mysql=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=91=BD=E4=BB=A4=E6=89=A7=E8=A1=8C=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/database_mysql.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/app/service/database_mysql.go b/backend/app/service/database_mysql.go index 387eb9811..7fc75a077 100644 --- a/backend/app/service/database_mysql.go +++ b/backend/app/service/database_mysql.go @@ -19,7 +19,6 @@ import ( "github.com/1Panel-dev/1Panel/backend/app/model" "github.com/1Panel-dev/1Panel/backend/constant" "github.com/1Panel-dev/1Panel/backend/global" - "github.com/1Panel-dev/1Panel/backend/utils/cmd" "github.com/1Panel-dev/1Panel/backend/utils/common" "github.com/1Panel-dev/1Panel/backend/utils/compose" "github.com/1Panel-dev/1Panel/backend/utils/files" @@ -589,7 +588,8 @@ func (u *MysqlService) LoadStatus() (*dto.MysqlStatus, error) { } func excuteSqlForMaps(containerName, password, command string) (map[string]string, error) { - stdout, err := cmd.Execf("docker exec %s mysql -uroot -p%s -e %s", containerName, password, command) + cmd := exec.Command("docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command) + stdout, err := cmd.CombinedOutput() stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "") if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") { return nil, errors.New(stdStr) @@ -607,7 +607,8 @@ func excuteSqlForMaps(containerName, password, command string) (map[string]strin } func excuteSqlForRows(containerName, password, command string) ([]string, error) { - stdout, err := cmd.Execf("docker exec %s mysql -uroot -p%s -e %s", containerName, password, command) + cmd := exec.Command("docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command) + stdout, err := cmd.CombinedOutput() stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "") if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") { return nil, errors.New(stdStr) @@ -616,7 +617,8 @@ func excuteSqlForRows(containerName, password, command string) ([]string, error) } func excuteSql(containerName, password, command string) error { - stdout, err := cmd.Execf("docker exec %s mysql -uroot -p%s -e %s", containerName, password, command) + cmd := exec.Command("docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command) + stdout, err := cmd.CombinedOutput() stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "") if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") { return errors.New(stdStr)