From c2b46f77b75f5f631090b466c55c14b43bf1e7d5 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Mon, 10 Jun 2024 02:37:03 +0800 Subject: [PATCH] Update mysql-yum.js --- plugins/mysql-yum/js/mysql-yum.js | 86 +++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 15 deletions(-) diff --git a/plugins/mysql-yum/js/mysql-yum.js b/plugins/mysql-yum/js/mysql-yum.js index 81d718480..71943e964 100755 --- a/plugins/mysql-yum/js/mysql-yum.js +++ b/plugins/mysql-yum/js/mysql-yum.js @@ -56,16 +56,17 @@ function myAsyncPost(method,args){ } var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 }); - return syncPost('/plugins/run', {name:'mysql-apt', func:method, args:_args}); + return syncPost('/plugins/run', {name:'mysql', func:method, args:_args}); } + function myPostCallbak(method, version, args,callback){ var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 }); var req_data = {}; req_data['name'] = 'mysql'; req_data['func'] = method; - req_data['script']='index_mysql_apt'; + req_data['script']='index_mysql'; args['version'] = version; @@ -93,7 +94,7 @@ function myPostCallbakN(method, version, args,callback){ var req_data = {}; req_data['name'] = 'mysql'; req_data['func'] = method; - req_data['script']='index_mysql_apt'; + req_data['script']='index_mysql'; args['version'] = version; @@ -160,7 +161,7 @@ function runInfo(){ 活动/峰值连接数' + rdata.Threads_running + '/' + rdata.Max_used_connections + '若值过大,增加max_connections\ 线程缓存命中率' + ((1 - rdata.Threads_created / rdata.Connections) * 100).toFixed(2) + '%若过低,增加thread_cache_size\ 索引命中率' + ((1 - rdata.Key_reads / rdata.Key_read_requests) * 100).toFixed(2) + '%若过低,增加key_buffer_size\ - Innodb索引命中率' + ((1 - rdata.Innodb_buffer_pool_reads / rdata.Innodb_buffer_pool_read_requests) * 100).toFixed(2) + '%若过低,增加innodb_buffer_pool_size\ + Innodb索引命中率' + (rdata.Innodb_buffer_pool_read_requests / (rdata.Innodb_buffer_pool_read_requests+rdata.Innodb_buffer_pool_reads)).toFixed(2) + '%若过低,增加innodb_buffer_pool_size\ 查询缓存命中率' + cache_size + '' + lan.soft.mysql_status_ps5 + '\ 创建临时表到磁盘' + ((rdata.Created_tmp_disk_tables / rdata.Created_tmp_tables) * 100).toFixed(2) + '%若过大,尝试增加tmp_table_size\ 已打开的表' + rdata.Open_tables + '若过大,增加table_cache_size\ @@ -199,7 +200,7 @@ function myPort(){ myPost('my_port','',function(data){ var con = '
\
\ - \ + \ \
'; $(".soft-man-con").html(con); @@ -293,7 +294,7 @@ function myPerfOpt() { } function reBootMySqld(){ - pluginOpService('mysql-apt','restart',''); + pluginOpService('mysql','restart',''); } @@ -700,7 +701,7 @@ function setDbPass(id, username, password){ \ \ \ - ", + ", yes:function(index){ // var data = $("#mod_pwd").serialize(); var data = {}; @@ -794,7 +795,7 @@ function addDatabase(type){ function delDb(id, name){ safeMessage('删除['+name+']','您真的要删除['+name+']吗？',function(){ - var data='id='+id+'&name='+name + var data='id='+id+'&name='+name; myPost('del_db', data, function(data){ var rdata = $.parseJSON(data.data); showMsg(rdata.msg,function(){ @@ -869,7 +870,7 @@ function openPhpmyadmin(name,username,password){ return; } - if (rdata.data['cfg']['choose'] != 'mysql-apt'){ + if (rdata.data['cfg']['choose'] != 'mysql'){ layer.msg('当前为['+rdata.data['cfg']['choose'] + ']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']}); return; } @@ -928,6 +929,31 @@ function importBackup(file,name){ }); } +function importBackupProgress(file,name){ + myPost('import_db_backup_progress',{file:file,name:name}, function(data){ + var rdata = $.parseJSON(data.data); + layer.open({ + title: "手动导入命令CMD【显示进度】", + area: ['600px', '180px'], + type:1, + closeBtn: 1, + shadeClose: false, + btn:["复制","取消"], + content: '
\ +
\ + 
'+rdata.data+'
\ +
\ +
', + success:function(){ + copyText(rdata.data); + }, + yes:function(){ + copyText(rdata.data); + } + }); + }); +} + function importDbExternal(file,name){ myPost('import_db_external',{file:file,name:name}, function(data){ @@ -935,6 +961,31 @@ function importDbExternal(file,name){ }); } +function importDbExternalProgress(file,name){ + myPost('import_db_external_progress',{file:file,name:name}, function(data){ + var rdata = $.parseJSON(data.data); + layer.open({ + title: "手动导入命令CMD【显示进度】", + area: ['600px', '180px'], + type:1, + closeBtn: 1, + shadeClose: false, + btn:["复制","取消"], + content: '
\ +
\ + 
'+rdata.data+'
\ +
\ +
', + success:function(){ + copyText(rdata.data); + }, + yes:function(){ + copyText(rdata.data); + } + }); + }); +} + function setLocalImport(db_name){ //上传文件 @@ -990,6 +1041,7 @@ function setLocalImport(db_name){ ' + file_list[i]['time'] + '\ \ 导入 | \ + 导入进度 | \ 删除\ \ '; @@ -1013,7 +1065,7 @@ function setLocalImport(db_name){ var layerIndex = layer.open({ type: 1, title: "从文件导入数据", - area: ['600px', '380px'], + area: ['700px', '380px'], closeBtn: 1, shadeClose: false, content: '
\ @@ -1059,7 +1111,7 @@ function setBackup(db_name){ var layerIndex = layer.open({ type: 1, title: "数据库备份详情", - area: ['600px', '280px'], + area: ['700px', '280px'], closeBtn: 1, shadeClose: false, content: '
\ @@ -1113,6 +1165,7 @@ function setBackupReq(db_name, obj){ ' + rdata.data[i]['time'] + '\ \ 导入 | \ + 导入进度 | \ 下载 | \ 删除\ \ @@ -1230,6 +1283,7 @@ function dbList(page, search){ }); } + function myBinRollingLogs(_name, func, _args, line){ var file_line = 100; @@ -1803,6 +1857,7 @@ function setDbMasterAccess(username){ }); } + function resetMaster(){ myPost('reset_master', '', function(data){ var rdata = $.parseJSON(data.data); @@ -1825,7 +1880,7 @@ function getMasterRepSlaveList(){ try { rdata = $.parseJSON(data.data); } catch(e){ - // console.log(e); + console.log(e); } var list = ''; // console.log(rdata['data']); @@ -2571,7 +2626,7 @@ function masterOrSlaveConf(version=''){ for(i in rdata.data){ var v = rdata.data[i]; - if ('Channel_Name' in v){ + if ('Channel_Name' in v && v['Channel_Name'] !=''){ isHasSign = true; } @@ -2658,6 +2713,7 @@ function masterOrSlaveConf(version=''){ "+(info['Slave_SQL_Running_State'] == '' ? '无':info['Slave_SQL_Running_State']) +"\ "; + var btn_list = ['复制错误',"取消"]; if (info['Last_IO_Error'].search(/1236/i)>0){ btn_list = ['复制错误',"取消","尝试修复"]; @@ -2790,7 +2846,7 @@ function masterOrSlaveConf(version=''){

\ Master[主]配置\ \ - \ + \

\
\ \ @@ -2858,7 +2914,7 @@ function masterOrSlaveConf(version=''){ return false; }, change:function(index,mode,reload){ - // console.log(index,mode,reload); + console.log(index,mode,reload); myPost('set_dbrun_mode',{'mode':mode,'reload':reload},function(data){ layer.close(index); var rdata = $.parseJSON(data.data);