diff --git a/plugins/mysql-yum/js/mysql-yum.js b/plugins/mysql-yum/js/mysql-yum.js
index f1d5c44de..c06faa24a 100755
--- a/plugins/mysql-yum/js/mysql-yum.js
+++ b/plugins/mysql-yum/js/mysql-yum.js
@@ -1,18 +1,9 @@
-function str2Obj(str){
-    var data = {};
-    kv = str.split('&');
-    for(i in kv){
-        v = kv[i].split('=');
-        data[v[0]] = v[1];
-    }
-    return data;
-}
 
 function myPost(method,args,callback, title){
 
     var _args = null; 
     if (typeof(args) == 'string'){
-        _args = JSON.stringify(str2Obj(args));
+        _args = JSON.stringify(toArrayObject(args));
     } else {
         _args = JSON.stringify(args);
     }
@@ -40,7 +31,7 @@ function myPostN(method,args,callback, title){
 
     var _args = null; 
     if (typeof(args) == 'string'){
-        _args = JSON.stringify(str2Obj(args));
+        _args = JSON.stringify(toArrayObject(args));
     } else {
         _args = JSON.stringify(args);
     }
@@ -59,7 +50,7 @@ function myPostN(method,args,callback, title){
 function myAsyncPost(method,args){
     var _args = null; 
     if (typeof(args) == 'string'){
-        _args = JSON.stringify(str2Obj(args));
+        _args = JSON.stringify(toArrayObject(args));
     } else {
         _args = JSON.stringify(args);
     }
@@ -68,6 +59,25 @@ function myAsyncPost(method,args){
     return syncPost('/plugins/run', {name:'mysql-yum', func:method, args:_args}); 
 }
 
+function vaildPhpmyadmin(url,username,password){
+    // console.log("Authorization: Basic " + btoa(username + ":" + password));
+    $.ajax({
+        type: "GET",
+        url: url,
+        dataType: 'json',
+        async: false,
+        username:username,
+        password:password,
+        headers: {
+            "Authorization": "Basic " + btoa(username + ":" + password)
+        },
+        data: 'vaild',
+        success: function (){
+            alert('Thanks for your comment!');
+        }
+    });
+}
+
 function runInfo(){
     myPost('run_info','',function(data){
 
@@ -77,6 +87,7 @@ function runInfo(){
             return;
         }
 
+        // Com_select , Qcache_inserts
         var cache_size = ((parseInt(rdata.Qcache_hits) / (parseInt(rdata.Qcache_hits) + parseInt(rdata.Qcache_inserts))) * 100).toFixed(2) + '%';
         if (cache_size == 'NaN%') cache_size = 'OFF';
         var Con = '<div class="divtable"><table class="table table-hover table-bordered" style="margin-bottom:10px;background-color:#fafafa">\
@@ -184,6 +195,12 @@ function myPerfOpt() {
     //获取MySQL配置
     myPost('db_status','',function(data){
         var rdata = $.parseJSON(data.data);
+        if ( typeof(rdata.status) != 'undefined' && !rdata.status){
+            layer.msg(rdata.msg, {icon:2});
+            return; 
+        }
+
+
         // console.log(rdata);
         var key_buffer_size = toSizeM(rdata.mem.key_buffer_size);
         var query_cache_size = toSizeM(rdata.mem.query_cache_size);
@@ -248,7 +265,7 @@ function myPerfOpt() {
 }
 
 function reBootMySqld(){
-    pluginOpService('mysql','restart','');
+    pluginOpService('mysql-apt','restart','');
 }
 
 
@@ -445,10 +462,9 @@ function syncToDatabase(type){
 
 function setRootPwd(type, pwd){
     if (type==1){
-        var data = $("#mod_pwd").serialize();
-        myPost('set_root_pwd', data, function(data){
+        var password = $("#MyPassword").val();
+        myPost('set_root_pwd', {password:password}, function(data){
             var rdata = $.parseJSON(data.data);
-            // console.log(rdata);
             showMsg(rdata.msg,function(){
                 dbList();
                 $('.layui-layer-close1').click();
@@ -459,26 +475,23 @@ function setRootPwd(type, pwd){
 
     var index = layer.open({
         type: 1,
-        skin: 'demo-class',
         area: '500px',
         title: '修改数据库密码',
         closeBtn: 1,
         shift: 5,
+        btn:["提交","关闭"],
         shadeClose: true,
-        content: "<form class='bt-form pd20 pb70' id='mod_pwd'>\
+        content: "<form class='bt-form pd20' id='mod_pwd'>\
                     <div class='line'>\
-                    <span class='tname'>root密码</span>\
-                    <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+pwd+"' /><span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
-                    </div>\
-                    <div class='bt-form-submit-btn'>\
-                        <button id='my_mod_close' type='button' class='btn btn-danger btn-sm btn-title'>关闭</button>\
-                        <button type='button' class='btn btn-success btn-sm btn-title' onclick=\"setRootPwd(1)\" >提交</button>\
+                        <span class='tname'>root密码</span>\
+                        <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+pwd+"' />\
+                            <span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span>\
+                        </div>\
                     </div>\
                   </form>",
-    });
-
-    $('#my_mod_close').click(function(){
-        $('.layui-layer-close1').click();
+        yes:function(){
+            setRootPwd(1);
+        }
     });
 }
 
@@ -526,6 +539,17 @@ function checkSelect(){
     },5)
 }
 
+function setDbRw(id,username,val){
+    myPost('set_db_rw',{id:id,username:username,rw:val}, function(data){
+        var rdata = $.parseJSON(data.data);
+        // layer.msg(rdata.msg,{icon:rdata.status ? 1 : 5,shade: [0.3, '#000']});
+        showMsg(rdata.msg, function(){
+            dbList();
+        },{icon:rdata.status ? 1 : 5,shade: [0.3, '#000']}, 2000);
+
+    });
+}
+
 function setDbAccess(username){
     myPost('get_db_access','username='+username, function(data){
         var rdata = $.parseJSON(data.data);
@@ -540,8 +564,9 @@ function setDbAccess(username){
             title: '设置数据库权限',
             closeBtn: 1,
             shift: 5,
+            btn:["提交","取消"],
             shadeClose: true,
-            content: "<form class='bt-form pd20 pb70' id='set_db_access'>\
+            content: "<form class='bt-form pd20' id='set_db_access'>\
                         <div class='line'>\
                             <span class='tname'>访问权限</span>\
                             <div class='info-r '>\
@@ -552,139 +577,115 @@ function setDbAccess(username){
                                 </select>\
                             </div>\
                         </div>\
-                        <div class='bt-form-submit-btn'>\
-                            <button id='my_mod_close' type='button' class='btn btn-danger btn-sm btn-title'>关闭</button>\
-                            <button id='my_mod_save' type='button' class='btn btn-success btn-sm btn-title'>提交</button>\
-                        </div>\
                       </form>",
-        });
-
-        layer.ready(function(){
-            if (rdata.msg == '127.0.0.1'){
-                $('select[name="dataAccess"]').find("option[value='127.0.0.1']").attr("selected",true);
-            } else if (rdata.msg == '%'){
-                $('select[name="dataAccess"]').find('option[value="%"]').attr("selected",true);
-            } else if ( rdata.msg == 'ip' ){
-                $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
-                $('select[name="dataAccess"]').after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
-            } else {
-                $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
-                $('select[name="dataAccess"]').after("<input value='"+rdata.msg+"' id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
-            }
-        });
-
-        $('#my_mod_close').click(function(){
-            $('.layui-layer-close1').click();
-        });
-
-
-        $('select[name="dataAccess"]').change(function(){
-            var v = $(this).val();
-            if (v == 'ip'){
-                $(this).after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
-            } else {
-                $('#dataAccess_subid').remove();
-            }
-        });
+            success:function(){
+                if (rdata.msg == '127.0.0.1'){
+                    $('select[name="dataAccess"]').find("option[value='127.0.0.1']").attr("selected",true);
+                } else if (rdata.msg == '%'){
+                    $('select[name="dataAccess"]').find('option[value="%"]').attr("selected",true);
+                } else if ( rdata.msg == 'ip' ){
+                    $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
+                    $('select[name="dataAccess"]').after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
+                } else {
+                    $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
+                    $('select[name="dataAccess"]').after("<input value='"+rdata.msg+"' id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
+                }
 
-        $('#my_mod_save').click(function(){
-            var data = $("#set_db_access").serialize();
-            data = decodeURIComponent(data);
-            var dataObj = str2Obj(data);
-            if(!dataObj['access']){
-                dataObj['access'] = dataObj['dataAccess'];
-                if ( dataObj['dataAccess'] == 'ip'){
-                    if (dataObj['address']==''){
-                        layer.msg('IP地址不能空!',{icon:2,shade: [0.3, '#000']});
-                        return;
+                 $('select[name="dataAccess"]').change(function(){
+                    var v = $(this).val();
+                    if (v == 'ip'){
+                        $(this).after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
+                    } else {
+                        $('#dataAccess_subid').remove();
+                    }
+                });
+            },
+            yes:function(index){
+                var data = $("#set_db_access").serialize();
+                data = decodeURIComponent(data);
+                var dataObj = toArrayObject(data);
+                if(!dataObj['access']){
+                    dataObj['access'] = dataObj['dataAccess'];
+                    if ( dataObj['dataAccess'] == 'ip'){
+                        if (dataObj['address']==''){
+                            layer.msg('IP地址不能空!',{icon:2,shade: [0.3, '#000']});
+                            return;
+                        }
+                        dataObj['access'] = dataObj['address'];
                     }
-                    dataObj['access'] = dataObj['address'];
                 }
+                dataObj['username'] = username;
+                myPost('set_db_access', dataObj, function(data){
+                    var rdata = $.parseJSON(data.data);
+                    showMsg(rdata.msg,function(){
+                        layer.close(index);
+                        dbList();
+                    },{icon: rdata.status ? 1 : 2});   
+                });
             }
-            dataObj['username'] = username;
-            // console.log(data,dataObj);
-            myPost('set_db_access', dataObj, function(data){
-                var rdata = $.parseJSON(data.data);
-                showMsg(rdata.msg,function(){
-                    dbList();
-                    $('.layui-layer-close1').click();
-                },{icon: rdata.status ? 1 : 2});   
-            });
         });
+
     });
 }
 
-function setDbPass(id, username, password){
+function fixDbAccess(username){
+    myPost('fix_db_access', '', function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        showMsg(rdata.msg,function(){
+            dbList();
+        },{icon: rdata.status ? 1 : 2}); 
+    });
+}
 
-    var index = layer.open({
+function setDbPass(id, username, password){
+    layer.open({
         type: 1,
-        skin: 'demo-class',
         area: '500px',
         title: '修改数据库密码',
         closeBtn: 1,
         shift: 5,
         shadeClose: true,
-        content: "<form class='bt-form pd20 pb70' id='mod_pwd'>\
+        btn:["提交","关闭"],
+        content: "<form class='bt-form pd20' id='mod_pwd'>\
                     <div class='line'>\
                         <span class='tname'>用户名</span>\
                         <div class='info-r'><input readonly='readonly' name=\"name\" class='bt-input-text mr5' type='text' style='width:330px;outline:none;' value='"+username+"' /></div>\
                     </div>\
                     <div class='line'>\
                     <span class='tname'>密码</span>\
-                    <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+password+"' /><span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
+                    <div class='info-r'>\
+                        <input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+password+"' />\
+                        <span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
                     </div>\
                     <input type='hidden' name='id' value='"+id+"'>\
-                    <div class='bt-form-submit-btn'>\
-                        <button id='my_mod_close' type='button' class='btn btn-danger btn-sm btn-title'>关闭</button>\
-                        <button id='my_mod_save' type='button' class='btn btn-success btn-sm btn-title'>提交</button>\
-                    </div>\
                   </form>",
-    });
-
-    $('#my_mod_close').click(function(){
-        $('.layui-layer-close1').click();
-    });
-
-    $('#my_mod_save').click(function(){
-        var data = $("#mod_pwd").serialize();
-        myPost('set_user_pwd', data, function(data){
-            var rdata = $.parseJSON(data.data);
-            showMsg(rdata.msg,function(){
-                dbList();
-                $('.layui-layer-close1').click();
-            },{icon: rdata.status ? 1 : 2});   
-        });
+        yes:function(index){
+            // var data = $("#mod_pwd").serialize();
+            var data = {};
+            data['name'] = $('input[name=name]').val();
+            data['password'] = $('#MyPassword').val();
+            data['id'] = $('input[name=id]').val();
+            myPost('set_user_pwd', data, function(data){
+                var rdata = $.parseJSON(data.data);
+                showMsg(rdata.msg,function(){
+                    layer.close(index);
+                    dbList();
+                },{icon: rdata.status ? 1 : 2});   
+            });
+        }
     });
 }
 
 function addDatabase(type){
-    if (type==1){
-        var data = $("#add_db").serialize();
-        data = decodeURIComponent(data);
-        var dataObj = str2Obj(data);
-        if(!dataObj['address']){
-            dataObj['address'] = dataObj['dataAccess'];
-        }
-        myPost('add_db', dataObj, function(data){
-            var rdata = $.parseJSON(data.data);
-            showMsg(rdata.msg,function(){
-                if (rdata.status){
-                    dbList();
-                }
-                $('.layui-layer-close1').click();
-            },{icon: rdata.status ? 1 : 2},600);
-        });
-        return;
-    }
-    var index = layer.open({
+    layer.open({
         type: 1,
-        skin: 'demo-class',
         area: '500px',
         title: '添加数据库',
         closeBtn: 1,
         shift: 5,
         shadeClose: true,
-        content: "<form class='bt-form pd20 pb70' id='add_db'>\
+        btn:["提交","关闭"],
+        content: "<form class='bt-form pd20' id='add_db'>\
                     <div class='line'>\
                         <span class='tname'>数据库名</span>\
                         <div class='info-r'><input name='name' class='bt-input-text mr5' placeholder='新的数据库名称' type='text' style='width:65%' value=''>\
@@ -712,28 +713,39 @@ function addDatabase(type){
                         </div>\
                     </div>\
                     <input type='hidden' name='ps' value='' />\
-                    <div class='bt-form-submit-btn'>\
-                        <button id='my_mod_close' type='button' class='btn btn-danger btn-sm btn-title'>关闭</button>\
-                        <button type='button' class='btn btn-success btn-sm btn-title' onclick=\"addDatabase(1)\" >提交</button>\
-                    </div>\
                   </form>",
-    });
-
-    $("input[name='name']").keyup(function(){
-        var v = $(this).val();
-        $("input[name='db_user']").val(v);
-        $("input[name='ps']").val(v);
-    });
+        success:function(){
+            $("input[name='name']").keyup(function(){
+                var v = $(this).val();
+                $("input[name='db_user']").val(v);
+                $("input[name='ps']").val(v);
+            });
 
-    $('#my_mod_close').click(function(){
-        $('.layui-layer-close1').click();
-    });
-    $('select[name="dataAccess"]').change(function(){
-        var v = $(this).val();
-        if (v == 'ip'){
-            $(this).after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
-        } else {
-            $('#dataAccess_subid').remove();
+            $('select[name="dataAccess"]').change(function(){
+                var v = $(this).val();
+                if (v == 'ip'){
+                    $(this).after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
+                } else {
+                    $('#dataAccess_subid').remove();
+                }
+            });
+        },
+        yes:function(index) {
+            var data = $("#add_db").serialize();
+            data = decodeURIComponent(data);
+            var dataObj = toArrayObject(data);
+            if(!dataObj['address']){
+                dataObj['address'] = dataObj['dataAccess'];
+            }
+            myPost('add_db', dataObj, function(data){
+                var rdata = $.parseJSON(data.data);
+                showMsg(rdata.msg,function(){
+                    if (rdata.status){
+                        layer.close(index);
+                        dbList();
+                    }
+                },{icon: rdata.status ? 1 : 2},600);
+            });
         }
     });
 }
@@ -745,7 +757,6 @@ function delDb(id, name){
             var rdata = $.parseJSON(data.data);
             showMsg(rdata.msg,function(){
                 dbList();
-                $('.layui-layer-close1').click();
             },{icon: rdata.status ? 1 : 2}, 600);
         });
     });
@@ -817,15 +828,26 @@ function openPhpmyadmin(name,username,password){
         layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
         return;
     }
-    // console.log(data);
+
+    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_cfg'});
+    var rdata = $.parseJSON(data.data);
+    if (rdata.choose != 'mysql-apt'){
+        layer.msg('当前为['+rdata.choose+']模式,若要使用请切换模式.',{icon:2,shade: [0.3, '#000']});
+        return;
+    }
+
+    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;
     }
-    $("#toPHPMyAdmin").attr('action',rdata.data);
+    var home_page = rdata.data;
+
+    home_page = home_page.replace("http://","http://"+phpmyadmin_cfg['username']+":"+phpmyadmin_cfg['password']+"@")
 
+    $("#toPHPMyAdmin").attr('action',home_page);
     if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
         layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
         setTimeout(function(){ window.location.href = '/soft'; },3000);
@@ -834,8 +856,8 @@ function openPhpmyadmin(name,username,password){
 
     //检查版本
     data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'version'});
-    bigVer = data.data.split('.')[0]
-    if (bigVer>=5){
+    bigVer = data.data.split('.')[0];
+    if (bigVer>=4.5){
 
         setTimeout(function(){
             $("#toPHPMyAdmin").submit();
@@ -856,12 +878,14 @@ function openPhpmyadmin(name,username,password){
     }    
 }
 
-function delBackup(filename,name){
-    myPost('delete_db_backup',{filename:filename},function(){
+function delBackup(filename, name, path){
+    if(typeof(path) == "undefined"){
+        path = "";
+    }
+    myPost('delete_db_backup',{filename:filename,path:path},function(){
         layer.msg('执行成功!');
         setTimeout(function(){
-            $('.layui-layer-close2').click();
-            setBackup(name);
+            setBackupReq(name);
         },2000);
     });
 }
@@ -877,9 +901,182 @@ function importBackup(file,name){
     });
 }
 
-function setBackup(db_name,obj){
-     myPost('get_db_backup_list', {name:db_name}, function(data){
 
+function importDbExternal(file,name){
+    myPost('import_db_external',{file:file,name:name}, function(data){
+        layer.msg('执行成功!');
+    });
+}
+
+function setLocalImport(db_name){
+
+    //上传文件
+    function uploadDbFiles(upload_dir){
+        var up_db = layer.open({
+            type:1,
+            closeBtn: 1,
+            title:"上传导入文件["+upload_dir+']',
+            area: ['500px','300px'],
+            shadeClose:false,
+            content:'<div class="fileUploadDiv">\
+                    <input type="hidden" id="input-val" value="'+upload_dir+'" />\
+                    <input type="file" id="file_input"  multiple="true" autocomplete="off" />\
+                    <button type="button"  id="opt" autocomplete="off">添加文件</button>\
+                    <button type="button" id="up" autocomplete="off" >开始上传</button>\
+                    <span id="totalProgress" style="position: absolute;top: 7px;right: 147px;"></span>\
+                    <span style="float:right;margin-top: 9px;">\
+                    <font>文件编码:</font>\
+                    <select id="fileCodeing" >\
+                        <option value="byte">二进制</option>\
+                        <option value="utf-8">UTF-8</option>\
+                        <option value="gb18030">GB2312</option>\
+                    </select>\
+                    </span>\
+                    <button type="button" id="filesClose" autocomplete="off">关闭</button>\
+                    <ul id="up_box"></ul>\
+                </div>',
+            success:function(){
+                $('#filesClose').click(function(){
+                    layer.close(up_db);
+                });
+            }
+
+        });
+        uploadStart(function(){
+            getList();
+            layer.close(up_db);
+        });
+    }
+
+    function getList(){
+        myPost('get_db_backup_import_list',{}, function(data){
+            var rdata = $.parseJSON(data.data);
+
+            var file_list = rdata.data.list;
+            var upload_dir = rdata.data.upload_dir;
+
+            var tbody = '';
+            for (var i = 0; i < file_list.length; i++) {
+                tbody += '<tr>\
+                        <td><span> ' + file_list[i]['name'] + '</span></td>\
+                        <td><span> ' + file_list[i]['size'] + '</span></td>\
+                        <td><span> ' + file_list[i]['time'] + '</span></td>\
+                        <td style="text-align: right;">\
+                            <a class="btlink" onclick="importDbExternal(\'' + file_list[i]['name'] + '\',\'' +db_name+ '\')">导入</a> | \
+                            <a class="btlink del" index="'+i+'">删除</a>\
+                        </td>\
+                    </tr>';
+            }
+
+            $('#import_db_file_list').html(tbody);
+            $('input[name="upload_dir"]').val(upload_dir);
+
+            $("#import_db_file_list .del").on('click',function(){
+                var index = $(this).attr('index');
+                var filename = file_list[index]["name"];
+                myPost('delete_db_backup',{filename:filename,path:upload_dir},function(){
+                    showMsg('执行成功!', function(){
+                        getList();
+                    },{icon:1},2000);
+                });
+            });
+        });
+    }
+
+    var layerIndex = layer.open({
+        type: 1,
+        title: "从文件导入数据",
+        area: ['600px', '380px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="pd15">\
+                    <div class="db_list">\
+                        <button id="btn_file_upload" class="btn btn-success btn-sm" type="button">从本地上传</button>\
+                    </div >\
+                    <div class="divtable">\
+                    <input type="hidden" name="upload_dir" value=""> \
+                    <div id="database_fix"  style="height:150px;overflow:auto;border:#ddd 1px solid">\
+                    <table class="table table-hover "style="border:none">\
+                        <thead>\
+                            <tr>\
+                                <th>文件名称</th>\
+                                <th>文件大小</th>\
+                                <th>备份时间</th>\
+                                <th style="text-align: right;">操作</th>\
+                            </tr>\
+                        </thead>\
+                        <tbody  id="import_db_file_list" class="gztr"></tbody>\
+                    </table>\
+                    </div>\
+                    <ul class="help-info-text c7">\
+                        <li>仅支持sql、zip、sql.gz、(tar.gz|gz|tgz)</li>\
+                        <li>zip、tar.gz压缩包结构：test.zip或test.tar.gz压缩包内，必需包含test.sql</li>\
+                        <li>若文件过大，您还可以使用SFTP工具，将数据库文件上传到/www/backup/import</li>\
+                    </ul>\
+                </div>\
+        </div>',
+        success:function(index){
+            $('#btn_file_upload').click(function(){
+                var upload_dir = $('input[name="upload_dir"]').val();
+                uploadDbFiles(upload_dir);
+            });
+
+            getList();
+        },
+    });
+
+    
+}
+
+function setBackup(db_name){
+    var layerIndex = layer.open({
+        type: 1,
+        title: "数据库备份详情",
+        area: ['600px', '280px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="pd15">\
+                    <div class="db_list">\
+                        <button id="btn_backup" class="btn btn-success btn-sm" type="button">备份</button>\
+                        <button id="btn_local_import" class="btn btn-success btn-sm" type="button">外部导入</button>\
+                    </div >\
+                    <div class="divtable">\
+                    <div  id="database_fix"  style="height:150px;overflow:auto;border:#ddd 1px solid">\
+                    <table id="database_table" class="table table-hover "style="border:none">\
+                        <thead>\
+                            <tr>\
+                                <th>文件名称</th>\
+                                <th>文件大小</th>\
+                                <th>备份时间</th>\
+                                <th style="text-align: right;">操作</th>\
+                            </tr>\
+                        </thead>\
+                        <tbody class="list"></tbody>\
+                    </table>\
+                    </div>\
+                </div>\
+        </div>',
+        success:function(index){
+            $('#btn_backup').click(function(){
+                myPost('set_db_backup',{name:db_name}, function(data){
+                    showMsg('执行成功!', function(){
+                        setBackupReq(db_name);
+                    }, {icon:1}, 2000);
+                });
+            });
+
+            $('#btn_local_import').click(function(){
+                setLocalImport(db_name);
+            });
+
+            setBackupReq(db_name);
+        },
+    });
+}
+
+
+function setBackupReq(db_name, obj){
+     myPost('get_db_backup_list', {name:db_name}, function(data){
         var rdata = $.parseJSON(data.data);
         var tbody = '';
         for (var i = 0; i < rdata.data.length; i++) {
@@ -894,49 +1091,10 @@ function setBackup(db_name,obj){
                     </td>\
                 </tr> ';
         }
-
-        var s = layer.open({
-            type: 1,
-            title: "数据库备份详情",
-            area: ['600px', '280px'],
-            closeBtn: 2,
-            shadeClose: false,
-            content: '<div class="pd15">\
-                        <div class="db_list">\
-                            <button id="btn_backup" class="btn btn-success btn-sm" type="button">备份</button>\
-                        </div >\
-                        <div class="divtable">\
-                        <div  id="database_fix"  style="height:150px;overflow:auto;border:#ddd 1px solid">\
-                        <table class="table table-hover "style="border:none">\
-                            <thead>\
-                                <tr>\
-                                    <th>文件名称</th>\
-                                    <th>文件大小</th>\
-                                    <th>备份时间</th>\
-                                    <th style="text-align: right;">操作</th>\
-                                </tr>\
-                            </thead>\
-                            <tbody class="gztr">' + tbody + '</tbody>\
-                        </table>\
-                        </div>\
-                    </div>\
-            </div>'
-        });
-
-        $('#btn_backup').click(function(){
-            myPost('set_db_backup',{name:db_name}, function(data){
-                layer.msg('执行成功!');
-
-                setTimeout(function(){
-                    layer.close(s);
-                    setBackup(db_name,obj);
-                },2000);
-            });
-        });
+        $('#database_table tbody').html(tbody);
     });
 }
 
-
 function dbList(page, search){
     var _data = {};
     if (typeof(page) =='undefined'){
@@ -968,9 +1126,28 @@ function dbList(page, search){
 
             list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\',this)" title="数据库备份">'+(rdata.data[i]['is_backup']?'备份':'未备份') +'</a> | ';
 
+            var rw = '';
+            var rw_change = 'all';
+            if (typeof(rdata.data[i]['rw'])!='undefined'){
+                var rw_val = '读写';
+                if (rdata.data[i]['rw'] == 'all'){
+                    rw_val = "所有";
+                    rw_change = 'rw';
+                } else if (rdata.data[i]['rw'] == 'rw'){
+                    rw_val = "读写";
+                    rw_change = 'r';
+                } else if (rdata.data[i]['rw'] == 'r'){
+                    rw_val = "只读";
+                    rw_change = 'all';
+                }
+                rw = '<a href="javascript:;" class="btlink" onclick="setDbRw(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['name']+'\',\''+rw_change+'\')" title="设置读写">'+rw_val+'</a> | ';
+            }
+
+
             list += '<a href="javascript:;" class="btlink" onclick="openPhpmyadmin(\''+rdata.data[i]['name']+'\',\''+rdata.data[i]['username']+'\',\''+rdata.data[i]['password']+'\')" title="数据库管理">管理</a> | ' +
                         '<a href="javascript:;" class="btlink" onclick="repTools(\''+rdata.data[i]['name']+'\')" title="MySQL优化修复工具">工具</a> | ' +
                         '<a href="javascript:;" class="btlink" onclick="setDbAccess(\''+rdata.data[i]['username']+'\')" title="设置数据库权限">权限</a> | ' +
+                        rw +
                         '<a href="javascript:;" class="btlink" onclick="setDbPass('+rdata.data[i]['id']+',\''+ rdata.data[i]['username'] +'\',\'' + rdata.data[i]['password'] + '\')">改密</a> | ' +
                         '<a href="javascript:;" class="btlink" onclick="delDb(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['name']+'\')" title="删除数据库">删除</a>' +
                     '</td>';
@@ -983,6 +1160,7 @@ function dbList(page, search){
             <button onclick="setRootPwd(0,\''+rdata.info['root_pwd']+'\')" title="设置MySQL管理员密码" class="btn btn-default btn-sm" type="button" style="margin-right: 5px;">root密码</button>\
             <button onclick="openPhpmyadmin(\'\',\'root\',\''+rdata.info['root_pwd']+'\')" title="打开phpMyadmin" class="btn btn-default btn-sm" type="button" style="margin-right: 5px;">phpMyAdmin</button>\
             <button onclick="setDbAccess(\'root\')" title="ROOT权限" class="btn btn-default btn-sm" type="button" style="margin-right: 5px;">ROOT权限</button>\
+            <button onclick="fixDbAccess(\'root\')" title="修复" class="btn btn-default btn-sm" type="button" style="margin-right: 5px;">修复</button>\
             <span style="float:right">              \
                 <button batch="true" style="float: right;display: none;margin-left:10px;" onclick="delDbBatch();" title="删除选中项" class="btn btn-default btn-sm">删除选中</button>\
             </span>\
@@ -1001,8 +1179,8 @@ function dbList(page, search){
                     '+ list +'\
                     </tbody></table>\
                 </div>\
-                 <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
-                <div class="table_toolbar">\
+                <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
+                <div class="table_toolbar" style="left:0px;">\
                     <span class="sync btn btn-default btn-sm" style="margin-right:5px" onclick="syncToDatabase(1)" title="将选中数据库信息同步到服务器">同步选中</span>\
                     <span class="sync btn btn-default btn-sm" style="margin-right:5px" onclick="syncToDatabase(0)" title="将所有数据库信息同步到服务器">同步所有</span>\
                     <span class="sync btn btn-default btn-sm" onclick="syncGetDatabase()" title="从服务器获取数据库列表">从服务器获取</span>\
@@ -1031,12 +1209,20 @@ function myLogs(){
     myPost('bin_log', {status:1}, function(data){
         var rdata = $.parseJSON(data.data);
 
+        var line_status = ""
+        if (rdata.status){
+            line_status = '<button class="btn btn-success btn-xs btn-bin va0">关闭</button>\
+                        <button class="btn btn-success btn-xs clean-btn-bin va0">清理BINLOG日志</button>';
+        } else {
+            line_status = '<button class="btn btn-success btn-xs btn-bin va0">开启</button>';
+        }
+
         var limitCon = '<p class="conf_p">\
                         <span class="f14 c6 mr20">二进制日志 </span><span class="f14 c6 mr20">' + toSize(rdata.msg) + '</span>\
-                        <button class="btn btn-success btn-xs btn-bin va0">'+ (rdata.status ? lan.soft.off : lan.soft.on) + '</button>\
-                        <p class="f14 c6 mtb10" style="border-top:#ddd 1px solid; padding:10px 0">错误日志<button class="btn btn-default btn-clear btn-xs" style="float:right;" >清空</button></p>\
+                        '+line_status+'\
+                        <p class="f14 c6 mtb10" style="border-top:#ddd 1px solid; padding:10px 0">错误日志<button class="btn btn-default btn-clear btn-xs" style="float:right;" >清理日志</button></p>\
                         <textarea readonly style="margin: 0px;width: 100%;height: 440px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
-                    </p>'
+                    </p>';
         $(".soft-man-con").html(limitCon);
 
         //设置二进制日志
@@ -1044,10 +1230,15 @@ function myLogs(){
             myPost('bin_log', 'close=change', function(data){
                 var rdata = $.parseJSON(data.data);
                 layer.msg(rdata.msg, { icon: rdata.status ? 1 : 5 });
-            
-                setTimeout(function(){
-                    myLogs();
-                }, 2000);
+                setTimeout(function(){myLogs();}, 2000);
+            });
+        });
+
+        $(".clean-btn-bin").click(function () {
+            myPost('clean_bin_log', '', function(data){
+                var rdata = $.parseJSON(data.data);
+                layer.msg(rdata.msg, { icon: rdata.status ? 1 : 5 });
+                setTimeout(function(){myLogs();}, 2000);
             });
         });
 
@@ -1056,10 +1247,7 @@ function myLogs(){
             myPost('error_log', 'close=1', function(data){
                 var rdata = $.parseJSON(data.data);
                 layer.msg(rdata.msg, { icon: rdata.status ? 1 : 5 });
-            
-                setTimeout(function(){
-                    myLogs();
-                }, 2000);
+                setTimeout(function(){myLogs();}, 2000);
             });
         })
 
@@ -1071,7 +1259,7 @@ function myLogs(){
             } else {
                 error_body = rdata.msg;
             }
-            $("#error_log").text(error_body);
+            $("#error_log").html(error_body);
             var ob = document.getElementById('error_log');
             ob.scrollTop = ob.scrollHeight;
         });
@@ -1183,7 +1371,7 @@ function repTools(db_name, res){
             type: 1,
             title: "MySQL工具箱【" + db_name + "】",
             area: ['780px', '580px'],
-            closeBtn: 2,
+            closeBtn: 1,
             shadeClose: false,
             content: '<div class="pd15">\
                             <div class="db_list">\
@@ -1243,88 +1431,65 @@ function setDbSlave(name){
 
 
 function addMasterRepSlaveUser(){
-
-        
-    var index = layer.open({
+    layer.open({
         type: 1,
-        skin: 'demo-class',
         area: '500px',
         title: '添加同步账户',
         closeBtn: 1,
         shift: 5,
         shadeClose: true,
-        content: "<form class='bt-form pd20 pb70' id='add_master'>\
+        btn:["提交","取消"],
+        content: "<form class='bt-form pd20' id='add_master'>\
             <div class='line'><span class='tname'>用户名</span><div class='info-r'><input name='username' class='bt-input-text mr5' placeholder='用户名' type='text' style='width:330px;' value='"+(randomStrPwd(6))+"'></div></div>\
             <div class='line'>\
             <span class='tname'>密码</span>\
             <div class='info-r'><input class='bt-input-text mr5' type='text' name='password' id='MyPassword' style='width:330px' value='"+(randomStrPwd(16))+"' /><span title='随机密码' class='glyphicon glyphicon-repeat cursor' onclick='repeatPwd(16)'></span></div>\
             </div>\
             <input type='hidden' name='ps' value='' />\
-            <div class='bt-form-submit-btn'>\
-                <button id='my_mod_close' type='button' class='btn btn-danger btn-sm btn-title'>关闭</button>\
-                <button type='button' class='btn btn-success btn-sm btn-title' id='submit_add_master' >提交</button>\
-            </div>\
           </form>",
-    });
-
-    // <div class='line'>\
-    //             <span class='tname'>访问权限</span>\
-    //             <div class='info-r '>\
-    //                 <select class='bt-input-text mr5' name='dataAccess' style='width:100px'>\
-    //                 <option value='127.0.0.1'>本地服务器</option>\
-    //                 <option value=\"%\">所有人</option>\
-    //                 <option value='ip'>指定IP</option>\
-    //                 </select>\
-    //             </div>\
-    //         </div>\
-
-    $("input[name='name']").keyup(function(){
-        var v = $(this).val();
-        $("input[name='db_user']").val(v);
-        $("input[name='ps']").val(v);
-    });
-
-    $('#my_mod_close').click(function(){
-        $('.layui-layer-close1').click();
-    });
-    $('select[name="dataAccess"]').change(function(){
-        var v = $(this).val();
-        if (v == 'ip'){
-            $(this).after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
-        } else {
-            $('#dataAccess_subid').remove();
-        }
-    });
+        success:function(){
+            $("input[name='name']").keyup(function(){
+                var v = $(this).val();
+                $("input[name='db_user']").val(v);
+                $("input[name='ps']").val(v);
+            });
 
-    $('#submit_add_master').click(function(){
+            $('select[name="dataAccess"]').change(function(){
+                var v = $(this).val();
+                if (v == 'ip'){
+                    $(this).after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
+                } else {
+                    $('#dataAccess_subid').remove();
+                }
+            });
+        },
+        yes:function(index){
+            var data = $("#add_master").serialize();
+            data = decodeURIComponent(data);
+            var dataObj = toArrayObject(data);
+            if(!dataObj['address']){
+                dataObj['address'] = dataObj['dataAccess'];
+            }
 
-        var data = $("#add_master").serialize();
-        data = decodeURIComponent(data);
-        var dataObj = str2Obj(data);
-        if(!dataObj['address']){
-            dataObj['address'] = dataObj['dataAccess'];
+            myPost('add_master_rep_slave_user', dataObj, function(data){
+                var rdata = $.parseJSON(data.data);
+                showMsg(rdata.msg,function(){
+                    layer.close(index);
+                    if (rdata.status){
+                        getMasterRepSlaveList();
+                    }
+                },{icon: rdata.status ? 1 : 2},600);
+            });
         }
-        // console.log(dataObj);
-        myPost('add_master_rep_slave_user', dataObj, function(data){
-            var rdata = $.parseJSON(data.data);
-            showMsg(rdata.msg,function(){
-                if (rdata.status){
-                    getMasterRepSlaveList();
-                }
-                $('.layui-layer-close1').click();
-            },{icon: rdata.status ? 1 : 2},600);
-        });
     });
 }
 
 
 
 function updateMasterRepSlaveUser(username){
-
-        
+  
     var index = layer.open({
         type: 1,
-        skin: 'demo-class',
         area: '500px',
         title: '更新账户',
         closeBtn: 1,
@@ -1346,8 +1511,7 @@ function updateMasterRepSlaveUser(username){
     $('#submit_update_master').click(function(){
         var data = $("#update_master").serialize();
         data = decodeURIComponent(data);
-        var dataObj = str2Obj(data);
-        // console.log(dataObj);
+        var dataObj = toArrayObject(data);
         myPost('update_master_rep_slave_user', data, function(data){
             var rdata = $.parseJSON(data.data);
             showMsg(rdata.msg,function(){
@@ -1369,22 +1533,24 @@ function getMasterRepSlaveUserCmd(username, db=''){
             return;
         }
 
-
+        var cmd = rdata.data['cmd'];
+        
         var loadOpen = layer.open({
             type: 1,
             title: '同步命令',
             area: '500px',
             content:"<form class='bt-form pd20 pb70' id='add_master'>\
-            <div class='line'>"+rdata.data+"</div>\
+            <div class='line'>"+cmd+"</div>\
             <div class='bt-form-submit-btn'>\
                 <button type='button' class='btn btn-success btn-sm btn-title class-copy-cmd'>复制</button>\
             </div>\
           </form>",
         });
 
-        copyPass(rdata.data);
+       
+        copyPass(cmd);
         $('.class-copy-cmd').click(function(){
-            copyPass(rdata.data);
+            copyPass(cmd);
         });
     });
 }
@@ -1402,6 +1568,84 @@ function delMasterRepSlaveUser(username){
     });
 }
 
+
+function setDbMasterAccess(username){
+    myPost('get_db_access','username='+username, function(data){
+        var rdata = $.parseJSON(data.data);
+        if (!rdata.status){
+            layer.msg(rdata.msg,{icon:2,shade: [0.3, '#000']});
+            return;
+        }
+        
+        var index = layer.open({
+            type: 1,
+            area: '500px',
+            title: '设置数据库权限',
+            closeBtn: 1,
+            shift: 5,
+            btn:["提交","取消"],
+            shadeClose: true,
+            content: "<form class='bt-form pd20' id='set_db_access'>\
+                        <div class='line'>\
+                            <span class='tname'>访问权限</span>\
+                            <div class='info-r '>\
+                                <select class='bt-input-text mr5' name='dataAccess' style='width:100px'>\
+                                <option value='127.0.0.1'>本地服务器</option>\
+                                <option value=\"%\">所有人</option>\
+                                <option value='ip'>指定IP</option>\
+                                </select>\
+                            </div>\
+                        </div>\
+                      </form>",
+            success:function(){
+                if (rdata.msg == '127.0.0.1'){
+                    $('select[name="dataAccess"]').find("option[value='127.0.0.1']").attr("selected",true);
+                } else if (rdata.msg == '%'){
+                    $('select[name="dataAccess"]').find('option[value="%"]').attr("selected",true);
+                } else if ( rdata.msg == 'ip' ){
+                    $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
+                    $('select[name="dataAccess"]').after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
+                } else {
+                    $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
+                    $('select[name="dataAccess"]').after("<input value='"+rdata.msg+"' id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
+                }
+
+                 $('select[name="dataAccess"]').change(function(){
+                    var v = $(this).val();
+                    if (v == 'ip'){
+                        $(this).after("<input id='dataAccess_subid' class='bt-input-text mr5' type='text' name='address' placeholder='多个IP使用逗号(,)分隔' style='width: 230px; display: inline-block;'>");
+                    } else {
+                        $('#dataAccess_subid').remove();
+                    }
+                });
+            },
+            yes:function(index){
+                var data = $("#set_db_access").serialize();
+                data = decodeURIComponent(data);
+                var dataObj = toArrayObject(data);
+                if(!dataObj['access']){
+                    dataObj['access'] = dataObj['dataAccess'];
+                    if ( dataObj['dataAccess'] == 'ip'){
+                        if (dataObj['address']==''){
+                            layer.msg('IP地址不能空!',{icon:2,shade: [0.3, '#000']});
+                            return;
+                        }
+                        dataObj['access'] = dataObj['address'];
+                    }
+                }
+                dataObj['username'] = username;
+                myPost('set_dbmaster_access', dataObj, function(data){
+                    var rdata = $.parseJSON(data.data);
+                    showMsg(rdata.msg,function(){
+                        layer.close(index);
+                    },{icon: rdata.status ? 1 : 2});   
+                });
+            }
+        });
+
+    });
+}
+
 function getMasterRepSlaveList(){
     var _data = {};
     if (typeof(page) =='undefined'){
@@ -1429,30 +1673,37 @@ function getMasterRepSlaveList(){
                 <td>\
                     <a class="btlink" onclick="updateMasterRepSlaveUser(\''+name+'\');">修改</a> | \
                     <a class="btlink" onclick="delMasterRepSlaveUser(\''+name+'\');">删除</a> | \
+                    <a class="btlink" onclick="setDbMasterAccess(\''+name+'\');">权限</a> | \
                     <a class="btlink" onclick="getMasterRepSlaveUserCmd(\''+name+'\');">从库同步命令</a>\
                 </td>\
             </tr>';
         }
 
-        var page = '<div class="dataTables_paginate_4 dataTables_paginate paging_bootstrap page" style="margin-top:0px;"></div>';
-        page += '<div class="table_toolbar"><span class="sync btn btn-default btn-sm" onclick="addMasterRepSlaveUser()" title="">添加同步账户</span></div>';
+        $('#get_master_rep_slave_list_page tbody').html(list);
+        $('.dataTables_paginate_4').html(rdata['page']);
+    });
+}
 
-        var loadOpen = layer.open({
-            type: 1,
-            title: '同步账户列表',
-            area: '500px',
-            content:"<div class='bt-form pd20 c6'>\
-                     <div class='divtable mtb10'>\
-                        <div><table class='table table-hover'>\
-                            <thead><tr><th>用户民</th><th>密码</th><th>操作</th></tr></thead>\
-                            <tbody>" + list + "</tbody>\
-                        </table></div>\
-                        "+page +"\
-                    </div>\
-                </div>"
-        });
+function getMasterRepSlaveListPage(){
+    var page = '<div class="dataTables_paginate_4 dataTables_paginate paging_bootstrap page" style="margin-top:0px;"></div>';
+        page += '<div class="table_toolbar" style="left:0px;"><span class="sync btn btn-default btn-sm" onclick="addMasterRepSlaveUser()" title="">添加同步账户</span></div>';
 
-        $('.dataTables_paginate_4').html(rdata['page']);
+    var loadOpen = layer.open({
+        type: 1,
+        title: '同步账户列表',
+        area: '500px',
+        content:"<div class='bt-form pd20 c6'>\
+                 <div class='divtable mtb10' id='get_master_rep_slave_list_page'>\
+                    <div><table class='table table-hover'>\
+                        <thead><tr><th>用户名</th><th>密码</th><th>操作</th></tr></thead>\
+                        <tbody></tbody>\
+                    </table></div>\
+                    "+page +"\
+                </div>\
+            </div>",
+        success:function(){
+            getMasterRepSlaveList();
+        }
     });
 }
 
@@ -1460,18 +1711,17 @@ function getMasterRepSlaveList(){
 function deleteSlave(){
     myPost('delete_slave', {}, function(data){
         var rdata = $.parseJSON(data.data);
-        layer.msg(rdata['msg']);
-        setTimeout(function(){
+        showMsg(rdata['msg'], function(){
             masterOrSlaveConf();
-        }, 3000);
-
+        },{},3000);
     });
 }
 
 
 function getFullSyncStatus(db){
+    var timeId = null;
 
-    var btn = '<div class="table_toolbar"><span class="sync btn btn-default btn-sm" id="begin_full_sync" title="">开始</span></div>';
+    var btn = '<div class="table_toolbar" style="left:0px;"><span data-status="init" class="sync btn btn-default btn-sm" id="begin_full_sync" title="">开始</span></div>';
     var loadOpen = layer.open({
         type: 1,
         title: '全量同步['+db+']',
@@ -1484,13 +1734,12 @@ function getFullSyncStatus(db){
                     </div>\
                 </div>\
                 "+btn+"\
-            </div>"
+            </div>",
+        cancel: function(){ 
+            clearInterval(timeId);
+        }
     });
 
-    var timeId = setInterval(function(){
-        fullSync(db,0);
-    }, 1000);
-
     function fullSync(db,begin){
        
         myPostN('full_sync', {db:db,begin:begin}, function(data){
@@ -1502,40 +1751,194 @@ function getFullSyncStatus(db){
             if (rdata['code']==6 ||rdata['code']<0){
                 layer.msg(rdata['msg']);
                 clearInterval(timeId);
+                $("#begin_full_sync").attr('data-status','init');
             }
         });
     }
 
-    fullSync(db,0);
     $('#begin_full_sync').click(function(){
-        fullSync(db,1);
+        var val = $(this).attr('data-status');
+        if (val == 'init'){
+            fullSync(db,1);
+            timeId = setInterval(function(){
+                fullSync(db,0);
+            }, 1000);
+            $(this).attr('data-status','starting');
+        } else {
+            layer.msg("正在同步中..");
+        }
+    });
+}
+
+function addSlaveSSH(ip=''){
+
+    myPost('get_slave_ssh_by_ip', {ip:ip}, function(rdata){
+        
+        var rdata = $.parseJSON(rdata.data);
+
+        var ip = '127.0.0.1';
+        var port = "22";
+        var id_rsa = '';
+        var db_user ='';
+
+        if (rdata.data.length>0){
+            ip = rdata.data[0]['ip'];
+            port = rdata.data[0]['port'];
+            id_rsa = rdata.data[0]['id_rsa'];
+            db_user = rdata.data[0]['db_user'];
+        }
 
-        timeId= setTimeout(function(){
-            fullSync(db,0);
-        }, 1000);
+        var index = layer.open({
+            type: 1,
+            area: ['500px','480px'],
+            title: '添加SSH',
+            closeBtn: 1,
+            shift: 5,
+            shadeClose: true,
+            btn:["确认","取消"],
+            content: "<form class='bt-form pd20'>\
+                <div class='line'><span class='tname'>IP</span><div class='info-r'><input name='ip' class='bt-input-text mr5' type='text' style='width:330px;' value='"+ip+"'></div></div>\
+                <div class='line'><span class='tname'>端口</span><div class='info-r'><input name='port' class='bt-input-text mr5' type='number' style='width:330px;' value='"+port+"'></div></div>\
+                <div class='line'><span class='tname'>同步账户[DB]</span><div class='info-r'><input name='db_user'  placeholder='为空则取第一个!' class='bt-input-text mr5' type='text' style='width:330px;' value='"+db_user+"'></div></div>\
+                <div class='line'>\
+                <span class='tname'>ID_RSA</span>\
+                <div class='info-r'><textarea class='bt-input-text mr5' row='20' cols='50' name='id_rsa' style='width:330px;height:200px;'></textarea></div>\
+                </div>\
+                <input type='hidden' name='ps' value='' />\
+              </form>",
+            success:function(){
+                $('textarea[name="id_rsa"]').html(id_rsa);
+            },
+            yes:function(index){
+                var ip = $('input[name="ip"]').val();
+                var port = $('input[name="port"]').val();
+                var db_user = $('input[name="db_user"]').val();
+                var id_rsa = $('textarea[name="id_rsa"]').val();
+
+                var data = {ip:ip,port:port,id_rsa:id_rsa,db_user:db_user};
+                myPost('add_slave_ssh', data, function(data){
+                    layer.close(index);
+                    var rdata = $.parseJSON(data.data);
+                    showMsg(rdata.msg,function(){
+                        if (rdata.status){
+                            getSlaveSSHPage();
+                        }
+                    },{icon: rdata.status ? 1 : 2},600);
+                });
+            }
+        });
     });
+}
+
 
-    $('.layui-layer-close1').click(function(){
-        clearInterval(timeId);
+function delSlaveSSH(ip){
+    myPost('del_slave_ssh', {ip:ip}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        layer.msg(rdata.msg, {icon: rdata.status ? 1 : 2});
+        getSlaveSSHPage();
     });
 }
 
-function handlerRun(){
-    cmd = 'cd /www/server/mdserver-web && python /www/server/mdserver-web/plugins/mysql/index.py do_full_sync {"db":"all"}';
-    var loadOpen = layer.open({
+function getSlaveSSHPage(page=1){
+    var _data = {};    
+    _data['page'] = page;
+    _data['page_size'] = 5;
+    _data['tojs'] ='getSlaveSSHPage';
+    myPost('get_slave_ssh_list', _data, function(data){
+        var layerId = null;
+        var rdata = [];
+        try {
+            rdata = $.parseJSON(data.data);
+        } catch(e) {
+            console.log(e);
+        }
+        var list = '';
+        var ssh_list = rdata['data'];
+        for (i in ssh_list) {
+            var ip = ssh_list[i]['ip'];
+            var port = ssh_list[i]['port'];
+
+            var id_rsa = '未设置';
+            if ( ssh_list[i]['port'] != ''){
+                id_rsa = '已设置';
+            }
+
+            var db_user = '未设置';
+            if ( ssh_list[i]['db_user'] != ''){
+                db_user = ssh_list[i]['db_user'];
+            }
+
+            list += '<tr><td>'+ip+'</td>\
+                <td>'+port+'</td>\
+                <td>'+db_user+'</td>\
+                <td>'+id_rsa+'</td>\
+                <td>\
+                    <a class="btlink" onclick="addSlaveSSH(\''+ip+'\');">修改</a> | \
+                    <a class="btlink" onclick="delSlaveSSH(\''+ip+'\');">删除</a>\
+                </td>\
+            </tr>';
+        }
+
+        $('.get-slave-ssh-list tbody').html(list);
+        $('.dataTables_paginate_4').html(rdata['page']);
+    });
+}
+
+
+function getSlaveSSHList(page=1){
+
+    var page = '<div class="dataTables_paginate_4 dataTables_paginate paging_bootstrap page" style="margin-top:0px;"></div>';
+    page += '<div class="table_toolbar" style="left:0px;"><span class="sync btn btn-default btn-sm" onclick="addSlaveSSH()" title="">添加SSH</span></div>';
+
+    layerId = layer.open({
         type: 1,
-        title: '手动执行',
+        title: 'SSH列表',
         area: '500px',
-        content:"<form class='bt-form pd20 pb70' id='add_master'>\
-        <div class='line'>"+cmd+"</div>\
-        <div class='bt-form-submit-btn'>\
-            <button type='button' class='btn btn-success btn-sm btn-title class-copy-cmd'>复制</button>\
-        </div>\
-      </form>",
+        content:"<div class='bt-form pd20 c6'>\
+                 <div class='divtable mtb10'>\
+                    <div><table class='table table-hover get-slave-ssh-list'>\
+                        <thead><tr><th>IP</th><th>PORT</th><th>同步账户</th><th>SSH</th><th>操作</th></tr></thead>\
+                        <tbody></tbody>\
+                    </table></div>\
+                    "+page +"\
+                </div>\
+            </div>",
+        success:function(){
+            getSlaveSSHPage(1);
+        }
     });
-    copyPass(cmd);
-    $('.class-copy-cmd').click(function(){
+}
+
+function handlerRun(){
+    myPostN('get_slave_sync_cmd', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        var cmd = rdata['data'];
+        var loadOpen = layer.open({
+            type: 1,
+            title: '手动执行',
+            area: '500px',
+            content:"<form class='bt-form pd20 pb70' id='add_master'>\
+            <div class='line'>"+cmd+"</div>\
+            <div class='bt-form-submit-btn'>\
+                <button type='button' class='btn btn-success btn-sm btn-title class-copy-cmd'>复制</button>\
+            </div>\
+          </form>",
+        });
         copyPass(cmd);
+        $('.class-copy-cmd').click(function(){
+            copyPass(cmd);
+        });
+    });
+}
+
+function initSlaveStatus(){
+    myPost('init_slave_status', '', function(data){
+        var rdata = $.parseJSON(data.data);
+        showMsg(rdata.msg,function(){
+            if (rdata.status){
+                masterOrSlaveConf();
+            }
+        },{icon:rdata.status?1:2},2000);
     });
 }
 
@@ -1576,8 +1979,8 @@ function masterOrSlaveConf(version=''){
                         </tbody></table>\
                     </div>\
                     <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
-                    <div class="table_toolbar">\
-                        <span class="sync btn btn-default btn-sm" onclick="getMasterRepSlaveList()" title="">同步账户列表</span>\
+                    <div class="table_toolbar" style="left:0px;">\
+                        <span class="sync btn btn-default btn-sm" onclick="getMasterRepSlaveListPage()" title="">同步账户列表</span>\
                     </div>\
                 </div>';
 
@@ -1599,6 +2002,13 @@ function masterOrSlaveConf(version=''){
             var rdata = $.parseJSON(data.data);
             var list = '';
             for(i in rdata.data){
+
+                var v = rdata.data[i];
+                var status = "异常";
+                if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){
+                    status = "正常";
+                }
+
                 list += '<tr>';
                 list += '<td>' + rdata.data[i]['Master_Host'] +'</td>';
                 list += '<td>' + rdata.data[i]['Master_Port'] +'</td>';
@@ -1606,6 +2016,7 @@ function masterOrSlaveConf(version=''){
                 list += '<td>' + rdata.data[i]['Master_Log_File'] +'</td>';
                 list += '<td>' + rdata.data[i]['Slave_IO_Running'] +'</td>';
                 list += '<td>' + rdata.data[i]['Slave_SQL_Running'] +'</td>';
+                list += '<td>' + status +'</td>';
                 list += '<td style="text-align:right">' + 
                     '<a href="javascript:;" class="btlink" onclick="deleteSlave()" title="删除">删除</a>' +
                 '</td>';
@@ -1622,6 +2033,7 @@ function masterOrSlaveConf(version=''){
                         <th>日志</th>\
                         <th>IO</th>\
                         <th>SQL</th>\
+                        <th>状态</th>\
                         <th style="text-align:right;">操作</th></tr></thead>\
                         <tbody>\
                         '+ list +'\
@@ -1653,7 +2065,7 @@ function masterOrSlaveConf(version=''){
                 list += '<td>' + rdata.data[i]['name'] +'</td>';
                 list += '<td style="text-align:right">' + 
                     '<a href="javascript:;" class="btlink" onclick="setDbSlave(\''+rdata.data[i]['name']+'\')"  title="加入|退出">'+(rdata.data[i]['slave']?'退出':'加入')+'</a> | ' +
-                    '<a href="javascript:;" class="btlink" onclick="getFullSyncStatus(\''+rdata.data[i]['name']+'\')" title="修复">修复</a>' +
+                    '<a href="javascript:;" class="btlink" onclick="getFullSyncStatus(\''+rdata.data[i]['name']+'\')" title="同步">同步</a>' +
                 '</td>';
                 list += '</tr>';
             }
@@ -1669,7 +2081,7 @@ function masterOrSlaveConf(version=''){
                         </tbody></table>\
                     </div>\
                     <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
-                    <div class="table_toolbar">\
+                    <div class="table_toolbar" style="left:0px;">\
                         <span class="sync btn btn-default btn-sm" onclick="handlerRun()" title="免登录设置后,需要手动执行一下!">手动命令</span>\
                         <span class="sync btn btn-default btn-sm" onclick="getFullSyncStatus(\'ALL\')" title="全量同步">全量同步</span>\
                     </div>\
@@ -1680,20 +2092,41 @@ function masterOrSlaveConf(version=''){
         });
     }
 
+   
+
     function getMasterStatus(){
-        myPost('get_master_status', '', function(data){
-            var rdata = $.parseJSON(data.data);
-            var limitCon = '<p class="conf_p">\
+        myPost('get_master_status', '', function(rdata){
+            var rdata = $.parseJSON(rdata.data);
+            // console.log('mode:',rdata.data);
+            if ( typeof(rdata.status) != 'undefined' && !rdata.status && rdata.data == 'pwd'){
+                layer.msg(rdata.msg, {icon:2});
+                return;
+            }
+
+            var rdata = rdata.data;
+            var limitCon = '\
+                <p class="conf_p">\
+                    <span class="f14 c6 mr20">主从同步模式</span><span class="f14 c6 mr20"></span>\
+                    <button class="btn '+(!(rdata.mode == "classic") ? 'btn-danger' : 'btn-success')+' btn-xs db-mode btn-classic">经典</button>\
+                    <button class="btn '+(!(rdata.mode == "gtid") ? 'btn-danger' : 'btn-success')+' btn-xs db-mode btn-gtid">GTID</button>\
+                </p>\
+                <hr/>\
+                <p class="conf_p">\
                     <span class="f14 c6 mr20">Master[主]配置</span><span class="f14 c6 mr20"></span>\
-                    <button class="btn '+(!rdata.status ? 'btn-danger' : 'btn-success')+' btn-xs btn-master va0">'+(!rdata.status ? '未开启' : '已开启') +'</button><hr/>\
+                    <button class="btn '+(!rdata.status ? 'btn-danger' : 'btn-success')+' btn-xs btn-master">'+(!rdata.status ? '未开启' : '已开启') +'</button>\
                 </p>\
+                <hr/>\
                 <!-- master list -->\
                 <div class="safe bgw table_master_list"></div>\
                 <hr/>\
+                <!-- class="conf_p" -->\
                 <p class="conf_p">\
                     <span class="f14 c6 mr20">Slave[从]配置</span><span class="f14 c6 mr20"></span>\
-                    <button class="btn '+(!rdata.data.slave_status ? 'btn-danger' : 'btn-success')+' btn-xs btn-slave va0">'+(!rdata.data.slave_status ? '未启动' : '已启动') +'</button><hr/>\
+                    <button class="btn '+(!rdata.slave_status ? 'btn-danger' : 'btn-success')+' btn-xs btn-slave">'+(!rdata.slave_status ? '未启动' : '已启动') +'</button>\
+                    <button class="btn btn-success btn-xs" onclick="getSlaveSSHList()" >[主]SSH配置</button>\
+                    <button class="btn btn-success btn-xs" onclick="initSlaveStatus()" >初始化</button>\
                 </p>\
+                <hr/>\
                 <!-- slave status list -->\
                 <div class="safe bgw table_slave_status_list"></div>\
                 <!-- slave list -->\
@@ -1722,11 +2155,49 @@ function masterOrSlaveConf(version=''){
                 });
             });
 
+            $('.db-mode').click(function(){
+                if ($(this).hasClass('btn-success')){
+                    //no action
+                    return;
+                }
+
+                var mode = 'classic';
+                if ($(this).hasClass('btn-gtid')){
+                    mode = 'gtid';
+                }
+
+                layer.open({
+                    type:1,
+                    title:"MySQL主从模式切换",
+                    shadeClose:false,
+                    btnAlign: 'c',
+                    btn: ['切换并重启', '切换不重启'],
+                    yes: function(index, layero){
+                        this.change(index,mode,"yes");
+
+                    },
+                    btn2: function(index, layero){
+                        this.change(index,mode,"no");
+                        return false;
+                    },
+                    change:function(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);
+                            showMsg(rdata.msg ,function(){
+                                getMasterStatus();
+                            },{ icon: rdata.status ? 1 : 5 });
+                        });
+                    }
+                });
+            });
+
             if (rdata.status){
                 getMasterDbList();
             }
             
-            if (rdata.data.slave_status){
+            if (rdata.slave_status){
                 getAsyncMasterDbList();
                 getAsyncDataList()
             }