From f77484df84b8049d702638382d269883ab24743a Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Fri, 22 Dec 2023 21:42:06 +0800 Subject: [PATCH] update --- plugins/mysql-apt/index.py | 14 +++++++++++-- plugins/mysql-apt/js/mysql-apt.js | 35 +++++++++++++++++++++++++++---- plugins/mysql-yum/index.py | 15 +++++++++++-- plugins/mysql-yum/js/mysql-yum.js | 35 +++++++++++++++++++++++++++---- 4 files changed, 87 insertions(+), 12 deletions(-) diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 3f38ca244..f982d37e9 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -1061,12 +1061,19 @@ def setRootPwd(version=''): if not data[0]: return data[1] + #强制修改 + force = 0 + if 'force' in args and args['force'] == '1': + force = 1 + password = args['password'] try: pdb = pMysqlDb() result = pdb.query("show databases") isError = isSqlError(result) if isError != None: + pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (password,)) + return mw.returnJson(True, '【强制修改】数据库root密码修改成功(不意为成功连接数据)!') return isError if version.find('5.7') > -1 or version.find('8.0') > -1: @@ -1081,11 +1088,14 @@ def setRootPwd(version=''): "update mysql.user set Password=password('" + password + "') where User='root'") pdb.execute("flush privileges") pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (password,)) - return mw.returnJson(True, '数据库root密码修改成功!') + + msg = '' + if force == 1: + msg = ',无须强制!' + return mw.returnJson(True, '数据库root密码修改成功!'+msg) except Exception as ex: return mw.returnJson(False, '修改错误:' + str(ex)) - def setUserPwd(version=''): args = getArgs() data = checkArgs(args, ['password', 'name']) diff --git a/plugins/mysql-apt/js/mysql-apt.js b/plugins/mysql-apt/js/mysql-apt.js index 452458dfd..4f72494de 100755 --- a/plugins/mysql-apt/js/mysql-apt.js +++ b/plugins/mysql-apt/js/mysql-apt.js @@ -439,7 +439,6 @@ function setRootPwd(type, pwd){ var rdata = $.parseJSON(data.data); showMsg(rdata.msg,function(){ dbList(); - $('.layui-layer-close1').click(); },{icon: rdata.status ? 1 : 2}); }); return; @@ -451,7 +450,7 @@ function setRootPwd(type, pwd){ title: '修改数据库密码', closeBtn: 1, shift: 5, - btn:["提交","关闭"], + btn:["提交", "关闭", "复制ROOT密码", "强制修改"], shadeClose: true, content: "
\
\ @@ -461,8 +460,36 @@ function setRootPwd(type, pwd){
\ \
", - yes:function(){ - setRootPwd(1); + yes:function(layerIndex){ + var password = $("#MyPassword").val(); + myPost('set_root_pwd', {password:password}, function(data){ + var rdata = $.parseJSON(data.data); + showMsg(rdata.msg,function(){ + layer.close(layerIndex); + dbList(); + },{icon: rdata.status ? 1 : 2}); + }); + }, + btn3:function(){ + var password = $("#MyPassword").val(); + copyText(password); + return false; + }, + btn4:function(layerIndex){ + layer.confirm('强制修改,是为了在重建时使用,确定强制?', { + btn: ['确定', '取消'] + }, function(index, layero){ + layer.close(index); + var password = $("#MyPassword").val(); + myPost('set_root_pwd', {password:password,force:'1'}, function(data){ + var rdata = $.parseJSON(data.data); + showMsg(rdata.msg,function(){ + layer.close(layerIndex); + dbList(); + },{icon: rdata.status ? 1 : 2}); + }); + }); + return false; } }); } diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index 52015d1b7..b073ffa54 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -95,7 +95,7 @@ def getLogBinName(): rep = 'log-bin\s*=\s*(.*)' tmp = re.search(rep, content) return tmp.groups()[0].strip() - + def getPidFile(): file = getConf() content = mw.readFile(file) @@ -1102,12 +1102,19 @@ def setRootPwd(version=''): if not data[0]: return data[1] + #强制修改 + force = 0 + if 'force' in args and args['force'] == '1': + force = 1 + password = args['password'] try: pdb = pMysqlDb() result = pdb.query("show databases") isError = isSqlError(result) if isError != None: + pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (password,)) + return mw.returnJson(True, '【强制修改】数据库root密码修改成功(不意为成功连接数据)!') return isError if version.find('5.7') > -1 or version.find('8.0') > -1: @@ -1122,7 +1129,11 @@ def setRootPwd(version=''): "update mysql.user set Password=password('" + password + "') where User='root'") pdb.execute("flush privileges") pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (password,)) - return mw.returnJson(True, '数据库root密码修改成功!') + + msg = '' + if force == 1: + msg = ',无须强制!' + return mw.returnJson(True, '数据库root密码修改成功!'+msg) except Exception as ex: return mw.returnJson(False, '修改错误:' + str(ex)) diff --git a/plugins/mysql-yum/js/mysql-yum.js b/plugins/mysql-yum/js/mysql-yum.js index 9c89b16ec..5b5dd919f 100755 --- a/plugins/mysql-yum/js/mysql-yum.js +++ b/plugins/mysql-yum/js/mysql-yum.js @@ -496,7 +496,6 @@ function setRootPwd(type, pwd){ var rdata = $.parseJSON(data.data); showMsg(rdata.msg,function(){ dbList(); - $('.layui-layer-close1').click(); },{icon: rdata.status ? 1 : 2}); }); return; @@ -508,7 +507,7 @@ function setRootPwd(type, pwd){ title: '修改数据库密码', closeBtn: 1, shift: 5, - btn:["提交","关闭"], + btn:["提交", "关闭", "复制ROOT密码", "强制修改"], shadeClose: true, content: "
\
\ @@ -518,8 +517,36 @@ function setRootPwd(type, pwd){
\ \
", - yes:function(){ - setRootPwd(1); + yes:function(layerIndex){ + var password = $("#MyPassword").val(); + myPost('set_root_pwd', {password:password}, function(data){ + var rdata = $.parseJSON(data.data); + showMsg(rdata.msg,function(){ + layer.close(layerIndex); + dbList(); + },{icon: rdata.status ? 1 : 2}); + }); + }, + btn3:function(){ + var password = $("#MyPassword").val(); + copyText(password); + return false; + }, + btn4:function(layerIndex){ + layer.confirm('强制修改,是为了在重建时使用,确定强制?', { + btn: ['确定', '取消'] + }, function(index, layero){ + layer.close(index); + var password = $("#MyPassword").val(); + myPost('set_root_pwd', {password:password,force:'1'}, function(data){ + var rdata = $.parseJSON(data.data); + showMsg(rdata.msg,function(){ + layer.close(layerIndex); + dbList(); + },{icon: rdata.status ? 1 : 2}); + }); + }); + return false; } }); }