sbd-npm 1.5.33 → 1.5.35

package/package.json

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

package/snowball_tool.js

@@ -0,0 +1,554 @@
+/**
+ * Copyright (C) 2015-present dhq <dhq314@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+$(function () {
+
+    let SnowballTool = {
+
+        cn_stock_data: [],
+        hk_stock_data: [],
+        us_stock_data: [],
+        status_data: [],
+        user_dict: {},
+
+        fetch: function () {
+            if (Util.is_load) {
+                return false;
+            }
+            let key_word = $("#key_word").val().trim();
+            if (key_word) {
+                Util.show_loading();
+                $("#key-tips").css("display", "none");
+                for (const [user_id, user_name] of Object.entries(SnowballTool.user_dict)) {
+                    if (key_word === user_name) {
+                        key_word = user_id;
+                    }
+                }
+                Util.post(location.pathname, {key_word: key_word}, function (j) {
+                    $("#search_tips").remove();
+                    $("#particles-js").remove();
+                    if (j.user) {
+                        $("#snowball-data").removeClass("hide");
+
+                        $("#user_id").html(Util.pack_html_link("https://xueqiu.com/u/" + j.user.id, j.user.id));
+                        let user_api_url = "https://xueqiu.com/user/show.json?id=" + j.user.id + "&_=" + Util.now();
+                        j.user.screen_name = j.user.screen_name ? j.user.screen_name : "--";
+                        let name_html = Util.pack_html_link(user_api_url, j.user.screen_name);
+                        if (j.user.name_list) {
+                            name_html += '&nbsp;<i class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-container="body" data-original-title="' + j.user.name_list.join("、") + '"></i>';
+                            $("#user_name").html(name_html);
+                            $("[data-toggle='tooltip']").tooltip();
+                        } else {
+                            $("#user_name").html(name_html);
+                        }
+                        let province = j.user.province;
+                        if (j.user.city && j.user.city.length > 0 && province !== j.user.city) {
+                            if (province === "海外") {
+                                province = j.user.city;
+                            } else {
+                                province += j.user.city;
+                            }
+                        }
+                        $("#province").html(province ? Util.map_url(province) : "--");
+                        $("#ip_location").html(j.user.ip_location ? Util.map_url(j.user.ip_location) : "--");
+                        $("#gender").html(j.user.gender === "f" ? "女" : "男");
+                        if (j.user.friends_count) {
+                            $("#friends_count").html(Util.pack_html_link("https://xueqiu.com/u/" + j.user.id + "#/follow", j.user.friends_count));
+                        } else {
+                            $("#friends_count").html(j.user.friends_count);
+                        }
+                        if (j.user.followers_count) {
+                            $("#followers_count").html(Util.pack_html_link("https://xueqiu.com/u/" + j.user.id + "#/fans", j.user.followers_count));
+                        } else {
+                            $("#followers_count").html(j.user.followers_count);
+                        }
+                        if (j.user.status_count) {
+                            $("#status_count").html(Util.pack_html_link("https://xueqiu.com/v4/statuses/user_timeline.json?&user_id=" + j.user.id + "&type=0&count=20", j.user.status_count));
+                        } else {
+                            $("#status_count").html(0);
+                        }
+                        let description = j.user.description ? j.user.description : "";
+                        let verified_array = [];
+                        if (j.user.verified_infos && j.user.verified_infos.length > 0) {
+                            j.user.verified_infos.forEach(function (item) {
+                                verified_array.push(item.verified_desc);
+                            });
+                        }
+                        if (j.user.verified_description && j.user.verified_description.length > 0 && !verified_array.includes(j.user.verified_description)) {
+                            verified_array.push(j.user.verified_description);
+                        }
+                        if (verified_array.length > 0) {
+                            description += "<br>";
+                            verified_array.forEach(function (verified) {
+                                description += "<span class='label label-info'>" + verified + "</span> ";
+                            });
+                        }
+                        $("#description").html(description);
+                        if (j.user.created_at && j.user.created_at > 0) {
+                            if (j.user.created_at.toString().length > 10) {
+                                j.user.created_at = j.user.created_at / 1000;
+                            }
+                            $("#created_time").html(Util.seconds_to_format(j.user.created_at));
+                        } else {
+                            $("#created_time").html("--");
+                        }
+                        if (j.user.weibo_id > 0) {
+                            $("#weibo_id").html(Util.pack_html_link("https://m.weibo.cn/profile/" + j.user.weibo_id, j.user.weibo_id));
+                        } else {
+                            $("#weibo_id").html("--");
+                        }
+                        if (j.user.profile_image_url) {
+                            let img_array = j.user.profile_image_url.split(",");
+                            if (img_array.length > 0) {
+                                let avatar_url = img_array[0];
+                                if (!avatar_url.startsWith('http')) {
+                                    avatar_url = "https:" + (j.user.photo_domain ? j.user.photo_domain : "") + img_array[0];
+                                }
+                                let avatar_object = $("#avatar");
+                                avatar_object.html('<img alt="' + j.user.screen_name + '" id="avatar_img" src="' + avatar_url + '!180x180.png">');
+                                avatar_object.attr("target", "_blank");
+                                avatar_object.attr("href", avatar_url);
+                                $('#avatar_img').load(function () {
+                                    SnowballTool.resize_avatar_img();
+                                });
+                                $("#menu_toggle").click(function () {
+                                    SnowballTool.resize_avatar_img();
+                                });
+                            }
+                        }
+                        if (j.stocks) {
+                            $("#total_stock_num").html(j.stocks.length > 0 ? Util.pack_html_link("https://xueqiu.com/u/" + j.user.id + "#/stock", j.stocks.length) : "--");
+                            SnowballTool.init_stock_data(j.stocks);
+                        }
+                        SnowballTool.render_snowball_html();
+                        SnowballTool.status_data = [];
+                        $("#tweet a").first().html("推文");
+                        Util.post(location.pathname, {action: "tweet", uid: j.user.id}, function (j) {
+                            SnowballTool.status_data = j.data ? j.data : [];
+                            $("#tweet a").first().html("推文 <span class='badge alert-info'>" + SnowballTool.status_data.length + "</span>");
+                        });
+                        Util.hide_tips();
+                    } else {
+                        $("#snowball-data").addClass("hide");
+                        Util.hide_tips();
+                        Util.show_tips("不存在该用户！！！", 5000, "alert-danger");
+                    }
+                });
+            }
+        },
+
+        init_stock_data: function (stock_data) {
+            SnowballTool.cn_stock_data = [];
+            SnowballTool.hk_stock_data = [];
+            SnowballTool.us_stock_data = [];
+            stock_data.forEach(function (item) {
+                if (Util.is_hk(item.code)) {
+                    SnowballTool.hk_stock_data.push(item);
+                } else if (Util.is_us(item.code)) {
+                    SnowballTool.us_stock_data.push(item);
+                } else {
+                    SnowballTool.cn_stock_data.push(item);
+                }
+            });
+            $("#cn a").first().html("A股 <span class='badge alert-info'>" + SnowballTool.cn_stock_data.length + "</span>");
+            $("#hk a").first().html("港股 <span class='badge alert-info'>" + SnowballTool.hk_stock_data.length + "</span>");
+            $("#us a").first().html("美股 <span class='badge alert-info'>" + SnowballTool.us_stock_data.length + "</span>");
+            localStorage["snowball_tool_nav"] = SnowballTool.cn_stock_data.length > 0 ? "cn" : (SnowballTool.hk_stock_data.length > 0 ? "hk" : (SnowballTool.us_stock_data.length > 0 ? "us" : "tweet"));
+            Util.tab_switch("snowball_tool_nav", SnowballTool.render_snowball_html);
+        },
+
+        resize_avatar_img: function () {
+            let avatar_object = $("#avatar");
+            if (Util.is_mobile()) {
+                let client_width = document.body.clientWidth;
+                avatar_object.css("width", client_width + "px");
+            } else {
+                let avatar_height = avatar_object.width();
+                avatar_object.css("height", (avatar_height + 10) + "px");
+                let img_object = $("#avatar_img");
+                let dist = avatar_height - img_object.height();
+                if (dist > 5) {
+                    img_object.css("margin-top", (dist / 2) + "px");
+                }
+            }
+        },
+
+        render_snowball_html: function () {
+            let tab_type = SnowballTool.get_tab_type();
+            if (tab_type === "tweet") {
+                if (SnowballTool.status_data.length > 0) {
+                    SnowballTool.render_tweet_html();
+                } else {
+                    SnowballTool.fetch_tweet_data();
+                }
+            } else {
+                SnowballTool.init_table_skeleton(tab_type);
+                let data_type_key = tab_type + "_stock_data";
+                if (SnowballTool[data_type_key]) {
+                    Util.render_type_option($("#industry"), SnowballTool[data_type_key], "industry", SnowballTool.render_stock_html);
+                    Util.render_type_option($("#area"), SnowballTool[data_type_key], "area", SnowballTool.render_stock_html);
+                }
+                SnowballTool.render_stock_html();
+            }
+        },
+
+        fetch_tweet_data: function () {
+            let uid = $("#user_id").text();
+            if (uid) {
+                Util.show_loading();
+                $("#snowball_tool_div").html('<div class="x_panel text-center">Loading...</div>');
+                Util.post(location.pathname, {action: "tweet", uid: uid}, function (j) {
+                    SnowballTool.status_data = j.data ? j.data : [];
+                    SnowballTool.render_tweet_html();
+                    Util.hide_tips();
+                });
+            } else {
+                $("#snowball_tool_div").html('<div class="x_panel text-center">暂无数据</div>');
+            }
+        },
+
+        render_tweet_html: function () {
+            if (SnowballTool.status_data && SnowballTool.status_data.length > 0) {
+                let html = [];
+                html.push('<div class="x_panel"><ul class="list-unstyled timeline widget">');
+                SnowballTool.status_data.forEach(function (item) {
+                    html.push('<li><div class="block"><div class="block_content">');
+                    if (item.title) {
+                        item.title = Util.strip_html(item.title).replace(/\\/g, "");
+                        item.title = Util.truncate(item.title, 50);
+                    } else {
+                        item.title = item.url;
+                    }
+                    item.content = item.content.replace(/\\/g, "");
+                    item.content = item.content.replace(/thumb\.jpg/g, "custom.jpg");
+                    if (item.pic) {
+                        let pic_array = item.pic.split(",");
+                        pic_array.forEach(function (pic) {
+                            if (pic.includes("thumb.jpg")) {
+                                pic = pic.replace("thumb.jpg", "custom.jpg");
+                            } else if (!pic.includes("custom.jpg")) {
+                                pic += "!custom.jpg";
+                            }
+                            if (!item.content.includes(pic)) {
+                                item.content += "<br><img src='" + pic + "'>";
+                            }
+                        });
+                    }
+                    html.push('<h2 class="title">' + Util.pack_html_link(item.url, item.title) + '</h2>');
+                    html.push('<div class="byline"><span>', Util.seconds_to_format(item.create_time), '</span></div>');
+                    html.push('<p class="excerpt">', item.content, '</p>');
+                    html.push('</div></div></li>');
+                });
+                html.push('</ul></div>');
+                $("#snowball_tool_div").html(html.join(""));
+                $("#tweet a").first().html("推文 <span class='badge alert-info'>" + SnowballTool.status_data.length + "</span>");
+            } else {
+                $("#snowball_tool_div").html('<div class="x_panel text-center">暂无数据</div>');
+            }
+        },
+
+        render_stock_html: function () {
+            let html = [];
+            let tab_type = SnowballTool.get_tab_type();
+            let data_type_key = tab_type + "_stock_data";
+            if (SnowballTool[data_type_key]) {
+                let stock_num = 0, stock_profit = 0, hk_mutual_code_list = [];
+                let area = $("#area").val();
+                let industry = $("#industry").val();
+                SnowballTool[data_type_key].forEach(function (item) {
+                    if (Util.is_industry_area(item, industry, area)) {
+                        item.code = item.code.replace(item.exchange, "");
+                        if (item.is_hk_mutual && item.is_hk_mutual === 1) {
+                            hk_mutual_code_list.push(item.code);
+                        }
+                        html.push("<tr", (item.is_recommend && item.is_recommend === 1 ? " class='info'" : ""), ">");
+                        html = Util.stock_basics_html(html, item);
+                        html.push("<td>", Util.year_price_rate(item.stock_price, item.year_price), "</td>");
+                        html.push("<td>", Util.year_price_rate(item.stock_price, item.d5_price), "</td>");
+                        if (tab_type === "cn") {
+                            html.push("<td class='holder_", item.code, "'>--</td>");
+                            html.push("<td class='fund_", item.code, "'>--</td>");
+                        }
+                        html.push("<td>", Util.seconds_to_format(item.created), "</td>");
+                        item.start_price = Util.to_float(item.start_price, 2);
+                        html.push("<td id='sp_", item.code, "'>", Util.digit_compare_trend1(item.stock_price, item.start_price), "</td>");
+                        let high_price = item.stock_price > item.high_price ? item.stock_price : item.high_price;
+                        html.push("<td id='hp_", item.code, "' data-price='", high_price, "'>", Util.digit_compare_trend1(high_price, item.start_price), "</td>");
+                        html.push("</tr>");
+                        stock_profit += ((item.stock_price - item.start_price) / item.start_price);
+                        stock_num++;
+                    }
+                });
+                Util.render_table_html("snowball_tool_div_body", html);
+                let code_list = Util.get_code_list("snowball_tool_div_body");
+                if (code_list.length > 0) {
+                    Util.post("/action", {action: "price", code_list: code_list.join("-")}, function (j) {
+                        for (let [code, item] of Object.entries(j)) {
+                            Util.render_price(item);
+                            let sp_object = $("#sp_" + code);
+                            let start_price = Util.to_float(parseFloat(Util.strip_bracket_string(sp_object.text())), 2);   // 删除括号内的字符
+                            sp_object.html(Util.digit_compare_trend1(item.price, start_price));
+                            let hp_object = $("#hp_" + code);
+                            let high_price = parseFloat(hp_object.attr("data-price"));
+                            if (item.price > high_price) {
+                                hp_object.html(Util.digit_compare_trend1(item.price, start_price));
+                            }
+                        }
+                    });
+                    if (tab_type === "hk") {
+                        if (hk_mutual_code_list.length > 0) {
+                            $("#snowball_tool_div_body .code_item").each(function () {
+                                let hk_code = $(this).text().replace(/[^0-9]/ig, "");
+                                if (hk_mutual_code_list.includes(hk_code)) {
+                                    $(this).parent().parent().children('td').eq(1).addClass("danger");
+                                }
+                            });
+                        }
+                        $("#snowball_tool_div_body .industry_link").each(function () {
+                            $(this).attr("href", Util.get_url("hk_list") + "?industry=" + $(this).text());
+                        });
+                    } else if (tab_type === "us") {
+                        $("#snowball_tool_div_body .industry_link").each(function () {
+                            $(this).attr("href", Util.get_url("us_list") + "?industry=" + $(this).text());
+                        });
+                        $("#snowball_tool_div_body .map_link").each(function () {
+                            $(this).attr("href", Util.get_url("us_list") + "?market=" + $(this).text());
+                        });
+                    } else {
+                        Util.init_stock_stuff("snowball_tool_div_body", [], 0, 0);
+                    }
+                }
+                $("#stock_num").html(stock_num);
+                if (stock_num > 0) {
+                    stock_profit = Util.to_float((stock_profit / stock_num) * 100, 2);
+                    $("#stock_profit").html("，平均收益: " + Util.parse_ratio(stock_profit) + "&nbsp;&nbsp;&nbsp;");
+                }
+            } else {
+                Util.render_table_html("snowball_tool_div_body", html);
+            }
+        },
+
+        init_data: function (is_render) {
+            Util.post(location.pathname, {action: "init_tool"}, function (j) {
+                if (j["user"] && typeof j["user"] === 'object') {
+                    SnowballTool.user_dict = j["user"];
+                    if (is_render === 1) {
+                        let html = [];
+                        for (const [user_id, user_name] of Object.entries(SnowballTool.user_dict)) {
+                            html.push('<a class="btn btn-default" data-val="', user_id, '" style="margin-bottom: 10px;" href="#">', user_name, '</a>');
+                        }
+                        $("#search_tips").html(html.join("")).find("a").each(function () {
+                            $(this).click(function () {
+                                $("#key_word").val($(this).attr("data-val"));
+                                SnowballTool.fetch();
+                            });
+                        });
+                    }
+                }
+                if (is_render === 1) {
+                    Util.hide_tips();
+                }
+            });
+        },
+
+        render_recent_stock_modal: function() {
+            Util.show_loading();
+            Util.post(location.pathname, {"action": "recent_stock"}, function (j) {
+                let html = [];
+                j.data.forEach(function (item, index) {
+                    html.push("<tr>");
+                    html.push("<td>",  (index + 1), "</td>");
+                    html.push("<td><a class='user_td' data-val='", item.uid, "' href='#'>", item.user_name, "</a></td>");
+                    html.push("<td class='code_item'>", Util.snowball_url(Util.is_alphabet(item.code) ? item.code.toUpperCase() : item.code), "</td>");
+                    html.push("<td>", Util.stock_url(item.code, item.name ? item.name : item.code.toUpperCase()), "</td>");
+                    html.push("<td>", Util.map_url((item.province_city && item.province_city !== "None") ? item.province_city : item.area), "</td>");
+                    html.push("<td>", item.industry ? item.industry.slice(0, 6) : "--", "</td>");
+                    html.push("<td class='price_", item.code.toLowerCase(), "'>", item.stock_price, "</td>");
+                    html.push("<td>", Util.year_price_rate(item.stock_price, item.year_price), "</td>");
+                    html.push("<td>", Util.year_price_rate(item.stock_price, item.d5_price), "</td>");
+                    html.push("<td>", Util.seconds_to_format(item.create_time), "</td>");
+                    html.push("</tr>");
+                });
+                Util.render_table_html("recent_stock_modal_body_body", html);
+                $("#recent_stock_modal_body_body .user_td").each(function() {
+                    $(this).click(function() {
+                        $("#key_word").val($(this).attr("data-val"));
+                        $('#recent_stock_modal').modal('hide');
+                        setTimeout(SnowballTool.fetch, 789);
+                    });
+                });
+                Util.refresh_price("recent_stock_modal_body_body");
+                Util.hide_tips();
+            });
+        },
+
+        get_tab_type: function() {
+            let tab_type = "cn";
+            $("#snowball_tool_nav").find("li").each(function () {
+                if ($(this).hasClass("active")) {
+                    tab_type = $(this).attr("id");
+                }
+            });
+            return tab_type;
+        },
+
+        init_table_skeleton: function (tab_type) {
+            let head_columns = [
+                {"name": "代码"},
+                {"name": "名称"},
+                {"name": "PE", "title": "市盈率(Price Earnings Ratio)", "table_sort": 1},
+                {"name": "总市值", "table_sort": 1},
+                {"name": "行业", "select_id": "industry"},
+                {"name": "地区", "select_id": "area"},
+                {"name": "当前价", "table_sort": 1},
+                {"name": "年初至今", "table_sort": 1},
+                {"name": "近5日", "table_sort": 1},
+            ];
+            if (tab_type === "cn") {
+                head_columns.push({"name": "股东数", "table_sort": 1});
+                head_columns.push({"name": "基金数", "table_sort": 1});
+            }
+            head_columns.push({"name": "创建时间", "class": "info", "table_sort": 1});
+            head_columns.push({"name": "创建收益", "table_sort": 1});
+            head_columns.push({"name": "创建最高收益", "table_sort": 1});
+            Util.init_table_skeleton({
+                "element_id": "snowball_tool_div",
+                "caption": '<caption class="text-right">共 <span id="stock_num" class="label label-info">0</span> 只自选股<span id="stock_profit"></span></caption>',
+                "head_columns": head_columns
+            });
+        }
+    };
+
+    $("#query-stock").click(function () {
+        SnowballTool.fetch();
+    });
+
+    $("#key_word").focus(function () {
+        let html = [];
+        html.push('<div class="list-group">');
+        for (const user_name of Object.values(SnowballTool.user_dict)) {
+            html.push('<a href="#" class="list-group-item">', user_name, '</a>');
+        }
+        html.push('</div>');
+        $("#key-tips").html(html.join("")).slideDown(300);
+        $(".list-group-item").each(function () {
+            $(this).click(function () {
+                $("#key_word").val($(this).text());
+                $("#key-tips").slideUp(200);
+                SnowballTool.fetch();
+            });
+        });
+    });
+    $(document).click(function (event) {
+        if (!$(event.target).closest("#key_word, #key-tips").length) {
+            $("#key-tips").slideUp(200);
+        }
+    });
+
+    let request_arguments = Util.request_arguments();
+    if (request_arguments.uid) {
+        $("#key_word").val(parseInt(request_arguments.uid));
+        SnowballTool.fetch();
+        SnowballTool.init_data(0);
+    } else {
+        SnowballTool.init_data(1);
+    }
+
+    Util.init_modal_skeleton("recent_stock_modal");
+    $("#recent_stock_modal_title").html("特别关注的用户最近一周内新添的个股");
+    Util.init_table_skeleton({
+        "element_id": "recent_stock_modal_body",
+        "head_columns": [
+            {"name": "序号", "table_sort": 1},
+            {"name": "用户"},
+            {"name": "代码"},
+            {"name": "名字"},
+            {"name": "地区"},
+            {"name": "行业"},
+            {"name": "当前价", "table_sort": 1},
+            {"name": "年初至今", "table_sort": 1},
+            {"name": "近5日", "table_sort": 1},
+            {"name": "时间", "table_sort": 1, "class": "info"},
+        ]
+    });
+    let rsm_object = $('#recent_stock_modal');
+    rsm_object.on('shown.bs.modal', function (e) {
+        SnowballTool.render_recent_stock_modal();
+    });
+    rsm_object.on('hidden.bs.modal', function () {
+        Util.set_table_loading("recent_stock_modal_body_body");
+        Util.hide_tips();
+    });
+
+});
+
+if (!Util.is_small_screen()) {
+    particlesJS('particles-js', {   // https://github.com/VincentGarreau/particles.js
+        "particles": {
+            "number": {"value": 80, "density": {"enable": true, "value_area": 800}},
+            "color": {"value": "#8f8f8f"},
+            "shape": {
+                "type": "circle",
+                "stroke": {"width": 0, "color": "#000000"},
+                "polygon": {"nb_sides": 5},
+                "image": {"src": "img/github.svg", "width": 100, "height": 100}
+            },
+            "opacity": {
+                "value": 0.5,
+                "random": false,
+                "anim": {"enable": false, "speed": 1, "opacity_min": 0.1, "sync": false}
+            },
+            "size": {
+                "value": 5,
+                "random": true,
+                "anim": {"enable": false, "speed": 40, "size_min": 0.1, "sync": false}
+            },
+            "line_linked": {"enable": true, "distance": 150, "color": "#8f8f8f", "opacity": 0.4, "width": 1},
+            "move": {
+                "enable": true,
+                "speed": 6,
+                "direction": "none",
+                "random": false,
+                "straight": false,
+                "out_mode": "out",
+                "attract": {"enable": false, "rotateX": 600, "rotateY": 1200}
+            }
+        },
+        "interactivity": {
+            "detect_on": "canvas",
+            "events": {
+                "onhover": {"enable": true, "mode": "repulse"},
+                "onclick": {"enable": true, "mode": "push"},
+                "resize": true
+            },
+            "modes": {
+                "grab": {"distance": 400, "line_linked": {"opacity": 1}},
+                "bubble": {"distance": 400, "size": 40, "duration": 2, "opacity": 8, "speed": 3},
+                "repulse": {"distance": 200},
+                "push": {"particles_nb": 4},
+                "remove": {"particles_nb": 2}
+            }
+        },
+        "retina_detect": true,
+        "config_demo": {
+            "hide_card": false,
+            "background_color": "#FFF",
+            "background_image": "",
+            "background_position": "50% 50%",
+            "background_repeat": "no-repeat",
+            "background_size": "cover"
+        }
+    });
+}

package/snowball_tweet.js

@@ -15,7 +15,7 @@
  */
 $(function () {
 
-    let Tweet = {
+    let SnowballTweet = {
 
         pageYOffset: 0,
         user_data: {},
@@ -32,7 +32,7 @@ $(function () {
                     if (j.user_data) {
                         let uid = request_arguments.uid ? parseInt(request_arguments.uid) : 0;
                         j.user_data.forEach(function (item) {
-                            Tweet.user_data[item.uid] = item.name;
+                            SnowballTweet.user_data[item.uid] = item.name;
                             let select_mark = "";
                             if (item.uid === uid) {
                                 is_select = 1;
@@ -51,16 +51,16 @@ $(function () {
                         $("#tid").val (request_arguments.tid);
                     }
                     if (is_select === 1) {
-                        Tweet.fetch_tweet_data();
+                        SnowballTweet.fetch_tweet_data();
                     }
                     if (j.key_words) {
-                        Tweet.tweet_key_words = j.key_words;
-                        let key_words = Tweet.tweet_key_words.map(item => "“" + item + "”").join("、");
+                        SnowballTweet.tweet_key_words = j.key_words;
+                        let key_words = SnowballTweet.tweet_key_words.map(item => "“" + item + "”").join("、");
                         $("#content").attr("data-original-title", "推文内容搜索，例如：" + key_words);
                     }
                     if (j.special_observe_uid_list) {
-                        Tweet.special_observe_uid_list = j.special_observe_uid_list;
-                        Tweet.raw_special_observe_uid_list = j.special_observe_uid_list;
+                        SnowballTweet.special_observe_uid_list = j.special_observe_uid_list;
+                        SnowballTweet.raw_special_observe_uid_list = j.special_observe_uid_list;
                     }
                     $("#today_so_num").html(j.today_so_num && j.today_so_num > 0 ? ("(" + j.today_so_num + ")") : "");
                     $("#update_time").html(j.update_time && j.update_time > 0 ? (" (更新于：" + Util.seconds_to_format(j.update_time) + ")") : "");
@@ -70,8 +70,8 @@ $(function () {
                             $("#today_new_tweet").after('<a href="#" id="key_word_tweet" class="btn btn-danger form-control">关键词(<span>' + j.key_word_num + '</span>)</a>');
                             $("#key_word_tweet").click(function() {
                                 if (!Util.is_load) {
-                                    Tweet.is_key_word_tweet = 1;
-                                    Tweet.fetch_tweet_data();
+                                    SnowballTweet.is_key_word_tweet = 1;
+                                    SnowballTweet.fetch_tweet_data();
                                 }
                             });
                         }
@@ -108,7 +108,7 @@ $(function () {
                                     html.push('</div>');
                                     $("#today_tweet_statistics_modal_body").html(html.join("")).find("a").each(function() {
                                         $(this).click(function() {
-                                            Tweet.set_today_date();
+                                            SnowballTweet.set_today_date();
                                             $("#tweet_list").html("");
                                             let uid = $(this).attr("data-val");
                                             if (uid) {
@@ -120,7 +120,7 @@ $(function () {
                                                 uid_object.val(uid);
                                             }
                                             $('#today_tweet_statistics_modal').modal('hide');
-                                            setTimeout(Tweet.fetch_tweet_data, 789);
+                                            setTimeout(SnowballTweet.fetch_tweet_data, 789);
                                         });
                                     });;
                                     Util.hide_tips();
@@ -138,25 +138,25 @@ $(function () {
                         }
                     }
                 } else {
-                    Tweet.init_tweet_status();
+                    SnowballTweet.init_tweet_status();
                 }
             });
         },
 
         fetch_tweet_data: function() {
             Util.show_loading();
-            let payload = Tweet.get_payload();
-            payload["is_key_word_tweet"] = Tweet.is_key_word_tweet;
+            let payload = SnowballTweet.get_payload();
+            payload["is_key_word_tweet"] = SnowballTweet.is_key_word_tweet;
             Util.post(location.pathname, payload, function (j) {
-                Tweet.render_tweet_html(j.data, 0);
-                Tweet.is_key_word_tweet = 0;
+                SnowballTweet.render_tweet_html(j.data, 0);
+                SnowballTweet.is_key_word_tweet = 0;
             });
         },
 
         get_payload: function() {
             let special_observe_uid = "";
-            if (Tweet.special_observe_uid_list && $("#is_special_observe").prop("checked")) {
-                special_observe_uid = Tweet.special_observe_uid_list.join(",");
+            if (SnowballTweet.special_observe_uid_list && $("#is_special_observe").prop("checked")) {
+                special_observe_uid = SnowballTweet.special_observe_uid_list.join(",");
             }
             return {
                 action: "tweet_search",
@@ -174,7 +174,7 @@ $(function () {
         render_tweet_html: function(data, render_type) {
             if (data && data.length > 0) {
                 let html = [], regexp_pattern = null, is_simple = 0;
-                let key_word_array = Tweet.tweet_key_words.slice();
+                let key_word_array = SnowballTweet.tweet_key_words.slice();
                 let key_word = $("#content").val().trim();
                 if (key_word) {
                     key_word_array.push(key_word);
@@ -243,17 +243,17 @@ $(function () {
                         }
                     }
                     let user_name = "";
-                    if (item.mark && Tweet.user_data[item.mark]) {
-                        user_name = Util.pack_html_link("https://xueqiu.com/S/" + item.mark, Tweet.user_data[item.mark]) + " - ";
+                    if (item.mark && SnowballTweet.user_data[item.mark]) {
+                        user_name = Util.pack_html_link("https://xueqiu.com/S/" + item.mark, SnowballTweet.user_data[item.mark]) + " - ";
                         if (item.user_name) {
                             user_name += Util.pack_html_link(user_url, item.user_name);
-                        } else if (Tweet.user_data[item.uid]) {
-                            user_name += Util.pack_html_link(user_url, Tweet.user_data[item.uid]);
+                        } else if (SnowballTweet.user_data[item.uid]) {
+                            user_name += Util.pack_html_link(user_url, SnowballTweet.user_data[item.uid]);
                         } else {
                             user_name += Util.pack_html_link(user_url, item.uid);
                         }
-                    } else if (Tweet.user_data[item.uid]) {
-                        user_name = Util.pack_html_link(user_url, Tweet.user_data[item.uid]);
+                    } else if (SnowballTweet.user_data[item.uid]) {
+                        user_name = Util.pack_html_link(user_url, SnowballTweet.user_data[item.uid]);
                     } else {
                         user_name = Util.pack_html_link(user_url, item.uid);
                     }
@@ -283,7 +283,7 @@ $(function () {
 
         render_special_observe_html() {
             let html = [];
-            let so_uid_list = Tweet.special_observe_uid_list ? Tweet.special_observe_uid_list : [];
+            let so_uid_list = SnowballTweet.special_observe_uid_list ? SnowballTweet.special_observe_uid_list : [];
             html.push('<div class="form-inline text-center">');
             html.push('<div class="form-group text-left">');
             $('#uid option').each(function() {
@@ -310,10 +310,10 @@ $(function () {
                 });
             });
             $("#reset_so_uid").click(function() {
-                if (Tweet.raw_special_observe_uid_list) {
+                if (SnowballTweet.raw_special_observe_uid_list) {
                     document.querySelectorAll('#special_observe_modal_body input[type="checkbox"]').forEach(cb => {
                         let uid = parseInt(cb.value);
-                        cb.checked = Tweet.raw_special_observe_uid_list.includes(uid) ? true : false;
+                        cb.checked = SnowballTweet.raw_special_observe_uid_list.includes(uid) ? true : false;
                     });
                 }
             });
@@ -326,7 +326,7 @@ $(function () {
                         so_uid_list.push(uid);
                     }
                 });
-                Tweet.special_observe_uid_list = so_uid_list;
+                SnowballTweet.special_observe_uid_list = so_uid_list;
                 $("#so_uid_tips").html("<b class='text-success'>保存成功！</b>");
             });
         },
@@ -342,7 +342,7 @@ $(function () {
 
     };
 
-    Util.init_date_range_picker("tweet_start_end_date", Tweet, "fetch_tweet_data");
+    Util.init_date_range_picker("tweet_start_end_date", SnowballTweet, "fetch_tweet_data");
     $("#tweet_start_date").val("");
     $("#tweet_end_date").val("");
     $("#today_new_tweet").click(function() {
@@ -351,19 +351,19 @@ $(function () {
             if (today_num > 0) {
                 let uid = parseInt($("#uid").val());
                 if (uid === 0) {
-                    Tweet.set_today_date();
+                    SnowballTweet.set_today_date();
                 }
-                Tweet.fetch_tweet_data();
+                SnowballTweet.fetch_tweet_data();
             } else {
                 Util.show_tips("今日暂无新帖", 4567, "alert-danger");
             }
         }
     });
     $("#tweet_type").change(function() {
-        Tweet.pageYOffset = 0;
+        SnowballTweet.pageYOffset = 0;
         $("#uid").html('<option value="0">Loading...</option>');
         $("#tweet_list").html("");
-        Tweet.init_tweet_status();
+        SnowballTweet.init_tweet_status();
     });
 
     Util.init_modal_skeleton("special_observe_modal");
@@ -371,26 +371,26 @@ $(function () {
     $("#special_observe_modal_body").parent().parent().removeClass("modal-xlg");
     let som_object = $('#special_observe_modal');
     som_object.on('show.bs.modal', function (e) {
-        Tweet.render_special_observe_html();
+        SnowballTweet.render_special_observe_html();
     });
     som_object.on('hidden.bs.modal', function () {
         $("#special_observe_modal_body").html("");
         Util.hide_tips();
     });
 
-    Tweet.init_tweet_status();
+    SnowballTweet.init_tweet_status();
     $("#query_data").click(function() {
-        Tweet.fetch_tweet_data();
+        SnowballTweet.fetch_tweet_data();
     });
     $("#is_simple").click(function() {
         if ($('#tweet_list li').length > 0) {
-            Tweet.fetch_tweet_data();
+            SnowballTweet.fetch_tweet_data();
         }
     });
 
     // 触发下拉到底部时的事件
     window.onscroll = function(ev) {
-        if (!Util.is_load && window.pageYOffset > Tweet.pageYOffset) {
+        if (!Util.is_load && window.pageYOffset > SnowballTweet.pageYOffset) {
             if ((window.innerHeight + window.pageYOffset) >= document.body.offsetHeight) {
                 if (!document.getElementById("tweet_loading")) {
                     let create_time = 0;
@@ -402,14 +402,14 @@ $(function () {
                         }
                     });
                     if (create_time > 0) {
-                        Tweet.pageYOffset = window.pageYOffset;
+                        SnowballTweet.pageYOffset = window.pageYOffset;
                         $('#tweet_list').append('<li id="tweet_loading"><div class="block"><div class="block_content text-center" style="font-size: 25px; line-height: 2em;">Loading...</div></div></li>');
                         Util.show_loading();
-                        let payload = Tweet.get_payload();
+                        let payload = SnowballTweet.get_payload();
                         payload["append_time"] = create_time;
                         Util.post(location.pathname, payload, function (j) {
                             $("#tweet_loading").remove();
-                            Tweet.render_tweet_html(j.data, 1);
+                            SnowballTweet.render_tweet_html(j.data, 1);
                         });
                     }
                 }

package/status.js

@@ -892,7 +892,13 @@ $(function () {
                         html.push("</tr>");
                     });
                     Util.render_table_html("machine_process_div_body", html);
-                    $("#machine_process_tip").html('共 <span class="label label-info">' + process_num + '</span> 进程，最后更新时间：' + Util.seconds_to_format(j.date) + '，Revision：' + j.revision + '，MachineId：' + j.machine_id);
+                    let process_num_cls = "label-info";
+                    let machine_id_status = j.machine_id;
+                    if (!j.is_activate || j.is_activate !== "1") {
+                        process_num_cls = "label-default";
+                        machine_id_status = '<span style="font-size: 90%" class="label label-default">' + j.machine_id + '</span>';
+                    }
+                    $("#machine_process_tip").html('共 <span class="label ' + process_num_cls + '">' + process_num + '</span> 进程，文件数：' + (j.files_count && j.files_count > 0 ? j.files_count : 0) + '，最后更新时间：' + Util.seconds_to_format(j.date) + '，Revision：' + j.revision + '，MachineId：' + machine_id_status);
                     $("#machines option[value='" + j.machine_id + "']").text(j.ip + "(" + process_num + ")");
                     // 终止进程
                     Status.handle_process_kill("machine_process_div_body", 2);

package/util.js

@@ -30,6 +30,7 @@ const Util = {
     countdown_timer_id: 0,
     is_init: 0,
     is_load: false,
+
     // 1年的天数
     ONE_YEAR_DAY: 365,
     // 一天的秒数
@@ -2871,15 +2872,15 @@ const Util = {
      */
     request_arguments: function () {
         // let url = location.search; //获取url中"?"符后的字串
-        // let obj = {};
+        // let ra_object = {};
         // if (url.includes("?")) {
         //     let query_array = url.slice(1).split("&");
         //     for (let i = 0; i < query_array.length; i++) {
         //         let query = query_array[i].split("=");
-        //         obj[query[0]] = query[1];
+        //         ra_object[query[0]] = query[1];
         //     }
         // }
-        // return obj;
+        // return ra_object;
         return Object.fromEntries(new URLSearchParams(location.search));
     },