From 61ed4d07737630d2314abf2e9f9c4ee82c152ff9 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 5 Feb 2021 11:26:47 +0800
Subject: [PATCH] up

---
 plugins/mysql/index.py    | 13 +++++++++++++
 plugins/mysql/js/mysql.js | 21 +++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index a953af4d6..af3ab4482 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -1470,12 +1470,23 @@ def setSlaveStatus(version=''):
     db = pMysqlDb()
     dlist = db.query('show slave status')
 
+    if len(dlist) == 0:
+        return mw.returnJson(False, '需要手动添加主服务同步命令!')
+
     if len(dlist) > 0 and (dlist[0][10] == 'Yes' or dlist[0][11] == 'Yes'):
         db.query('stop slave')
     else:
         db.query('start slave')
+
     return mw.returnJson(True, '设置成功!')
 
+
+def deleteSlave(version=''):
+    db = pMysqlDb()
+    dlist = db.query('stop slave;reset slave all')
+    # print(dlist)
+    return mw.returnJson(True, '删除成功!')
+
 if __name__ == "__main__":
     func = sys.argv[1]
     version = sys.argv[2]
@@ -1571,5 +1582,7 @@ if __name__ == "__main__":
         print(getSlaveList(version))
     elif func == 'set_slave_status':
         print(setSlaveStatus(version))
+    elif func == 'delete_slave':
+        print(deleteSlave(version))
     else:
         print('error')
diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js
index 19a85c32f..7caf8a46f 100755
--- a/plugins/mysql/js/mysql.js
+++ b/plugins/mysql/js/mysql.js
@@ -1308,8 +1308,6 @@ function getMasterRepSlaveList(){
         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>';
 
-        
-
         var loadOpen = layer.open({
             type: 1,
             title: '同步账户列表',
@@ -1330,6 +1328,19 @@ function getMasterRepSlaveList(){
 }
 
 
+function deleteSlave(){
+    myPost('delete_slave', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+
+        layer.msg(rdata['msg']);
+
+        setTimeout(function(){
+            masterOrSlaveConf();
+        }, 3000);
+
+    });
+}
+
 function masterOrSlaveConf(version=''){
 
     function getMasterDbList(){
@@ -1398,12 +1409,11 @@ function masterOrSlaveConf(version=''){
                 list += '<td>' + rdata.data[i]['Slave_IO_Running'] +'</td>';
                 list += '<td>' + rdata.data[i]['Slave_SQL_Running'] +'</td>';
                 list += '<td style="text-align:right">' + 
-                    '<a href="javascript:;" class="btlink" onclick="" title="删除">删除</a>' +
+                    '<a href="javascript:;" class="btlink" onclick="deleteSlave()" title="删除">删除</a>' +
                 '</td>';
                 list += '</tr>';
             }
 
-             // <th style="text-align:right;">操作</th></tr></thead>\
             var con = '<div class="divtable mtb10">\
                     <div class="tablescroll">\
                         <table id="DataBody" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
@@ -1424,8 +1434,7 @@ function masterOrSlaveConf(version=''){
             // <div id="databasePage_slave" class="dataTables_paginate paging_bootstrap page"></div>\
             // <div class="table_toolbar">\
             //     <span class="sync btn btn-default btn-sm" onclick="getMasterRepSlaveList()" title="">添加</span>\
-            // </div>\
-
+            // </div>
             $(".table_slave_status_list").html(con);
         });
     }