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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@less-is-more/less-js",
3
- "version": "1.4.17",
3
+ "version": "1.4.19",
4
4
  "description": "Fast develop kit for nodejs",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -20,6 +20,7 @@
20
20
  "@alicloud/pop-core": "^1.7.10",
21
21
  "ali-oss": "^6.17.1",
22
22
  "axios": "^0.27.2",
23
+ "body": "^5.1.0",
23
24
  "ejs": "^3.1.6",
24
25
  "fs-extra": "^10.0.0",
25
26
  "inquirer": "^8.2.0",
@@ -28,7 +29,6 @@
28
29
  "mysql2": "^2.3.3",
29
30
  "pg-hstore": "^2.3.4",
30
31
  "qs": "^6.11.0",
31
- "raw-body": "^2.5.2",
32
32
  "redis": "^4.0.1",
33
33
  "sequelize": "^6.13.0",
34
34
  "uuid": "^9.0.0",
package/src/param.js CHANGED
@@ -37,7 +37,7 @@ module.exports = class Param {
37
37
  }
38
38
  }
39
39
  if (!result) {
40
- throw new Error("参数:" + nCheck[3]);
40
+ throw "参数:" + nCheck[3];
41
41
  }
42
42
  });
43
43
  }
package/src/router.js CHANGED
@@ -1,7 +1,7 @@
1
1
  const Ret = require("./ret.js");
2
2
  const Param = require("./param.js");
3
3
  const qs = require("qs");
4
- const getRawBody = require("raw-body");
4
+ const body = require("body");
5
5
  const multiparty = require("multiparty");
6
6
  const { promisify } = require("util");
7
7
 
@@ -49,7 +49,11 @@ module.exports = class Router {
49
49
  // controller方法有返回值的自动send
50
50
  this._handleReturn(result, startTime, req, res);
51
51
  } catch (e) {
52
- return this._sendError(e.message ? e.message : "出错啦", res, true);
52
+ if (e instanceof Error) {
53
+ return this._sendError(e.message ? e.message : "出错啦", res, true);
54
+ } else {
55
+ return this._sendError(e, res, false);
56
+ }
53
57
  }
54
58
  } else {
55
59
  return this._sendError("请输入正确方法", res);
@@ -93,7 +97,7 @@ module.exports = class Router {
93
97
  console.log("params:", req.params);
94
98
  console.log("files:", req.files);
95
99
  } else if (isJson) {
96
- const data = (await getRawBody(req)).toString();
100
+ const data = await promisify(body)(req);
97
101
  console.log("body: " + data);
98
102
  if (!Param.isBlank(data)) {
99
103
  try {
@@ -103,7 +107,7 @@ module.exports = class Router {
103
107
  }
104
108
  }
105
109
  } else {
106
- const data = (await getRawBody(req)).toString();
110
+ const data = await promisify(body)(req);
107
111
  console.log("body: " + data);
108
112
  req.body = qs.parse(data);
109
113
  }