sbd-npm 1.4.86 → 1.4.88

package/package.json

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

package/status.js

@@ -178,7 +178,7 @@ $(function () {
 
         fetch_mysql_access_data: function() {
             Util.show_loading();
-            Util.post(location.pathname, {"active_div": "mysql_access"}, function (j) {
+            Util.post(location.pathname, {"active_div": "mysql_access", "filter_type": $("#mysql_access_filter").val()}, function (j) {
                 let html = [], ip_num = 0;
                 j["data"].forEach(function (item) {
                     ip_num++;
@@ -196,7 +196,7 @@ $(function () {
                     html.push("</tr>");
                 });
                 Util.render_table_html("mysql_access_modal_body_body", html);
-                $("#mysql_access_summary").html("&nbsp;&nbsp;共 <span class='label label-info'>" + ip_num + "</span> 条，屏蔽 <span class='label label-danger'>" + j["block_len"] + "</span> 条");
+                $("#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() {
                     $(this).click(function() {
                         let ip = $(this).parent().parent().children('td').eq(1).text();
@@ -1373,7 +1373,10 @@ $(function () {
                                 let ip_address = Status.convert_ip_address(j);
                                 if (ip_address.length > 0) {
                                     let map_url = Status.map_url(ip_address, "<i class='glyphicon glyphicon-map-marker'></i>");
-                                    let ip_result = Util.pack_html_link(Status.ip_url(j["ip"]), "<b class='text-success'>" + ip_address + "</b>") + "&nbsp;&nbsp;" + map_url;
+                                    let ip_result = Util.pack_html_link(Status.ip_url(j["ip"]), "<b class='text-success'>" + ip_address + "</b>") + "&nbsp;&nbsp;&nbsp;" + map_url;
+                                    ip_result += "&nbsp;&nbsp;&nbsp;" + Util.pack_html_link("https://apis.map.qq.com/ws/location/v1/ip?output=jsonp&key=SGVBZ-4RO34-NB2US-DQKYK-ZEUVJ-4KFZF&ip=" + j["ip"] + "&callback=Callback&_=" + Util.now(), "1");
+                                    ip_result += "&nbsp;&nbsp;&nbsp;" + Util.pack_html_link("https://whois.pconline.com.cn/ipJson.jsp?ip=" + j["ip"] + "&json=true", "2");
+                                    ip_result += "&nbsp;&nbsp;&nbsp;" + Util.pack_html_link("http://ip-api.com/json/" + j["ip"] + "?lang=zh-CN", "3");
                                     if (j["domain"]) {
                                         ip_result += "<br><br>" + Util.pack_html_link(j["domain"], "<b>" + j["domain"] + "</b>");
                                     }
@@ -1555,12 +1558,12 @@ $(function () {
 
         map_url: function (location, location_name = "") {
             location_name = location_name === "" ? location : location_name;
-            let location_arr = location.split(' ');
+            let location_array = location.split(' ');
             if (/中国|省|市/.test(location)) {
-                let url = Util.map_url(location_arr[0]);
-                return url.replace('>' + location_arr[0] + '</a>', '>' + location_name + '</a>');
+                let url = Util.map_url(location_array[0]);
+                return url.replace('>' + location_array[0] + '</a>', '>' + location_name + '</a>');
             }
-            return Util.google_map_url(location_arr[0], location_name);
+            return Util.google_map_url(location_array[0], location_name);
         }
 
     };
@@ -1642,6 +1645,7 @@ $(function () {
         Status.fetch_mysql_process_data();
     });
     mpm_obj.on('hidden.bs.modal', function () {
+        $("#mysql_process_summary").html("");
         Util.set_table_loading("mysql_process_modal_body_body");
     });
 
@@ -1651,7 +1655,7 @@ $(function () {
         "element_id": "mysql_access_modal_body",
         "caption": '<caption class="' + (Util.is_mobile() ? "text-left" : "text-right") + '" id="mysql_access_summary"></caption>',
         "head_cols": [
-            {"name": "序号", "table_sort": 1},
+            {"name": "", "select_id": "mysql_access_filter", "select_options": [{"key": "0", "val": "全部"},{"key": "1", "val": "正常"},{"key": "2", "val": "屏蔽"}]},
             {"name": "IP", "table_sort": 1, "tooltip": "IP地址(Internet Protocol Address)是指互联网协议地址"},
             {"name": "地址信息", "table_sort": 1},
             {"name": "连接次数", "table_sort": 1},
@@ -1659,11 +1663,17 @@ $(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();
+    });
     let mam_obj = $('#mysql_access_modal');
     mam_obj.on('shown.bs.modal', function (e) {
         Status.fetch_mysql_access_data();
     });
     mam_obj.on('hidden.bs.modal', function () {
+        $("#mysql_access_summary").html("");
         Util.set_table_loading("mysql_access_modal_body_body");
     });
 

package/stock_basics.js

@@ -148,9 +148,9 @@ let Stock = {
 
         let concept_obj = $("#concept");
         if (concept_obj.length > 0) {
-            let concept_arr = concept_obj.html().split(",");
+            let concept_array = concept_obj.html().split(",");
             html = [];
-            concept_arr.forEach(function (item) {
+            concept_array.forEach(function (item) {
                 html.push('<a target="_blank" rel="noopener noreferrer nofollow" href="', Util.get_url("query_list"), '?concept=', item, '" class="btn btn-xs btn-warning">', item, '</a> ');
             });
             concept_obj.html(html.join(""));
@@ -158,9 +158,9 @@ let Stock = {
 
         let location_obj = $("#location");
         if (location_obj.length > 0) {
-            let location_arr = location_obj.text().split(/[；;,]/);
+            let location_array = location_obj.text().split(/[；;，,]/);
             html = [];
-            location_arr.forEach(function (location) {
+            location_array.forEach(function (location) {
                 html.push(Util.map_url(location, location) + '&nbsp;&nbsp;');
             });
             location_obj.html(html.join(""));
@@ -985,9 +985,9 @@ let Stock = {
                             Stock.hist_end_date = Util.seconds_to_format(date - 1 + 7 * Util.one_day_second, "%Y-%m-%d");
                         } else if (date_type === "month") {
                             Stock.hist_start_date = date;
-                            let d_arr = date.split("-");
-                            let year = parseInt(d_arr[0]);
-                            let month = parseInt(d_arr[1]);
+                            let d_array = date.split("-");
+                            let year = parseInt(d_array[0]);
+                            let month = parseInt(d_array[1]);
                             if (month === 12) {
                                 month = 1;
                                 year += 1;
@@ -997,9 +997,9 @@ let Stock = {
                             date = Util.format_to_second(year + "-" + month + "-01");
                             Stock.hist_end_date = Util.seconds_to_format(date - 1, "%Y-%m-%d");
                         } else if (date_type === "quarter") {
-                            let d_arr = date.split("-");
-                            let year = parseInt(d_arr[0]);
-                            let quarter = d_arr[1];
+                            let d_array = date.split("-");
+                            let year = parseInt(d_array[0]);
+                            let quarter = d_array[1];
                             if (quarter === "S1") {
                                 Stock.hist_start_date = year + "-01-01";
                                 date = year + "-04-01";

package/summary_daily.js

@@ -197,11 +197,11 @@ $(function () {
         pack_hsgt_money_flow: function (hsgt_money_flow_data) {
             if ($("#hsgt_money_flow_line").length) {
                 DailySummary["hsgt_money_flow_chart"].hideLoading();
-                let time_arr = [], hsmf_data = [], hmf_arr = [], smf_arr = [], tmf_val = 0, hmf_val = 0, smf_val = 0;
+                let time_array = [], hsmf_data = [], hmf_array = [], smf_array = [], tmf_val = 0, hmf_val = 0, smf_val = 0;
                 hsgt_money_flow_data.forEach(function (d) {
-                    time_arr.push(d[0]);
-                    hmf_arr.push(d[1]);
-                    smf_arr.push(d[2]);
+                    time_array.push(d[0]);
+                    hmf_array.push(d[1]);
+                    smf_array.push(d[2]);
                     let total_mf_val = Util.to_float(parseFloat(d[1]) + parseFloat(d[2]), 2);
                     hsmf_data.push(total_mf_val);
                     if (total_mf_val) {
@@ -231,7 +231,7 @@ $(function () {
                         legend: {x: 20, y: 20, data: ["总流向", "沪股通", "深股通"]},
                         "grid": {"x": 30, "y": 50, "x2": 5, "y2": 20},
                         calculable: !0,
-                        xAxis: [{type: "category", boundaryGap: !1, data: time_arr}],
+                        xAxis: [{type: "category", boundaryGap: !1, data: time_array}],
                         yAxis: [{type: "value"}],
                         series: [
                             {
@@ -246,14 +246,14 @@ $(function () {
                                 type: "line",
                                 smooth: !0,
                                 itemStyle: {normal: {color: "#34495E", areaStyle: {type: "default"}}},
-                                data: hmf_arr
+                                data: hmf_array
                             },
                             {
                                 name: "深股通",
                                 type: "line",
                                 smooth: !0,
                                 itemStyle: {normal: {color: "#BDC3C7", areaStyle: {type: "default"}}},
-                                data: smf_arr
+                                data: smf_array
                             }
                         ]
                     })

package/util.js

@@ -112,7 +112,7 @@ const Util = {
         });
 
         $("#stock").on("focus keyup", function () {
-            let key_word = $(this).val();
+            let key_word = $(this).val().trim();
             if (key_word) {
                 if (Util.is_has_chinese(key_word) || (Util.is_alphabet(key_word) && key_word.length >= 2) || ($.isNumeric(key_word) && key_word.length >= 3)) {
                     if (window.location.pathname === "/status" && $("#word").hasClass('active')) {
@@ -184,7 +184,7 @@ const Util = {
     request_search: function() {
         Util.show_loading();
         Util.post("/action", {action: "search", key_word: $("#stock").val()}, function (j) {
-            let key_word = $("#stock").val();
+            let key_word = $("#stock").val().trim();
             if (key_word) {
                 if (key_word === j["key_word"]) {
                     let html = [];
@@ -397,8 +397,8 @@ const Util = {
             name = item["name"];
             if (Util.is_us(item["code"])) {
                 if (name.indexOf(' ') !== -1) {
-                    let name_arr = name.split(' ');
-                    name = name_arr[0] ? name_arr[0] : name;
+                    let name_array = name.split(' ');
+                    name = name_array[0] ? name_array[0] : name;
                 } else {
                     name = name.replace("公司", "").replace("•", "").replace("•", "");
                 }
@@ -2078,9 +2078,9 @@ const Util = {
             show_profile += "&nbsp;&nbsp;&nbsp;<a class='unfold text-info' data-toggle='modal' data-target='." + modal_id + "' href='#'>展开</a>";
             $("#" + element_id).html(show_profile);
             $('#' + modal_id).on('shown.bs.modal', function () {
-                let p_arr = profile.split("。");
+                let p_array = profile.split("。");
                 let html = [];
-                p_arr.forEach(function (p) {
+                p_array.forEach(function (p) {
                     if (p.length > 0) {
                         html.push("<p>", p.replace(/,/g, "，"), "。</p>");
                     }
@@ -2260,8 +2260,8 @@ const Util = {
      * @returns {undefined}
      */
     get_cookie: function getCookie(name) {
-        let m_arr = document.cookie.match("\\b" + name + "=([^;]*)\\b");
-        return m_arr ? m_arr[1] : undefined;
+        let match_array = document.cookie.match("\\b" + name + "=([^;]*)\\b");
+        return match_array ? match_array[1] : undefined;
     },
 
     /**
@@ -2656,24 +2656,24 @@ const Util = {
      * @param obj_token
      */
     parse_value_trend: function (obj_token) {
-        let data_arr = [], unit = "";
+        let data_array = [], unit = "";
         $("." + obj_token).each(function () {
             let val = $(this).text();
             if (unit === "") {
-                let match_arr = val.match(/[\u4e00-\u9fa5]+/);
-                if ($.isArray(match_arr) && match_arr[0]) {
-                    unit = match_arr[0];
+                let match_array = val.match(/[\u4e00-\u9fa5]+/);
+                if ($.isArray(match_array) && match_array[0]) {
+                    unit = match_array[0];
                 }
             }
-            data_arr.push({"obj": $(this), "digit": Util.filter_chinese(val)});
+            data_array.push({"obj": $(this), "digit": Util.filter_chinese(val)});
         });
-        let data_arr_len = data_arr.length;
+        let data_arr_len = data_array.length;
         if (data_arr_len > 0) {
             for (let i = 0; i < data_arr_len; i++) {
-                if (data_arr[i + 1]) {
-                    let digit = data_arr[i]["digit"];
-                    let next_digit = data_arr[i + 1]["digit"];
-                    let obj = data_arr[i]["obj"];
+                if (data_array[i + 1]) {
+                    let digit = data_array[i]["digit"];
+                    let next_digit = data_array[i + 1]["digit"];
+                    let obj = data_array[i]["obj"];
                     if (digit > next_digit) {
                         $(obj).html("<b class='text-danger'>" + digit + unit + " ↑</b>");
                     } else if (digit < next_digit) {
@@ -2788,9 +2788,9 @@ const Util = {
      */
     sort_table_row: function (td_obj) {
         let table = td_obj.parents('table').eq(0);
-        let row_arr = table.find('tr:gt(0)').toArray();
+        let row_array = table.find('tr:gt(0)').toArray();
         let td_index = td_obj.index();
-        row_arr.sort(function (row1, row2) {
+        row_array.sort(function (row1, row2) {
             let td1_val = Util.get_table_td_value(row1, td_index);
             let td2_val = Util.get_table_td_value(row2, td_index);
             return $.isNumeric(td1_val) && $.isNumeric(td2_val) ? td1_val - td2_val : td1_val.localeCompare(td2_val);
@@ -2798,10 +2798,10 @@ const Util = {
         let sort_cls = "fa-sort-asc";
         this.asc = !this.asc;
         if (!this.asc) {
-            row_arr = row_arr.reverse();
+            row_array = row_array.reverse();
             sort_cls = "fa-sort-desc";
         }
-        table.children('tbody').empty().html(row_arr);
+        table.children('tbody').empty().html(row_array);
         table.children('thead').find("i").each(function () {
             if ($(this).hasClass("fa")) {
                 $(this).removeClass("fa-sort-asc");
@@ -2838,18 +2838,18 @@ const Util = {
             } else {
                 // 174.36(+0.79%) 括号里的数字
                 let bracket_re = /\(([-+]?\d*\.?\d+|[-+]?\d+|\d+)\%?\)/;
-                let match_arr = bracket_re.exec(td_val);
-                if ($.isArray(match_arr)) {
-                    if (match_arr.length >= 2) {
-                        return match_arr[1];
+                let match_array = bracket_re.exec(td_val);
+                if ($.isArray(match_array)) {
+                    if (match_array.length >= 2) {
+                        return match_array[1];
                     }
                     return 0;
                 } else {
                     // 匹配数字
                     let digit_re = /([-+]?\d*\.?\d+|[-+]?\d+|\d+)/;
-                    match_arr = digit_re.exec(td_val);
-                    if ($.isArray(match_arr) && match_arr[0]) {
-                        return match_arr[0];
+                    match_array = digit_re.exec(td_val);
+                    if ($.isArray(match_array) && match_array[0]) {
+                        return match_array[0];
                     }
                     return td_val.replace("%", "");
                 }
@@ -2884,9 +2884,9 @@ const Util = {
         let url = location.search; //获取url中"?"符后的字串
         let obj = {};
         if (url.indexOf("?") !== -1) {
-            let query_arr = url.substring(1).split("&");
-            for (let i = 0; i < query_arr.length; i++) {
-                let query = query_arr[i].split("=");
+            let query_array = url.substring(1).split("&");
+            for (let i = 0; i < query_array.length; i++) {
+                let query = query_array[i].split("=");
                 obj[query[0]] = query[1];
             }
         }
@@ -3626,8 +3626,8 @@ const Util = {
      */
     init_date_range_picker: function (element_id, Obj, callback_func, start_date = 0, end_date = 0) {
         let separator = element_id.indexOf("_start_end") > -1 ? "_start_end" : "_";
-        let element_arr = element_id.split(separator);
-        let prefix = element_arr[0];
+        let element_array = element_id.split(separator);
+        let prefix = element_array[0];
         let select_id = prefix + "_time_select";
         let start_id = prefix + "_start_date";
         let end_id = prefix + "_end_date";
@@ -3864,9 +3864,9 @@ const Util = {
             fraction = Math.pow(10, fraction);
             digit = Math.round(digit * fraction) / fraction;
             if (fraction === 100) {
-                let digit_arr = digit.toString().split(".");
-                if (digit_arr.length > 1) {
-                    if (digit_arr[1].length === 1) {
+                let digit_array = digit.toString().split(".");
+                if (digit_array.length > 1) {
+                    if (digit_array[1].length === 1) {
                         return (digit + "0");
                     }
                 } else {
@@ -4016,21 +4016,21 @@ const Util = {
     init_time_drop_down: function (metrics, metrics_drop_down_id, date_type, callback_func) {
         let metrics_drop_down_type_id = metrics_drop_down_id + "_date_" + date_type;
         let metrics_drop_down_btn_id = metrics + "_btn_" + date_type;
-        let time_arr = ["30周", "52周", "100周", "150周", "200周", "300周"];
+        let time_array = ["30周", "52周", "100周", "150周", "200周", "300周"];
         if (date_type === "month") {
-            time_arr = ["30月", "40月", "50月", "60月", "100月", "120月"];
+            time_array = ["30月", "40月", "50月", "60月", "100月", "120月"];
         } else if (date_type === "quarter") {
-            time_arr = ["30季", "40季", "50季"];
+            time_array = ["30季", "40季", "50季"];
         } else if (date_type === "daily") {
-            time_arr = ["20日", "60日", "120日", "200日"];
+            time_array = ["20日", "60日", "120日", "200日"];
         }
-        let default_time = (date_type === "daily" || date_type === "week") ? time_arr[1] : time_arr[0];
+        let default_time = (date_type === "daily" || date_type === "week") ? time_array[1] : time_array[0];
         let html = [];
         html.push('<div class="btn-group">');
         html.push('<button id="' + metrics_drop_down_btn_id + '" data-val="' + date_type + '" type="button" class="btn btn-default ' + metrics + '_bar_btn">' + default_time + '</button>');
         html.push('<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span></button>');
         html.push('<ul style="margin-top: 5px;" class="dropdown-menu" id="' + metrics_drop_down_type_id + '">');
-        time_arr.forEach(function (t) {
+        time_array.forEach(function (t) {
             html.push('<li><a href="javacript:void(0);">', t, '</a></li>');
         });
         html.push('</ul></div>&nbsp;');