diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index 90ac99d9b..e502a1497 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -860,12 +860,15 @@ function openPhpmyadmin(name,username,password){ data = syncPost('/plugins/check',{'name':'phpmyadmin'}); - if (!data.status){ layer.msg(data.msg,{icon:2,shade: [0.3, '#000']}); return; } + data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'plugins_db_support'}); + + console.log(data); + data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'status'}); if (data.data != 'start'){ layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']}); diff --git a/plugins/phpmyadmin/index.py b/plugins/phpmyadmin/index.py index 6ea24e805..15116b83a 100755 --- a/plugins/phpmyadmin/index.py +++ b/plugins/phpmyadmin/index.py @@ -446,9 +446,28 @@ def errorLog(): return getServerDir() + '/error.log' -def Version(): +def installVersion(): return mw.readFile(getServerDir() + '/version.pl') +def pluginsDBSupport(): + data = {} + data['status'] = status() + data['cfg'] = getCfg() + + port = getPort() + ip = '127.0.0.1' + if not mw.isAppleSystem(): + ip = mw.getLocalIp() + + cfg = data['cfg'] + auth = cfg['username']+':'+cfg['password'] + rand_path = cfg['path'] + home_page = 'http://' + auth + '@' + ip + ':' + port + '/' + rand_path + '/index.php' + + data['home_page'] = home_page + data['version'] = installVersion() + + return mw.returnJson(True, 'ok', data) if __name__ == "__main__": func = sys.argv[1] @@ -465,7 +484,7 @@ if __name__ == "__main__": elif func == 'conf': print(getConf()) elif func == 'version': - print(Version()) + print(installVersion()) elif func == 'get_cfg': print(returnCfg()) elif func == 'config_inc': @@ -494,5 +513,7 @@ if __name__ == "__main__": print(accessLog()) elif func == 'error_log': print(errorLog()) + elif func == 'plugins_db_support': + print(pluginsDbSupport()) else: print('error') diff --git a/route/static/app/crontab.js b/route/static/app/crontab.js index c38ac2f4b..bacee7cd3 100755 --- a/route/static/app/crontab.js +++ b/route/static/app/crontab.js @@ -63,7 +63,9 @@ function getLogs(id){ }, yes:function(index){ + clearInterval(reqTimer); closeLogs(id); + layer.close(index); }, }); } @@ -157,7 +159,6 @@ function startTask(id){ var data='id='+id; $.post('/crontab/start_task',data,function(rdata){ showMsg(rdata.msg, function(){ - layer.closeAll(); },{icon:rdata.status?1:2,time:2000}); },'json'); } @@ -169,7 +170,7 @@ function closeLogs(id){ var data='id='+id; $.post('/crontab/del_logs',data,function(rdata){ showMsg(rdata.msg, function(){ - layer.closeAll(); + // layer.closeAll(); },{icon:rdata.status?1:2,time:2000}); },'json'); }