@less-is-more/less-js 1.2.11 → 1.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.2.11",
+  "version": "1.2.15",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://gitee.com/lim/less-js.git"
+    "url": "https://gitee.com/shengapp/lim-js"
   },
   "author": "Less Is More",
   "license": "MIT",
@@ -21,6 +21,7 @@
     "ejs": "^3.1.6",
     "fs-extra": "^10.0.0",
     "inquirer": "^8.1.2",
+    "multiparty": "^4.2.2",
     "mysql2": "^2.2.5",
     "pg-hstore": "^2.3.3",
     "querystring": "^0.2.1",

package/src/db.js

@@ -102,7 +102,7 @@ module.exports = class Db {
         await this.add(model, nNewData);
       } else {
         let needUpdate = false;
-        if ( compareColumn.length > 0) {
+        if (compareColumn.length > 0) {
           const nOldData = oldData[nOldIndex];
           for (let nColumn of compareColumn) {
             if (nOldData[nColumn] !== nNewData[nColumn]) {
@@ -164,7 +164,7 @@ module.exports = class Db {
    * @param {*} attributes 只返回属性
    * @returns
    */
-   static async findAll(
+  static async findAll(
     model,
     params = {},
     order = [["id", "desc"]],
@@ -202,10 +202,16 @@ module.exports = class Db {
     }
   }
 
-  static async sql(sql, values = [], type = this.SQL_TYPE_SELECT) {
-    return await this.getInstance().query(sql, {
+  static async sql(sql, values = [], type = this.SQL_TYPE_SELECT, model) {
+    let params = {
       type: type,
       replacements: values,
-    });
+    };
+    if (model) {
+      params.model = model;
+      params.mapToModel = true;
+      params.type = Sequelize.QueryTypes.RAW;
+    }
+    return await this.getInstance().query(sql, params);
   }
 };

package/src/router.js

@@ -2,6 +2,7 @@ const Ret = require("./ret.js");
 const Param = require("./param.js");
 const querystring = require("querystring");
 const body = require("body");
+const multiparty = require("multiparty");
 const { promisify } = require("util");
 
 module.exports = class Router {
@@ -52,8 +53,7 @@ module.exports = class Router {
   }
 
   static _getPath(req) {
-    console.log("method: " + req.method);
-    console.log("path: " + req.path);
+    console.log("path:", req.method, req.path);
     const paths = req.path.split("/");
     const className = paths.length > 2 ? "/" + paths[paths.length - 2] : "/";
     const methodName = paths[paths.length - 1];
@@ -70,15 +70,17 @@ module.exports = class Router {
       JSON.stringify(req.headers).includes("multipart/form-data");
     console.log("multipart:", isFile);
     if (req.method == "POST") {
-      let data = await promisify(body)(req);
       if (isFile) {
-        req.body = data.toString();
+        await this._getFile(req);
+        console.log("params:", req.params);
+        console.log("files:", req.files);
       } else {
+        const data = await promisify(body)(req);
         console.log("body: " + decodeURIComponent(data));
         req.body = querystring.parse(decodeURIComponent(data));
       }
     }
-    req.params = {};
+    if (req.params == undefined) req.params = {};
     if (!Param.isBlank(req.queries)) {
       Object.keys(req.queries).forEach((n) => (req.params[n] = req.queries[n]));
     }
@@ -87,14 +89,30 @@ module.exports = class Router {
     }
   }
 
+  static _getFile(req) {
+    return new Promise((resolve, reject) => {
+      const form = new multiparty.Form();
+
+      form.parse(req, function (err, fields, files) {
+        if (err) reject(err);
+        req.params = fields;
+        req.files = files;
+        resolve();
+      });
+    });
+  }
+
   static _handleReturn(result, res) {
     if (!Param.isBlank(result)) {
       if (result instanceof Ret) {
+        console.log("return:", result.toString());
         res.send(result.toString());
       } else {
         if (typeof result === "string") {
+          console.log("return:", result);
           res.send(result);
         } else {
+          console.log("return:", JSON.stringify(result));
           res.send(JSON.stringify(result));
         }
       }

package/test/test-db.js

@@ -114,6 +114,15 @@ describe("db.js", () => {
       let data = await Db.sql("select * from menu where id=?", [1]);
       console.log(data);
     });
+    it("to model", async () => {
+      let data = await Db.sql(
+        "select * from menu",
+        [],
+        Db.SQL_TYPE_SELECT,
+        Menu
+      );
+      console.log(JSON.stringify(data));
+    });
     it("insert", async () => {
       let data = await Db.sql(
         "insert into menu (name) values(?)",
@@ -177,5 +186,5 @@ describe("db.js", () => {
       console.log(data);
       assert(data.length > 0, "no data");
     });
-  })
+  });
 });