sbd-npm 1.5.49 → 1.5.51

package/constant.js

@@ -161,8 +161,9 @@ const MenuList = [
 		'icon': 'retweet',
 		'menu': [
 			{'key': 'portfolio_recommend', 'name': '特别关注', 'url': '/0x2da99e58e28de94b670c4200657ac7e26dd8dceb'},
-			{'key': 'portfolio_gao', 'name': '高大侠', 'url': '/0x44fe5ef98b6802a9e7a893a1dcc231031ef8683d'},
 			{'key': 'portfolio_stratagem', 'name': '上兵伐谋zgz', 'url': '/0x622a4a04d7a04e3b28c85a36500371ba28edea83'},
+			{'key': 'portfolio_gao', 'name': '高大侠', 'url': '/0x44fe5ef98b6802a9e7a893a1dcc231031ef8683d'},
+			{'key': 'portfolio_ming', 'name': '明泓投资', 'url': '/0x70144fc2814bd29d01c8090245cf5518bbee41b1'},
 			{'key': 'portfolio_uestc', 'name': '独钓寒江雪', 'url': '/0x7cbaee9df4ea09cc2ad0d001f4b948109b75f39f'},
 			{'key': 'portfolio_ning', 'name': '宁湖', 'url': '/0x69717049aefea13348d702755a4ed38a2f0e40ad'},
 			{'key': 'portfolio_two', 'name': '两瓢(彭波)', 'url': '/0x376350389c657c5153d59959b6351935c9357651'},

package/package.json

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

package/status.js

@@ -320,7 +320,7 @@ $(function () {
                     html.push("<td>", item.status, "</td>");
                     html.push("<td data-val='", item.rss, "'>", Util.trans_byte_size(item.rss), "</td>");
                     html.push("<td data-val='", item.vms, "'>", Util.trans_byte_size(item.vms), "</td>");
-                    html.push("<td title='", item.cmdline, "'>", Util.truncate(item.cmdline, 60), "</td>");
+                    html.push("<td title='", item.cmdline, "'>", Util.truncate(item.cmdline, -60), "</td>");
                     html.push("<td>", Util.seconds_to_format(item.create_time), "</td>");
                     html.push(Status.pack_screen_html(is_screen, item.pid, screen_pid, screen_pid_date, item.cmdline));
                     html.push("</tr>");
@@ -898,7 +898,7 @@ $(function () {
                         html.push("<td>", item.pid, "</td>");
                         html.push("<td>", item.status, "</td>");
                         html.push("<td data-val='", item.rss, "'>", Util.trans_byte_size(item.rss), "</td>");
-                        let cmdline = Util.truncate(item.cmdline, 100);
+                        let cmdline = Util.truncate(item.cmdline, -100);
                         if (is_xmr === 1) {
                             html.push("<td>", Util.pack_html_link("/xmr", cmdline), "</td>");
                         } else {
@@ -1499,7 +1499,7 @@ $(function () {
                                 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;&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://apis.map.qq.com/ws/location/v1/ip?output=jsonp&key=SZYBZ-M7A6J-WSSF3-X7725-OH4J3-PZBIO&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) {

package/util.js

@@ -3895,9 +3895,15 @@ const Util = {
      * @returns {*}
      */
     truncate: function (str, len) {
-        if (str.length > len) {
-            str = str.slice(0, len) + "...";
-            //str = str.substring(0, len) + "...";
+        if (len < 0) {
+            if (str.length > Math.abs(len)) {
+                str = "..." + str.slice(len);
+            }
+        } else {
+            if (str.length > len) {
+                str = str.slice(0, len) + "...";
+                //str = str.substring(0, len) + "...";
+            }
         }
         return str
     },