ming_node 2.9.2 → 2.9.6

package/beforeTest/FileDbTest.js

@@ -0,0 +1,18 @@
+FileDb=require("../module/FileDb")
+
+db= new FileDb("a.json",false)
+
+db.add({
+    name:"zs"
+})
+
+console.log(db.listByPage({caseObj:{
+        "$name":"s"
+    }}))
+
+
+db.add({
+    name:"ls"
+})
+
+console.log(db.listByPage({}))

package/beforeTest/MemorDbTest.js

@@ -6,11 +6,13 @@ db.add({
     name:"zs"
 })
 
-console.log(db.listByPage())
+console.log(db.listByPage({caseObj:{
+        "$name":"s"
+    }}))
 
 
 db.add({
     name:"ls"
 })
 
-console.log(db.listByPage())
+console.log(db.listByPage({}))

package/index.js

@@ -3,7 +3,7 @@
  * By : Minglie
  * QQ: 934031452
  * Date :2021.12.01
- * version :2.9.2
+ * version :2.9.6
  */
 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;
                 }
@@ -1985,8 +1989,6 @@ M.server = function () {
         console.log("listen on port:" + port);
         return server;
     }
-
-    global.app=app;
     return app;
 }
 M["_gloable_exception_handle"]=(err)=>{
@@ -2833,7 +2835,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

@@ -0,0 +1,193 @@
+/**
+ * File : MemoryDb.js
+ * By : Minglie
+ * QQ: 934031452
+ * Date :2021.09.14
+ * rem : 文件数据库
+ */
+
+const M=require("../index");
+
+class FileDb{
+
+    constructor(tableName,readFromMemory=true) {
+        this.tableName=tableName;
+        this.readFromMemory=readFromMemory;
+        this.dataList=M.getObjByFile(this.tableName)
+    }
+
+    readFromFile(){
+        if(this.readFromMemory){
+            return
+        }else {
+            this.dataList=M.getObjByFile(this.tableName);
+        }
+    }
+
+    /**
+     * 单个加
+     * @param obj
+     * @returns {Promise<*>}
+     */
+    async add(obj){
+        this.readFromFile();
+        obj.id = M.randomStr();
+        this.dataList=[...this.dataList,obj];
+        M.writeObjToFile(this.tableName,this.dataList)
+        return obj;
+    }
+
+    async update(obj){
+        this.readFromFile();
+        for (let i = 0; i < this.dataList.length; i++) {
+            if (this.dataList[i].id == obj.id) {
+                this.dataList[i]=obj;
+                return
+            }
+        }
+        M.writeObjToFile(this.tableName,this.dataList)
+    }
+
+    listAll(caseObj){
+        this.readFromFile();
+        let o_keys=[];
+        if(caseObj){
+            o_keys = Object.keys(caseObj);
+        }
+        if (caseObj && o_keys.length>0) {
+            let r_list = [];
+            let o_vals = Object.values(caseObj);
+            var d = this.dataList;
+            for (let i = 0; i < d.length; i++) {
+                let s=0;
+                for (let j=0;j<o_keys.length;j++){
+                    if(o_keys[j][0]=="$"){
+                        let realKey=o_keys[j].replace("$","");
+                        if (d[i][realKey].indexOf(o_vals[j])==-1) {
+                            break
+                        }
+                    }else {
+                        if (d[i][o_keys[j]] != o_vals[j]) {
+                            break
+                        }
+                    }
+                    s++;
+                }
+                if(s==o_keys.length){
+                    r_list.push(d[i]);
+                }
+            }
+            return r_list;
+        } else {
+            return this.dataList;
+        }
+    }
+
+
+    listByPage({page=0, num=10, caseObj,order}) {
+        page=Number.parseInt(page);
+        num=Number.parseInt(num);
+        if (page <= 0) page = 1;
+        let rows;
+        if (caseObj) {
+            rows = this.listAll(caseObj);
+        } else {
+            rows = this.listAll();
+        }
+        if(order){
+            let orderArr= order.split(" ");
+            let orderField=orderArr[0];
+            let orderType=orderArr[1];
+            rows.sort((a,b)=>{
+                let ret=0;
+                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_order_v<b_order_v){
+                    ret= -1
+                }else{
+                    ret= 0;
+                }
+                if(orderType=="asc"){
+                    return ret;
+                }else {
+                    return -1*ret;
+                }
+            })
+        }
+        let total = rows.length;
+        rows=JSON.parse(JSON.stringify(rows))
+        rows = rows.splice((page - 1) * num, num)
+        return {rows, total}
+    }
+
+
+    deleteAll(o) {
+        this.readFromFile();
+        if (o) {
+            let r_list = [];
+            let o_keys = Object.keys(o);
+            let o_vals = Object.values(o)
+            var d = this.dataList;
+            let delete_index=[]
+            for (let i = 0; i < d.length; i++) {
+                let s=0;
+                for (let j=0;j<o_keys.length;j++){
+                    if (d[i][o_keys[j]] != o_vals[j]) {
+                        break
+                    }
+                    s++;
+                }
+                if(s==o_keys.length){
+                    delete_index.push(i)
+                }
+            }
+            for (let i = 0; i < d.length; i++) {
+                if(!delete_index.includes(i)){
+                    r_list.push(d[i])
+                }
+            }
+            this.dataList=r_list;
+            return delete_index.length;
+        } else {
+            let length=this.dataList.length;
+            this.dataList=[];
+            return length;
+        }
+        M.writeObjToFile(this.tableName,this.dataList)
+    }
+
+    getById(id) {
+        this.readFromFile();
+        var d = this.dataList;
+        for (let i = 0; i < d.length; i++) {
+            if(d[i].id==id){
+                return d[i];
+            }
+        }
+        return null;
+    }
+
+    deleteById(id) {
+        this.readFromFile();
+        var d = this.dataList;
+        for (let i = 0; i < d.length; i++) {
+            if(d[i].id==id){
+                this.dataList.splice(i, 1);
+                return id;
+            }
+        }
+        M.writeObjToFile(this.tableName,this.dataList)
+        return 0;
+    }
+}
+
+
+module.exports = FileDb;

package/module/MemoryDb.js

@@ -36,7 +36,10 @@ class MemoryDb{
     }
 
     listAll(caseObj){
-        let o_keys = Object.keys(caseObj);
+        let o_keys=[];
+        if(caseObj){
+            o_keys = Object.keys(caseObj);
+        }
         if (caseObj && o_keys.length>0) {
             let r_list = [];
             let o_vals = Object.values(caseObj);
@@ -44,8 +47,15 @@ class MemoryDb{
             for (let i = 0; i < d.length; i++) {
                 let s=0;
                 for (let j=0;j<o_keys.length;j++){
-                    if (d[i][o_keys[j]] != o_vals[j]) {
-                       break
+                    if(o_keys[j][0]=="$"){
+                        let realKey=o_keys[j].replace("$","");
+                        if (d[i][realKey].indexOf(o_vals[j])==-1) {
+                            break
+                        }
+                    }else {
+                        if (d[i][o_keys[j]] != o_vals[j]) {
+                            break
+                        }
                     }
                     s++;
                 }
@@ -60,19 +70,39 @@ class MemoryDb{
     }
 
 
-    listByPage(startPage=0, limit=10, caseObj) {
-        startPage=Number.parseInt(startPage);
-        limit=Number.parseInt(limit);
-        if (startPage <= 0) startPage = 1;
+    listByPage({page=0, num=10, caseObj,order}) {
+        page=Number.parseInt(page);
+        num=Number.parseInt(num);
+        if (page <= 0) page = 1;
         let rows;
         if (caseObj) {
             rows = this.listAll(caseObj);
         } else {
             rows = this.listAll();
         }
+        if(order){
+            let orderArr= order.split(" ");
+            let orderField=orderArr[0];
+            let orderType=orderArr[1];
+            rows.sort((a,b)=>{
+                let ret=0;
+                if (a[orderField]>b[orderField]) {
+                    ret= 1;
+                 }else if(a<b){
+                    ret= -1
+                 }else{
+                    ret= 0;
+                 }
+                 if(orderType=="desc"){
+                     return ret;
+                 }else {
+                     return -1*ret;
+                 }
+            })
+        }
         let total = rows.length;
         rows=JSON.parse(JSON.stringify(rows))
-        rows = rows.splice((startPage - 1) * limit, limit)
+        rows = rows.splice((page - 1) * num, num)
         return {rows, total}
     }
 

package/package.json

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

package/plugins/BaseRestApi/MemoryBaseRestApi.js

@@ -26,7 +26,7 @@ class MemoryBaseRestApi extends AbstractBaseRestApi{
     }
 
     async list({page,num,order,queryCase}){
-        let r= this.memoryDb.listByPage(page,num,queryCase);
+        let r= this.memoryDb.listByPage({page,num,caseObj:queryCase,order});
         return r;
     }
 

package/plugins/BaseRpcApi/FileBaseRpcApi.js

@@ -1,59 +1,50 @@
 /**
  * 数据源为内存的rpc风格接口
  */
-const M=require("../../index")
+const FileDb=require("../../module/FileDb");
 const AbstractBaseRpcApi=require("./AbstractBaseRpcApi");
 
 class FileBaseRpcApi extends AbstractBaseRpcApi{
+
     constructor(props) {
         super(props);
+        if(props.readFromMemory==null){
+            props.readFromMemory=true;
+        }
+        this.fileDb=new FileDb(props.tableName,props.readFromMemory);
     }
     async add(obj){
-        obj.id = M.randomStr();
-        M.addObjToFile(this.tableName, obj);
-        return obj;
+        let r= this.fileDb.add(obj);
+        return r;
     }
 
     async delete(obj){
-        let r=0;
-        if (obj) {
-            r= M.deleteObjByPropFile(this.tableName, obj);
-        } else {
-            r=M.writeObjToFile(this.tableName,[]);
-        }
+        let r= this.fileDb.deleteAll(obj);
         return r;
     }
 
     async getById(id){
-        let r=M.getById(this.tableName,id);
+        let r=this.fileDb.getById(id);
         return r;
     }
 
-    async list({page=1,num=10,order, queryCase}){
-        page=Number.parseInt(page);
-        num=Number.parseInt(num);
-        if (page <= 0) page = 1;
-        let rows =await this.listAll(queryCase);
-        let total = rows.length;
-        rows = rows.splice((page - 1) * num, num)
-        return {rows, total}
+    async list({page,num,order,queryCase}){
+        let r= this.fileDb.listByPage({page,num,caseObj:queryCase,order});
+        return r;
     }
 
     async listAll(obj){
-        if (obj) {
-            return M.listAllObjByPropFile(this.tableName, obj);
-        } else {
-            return M.getObjByFile(this.tableName);
-        }
+        let r= this.fileDb.listAll(obj);
+        return r;
     }
 
     async update(obj){
-        let r=  M.updateObjByIdFile(this.tableName,obj);
+        let r= this.fileDb.update(obj);
         return r;
     }
 
     async getChildenList(id,caseObj){
-        let r= this.listAll({parent_id:id,...caseObj});
+        let r= this.fileDb.listAll({parent_id:id,...caseObj});
         return r;
     }
 }

package/plugins/BaseRpcApi/MemoryBaseRpcApi.js

@@ -26,7 +26,7 @@ class MemoryBaseRpcApi extends AbstractBaseRpcApi{
     }
 
     async list({page,num,order,queryCase}){
-        let r= this.memoryDb.listByPage(page,num,queryCase);
+        let r= this.memoryDb.listByPage({page,num,caseObj: queryCase,order});
         return r;
     }