sbd-npm 1.5.35 → 1.5.37

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sbd-npm",
-    "version": "1.5.35",
+    "version": "1.5.37",
     "description": "Stock Big Data",
     "author": "DHQ <dhq314@gmail.com>",
     "license": "ISC",

package/status.js

@@ -77,9 +77,9 @@ $(function () {
                 let html = [];
                 if (!document.getElementById("start_time")) {
                     let error_tips = j.error_num > 0 ? ("class='danger' title='" + j.error_num + "' ") : "";
-                    html.push("<tr><th ", error_tips, "width='25%'>系统时区</th><td>", Status.map_url(j.timezone), "</td>");
-                    html.push("<th id='start_time' width='25%'>服务器运行时间</th><td colspan='3'>", Util.seconds_to_format(j.start_time), "(" + j.up_time + ")</td></tr>");
-                    html.push("<tr><th>数据库最后同步时间</th><td>", Util.seconds_to_format(j.sync_end_time), "</td>");
+                    html.push("<tr><th ", error_tips, "width='25%'>系统时区</th><td>", Status.map_url(j.timezone), " (", j.timestamp_server, ")</td>");
+                    html.push("<th id='start_time' width='25%'>服务器运行时间</th><td colspan='3'>", Util.seconds_to_format(j.start_time), " (" + j.uptime + ")</td></tr>");
+                    html.push("<tr><th>凌晨ALL任务完成时间</th><td>", Util.seconds_to_format(j.sync_end_time), "</td>");
                     html.push("<th>数据库句柄更新时间</th><td colspan='3'>", Util.seconds_to_format(j.db_time), "</td></tr>");
                     // 数据库
                     html.push("<tr><th>数据库版本</th><td>", j.db_version, "</td>");
@@ -93,7 +93,7 @@ $(function () {
                         });
                         mysql_remote_ip = mri_html.join("、");
                     }
-                    html.push("<tr><th><a data-toggle='modal' data-target='.mysql_access_modal'>数据库正在连接的IP</a></th><td colspan='5'>", mysql_remote_ip, "</td></tr>");
+                    html.push("<tr><th><a data-toggle='modal' data-target='.mysql_ssh_modal'>数据库正在连接的IP</a></th><td colspan='5'>", mysql_remote_ip, "</td></tr>");
 
                     let max_files_tips = "系统允许打开的最大文件描述符数量（即每个进程最多能打开多少个文件，包括网络连接、管道、实际文件等）";
                     html.push("<tr><th>最大文件描述符数量 <i class='glyphicon glyphicon-info-sign' data-toggle='tooltip' data-original-title='", max_files_tips, "'></i></th><td>", (j.max_files == "None" ? "--" : j.max_files), "</td>");
@@ -190,9 +190,9 @@ $(function () {
             });
         },
 
-        fetch_mysql_access_data: function() {
+        fetch_mysql_ssh_ip_data: function() {
             Util.show_loading();
-            Util.post(location.pathname, {"active_div": "mysql_access", "filter_type": $("#mysql_access_filter").val()}, function (j) {
+            Util.post(location.pathname, {"active_div": "mysql_ssh_ip", "data_type": $("#mysql_ssh_type").val(), "filter_type": $("#mysql_ssh_filter").val()}, function (j) {
                 let html = [], ip_num = 0;
                 j.data.forEach(function (item) {
                     ip_num++;
@@ -209,9 +209,9 @@ $(function () {
                     html.push("<td>", Util.seconds_to_format(item.latest_time), "</td>");
                     html.push("</tr>");
                 });
-                Util.render_table_html("mysql_access_modal_body_body", html);
-                $("#mysql_access_summary").html("&nbsp;&nbsp;共 <span class='label label-info'>" + j.total_len + "</span> 条，屏蔽 <span class='label label-danger'>" + j.block_len + "</span> 条");
-                $("#mysql_access_modal_body_body .block_ip").each(function() {
+                Util.render_table_html("mysql_ssh_modal_body_body", html);
+                $("#mysql_ssh_summary").html("&nbsp;&nbsp;共 <span class='label label-info'>" + j.total_len + "</span> 条，屏蔽 <span class='label label-danger'>" + j.block_len + "</span> 条");
+                $("#mysql_ssh_modal_body_body .block_ip").each(function() {
                     $(this).click(function() {
                         let ip = $(this).parent().parent().children('td').eq(1).text();
                         let ip_address = $(this).parent().parent().children('td').eq(2).text();
@@ -1716,13 +1716,13 @@ $(function () {
         Util.set_table_loading("mysql_process_modal_body_body");
     });
 
-    Util.init_modal_skeleton("mysql_access_modal");
-    $("#mysql_access_modal_title").html("连接MySQL的IP日志统计数据");
+    Util.init_modal_skeleton("mysql_ssh_modal");
+    $("#mysql_ssh_modal_title").html("连接 <select id='mysql_ssh_type'><option value='1'>MySQL</option><option value='2'>SSH</option></select> 的IP日志统计数据");
     Util.init_table_skeleton({
-        "element_id": "mysql_access_modal_body",
-        "caption": '<caption class="' + (Util.is_mobile() ? "text-left" : "text-right") + '" id="mysql_access_summary"></caption>',
+        "element_id": "mysql_ssh_modal_body",
+        "caption": '<caption class="' + (Util.is_mobile() ? "text-left" : "text-right") + '" id="mysql_ssh_summary"></caption>',
         "head_columns": [
-            {"name": "", "select_id": "mysql_access_filter", "select_options": [{"key": "0", "val": "全部"},{"key": "1", "val": "正常"},{"key": "2", "val": "屏蔽"},{"key": "3", "val": "异常"}]},
+            {"name": "", "select_id": "mysql_ssh_filter", "select_options": [{"key": "0", "val": "全部"},{"key": "1", "val": "正常"},{"key": "2", "val": "屏蔽"},{"key": "3", "val": "异常"}]},
             {"name": "IP", "table_sort": 1, "tooltip": "IP地址(Internet Protocol Address)是指互联网协议地址"},
             {"name": "地址信息", "table_sort": 1},
             {"name": "连接次数", "table_sort": 1},
@@ -1730,19 +1730,24 @@ $(function () {
             {"name": "最后一次连接时间", "class": "info", "table_sort": 1},
         ]
     });
-    $("#mysql_access_filter").change(function() {
-        $("#mysql_access_summary").html("");
-        Util.set_table_loading("mysql_access_modal_body_body");
-        Status.fetch_mysql_access_data();
+    $("#mysql_ssh_type").change(function() {
+        $("#mysql_ssh_summary").html("");
+        Util.set_table_loading("mysql_ssh_modal_body_body");
+        Status.fetch_mysql_ssh_ip_data();
     });
-    let mam_object = $('#mysql_access_modal');
+    $("#mysql_ssh_filter").change(function() {
+        $("#mysql_ssh_summary").html("");
+        Util.set_table_loading("mysql_ssh_modal_body_body");
+        Status.fetch_mysql_ssh_ip_data();
+    });
+    let mam_object = $('#mysql_ssh_modal');
     mam_object.on('shown.bs.modal', function (e) {
-        $("#mysql_access_filter").val("0");
-        Status.fetch_mysql_access_data();
+        $("#mysql_ssh_filter").val("0");
+        Status.fetch_mysql_ssh_ip_data();
     });
     mam_object.on('hidden.bs.modal', function () {
-        $("#mysql_access_summary").html("");
-        Util.set_table_loading("mysql_access_modal_body_body");
+        $("#mysql_ssh_summary").html("");
+        Util.set_table_loading("mysql_ssh_modal_body_body");
     });
 
     let request_arguments = Util.request_arguments();

package/util.js

@@ -2901,27 +2901,27 @@ const Util = {
 
     /**
      * 提示信息显示
-     * @param msg
+     * @param message
      * @param interval 信息持续的时间(毫秒，到期则关闭)
      * @param cls 样式：alert-warning | alert-danger
      * @param loading 设置加载状态效果表现
      */
-    show_tips: function (msg, interval = 0, cls = "", loading = 0) {
+    show_tips: function (message, interval = 0, cls = "", loading = 0) {
         let tips_object = document.getElementById(Util.tips_token);
         if (tips_object) {
             if (loading > 0) {
-                let origin_msg = msg.replace(/\./g, '');
+                let origin_message = message.replace(/\./g, '');
                 let origin_txt = tips_object.innerText.replace(/\./g, '');
-                if (origin_msg === origin_txt) {
+                if (origin_message === origin_txt) {
                     loading = loading < 5 ? (loading + 1) : 1;
                     let load_string = ".".repeat(loading);
-                    tips_object.innerHTML = origin_msg + load_string;
+                    tips_object.innerHTML = origin_message + load_string;
                     setTimeout(() => {
-                        Util.show_tips(msg, interval, cls, loading);
+                        Util.show_tips(message, interval, cls, loading);
                     }, 300);
                 }
             } else {
-                tips_object.innerHTML = msg;
+                tips_object.innerHTML = message;
             }
         } else {
             if (loading === 0) {
@@ -2929,15 +2929,15 @@ const Util = {
                 tips_object.id = Util.tips_token;
                 tips_object.className = "alert " + (cls === "" ? "alert-warning" : cls);
                 tips_object.style = "position: fixed; right: 0; top: 0; z-index: 999;";
-                tips_object.innerHTML = msg;
+                tips_object.innerHTML = message;
                 document.getElementsByTagName('body')[0].appendChild(tips_object);
                 if (interval > 0) {
                     setTimeout(Util.hide_tips, interval);
                 }
-                if (msg.endsWith('.')) {
-                    loading = msg.replace(/[^.]/g, '').length;
+                if (message.endsWith('.')) {
+                    loading = message.replace(/[^.]/g, '').length;
                     setTimeout(() => {
-                        Util.show_tips(msg, interval, cls, loading);
+                        Util.show_tips(message, interval, cls, loading);
                     }, 200);
                 }
             }