@less-is-more/less-js 1.2.33 → 1.2.36

package/package.json

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

package/src/redis.js

@@ -14,23 +14,34 @@ module.exports = class Redis {
 
   static async getInstance() {
     if (!this.#client) {
-      if (this.#host) {
-        let params = {
-          socket: { host: this.#host },
-        };
-        if (this.#password) {
-          params.username = this.#user;
-          params.password = this.#password;
-        }
-        this.#client = await redis.createClient(params);
-        await this.#client.connect();
-      } else {
-        throw new Error("Redis not init");
+      await Redis.connect();
+    } else {
+      // 旧的实例判断一下是否可以链接，不能就重新建一个
+      try {
+        await this.#client.ping();
+      } catch (e) {
+        await Redis.connect();
       }
     }
     return this.#client;
   }
 
+  static async connect() {
+    if (this.#host) {
+      let params = {
+        socket: { host: this.#host },
+      };
+      if (this.#password) {
+        params.username = this.#user;
+        params.password = this.#password;
+      }
+      this.#client = redis.createClient(params);
+      await this.#client.connect();
+    } else {
+      throw new Error("Redis not init");
+    }
+  }
+
   static async exec(name, ...args) {
     let client = await Redis.getInstance();
     args.unshift(name);

package/src/router.js

@@ -35,7 +35,8 @@ module.exports = class Router {
             await targets.before(req, res, context);
           }
           console.log("start main action");
-          const result = await method(req, res, context);
+          // 需要直接调用，不能用中间变量
+          const result = await controller[methodName](req, res, context);
           // after
           if (targets.after) {
             console.log("start after action");
@@ -72,19 +73,22 @@ module.exports = class Router {
     const isFile =
       req.headers &&
       JSON.stringify(req.headers).includes("multipart/form-data");
-      const isJson =
-      req.headers &&
-      JSON.stringify(req.headers).includes("application/json");
+    const isJson =
+      req.headers && JSON.stringify(req.headers).includes("application/json");
     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 if(isJson){
+      } else if (isJson) {
         const data = await promisify(body)(req);
-        console.log("body: " + JSON.stringify(data));
-        req.body = body;
+        console.log("body: " + data);
+        try {
+          req.body = JSON.parse(data);
+        } catch (e) {
+          console.error("body格式错误", data);
+        }
       } else {
         const data = await promisify(body)(req);
         console.log("body: " + decodeURIComponent(data));