ming_node 2.9.3 → 2.9.7

package/index.js

@@ -3,7 +3,7 @@
  * By : Minglie
  * QQ: 934031452
  * Date :2021.12.01
- * version :2.9.3
+ * version :2.9.7
  */
 var http = require('http');
 var https = require('https');
@@ -109,7 +109,7 @@ M.get = function (url, callback, data, headers) {
     if (typeof callback == "function") {
 
     } else {
-        headers = data || {};
+        headers = data || {'Content-Type': 'application/json'};
         data = callback;
         callback = () => {
         };
@@ -175,7 +175,11 @@ M.get = function (url, callback, data, headers) {
             res.on('end', function () {
                 callback(html, res);
                 try {
-                    html = JSON.parse(html)
+                    if(headers && headers['Content-Type']=='application/json'){
+                        html = JSON.parse(html)
+                    }else {
+                        html = html;
+                    }
                 } catch (e) {
                     html = html;
                 }
@@ -1497,11 +1501,14 @@ M.server = function () {
                 }
                 return isRest;
             }
-
-            req.ip = req.headers['x-forwarded-for'] ||
-                req.connection.remoteAddress ||
-                req.socket.remoteAddress ||
-                req.connection.socket.remoteAddress;
+            try {
+                req.ip = req.headers['x-forwarded-for'] ||
+                    req.connection.remoteAddress ||
+                    req.socket.remoteAddress ||
+                    req.connection.socket.remoteAddress;
+            }catch (e){
+                req.ip="";
+            }
             //请求cookies封装
             req.cookies = querystring.parse(req.headers['cookie'], "; ");
             //设置浏览器cookies
@@ -1769,7 +1776,11 @@ M.server = function () {
             }
         } catch (e) {
             console.error(e);
-            M["_gloable_exception_handle"](e,req,res);
+            try {
+                M["_gloable_exception_handle"](e,req,res);
+            }catch (e){
+                console.error("e2",e);
+            }
         }
     }
 
@@ -1941,7 +1952,7 @@ M.server = function () {
     //全局异常钩子
     app.set("gloable_exception_handle",(err,req,res)=>{
         console.error(err.stack)
-        if (res && !res.alreadySend) {
+        if (res && res.send && !res.alreadySend) {
             // res.writeHead(500, { "Content-Type": "text/j;charset='utf-8'" });
             res.send(M.result(err.message,false,-1));
         }
@@ -1985,8 +1996,6 @@ M.server = function () {
         console.log("listen on port:" + port);
         return server;
     }
-
-    global.app=app;
     return app;
 }
 M["_gloable_exception_handle"]=(err)=>{
@@ -2833,7 +2842,7 @@ M.getRemoteCacheByUrl = async function (url) {
     if (url.startsWith("file:")) {
         text = M.readFile(url.substring(5));
     } else {
-        text = await M.get(url);
+        text = await M.get(url,{},{});
     }
     console.log("req remote url:", url);
     M._globle_cacheMap[url] = text;

package/module/FileDb.js

@@ -100,9 +100,17 @@ class FileDb{
             let orderType=orderArr[1];
             rows.sort((a,b)=>{
                 let ret=0;
-                if (a[orderField]>b[orderField]) {
+                let a_order_v=0;
+                let b_order_v=0;
+                if(a[orderField]!=null){
+                    a_order_v=a[orderField];
+                }
+                if(b[orderField]!=null){
+                    b_order_v=b[orderField];
+                }
+                if (a_order_v>b_order_v) {
                     ret= 1;
-                }else if(a<b){
+                }else if(a_order_v<b_order_v){
                     ret= -1
                 }else{
                     ret= 0;

package/package.json

@@ -46,5 +46,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "2.9.3"
+  "version": "2.9.7"
 }

package/utils/yuque/yuque.js

@@ -0,0 +1,25 @@
+M=require("ming_node");
+let url=require("url");
+
+
+//M.yuqueToken="ZW9aH3CUDFWvC0ZU6nzoozBg03smn6Y5D36LqB8x";
+
+
+M.getYuque= async function (yuqueUrl,type){
+    M.reqComHeaders={"X-Auth-Token": M.yuqueToken,"User-Agent":"PostmanRuntime/7.26.1"}
+    type=type||"html";
+    let r= url.parse(yuqueUrl)
+    let host="https://"+r.hostname;
+    let all_path=yuqueUrl.split(host)[1];
+    let all_path_arr=all_path.split("/");
+    let yuqueApi=`${host}/api/v2/repos/${all_path_arr[1]}/${all_path_arr[2]}/docs/${all_path_arr[3]}`;
+    let r1=await M.get(yuqueApi);
+    let artileContent=r1.data.body;
+    artileContent=artileContent.replace(/\s+/g,'')
+    artileContent=artileContent.replace("```"+type,"")
+    artileContent=artileContent.replace("```","")
+    return artileContent;
+}
+
+
+