From b76a9bf13cd7c12449327a465cd33fc53dc73be8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 4 Jul 2024 02:33:09 +0800
Subject: [PATCH] update

---
 plugins/mysql-apt/js/mysql-apt.js |  4 +---
 plugins/mysql-yum/js/mysql-yum.js | 38 +++++++++++++++++++++++--------
 plugins/mysql/js/mysql.js         | 36 +++++++++++++++++++++--------
 3 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/plugins/mysql-apt/js/mysql-apt.js b/plugins/mysql-apt/js/mysql-apt.js
index 778075be9..e583af795 100755
--- a/plugins/mysql-apt/js/mysql-apt.js
+++ b/plugins/mysql-apt/js/mysql-apt.js
@@ -2641,10 +2641,9 @@ function masterOrSlaveConf(version=''){
                     isHasSign = true;
                 }
 
-                
+                var status = "<a data-id="+i+"  class='btlink db_error'>异常</>";
                 if (mdb_ver >= 8){
 
-                    var status = "<a data-id="+i+"  class='btlink db_error'>异常</>";
                     if (v['Replica_SQL_Running'] == 'Yes' && v['Replica_IO_Running'] == 'Yes'){
                         status = "正常";
                     }
@@ -2658,7 +2657,6 @@ function masterOrSlaveConf(version=''){
                     list += '<td>' + rdata.data[i]['Replica_SQL_Running'] +'</td>';
 
                 } else {
-                    var status = "<a data-id="+i+"  class='btlink db_error'>异常</>";
                     if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){
                         status = "正常";
                     }
diff --git a/plugins/mysql-yum/js/mysql-yum.js b/plugins/mysql-yum/js/mysql-yum.js
index 9bc3c9ceb..66836f384 100755
--- a/plugins/mysql-yum/js/mysql-yum.js
+++ b/plugins/mysql-yum/js/mysql-yum.js
@@ -2626,6 +2626,8 @@ function masterOrSlaveConf(version=''){
         _data['page'] = page;
         _data['page_size'] = 10;
 
+        var mdb_ver = $('.plugin_version').attr('version');
+
         myPost('get_slave_list', _data, function(data){
             var rdata = $.parseJSON(data.data);
             var list = '';
@@ -2639,17 +2641,33 @@ function masterOrSlaveConf(version=''){
                 }
 
                 var status = "<a data-id="+i+"  class='btlink db_error'>异常</>";
-                if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){
-                    status = "正常";
-                }
+                if (mdb_ver >= 8){                    
+                    if (v['Replica_SQL_Running'] == 'Yes' && v['Replica_IO_Running'] == 'Yes'){
+                        status = "正常";
+                    }
 
-                list += '<tr>';
-                list += '<td>' + rdata.data[i]['Master_Host'] +'</td>';
-                list += '<td>' + rdata.data[i]['Master_Port'] +'</td>';
-                list += '<td>' + rdata.data[i]['Master_User'] +'</td>';
-                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 += '<tr>';
+                    list += '<td>' + rdata.data[i]['Source_Host'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Source_Port'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Source_User'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Relay_Source_Log_File'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Replica_IO_Running'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Replica_SQL_Running'] +'</td>';
+
+                } else {
+                    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>';
+                    list += '<td>' + rdata.data[i]['Master_User'] +'</td>';
+                    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>';
+                }
+                
 
                 if (isHasSign){
                     list += '<td>' + v['Channel_Name'] +'</td>';
diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js
index 68cf8e277..9b9dcee4e 100755
--- a/plugins/mysql/js/mysql.js
+++ b/plugins/mysql/js/mysql.js
@@ -2625,6 +2625,7 @@ function masterOrSlaveConf(version=''){
         
         _data['page'] = page;
         _data['page_size'] = 10;
+        var mdb_ver = $('.plugin_version').attr('version');
 
         myPost('get_slave_list', _data, function(data){
             var rdata = $.parseJSON(data.data);
@@ -2639,17 +2640,32 @@ function masterOrSlaveConf(version=''){
                 }
 
                 var status = "<a data-id="+i+"  class='btlink db_error'>异常</>";
-                if (v['Slave_SQL_Running'] == 'Yes' && v['Slave_IO_Running'] == 'Yes'){
-                    status = "正常";
-                }
+                if (mdb_ver >= 8){
+                    if (v['Replica_SQL_Running'] == 'Yes' && v['Replica_IO_Running'] == 'Yes'){
+                        status = "正常";
+                    }
 
-                list += '<tr>';
-                list += '<td>' + rdata.data[i]['Master_Host'] +'</td>';
-                list += '<td>' + rdata.data[i]['Master_Port'] +'</td>';
-                list += '<td>' + rdata.data[i]['Master_User'] +'</td>';
-                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 += '<tr>';
+                    list += '<td>' + rdata.data[i]['Source_Host'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Source_Port'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Source_User'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Relay_Source_Log_File'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Replica_IO_Running'] +'</td>';
+                    list += '<td>' + rdata.data[i]['Replica_SQL_Running'] +'</td>';
+
+                } else {
+                    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>';
+                    list += '<td>' + rdata.data[i]['Master_User'] +'</td>';
+                    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>';
+                }
 
                 if (isHasSign){
                     list += '<td>' + v['Channel_Name'] +'</td>';