From 8753f45bcb37a7f8586bd94bce2ec931dfc2ba1a Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 4 Nov 2022 12:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/mariadb/index.py | 2 +- plugins/mariadb/js/mariadb.js | 4 ++-- plugins/mysql/index.py | 2 +- plugins/mysql/js/mysql.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/mariadb/index.py b/plugins/mariadb/index.py index 931821104..2777a1fbe 100755 --- a/plugins/mariadb/index.py +++ b/plugins/mariadb/index.py @@ -1681,7 +1681,7 @@ def getMasterStatus(version=''): return mw.returnJson(master_status, '设置成功', data) except Exception as e: - return mw.returnJson(False, "数据库密码错误,在管理列表-点击【修复】!") + return mw.returnJson(False, "数据库密码错误,在管理列表-点击【修复】!", 'pwd') def setMasterStatus(version=''): diff --git a/plugins/mariadb/js/mariadb.js b/plugins/mariadb/js/mariadb.js index 921aadda9..fa6dcdc92 100755 --- a/plugins/mariadb/js/mariadb.js +++ b/plugins/mariadb/js/mariadb.js @@ -2075,9 +2075,9 @@ function masterOrSlaveConf(version=''){ myPost('get_master_status', '', function(rdata){ var rdata = $.parseJSON(rdata.data); // console.log('mode:',rdata.data); - if ( typeof(rdata.status) != 'undefined' && !rdata.status){ + if ( typeof(rdata.status) != 'undefined' && !rdata.status && rdata.data == 'pwd'){ layer.msg(rdata.msg, {icon:2}); - return; + return; } var rdata = rdata.data; diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 3fc982ab4..e65580ad4 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -1843,7 +1843,7 @@ def getMasterStatus(version=''): return mw.returnJson(master_status, '设置成功', data) except Exception as e: - return mw.returnJson(False, "数据库密码错误,在管理列表-点击【修复】!") + return mw.returnJson(False, "数据库密码错误,在管理列表-点击【修复】!", 'pwd') def setMasterStatus(version=''): diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index 5bc565867..64d403cbf 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -2099,9 +2099,9 @@ function masterOrSlaveConf(version=''){ myPost('get_master_status', '', function(rdata){ var rdata = $.parseJSON(rdata.data); // console.log('mode:',rdata.data); - if ( typeof(rdata.status) != 'undefined' && !rdata.status){ + if ( typeof(rdata.status) != 'undefined' && !rdata.status && rdata.data == 'pwd'){ layer.msg(rdata.msg, {icon:2}); - return; + return; } var rdata = rdata.data;