@less-is-more/less-js 1.2.8 → 1.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.2.8",
+  "version": "1.2.12",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {
@@ -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

@@ -36,8 +36,8 @@ module.exports = class Db {
               timestamps: false,
             },
             pool: {
-              max: 10,
-              min: 1,
+              max: 30,
+              min: 0,
               idle: 10000,
             },
           }
@@ -156,6 +156,27 @@ module.exports = class Db {
     });
   }
 
+  /**
+   * 查询所有数据，不分页
+   * @param {*} model 模型
+   * @param {*} params 查询参数，支持符号标记，如Db.Op.lt，具体参考https://sequelize.org/master/manual/model-querying-basics.html#operators
+   * @param {*} order 排序，参考默认值
+   * @param {*} attributes 只返回属性
+   * @returns
+   */
+   static async findAll(
+    model,
+    params = {},
+    order = [["id", "desc"]],
+    attributes = { exclude: [""] }
+  ) {
+    return await model(this.getInstance()).findAll({
+      where: params,
+      order: order,
+      attributes: attributes,
+    });
+  }
+
   static async findOne(
     model,
     params = {},
@@ -177,7 +198,7 @@ module.exports = class Db {
     if (data == null) {
       throw new Error("数据不存在");
     } else {
-      data.destroy();
+      await data.destroy();
     }
   }
 

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 {
@@ -17,46 +18,13 @@ module.exports = class Router {
    */
   static async route(targets, req, res, context) {
     const startTime = new Date().getTime();
-    console.log("method: " + req.method);
-    console.log("path: " + req.path);
-    const paths = req.path.split("/");
-    const className = paths.length > 2 ? "/" + paths[paths.length - 2] : "/";
-    const methodName = paths[paths.length - 1];
-    let message;
+    const { methodName, className } = this._getPath(req);
     if (methodName) {
       const method = targets[className][methodName];
       if (method) {
         try {
           // 兼容非阿里云
-          if (req.query) {
-            req.queries = req.query;
-          }
-          console.log(
-            "queries:",
-            req.queries ? JSON.stringify(req.queries) : ""
-          );
-          const isFile =
-            req.headers &&
-            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();
-            } else {
-              console.log("body: " + decodeURIComponent(data));
-              req.body = querystring.parse(decodeURIComponent(data));
-            }
-          }
-          req.params = {};
-          if (!Param.isBlank(req.queries)) {
-            Object.keys(req.queries).forEach(
-              (n) => (req.params[n] = req.queries[n])
-            );
-          }
-          if (!Param.isBlank(req.body) && !isFile) {
-            Object.keys(req.body).forEach((n) => (req.params[n] = req.body[n]));
-          }
+          await this._handleParams(req);
           // before
           if (targets.before) {
             console.log("start before action");
@@ -70,39 +38,91 @@ module.exports = class Router {
             await targets.after(req, res, context);
           }
           // controller方法有返回值的自动send
-          if (!Param.isBlank(result)) {
-            if (result instanceof Ret) {
-              res.send(result.toString());
-            } else {
-              if (typeof result === "string") {
-                res.send(result);
-              } else {
-                res.send(JSON.stringify(result));
-              }
-            }
-          }
+          this._handleReturn(result, res);
         } catch (e) {
           console.log(e);
-          message = e.message ? e.message : "出错啦";
+          return this._sendError(e.message ? e.message : "出错啦", res);
         }
       } else {
-        message = "请输入正确方法";
+        return this._sendError("请输入正确方法", res);
       }
     } else {
-      message = "请输入方法";
-    }
-    if (message) {
-      console.log("error:", message);
-      this.sendBack(message, res);
+      return this._sendError("请输入方法", res);
     }
     console.log("end", (new Date().getTime() - startTime) / 1000, "s");
-    return message;
   }
 
-  static sendBack(message, res) {
+  static _getPath(req) {
+    console.log("method: " + req.method);
+    console.log("path: " + req.path);
+    const paths = req.path.split("/");
+    const className = paths.length > 2 ? "/" + paths[paths.length - 2] : "/";
+    const methodName = paths[paths.length - 1];
+    return { methodName, className };
+  }
+
+  static async _handleParams(req) {
+    if (req.query) {
+      req.queries = req.query;
+    }
+    console.log("queries:", req.queries ? JSON.stringify(req.queries) : "");
+    const isFile =
+      req.headers &&
+      JSON.stringify(req.headers).includes("multipart/form-data");
+    console.log("multipart:", isFile);
+    if (req.method == "POST") {
+      if (isFile) {
+        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));
+      }
+    }
+    if (req.params == undefined) req.params = {};
+    if (!Param.isBlank(req.queries)) {
+      Object.keys(req.queries).forEach((n) => (req.params[n] = req.queries[n]));
+    }
+    if (!Param.isBlank(req.body) && !isFile) {
+      Object.keys(req.body).forEach((n) => (req.params[n] = req.body[n]));
+    }
+  }
+
+  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) {
+        res.send(result.toString());
+      } else {
+        if (typeof result === "string") {
+          res.send(result);
+        } else {
+          res.send(JSON.stringify(result));
+        }
+      }
+    }
+  }
+
+  static _sendError(message, res) {
+    console.log("error:", message);
     if (this.#defaultFormat) {
       res.send(new Ret(false, message, Ret.CODE_SYSTEM).toString());
     }
+    return message;
   }
 
   /**

package/test/test-db.js

@@ -170,4 +170,12 @@ describe("db.js", () => {
       }
     });
   });
+
+  describe("findAll()", () => {
+    it("success", async () => {
+      let data = await Db.findAll(Menu, { ordering: "1" });
+      console.log(data);
+      assert(data.length > 0, "no data");
+    });
+  })
 });