mm_api 1.1.1 → 1.1.2
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/lib/api.js +3 -2
- package/lib/manager.js +5 -1
- package/package.json +33 -32
package/lib/api.js
CHANGED
|
@@ -268,6 +268,7 @@ Api.prototype._loadParam = function (file_path) {
|
|
|
268
268
|
if (!cfg) {
|
|
269
269
|
return null;
|
|
270
270
|
}
|
|
271
|
+
cfg.name = cfg.name || this.config.name;
|
|
271
272
|
cfg.config_file = p;
|
|
272
273
|
cfg.dir = path.dirname(p);
|
|
273
274
|
this.param = new Param(cfg, this);
|
|
@@ -450,7 +451,7 @@ Api.prototype.saveFile = function (files) {
|
|
|
450
451
|
* @private
|
|
451
452
|
*/
|
|
452
453
|
Api.prototype._getState = async function (db, token) {
|
|
453
|
-
var db1 = db.new("
|
|
454
|
+
var db1 = db.new("sys_user_state", "user_id");
|
|
454
455
|
var state = await db1.getObj(
|
|
455
456
|
{
|
|
456
457
|
token,
|
|
@@ -464,7 +465,7 @@ Api.prototype._getState = async function (db, token) {
|
|
|
464
465
|
}
|
|
465
466
|
var now = new Date();
|
|
466
467
|
if (date.interval(state.time_sign, now, "day") <= 30) {
|
|
467
|
-
db.table = "
|
|
468
|
+
db.table = "sys_user";
|
|
468
469
|
var user = await db.getObj({
|
|
469
470
|
user_id: state.user_id,
|
|
470
471
|
});
|
package/lib/manager.js
CHANGED
|
@@ -228,6 +228,7 @@ ApiManager.prototype.run = async function (ctx, options = {}) {
|
|
|
228
228
|
let args = this._getRunArgs(ctx, options, arguments[2]);
|
|
229
229
|
let path = args.ctx.request.path;
|
|
230
230
|
let drives = this._sortedDrives();
|
|
231
|
+
let result = null;
|
|
231
232
|
|
|
232
233
|
for (var i = 0; i < drives.length; i++) {
|
|
233
234
|
var mod = drives[i];
|
|
@@ -237,12 +238,15 @@ ApiManager.prototype.run = async function (ctx, options = {}) {
|
|
|
237
238
|
}
|
|
238
239
|
var ret = await mod.run(args.params, args.ctx, args.options);
|
|
239
240
|
if (ret) {
|
|
241
|
+
// 同时写入上下文与数据管理器，兼容两种结果读取方式
|
|
240
242
|
args.ctx.result = ret;
|
|
243
|
+
args.options.ret = ret;
|
|
244
|
+
result = ret;
|
|
241
245
|
break;
|
|
242
246
|
}
|
|
243
247
|
}
|
|
244
248
|
}
|
|
245
|
-
return
|
|
249
|
+
return result;
|
|
246
250
|
};
|
|
247
251
|
|
|
248
252
|
/**
|
package/package.json
CHANGED
|
@@ -1,34 +1,35 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
"
|
|
33
|
-
|
|
2
|
+
"name": "mm_api",
|
|
3
|
+
"version": "1.1.2",
|
|
4
|
+
"description": "API框架，用于实现web api和mvc模式路由请求，负责配置路由路径、访问权限、校验机制；基于 mm_corejs，内置管理器池，无全局/原型扩展依赖",
|
|
5
|
+
"main": "index.js",
|
|
6
|
+
"keywords": [
|
|
7
|
+
"mm_mod",
|
|
8
|
+
"mm_port",
|
|
9
|
+
"mm_in_port",
|
|
10
|
+
"api",
|
|
11
|
+
"mvc",
|
|
12
|
+
"router",
|
|
13
|
+
"oauth",
|
|
14
|
+
"API管理器"
|
|
15
|
+
],
|
|
16
|
+
"layer": "port",
|
|
17
|
+
"group": "web",
|
|
18
|
+
"author": "邱文武",
|
|
19
|
+
"license": "ISC",
|
|
20
|
+
"repository": {
|
|
21
|
+
"type": "git",
|
|
22
|
+
"url": "git+https://gitee.com/qiuwenwu91/mm_api.git"
|
|
23
|
+
},
|
|
24
|
+
"dependencies": {
|
|
25
|
+
"mm_corejs": "^1.1.4",
|
|
26
|
+
"mm_helper": "^1.0.0",
|
|
27
|
+
"mm_machine": "^3.5.4",
|
|
28
|
+
"mm_param": "^1.1.0",
|
|
29
|
+
"mm_ret": "^1.4.8",
|
|
30
|
+
"mm_sql": "^1.8.0"
|
|
31
|
+
},
|
|
32
|
+
"scripts": {
|
|
33
|
+
"test": "node test.js && node --test tests/*.test.js"
|
|
34
|
+
}
|
|
34
35
|
}
|