@less-is-more/less-js 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {

package/src/oss.js

@@ -7,7 +7,7 @@ const util = require("util");
 module.exports = class Oss {
   static async upload(
     path,
-    reqFile,
+    reqFileOrPath,
     prefix,
     accessKeyId,
     accessKeySecret,
@@ -25,14 +25,20 @@ module.exports = class Oss {
       endpoint: "oss-" + region + ".aliyuncs.com",
     });
     let id = uuid.v4().replace(/-/g, "");
-
-    // 计算文件名
-    const fileName = reqFile.originalFilename;
-    let subfix = "";
+    let fileName, filePath, subfix;
+    // 判断是否文本
+    if (typeof reqFileOrPath == "string") {
+      fileName = reqFileOrPath.split("/").pop();
+      filePath = reqFileOrPath;
+    } else {
+      // 计算文件名
+      fileName = reqFileOrPath.originalFilename;
+      filePath = reqFileOrPath.path;
+    }
     if (fileName.includes(".")) {
       subfix = fileName.split(".").pop();
     }
-    let filePath = reqFile.path;
+
     if (toWidth) {
       let imageObject = await util.promisify(Jimp.read)(filePath);
       if (toWidth < imageObject.bitmap.width) {

package/src/router.js

@@ -10,7 +10,7 @@ module.exports = class Router {
 
   /**
    * 根据request路由
-   * @param {object} targets 路由表。支持before和after，如果提供了会在执行主方法前后执行。
+   * @param {object} targets 路由表。支持before和after，如果提供了会在执行主方法前后执行。需要async的方法。并且before返回值为Ret，如果不为true，会直接返回
    * @param {*} req 请求
    * @param {*} res 响应
    * @param {*} context 系统属性
@@ -32,7 +32,11 @@ module.exports = class Router {
           // before
           if (targets.before) {
             console.log("start before action");
-            await targets.before(req, res, context);
+            const beforeResult = await targets.before(req, res, context);
+            if (beforeResult && !beforeResult.success) {
+              this._handleReturn(beforeResult, startTime, req, res);
+              return;
+            }
           }
           console.log("start main action");
           // 需要直接调用，不能用中间变量
@@ -42,9 +46,8 @@ module.exports = class Router {
             console.log("start after action");
             await targets.after(req, res, context);
           }
-          const useTime = (new Date().getTime() - startTime) / 1000;
           // controller方法有返回值的自动send
-          this._handleReturn(result, useTime, req, res);
+          this._handleReturn(result, startTime, req, res);
         } catch (e) {
           console.log(e);
           return this._sendError(e.message ? e.message : "出错啦", res);
@@ -128,7 +131,8 @@ module.exports = class Router {
     });
   }
 
-  static _handleReturn(result, useTime, req, res) {
+  static _handleReturn(result, startTime, req, res) {
+    const useTime = (new Date().getTime() - startTime) / 1000;
     if (!Param.isBlank(result)) {
       let content;
       if (result instanceof Ret) {

package/test/test-oss.js

@@ -40,5 +40,19 @@ describe("oss.js", () => {
       );
       console.log(result);
     });
+    it("upload with path", async () => {
+      const result = await Oss.upload(
+        "test",
+        "C:/Users/shang/Pictures/sheng-logo.png",
+        "pp",
+        "STS.NUQkfS4uutHRRq94x9hpcf2Ao",
+        "7rzHRnBor2WbxQYPzHFZM6eVn2xMMPWssq2wsrNJToLv",
+        "CAIShgJ1q6Ft5B2yfSjIr5bkINzn2apUw4q5UFeI0HhsZP9PiffqjTz2IH1MeXduBuAZsfk2nGpT7fgelqZdVplOWU3Da+B364xK7Q75/BttJV/tv9I+k5SANTW5KXyShb3/AYjQSNfaZY3eCTTtnTNyxr3XbCirW0ffX7SClZ9gaKZ8PGD6F00kYu1bPQx/ssQXGGLMPPK2SH7Qj3HXEVBjt3gX6wo9y9zmn5LGskWD3QWgkrRO/tmtGPX+MZkwZqUYesyuwel7epDG1CNt8BVQ/M909vcZoWqZ4I7NXAYMuk3caLGKrscfBQt4d7U8NYVgq/fRhfBzp/DSkILNzBJALV/Y0qNT2WHLGoABd1HbGnGE408ZNOYLDxBIjDMn8hmcaBxw9ZG7LathUeOLjWaYxX07lh11nbfRheMXtQ6tTrsDjCV/7AW/zIu5YIiy6GvE4GzwkX2nFsNR/zd92MXSGNE18ECDB8Z490RwJdGPkwQktTEkAcBDaC958kcGovCH4jojGjGWlQqK/jk=",
+        "cn-shenzhen",
+        "shengapp-dev",
+        50
+      );
+      console.log(result);
+    });
   });
 });

package/test/test-router.js

@@ -212,4 +212,30 @@ describe("router.js", () => {
     };
     await Router.route(targets, req, res);
   });
+
+  it("before return false", async () => {
+    let targets = {
+      before: async () => {
+        return new Ret(false, "错误", Ret.CODE_LOGIC);
+      },
+      "/product": {
+        add: function (req, res) {
+          assert(req.params.a === 1);
+          return 1;
+        },
+      },
+    };
+    let req = {
+      method: "GET",
+      path: "/product/add",
+      query: { a: 1 },
+      headers: {},
+    };
+    let res = {
+      send: function (data) {
+        console.log("send: " + data);
+      },
+    };
+    await Router.route(targets, req, res);
+  });
 });