sbd-npm 1.5.40 → 1.5.41

package/package.json

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

package/status.js

@@ -849,13 +849,40 @@ $(function () {
                                 {"name": "物理内存", "table_sort": 1, "title": "Resident Set Size(常驻内存，进程实际占用的物理内存)"},
                                 {"name": "启动命令"},
                                 {"name": "创建时间", "class": "info", "table_sort": 1},
-                                {"name": "操作", "id": "machine_action", "link": "#"}
+                                {"name": "操作", "id": "machine_action_log", "link": "#", "title": "操作日志记录"}
                             ]
                         });
+                        $("#machine_action_log").click(function() {
+                            let machine_id = $("#machines").val();
+                            if (machine_id) {
+                                let instruction = "screen_1_machine_action_log";
+                                Util.post(location.pathname, {action: "machine_instruction_add", "machine_id": machine_id, "instruction": instruction, "action_type": 2}, function (j) {
+                                    Util.hide_tips();
+                                    if (j.code === 1) {
+                                        Status.reset_screen_status("machine_process_div_body");
+                                        $("#machine_action_log").html("<a href='#'><span title='日志记录获取中...' class='label label-info'>操作</span></a>");
+                                        Util.show_tips("[获取操作日志记录] 已加到会话队列中", 4567, "alert-success");
+                                    } else if (j.code === 2) {
+                                        Util.show_tips("Machine 不存在！", 4567, "alert-danger");
+                                    } else {
+                                        Util.show_tips("[获取操作日志记录] 异常！", 4567, "alert-danger");
+                                    }
+                                });
+                            }
+                        });
                     }
                     let html = [], process_num = 0;
                     let screen_pid = j.screen_pid ? j.screen_pid : 0;
                     let screen_pid_date = j.screen_pid_date ? j.screen_pid_date : 0;
+                    if (screen_pid === 1) {
+                        if (screen_pid_date > 0) {
+                            $("#machine_action_log").html("<a href='#'><span title='日志记录已成功获取(" + Util.seconds_to_format(screen_pid_date) + ")' class='label label-success'>操作</span></a>");
+                        } else {
+                            $("#machine_action_log").html("<a href='#'><span title='日志记录获取中...' class='label label-info'>操作</span></a>");
+                        }
+                    } else {
+                        $("#machine_action_log").html("<a href='#'>操作</a>");
+                    }
                     j.process.forEach(function (item) {
                         process_num++;
                         let is_xmr = 0, is_screen = 0;
@@ -984,19 +1011,8 @@ $(function () {
                             Util.post(location.pathname, {action: "machine_instruction_add", "machine_id": machine_id, "instruction": instruction, "action_type": action_type}, function (j) {
                                 Util.hide_tips();
                                 if (j.code === 1) {
-                                    $("#" + element_id + " a").each(function() {
-                                        let span_object = $(this).find('span.label.label-info');
-                                        if (span_object.length) {
-                                            var span_text = span_object.text();
-                                            span_object.remove();
-                                            $(this).append(span_text);
-                                        } else {
-                                            let is_fetch_screen = $(this).attr("data-screen");
-                                            if (is_fetch_screen && is_fetch_screen == "1") {
-                                                $(this).text('会话').removeAttr('data-screen');
-                                            }
-                                        }
-                                    });
+                                    $("#machine_action_log").html("<a href='#'>操作</a>");
+                                    Status.reset_screen_status(element_id);
                                     this_object.html("<span title='会话数据获取中...' class='label label-info'>会话</span>");
                                     Util.show_tips("进程 [" + pid + "(" + action + ")] 已加到会话队列中", 4567, "alert-success");
                                 } else if (j.code === 2) {
@@ -1013,6 +1029,22 @@ $(function () {
             });
         },
 
+        reset_screen_status: function(element_id) {
+            $("#" + element_id + " a").each(function() {
+                let span_object = $(this).find('span.label.label-info');
+                if (span_object.length) {
+                    let span_text = span_object.text();
+                    span_object.remove();
+                    $(this).append(span_text);
+                } else {
+                    let is_fetch_screen = $(this).attr("data-screen");
+                    if (is_fetch_screen && is_fetch_screen == "1") {
+                        $(this).text('会话').removeAttr('data-screen');
+                    }
+                }
+            });
+        },
+
         pack_screen_html: function(is_screen, pid, screen_pid, screen_pid_date, cmdline) {
             if (is_screen === 1) {
                 let screen_html = "";

package/util.js

@@ -2894,9 +2894,10 @@ const Util = {
     },
 
     uuid: function () {
-        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-            var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-            return v.toString(16);
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (char) {
+            let randomHexDigit = Math.random() * 16 | 0;
+            let digit = char == 'x' ? randomHexDigit : (randomHexDigit & 0x3 | 0x8);
+            return digit.toString(16);
         });
     },