diff --git a/README.md b/README.md index 3ac2b796d..6fa2c9e26 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443: * OpenResty安装兼容。 * Debian10安装优化。 * 安装时默认监控开启。 +* MySQL/MYSQL-YUM/MySQL-APT添加重置master功能。 ### JSDelivr安装地址 diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 8deeae18f..ece366263 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -1596,6 +1596,15 @@ def setDbMasterAccess(): return mw.returnJson(True, '设置成功!') +def resetMaster(version=''): + pdb = pMysqlDb() + r = pdb.execute('reset master') + isError = isSqlError(r) + if isError != None: + return isError + return mw.returnJson(True, '重置成功!') + + def getMasterDbList(version=''): try: args = getArgs() @@ -2850,6 +2859,8 @@ if __name__ == "__main__": print(getDbrunMode(version)) elif func == 'set_dbrun_mode': print(setDbrunMode(version)) + elif func == 'reset_master': + print(resetMaster(version)) elif func == 'get_masterdb_list': print(getMasterDbList(version)) elif func == 'get_master_status': diff --git a/plugins/mysql-apt/js/mysql-apt.js b/plugins/mysql-apt/js/mysql-apt.js index f7c9c50a1..452458dfd 100755 --- a/plugins/mysql-apt/js/mysql-apt.js +++ b/plugins/mysql-apt/js/mysql-apt.js @@ -1601,6 +1601,14 @@ function setDbMasterAccess(username){ }); } +function resetMaster(){ + myPost('reset_master', '', function(data){ + var rdata = $.parseJSON(data.data); + showMsg(rdata.msg,function(){ + },{icon: rdata.status ? 1 : 2}); + },'正在执行重置master命令[reset master]'); +} + function getMasterRepSlaveList(){ var _data = {}; if (typeof(page) =='undefined'){ @@ -2446,6 +2454,7 @@ function masterOrSlaveConf(version=''){

\ Master[主]配置\ \ + \

\
\ \ diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index fda6c4788..7e2798e97 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -1577,6 +1577,15 @@ def setDbMasterAccess(): return mw.returnJson(True, '设置成功!') +def resetMaster(version=''): + pdb = pMysqlDb() + r = pdb.execute('reset master') + isError = isSqlError(r) + if isError != None: + return isError + return mw.returnJson(True, '重置成功!') + + def getMasterDbList(version=''): try: args = getArgs() @@ -2827,6 +2836,8 @@ if __name__ == "__main__": print(getDbrunMode(version)) elif func == 'set_dbrun_mode': print(setDbrunMode(version)) + elif func == 'reset_master': + print(resetMaster(version)) elif func == 'get_masterdb_list': print(getMasterDbList(version)) elif func == 'get_master_status': diff --git a/plugins/mysql-yum/js/mysql-yum.js b/plugins/mysql-yum/js/mysql-yum.js index d215d27b2..fe7ca62e6 100755 --- a/plugins/mysql-yum/js/mysql-yum.js +++ b/plugins/mysql-yum/js/mysql-yum.js @@ -1601,6 +1601,14 @@ function setDbMasterAccess(username){ }); } +function resetMaster(){ + myPost('reset_master', '', function(data){ + var rdata = $.parseJSON(data.data); + showMsg(rdata.msg,function(){ + },{icon: rdata.status ? 1 : 2}); + },'正在执行重置master命令[reset master]'); +} + function getMasterRepSlaveList(){ var _data = {}; if (typeof(page) =='undefined'){ @@ -2446,6 +2454,7 @@ function masterOrSlaveConf(version=''){

\ Master[主]配置\ \ + \

\
\ \ diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 092598e91..610ee237d 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -1811,6 +1811,15 @@ def setDbMasterAccess(): return mw.returnJson(True, '设置成功!') +def resetMaster(version=''): + pdb = pMysqlDb() + r = pdb.execute('reset master') + isError = isSqlError(r) + if isError != None: + return isError + return mw.returnJson(True, '重置成功!') + + def getMasterDbList(version=''): try: args = getArgs() @@ -3073,6 +3082,8 @@ if __name__ == "__main__": print(getDbrunMode(version)) elif func == 'set_dbrun_mode': print(setDbrunMode(version)) + elif func == 'reset_master': + print(resetMaster(version)) elif func == 'get_masterdb_list': print(getMasterDbList(version)) elif func == 'get_master_status': diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index 402993a44..6754df892 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -1601,6 +1601,15 @@ function setDbMasterAccess(username){ }); } + +function resetMaster(){ + myPost('reset_master', '', function(data){ + var rdata = $.parseJSON(data.data); + showMsg(rdata.msg,function(){ + },{icon: rdata.status ? 1 : 2}); + },'正在执行重置master命令[reset master]'); +} + function getMasterRepSlaveList(){ var _data = {}; if (typeof(page) =='undefined'){ @@ -2446,6 +2455,7 @@ function masterOrSlaveConf(version=''){

\ Master[主]配置\ \ + \

\
\ \