From 3f9d6737c9395565a12e86ab25280af9aa498425 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Thu, 4 Aug 2022 02:05:55 +0800
Subject: [PATCH] up

---
 plugins/mysql/index.html  |  7 +++++++
 plugins/mysql/index.py    |  8 ++++----
 plugins/mysql/js/mysql.js | 13 +++++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/plugins/mysql/index.html b/plugins/mysql/index.html
index f7db357ea..ee348dbdc 100755
--- a/plugins/mysql/index.html
+++ b/plugins/mysql/index.html
@@ -49,6 +49,13 @@
 #db_tools button:last-child{
 	margin-right: 0;
 }
+
+.conf_p span {
+    display: inline-block;
+    margin-right: 10px;
+    width: 95px;
+    text-align: right;
+}
 </style>
 <script type="text/javascript">
 resetPluginWinWidth(800);
diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py
index de76df55e..9c9b16a62 100755
--- a/plugins/mysql/index.py
+++ b/plugins/mysql/index.py
@@ -1687,16 +1687,16 @@ def getMasterRepSlaveUserCmd(version):
         clist[0]['username']  + "', MASTER_PASSWORD='" + \
         clist[0]['password'] + \
         "', MASTER_LOG_FILE='" + mstatus[0]["File"] + \
-        "',MASTER_LOG_POS=" + str(mstatus[0]["Position"]) + ""
+        "',MASTER_LOG_POS=" + str(mstatus[0]["Position"])
 
     if version == "8.0":
         sql = "CHANGE REPLICATION SOURCE TO SOURCE_HOST='" + ip + "', SOURCE_PORT=" + port + ", SOURCE_USER='" + \
             clist[0]['username']  + "', SOURCE_PASSWORD='" + \
             clist[0]['password'] + \
             "', SOURCE_LOG_FILE='" + mstatus[0]["File"] + \
-            "',SOURCE_LOG_POS=" + str(mstatus[0]["Position"]) + ""
+            "',SOURCE_LOG_POS=" + str(mstatus[0]["Position"])
 
-    return mw.returnJson(True, 'OK!', sql)
+    return mw.returnJson(True, clist[0], sql)
 
 
 def delMasterRepSlaveUser(version=''):
@@ -1854,7 +1854,7 @@ def getSlaveList(version=''):
 def getSlaveSyncCmd(version=''):
 
     root = mw.getRunDir()
-    cmd = 'cd ' + root + ' && python ' + root + \
+    cmd = 'cd ' + root + ' && python3 ' + root + \
         '/plugins/mysql/index.py do_full_sync {"db":"all"}'
     return mw.returnJson(True, 'ok', cmd)
 
diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js
index 1f5e903c3..0cad024f2 100755
--- a/plugins/mysql/js/mysql.js
+++ b/plugins/mysql/js/mysql.js
@@ -1837,10 +1837,19 @@ function masterOrSlaveConf(version=''){
     function getMasterStatus(){
         myPost('get_master_status', '', function(data){
             var rdata = $.parseJSON(data.data);
-            var limitCon = '<p class="conf_p">\
+            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>\
+                <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">'+(!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/>\