up

plugins/mysql/index.py

@@ -1696,7 +1696,11 @@ def getMasterRepSlaveUserCmd(version):
             "', SOURCE_LOG_FILE='" + mstatus[0]["File"] + \
             "',SOURCE_LOG_POS=" + str(mstatus[0]["Position"])
 
-    return mw.returnJson(True, clist[0], sql)
+    data = {}
+    data['cmd'] = sql
+    data["info"] = clist[0]
+
+    return mw.returnJson(True, 'ok!', data)
 
 
 def delMasterRepSlaveUser(version=''):
@@ -2063,7 +2067,7 @@ def doFullSync():
     writeDbSyncStatus({'code': 3, 'msg': '停止从库完成...', 'progress': 45})
 
     print(cmd_data)
-    dlist = db.query(cmd_data['data'])
+    dlist = db.query(cmd_data['data']['cmd'])
     writeDbSyncStatus({'code': 4, 'msg': '刷新从库同步信息完成...', 'progress': 50})
 
     pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
@@ -2079,8 +2083,9 @@ def doFullSync():
     else:
         writeDbSyncStatus({'code': 5, 'msg': '导入数据失败...', 'progress': 90})
         return 'fail'
-
+    uinfo = cmd_data['data']['info']
-    db.query('start slave')
+    db.query("start slave user='{}' password='{}';".format(
+        uinfo['username'], uinfo['password']))
     writeDbSyncStatus({'code': 6, 'msg': '从库重启完成...', 'progress': 100})
 
     os.system("rm -rf " + SSH_PRIVATE_KEY)

plugins/mysql/js/mysql.js

@@ -1376,22 +1376,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);
         });
     });
 }
@@ -1652,7 +1654,7 @@ function getSlaveSSHList(page=1){
 function handlerRun(){
     myPostN('get_slave_sync_cmd', {}, function(data){
         var rdata = $.parseJSON(data.data);
-        var cmd = rdata.data;
+        var cmd = rdata['data'];
         var loadOpen = layer.open({
             type: 1,
             title: '手动执行',
@@ -1840,7 +1842,6 @@ function masterOrSlaveConf(version=''){
             var limitCon = '\
                 <p class="conf_p">\
                     <span class="f14 c6 mr20">运行模式</span><span class="f14 c6 mr20"></span>\
-                    <button class="btn '+(!rdata.status ? 'btn-danger' : 'btn-success')+' btn-xs">'+(!rdata.status ? '未开启' : '已开启') +'</button>\
                     <button class="btn '+(!rdata.status ? 'btn-danger' : 'btn-success')+' btn-xs">经典</button>\
                     <button class="btn '+(!rdata.status ? 'btn-danger' : 'btn-success')+' btn-xs">GTID</button>\
                 </p>\