@less-is-more/less-js 1.2.23 → 1.2.26

package/package.json

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

package/src/cache.js

@@ -50,12 +50,16 @@ module.exports = class Cache {
       if (!Param.isBlank(result)) {
         // 处理JSON
         if (result instanceof Object) {
-          await Redis.exec(
-            "setex",
-            fullKey,
-            timeSecond + "",
-            JSON.stringify(result)
-          );
+          if (result.success === false) {
+            console.log("Do not cache fail result");
+          } else {
+            await Redis.exec(
+              "setex",
+              fullKey,
+              timeSecond + "",
+              JSON.stringify(result)
+            );
+          }
         } else {
           await Redis.exec(
             "setex",

package/src/ret.js

@@ -6,65 +6,64 @@ module.exports = class Ret {
   static CODE_SYSTEM = 1004;
 
   constructor(success, message, code) {
-    this.#instance.success = success;
+    this.success = success;
     if (message) {
-      this.#instance.message = message;
+      this.message = message;
     }
     if (code) {
-      this.#instance.code = code;
+      this.code = code;
     }
   }
 
-  #instance = {};
   ok() {
-    this.#instance.success = true;
+    this.success = true;
     return this;
   }
-  isOk(){
-    return this.#instance.success;
+  isOk() {
+    return this.success;
   }
   fail() {
-    this.#instance.success = false;
+    this.success = false;
     return this;
   }
-  isFail(){
-    return !this.#instance.success;
+  isFail() {
+    return !this.success;
   }
   setMessage(message) {
-    this.#instance.message = message;
+    this.message = message;
     return this;
   }
   getMessage() {
-    return this.#instance.message;
+    return this.message;
   }
   setCode(code) {
-    this.#instance.code = code;
+    this.code = code;
     return this;
   }
   setData(data) {
-    this.#instance.data = data;
+    this.data = data;
     return this;
   }
   getData() {
-    return this.#instance.data;
+    return this.data;
   }
   toString() {
-    return JSON.stringify(this.#instance);
+    return JSON.stringify(this);
   }
   getJson() {
-    return this.#instance;
+    return this;
   }
   toJson() {
-    return this.#instance;
+    return this;
   }
 
   filter(props = []) {
     if (props.length > 0) {
-      const data = this.#instance.data;
+      const data = this.data;
       if (data instanceof Array) {
-        this.#instance.data = this._filterArray(data, props);
+        this.data = this._filterArray(data, props);
       } else {
-        this.#instance.data = this._filterObject(data, props);
+        this.data = this._filterObject(data, props);
       }
     }
     return this;

package/src/router.js

@@ -37,6 +37,7 @@ module.exports = class Router {
             console.log("start after action");
             await targets.after(req, res, context);
           }
+          console.log("end", (new Date().getTime() - startTime) / 1000, "s");
           // controller方法有返回值的自动send
           this._handleReturn(result, res);
         } catch (e) {
@@ -49,7 +50,6 @@ module.exports = class Router {
     } else {
       return this._sendError("请输入方法", res);
     }
-    console.log("end", (new Date().getTime() - startTime) / 1000, "s");
   }
 
   static _getPath(req) {
@@ -104,18 +104,22 @@ module.exports = class Router {
 
   static _handleReturn(result, res) {
     if (!Param.isBlank(result)) {
+      let content;
       if (result instanceof Ret) {
-        console.log("return:", result.toString());
-        res.send(result.toString());
+        content = result.toString();
       } else {
         if (typeof result === "string") {
-          console.log("return:", result);
-          res.send(result);
+          content = result;
         } else {
-          console.log("return:", JSON.stringify(result));
-          res.send(JSON.stringify(result));
+          content = Json.stringify(result);
         }
       }
+      if (content.length > 500) {
+        console.log("return:", content.substring(0, 500));
+      } else {
+        console.log("return:", content);
+      }
+      res.send(content);
     }
   }
 

package/test/test-cache.js

@@ -1,6 +1,7 @@
 const assert = require("assert");
 const Cache = require("../src/cache.js");
 const Redis = require("../src/redis.js");
+const Ret = require("../src/ret.js");
 
 describe("cache.js", () => {
   before(() => {
@@ -92,5 +93,15 @@ describe("cache.js", () => {
       console.log("result", JSON.stringify(result));
       assert(result.length === 1);
     });
+    it("no cache fail", async () => {
+      async function test(a, b) {
+        return await Cache.auto("test5", 20, arguments, () => {
+          return new Ret(false);
+        });
+      }
+      const result = await test(1, 2);
+      console.log("result", JSON.stringify(result));
+      assert(result.success === false);
+    });
   });
 });

package/test/test-ret.js

@@ -5,6 +5,7 @@ describe("ret.js", () => {
   describe("new()", () => {
     it("ok", () => {
       let ret = new Ret(true).setData({ name: "good" });
+      console.log(ret)
       assert(ret.getJson().data.name, "good");
     });
     it("mutli params", () => {