@less-is-more/less-js 1.4.19 → 1.4.21

package/package.json

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

package/src/db.js

@@ -94,12 +94,14 @@ module.exports = class Db {
     needDelete = false,
     compareColumn = []
   ) {
+    let updateData = [];
+    let addData = [];
     for (let nNewData of newData) {
       const nOldIndex = oldData.findIndex(
         (nOld) => nOld[keyColumn] == nNewData[keyColumn]
       );
       if (nOldIndex == -1) {
-        await this.add(model, nNewData);
+        addData.push(await this.add(model, nNewData));
       } else {
         const nOldData = oldData[nOldIndex];
         let needUpdate = false;
@@ -127,7 +129,7 @@ module.exports = class Db {
           for (let nColumn of compareColumn) {
             setValues[nColumn] = nNewData[nColumn];
           }
-          await this.update(model, setValues, where);
+          updateData.push(await this.update(model, setValues, where));
         }
         // 剔除已经处理的
         oldData.splice(nOldIndex, 1);
@@ -139,6 +141,7 @@ module.exports = class Db {
         await n.destroy();
       }
     }
+    return { addData: addData, updateData: updateData };
   }
 
   /**

package/src/router.js

@@ -18,9 +18,9 @@ module.exports = class Router {
    */
   static async route(targets, req, res, context) {
     const startTime = new Date().getTime();
+    const { methodName, className } = this._getPath(req);
     // 兼容非阿里云
     await this._handleParams(req);
-    const { methodName, className } = this._getPath(req);
     if (methodName) {
       const controller = targets[className];
       if (controller == undefined) {
@@ -64,13 +64,7 @@ module.exports = class Router {
   }
 
   static _getPath(req) {
-    console.log(
-      "path:",
-      req.method,
-      req.path,
-      req.headers["content-type"],
-      JSON.stringify(req.params)
-    );
+    console.log("path:", req.method, req.path, req.headers["content-type"]);
     const paths = req.path.split("/");
     const className = paths.length > 2 ? "/" + paths[paths.length - 2] : "/";
     const methodName = paths[paths.length - 1];
@@ -81,7 +75,10 @@ module.exports = class Router {
     if (req.query) {
       req.queries = req.query;
     }
-    console.log("queries:", req.queries ? JSON.stringify(req.queries) : "");
+    console.log(
+      "queries:",
+      req.queries ? JSON.stringify(req.queries).substring(0, 500) : ""
+    );
     const isFile =
       req.headers &&
       req.headers["content-type"] &&
@@ -108,7 +105,7 @@ module.exports = class Router {
         }
       } else {
         const data = await promisify(body)(req);
-        console.log("body: " + data);
+        console.log("body: " + data.substring(0, 500));
         req.body = qs.parse(data);
       }
     }
@@ -157,7 +154,7 @@ module.exports = class Router {
         useTime + "s",
         req.path,
         "response:",
-        content.length > 500 ? content.substring(0, 500) : content
+        content.substring(0, 500)
       );
       res.send(content);
     }