@ticatec/common-express-server 0.0.1 → 0.0.3
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/BaseServer.d.ts +9 -1
- package/lib/BaseServer.js +1 -1
- package/lib/BaseServer.js.map +1 -1
- package/lib/CommonRouterHelper.d.ts +2 -1
- package/lib/CommonRouterHelper.js +2 -2
- package/lib/CommonRouterHelper.js.map +1 -1
- package/lib/CommonRoutes.js +2 -2
- package/lib/CommonRoutes.js.map +1 -1
- package/lib/common/BaseController.js +2 -2
- package/lib/common/BaseController.js.map +1 -1
- package/package.json +4 -5
package/lib/BaseServer.d.ts
CHANGED
|
@@ -9,7 +9,16 @@ export default abstract class BaseServer {
|
|
|
9
9
|
protected helper: CommonRouterHelper;
|
|
10
10
|
protected contextRoot: string;
|
|
11
11
|
protected constructor();
|
|
12
|
+
/**
|
|
13
|
+
* 获取当前服务器的RouterHelper
|
|
14
|
+
* @protected
|
|
15
|
+
*/
|
|
12
16
|
protected abstract getHelper(): CommonRouterHelper;
|
|
17
|
+
/**
|
|
18
|
+
* 获得当前应用的logger
|
|
19
|
+
* @protected
|
|
20
|
+
*/
|
|
21
|
+
protected abstract getLogger(): Logger;
|
|
13
22
|
/**
|
|
14
23
|
* 读取配置文件
|
|
15
24
|
* @protected
|
|
@@ -22,7 +31,6 @@ export default abstract class BaseServer {
|
|
|
22
31
|
* @protected
|
|
23
32
|
*/
|
|
24
33
|
protected writeCheckFile(port: number, fileName?: string): void;
|
|
25
|
-
protected abstract getLogger(): Logger;
|
|
26
34
|
startup(): Promise<void>;
|
|
27
35
|
/**
|
|
28
36
|
* web服务器创建后的拦截函数
|
package/lib/BaseServer.js
CHANGED
|
@@ -25,9 +25,9 @@ class BaseServer {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
async startup() {
|
|
28
|
-
this.helper = this.getHelper();
|
|
29
28
|
await this.loadConfigFile();
|
|
30
29
|
this.logger = this.getLogger();
|
|
30
|
+
this.helper = this.getHelper();
|
|
31
31
|
try {
|
|
32
32
|
await this.beforeStart();
|
|
33
33
|
let webConf = this.getWebConf();
|
package/lib/BaseServer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseServer.js","sourceRoot":"src/","sources":["BaseServer.ts"],"names":[],"mappings":";;;;;AAAA,sDAA4D;AAE5D,kEAAuD;AACvD,4CAAoB;
|
|
1
|
+
{"version":3,"file":"BaseServer.js","sourceRoot":"src/","sources":["BaseServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Request, Response } from "express";
|
|
2
|
+
import log4js from "log4js";
|
|
2
3
|
export declare type RestfulFunction = (req: any) => any;
|
|
3
4
|
export declare type ControlFunction = (req: any, res: any) => any;
|
|
4
5
|
export default class CommonRouterHelper {
|
|
5
|
-
protected readonly logger:
|
|
6
|
+
protected readonly logger: log4js.Logger;
|
|
6
7
|
/**
|
|
7
8
|
* 设置Http Response的header为JSON格式
|
|
8
9
|
* @param req
|
|
@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const express_exception_1 = require("@ticatec/express-exception");
|
|
7
|
-
const
|
|
7
|
+
const log4js_1 = __importDefault(require("log4js"));
|
|
8
8
|
class CommonRouterHelper {
|
|
9
9
|
constructor() {
|
|
10
|
-
this.logger =
|
|
10
|
+
this.logger = log4js_1.default.getLogger("CommonRouterHelper");
|
|
11
11
|
}
|
|
12
12
|
/**
|
|
13
13
|
* 设置Http Response的header为JSON格式
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRouterHelper.js","sourceRoot":"src/","sources":["CommonRouterHelper.ts"],"names":[],"mappings":";;;;;AACA,kEAAkG;AAClG,
|
|
1
|
+
{"version":3,"file":"CommonRouterHelper.js","sourceRoot":"src/","sources":["CommonRouterHelper.ts"],"names":[],"mappings":";;;;;AACA,kEAAkG;AAClG,oDAA4B;AAM5B,MAAqB,kBAAkB;IAAvC;QAEuB,WAAM,GAAG,gBAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IAkGvE,CAAC;IAhGG;;;;;OAKG;IACH,aAAa,CAAC,GAAY,EAAE,GAAa,EAAE,IAAQ;QAC/C,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAC/C,IAAI,EAAE,CAAC;IACX,CAAC;IAGD;;;;;;OAMG;IACH,UAAU,CAAC,GAAY,EAAE,GAAa,EAAE,IAAQ;QAC5C,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,8CAA8C,CAAC,CAAC;QAC5E,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC5B,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACjC,IAAI,EAAE,CAAC;IACX,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,IAAqB;QACrC,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;YACxD,IAAI;gBACA,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,MAAM,IAAI,IAAI,EAAE;oBAChB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBACpB;qBAAM;oBACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;iBAC1B;aACJ;YAAC,OAAO,EAAE,EAAE;gBACT,IAAA,+BAAW,EAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC7B;QACL,CAAC,CAAA;IACL,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,IAAqB;QAClC,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;YACxD,IAAI;gBACA,MAAM,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aACxB;YAAC,OAAO,EAAE,EAAE;gBACT,IAAA,+BAAW,EAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC7B;QACL,CAAC,CAAA;IACL,CAAC;IAED;;OAEG;IAEH;;OAEG;IACH,cAAc;QACV,OAAO,CAAC,GAAW,EAAE,GAAY,EAAE,IAAQ,EAAE,EAAE;YAC3C,IAAA,+BAAW,EAAC,IAAI,uCAAmB,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACrD,CAAC,CAAA;IACL,CAAC;IAGS,YAAY,CAAC,GAAY;QAC/B,IAAI,OAAO,GAAW,GAAG,CAAC,OAAO,CAAC,MAAM,CAAW,CAAC;QACpD,IAAI,OAAO,IAAI,IAAI,EAAE;YACjB,IAAI;gBACA,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;aACzD;YAAC,OAAO,EAAE,EAAE;gBACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;aAC1C;SACJ;IACL,CAAC;IAGD,eAAe;QACX,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAQ,EAAE,EAAE;YAC7C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACvB,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE;gBACrB,IAAA,+BAAW,EAAC,IAAI,wCAAoB,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACrD;iBAAM;gBACH,IAAI,EAAE,CAAC;aACV;QACL,CAAC,CAAA;IACL,CAAC;CAEJ;AApGD,qCAoGC"}
|
package/lib/CommonRoutes.js
CHANGED
|
@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const express_1 = require("express");
|
|
7
|
-
const
|
|
7
|
+
const log4js_1 = __importDefault(require("log4js"));
|
|
8
8
|
class CommonRoutes {
|
|
9
9
|
constructor(helper, checkUser = true) {
|
|
10
10
|
this.router = (0, express_1.Router)();
|
|
11
11
|
this.helper = helper;
|
|
12
|
-
this.logger =
|
|
12
|
+
this.logger = log4js_1.default.getLogger(this.constructor.name);
|
|
13
13
|
if (checkUser) {
|
|
14
14
|
this.logger.debug('检查用户是否登录');
|
|
15
15
|
this.router.all('/', helper.checkLoggedUser());
|
package/lib/CommonRoutes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRoutes.js","sourceRoot":"src/","sources":["CommonRoutes.ts"],"names":[],"mappings":";;;;;AAAA,qCAAwC;
|
|
1
|
+
{"version":3,"file":"CommonRoutes.js","sourceRoot":"src/","sources":["CommonRoutes.ts"],"names":[],"mappings":";;;;;AAAA,qCAAwC;AAExC,oDAAsC;AAEtC,MAA8B,YAAY;IAKtC,YAAsB,MAA0B,EAAE,YAAqB,IAAI;QACvE,IAAI,CAAC,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,SAAS,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;YAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;SAClD;IACL,CAAC;IAED,UAAU,CAAC,GAAY,EAAE,IAAY;QACjC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;CACJ;AAlBD,+BAkBC"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const log4js_1 = __importDefault(require("log4js"));
|
|
7
7
|
class BaseController {
|
|
8
8
|
/**
|
|
9
9
|
* 构造方法
|
|
@@ -11,7 +11,7 @@ class BaseController {
|
|
|
11
11
|
* @protected
|
|
12
12
|
*/
|
|
13
13
|
constructor(service) {
|
|
14
|
-
this.logger =
|
|
14
|
+
this.logger = log4js_1.default.getLogger(this.constructor.name);
|
|
15
15
|
this.service = service;
|
|
16
16
|
}
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseController.js","sourceRoot":"src/","sources":["common/BaseController.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"BaseController.js","sourceRoot":"src/","sources":["common/BaseController.ts"],"names":[],"mappings":";;;;;AACA,oDAAsC;AAEtC,MAA8B,cAAc;IAMxC;;;;OAIG;IACH,YAAsB,OAAU;QAC5B,IAAI,CAAC,MAAM,GAAG,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;;AAdL,iCAeC;AAbU,2BAAY,GAAY,KAAK,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ticatec/common-express-server",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.3",
|
|
4
4
|
"description": "A set of common classes for node express apps.",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -26,10 +26,8 @@
|
|
|
26
26
|
},
|
|
27
27
|
"homepage": "https://github.com/ticatec/common-express-server",
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@ticatec/singleton-log4js": "^0.0.5",
|
|
30
29
|
"@types/express": "^5.0.1",
|
|
31
|
-
"@types/node": "^22.8.6"
|
|
32
|
-
"log4js": "^6.7.0"
|
|
30
|
+
"@types/node": "^22.8.6"
|
|
33
31
|
},
|
|
34
32
|
"dependencies": {
|
|
35
33
|
"@ticatec/bean-validator": "^0.0.1",
|
|
@@ -37,6 +35,7 @@
|
|
|
37
35
|
"express": "^5.1.0"
|
|
38
36
|
},
|
|
39
37
|
"peerDependencies": {
|
|
40
|
-
"express": "^5.1.0"
|
|
38
|
+
"express": "^5.1.0",
|
|
39
|
+
"log4js": "^6.7.0"
|
|
41
40
|
}
|
|
42
41
|
}
|