@less-is-more/less-js 1.4.9 → 1.4.11

package/package.json

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

package/src/db.js

@@ -225,10 +225,19 @@ module.exports = class Db {
       replacements: values,
     });
     if (modelFormat) {
-      return JSON.parse(this._toHump(JSON.stringify(result)));
-    } else {
-      return result;
+      // 如果不为空，循环转换为驼峰
+      if (result) {
+        for (let n of result) {
+          for (let key in n) {
+            if (key.includes("_")) {
+              n[this._toHump(key)] = n[key];
+              delete n[key];
+            }
+          }
+        }
+      }
     }
+    return result;
   }
 
   static _toHump(text) {

package/src/router.js

@@ -18,6 +18,8 @@ module.exports = class Router {
    */
   static async route(targets, req, res, context) {
     const startTime = new Date().getTime();
+    // 兼容非阿里云
+    await this._handleParams(req);
     const { methodName, className } = this._getPath(req);
     if (methodName) {
       const controller = targets[className];
@@ -27,8 +29,6 @@ module.exports = class Router {
       const method = controller[methodName];
       if (method) {
         try {
-          // 兼容非阿里云
-          await this._handleParams(req);
           // before
           if (targets.before) {
             console.log("start before action");
@@ -61,7 +61,13 @@ module.exports = class Router {
   }
 
   static _getPath(req) {
-    console.log("path:", req.method, req.path, req.headers["content-type"]);
+    console.log(
+      "path:",
+      req.method,
+      req.path,
+      req.headers["content-type"],
+      JSON.stringify(req.params)
+    );
     const paths = req.path.split("/");
     const className = paths.length > 2 ? "/" + paths[paths.length - 2] : "/";
     const methodName = paths[paths.length - 1];

package/test/test-db.js

@@ -116,7 +116,7 @@ describe("db.js", () => {
     });
     it("to model", async () => {
       let data = await Db.sql(
-        "select * from menu",
+        "select * from city",
         [],
         Db.SQL_TYPE_SELECT,
         true