From ebf8c82d33d109c5425b5b39c6a04a8be3fdd4ad Mon Sep 17 00:00:00 2001 From: midoks Date: Sat, 31 Dec 2022 20:30:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/mysql/index.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index a135044bb..d54ba3b36 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -906,11 +906,13 @@ def importDbExternal(): mysql_cmd = getServerDir() + '/bin/mysql -S ' + sock + ' -uroot -p' + \ pwd + ' ' + name + ' < ' + import_sql - # print(mysql_cmd) - os.system(mysql_cmd) + rdata = mw.execShell(mysql_cmd) if ext != 'sql': os.remove(import_sql) + if rdata[1].lower().find('error') > -1: + return mw.returnJson(False, rdata[1]) + return mw.returnJson(True, 'ok') @@ -941,7 +943,12 @@ def importDbBackup(): ' ' + name + ' < ' + file_path_sql # print(mysql_cmd) - os.system(mysql_cmd) + # os.system(mysql_cmd) + + rdata = mw.execShell(mysql_cmd) + if rdata[1].lower().find('error') > -1: + return mw.returnJson(False, rdata[1]) + return mw.returnJson(True, 'ok')