pull/535/head
Mr Chen 1 year ago
parent bfc96e925f
commit bf7de761c8
  1. 23
      plugins/mysql/js/mysql.js
  2. 2
      plugins/phpmyadmin/index.py

@ -869,30 +869,16 @@ function openPhpmyadmin(name,username,password){
var rdata = $.parseJSON(data.data); var rdata = $.parseJSON(data.data);
console.log(rdata); console.log(rdata);
data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'status'}); if (rdata.data['status'] != 'start'){
if (data.data != 'start'){
layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']}); layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
return; return;
} }
data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_cfg'}); if (rdata.data['cfg']['choose'] != 'mysql'){
var rdata = $.parseJSON(data.data);
if (rdata.choose != 'mysql'){
layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']}); layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
return; return;
} }
var home_page = rdata.data['home_page'];
var phpmyadmin_cfg = rdata;
data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_home_page'});
var rdata = $.parseJSON(data.data);
if (!rdata.status){
layer.msg(rdata.msg,{icon:2,shade: [0.3, '#000']});
return;
}
var home_page = rdata.data;
home_page = home_page.replace("http://","http://"+phpmyadmin_cfg['username']+":"+phpmyadmin_cfg['password']+"@")
$("#toPHPMyAdmin").attr('action',home_page); $("#toPHPMyAdmin").attr('action',home_page);
if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){ if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']}); layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
@ -901,8 +887,7 @@ function openPhpmyadmin(name,username,password){
} }
//检查版本 //检查版本
data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'version'}); bigVer = rdata.data['version'];
bigVer = data.data.split('.')[0];
if (bigVer>=4.5){ if (bigVer>=4.5){
setTimeout(function(){ setTimeout(function(){

@ -467,7 +467,7 @@ def pluginsDbSupport():
home_page = 'http://' + auth + '@' + ip + ':' + port + '/' + rand_path + '/index.php' home_page = 'http://' + auth + '@' + ip + ':' + port + '/' + rand_path + '/index.php'
data['home_page'] = home_page data['home_page'] = home_page
data['version'] = installVersion() data['version'] = installVersion().strip()
return mw.returnJson(True, 'ok', data) return mw.returnJson(True, 'ok', data)

Loading…
Cancel
Save