diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 0fb50dd9e..d64c874bc 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -1493,6 +1493,10 @@ def dumpMysqlData(version): if not data[0]: return data[1] + dlist = findBinlogDoDb() + if not args['db'] in dlist: + return 'fail' + pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root') # print getServerDir() @@ -1511,21 +1515,27 @@ def fullSync(version=''): if not data[0]: return data[1] - import paramiko - paramiko.util.log_to_file('paramiko.log') - ssh = paramiko.SSHClient() - - SSH_PRIVATE_KEY = '/Users/midoks/.ssh/id_rsa' - key = paramiko.RSAKey.from_private_key_file(SSH_PRIVATE_KEY) - ssh.load_system_host_keys() - ssh.connect(hostname='8.210.55.220', port=22, username='root', pkey=key) - cmd = "/www/server/mdserver-web/plugins/mysql/index.py dump_mysql_data {\"db\":'" + args[ - 'db'] + "'} " - stdin, stdout, stderr = ssh.exec_command(cmd) - result = stdout.read() - result_err = stderr.read() - # 打印输出 - print(result.decode(), result_err.decode()) + # import paramiko + # paramiko.util.log_to_file('paramiko.log') + # ssh = paramiko.SSHClient() + + # SSH_PRIVATE_KEY = '/Users/midoks/.ssh/id_rsa' + # key = paramiko.RSAKey.from_private_key_file(SSH_PRIVATE_KEY) + # ssh.load_system_host_keys() + # ssh.connect(hostname='8.210.55.220', port=22, username='root', pkey=key) + # cmd = "cd /www/server/mdserver-web && python /www/server/mdserver-web/plugins/mysql/index.py dump_mysql_data {\"db\":'" + args[ + # 'db'] + "'} " + # stdin, stdout, stderr = ssh.exec_command(cmd) + # result = stdout.read() + # result_err = stderr.read() + # print(result.decode(), result_err.decode()) + + print mw.execShell('scp root@8.210.55.220:/tmp/dump.sql /tmp') + + pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root') + cmd = getServerDir() + "/bin/mysql -uroot -p" + pwd + " < /tmp/dump.sql" + print cmd + print mw.execShell(cmd) return mw.returnJson(True, '同步成功!') diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index a1dc54c7b..8fecbab38 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -1342,15 +1342,30 @@ function deleteSlave(){ function getFullSyncStatus(db){ - myPost('full_sync', {db:db}, function(data){ - var rdata = $.parseJSON(data.data); - layer.msg(rdata['msg']); - setTimeout(function(){ - masterOrSlaveConf(); - }, 3000); - + var btn = '
开始
'; + var loadOpen = layer.open({ + type: 1, + title: '全量同步'+db, + area: '500px', + content:"
\ +
\ +
\ +
0%
\ +
\ +
\ + "+btn+"\ +
" }); + $('#begin_full_sync').click(function(){ + myPost('full_sync', {db:db}, function(data){ + var rdata = $.parseJSON(data.data); + layer.msg(rdata['msg']); + setTimeout(function(){ + masterOrSlaveConf(); + }, 3000); + }); + }); } function masterOrSlaveConf(version=''){