@cicctencent/midwayjs-base 1.0.29 → 1.0.31
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/dist/config/config.default.js +2 -2
- package/dist/guard/auth.js +2 -2
- package/package.json +12 -11
- package/typings/midway.d.ts +54 -54
|
@@ -98,7 +98,7 @@ exports.default = (appInfo) => {
|
|
|
98
98
|
// session 过期设置
|
|
99
99
|
timeout: Number(process.env.SESSION_TIMEOUT) || 20 * 60 * 1000,
|
|
100
100
|
secretKey: 'fjjiowhb@#$^111)*&',
|
|
101
|
-
serviceKey: 'session:service',
|
|
101
|
+
//serviceKey: 'session:service',
|
|
102
102
|
},
|
|
103
103
|
// 登陆态校验配置
|
|
104
104
|
auth: {
|
|
@@ -151,4 +151,4 @@ exports.default = (appInfo) => {
|
|
|
151
151
|
};
|
|
152
152
|
return config;
|
|
153
153
|
};
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NvbmZpZy5kZWZhdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsNkJBQTZCO0FBQzdCLGtCQUFlLENBQUMsT0FBc0IsRUFBRSxFQUFFO0lBQ3RDLE9BQU8sQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hELE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQztJQUMvQyxPQUFPLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQ2pELE9BQU8sQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBRXpELE1BQU0sTUFBTSxHQUFHO1FBQ1gsdUVBQXVFO1FBQ3ZFLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxHQUFHLHFCQUFxQjtRQUMxQyxPQUFPLEVBQUU7WUFDTCx3QkFBd0I7WUFDeEIsTUFBTSxFQUFFLEVBQUUsRUFBRSxtQ0FBbUM7WUFDL0MsTUFBTTtTQUNUO1FBQ0QsSUFBSSxFQUFFO1lBQ0YsVUFBVTtZQUNWLGlCQUFpQixFQUFFLFVBQVU7WUFDN0Isb0RBQW9EO1lBQ3BELE9BQU8sRUFBRTtnQkFDTCxPQUFPLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQzthQUMvQztZQUNELE9BQU8sRUFBRTtnQkFDTCxPQUFPLEVBQUUsVUFBVTthQUN0QjtTQUNKO1FBQ0gsT0FBTztRQUNQLE1BQU0sRUFBRTtZQUNOLE9BQU87WUFDUCxJQUFJLEVBQUUsTUFBTTtZQUNaLE9BQU87WUFDUCxRQUFRLEVBQUUsTUFBTTtZQUNoQixTQUFTLEVBQUUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sQ0FBQztTQUNqSDtRQUNELFdBQVc7UUFDWCxVQUFVLEVBQUU7WUFDTixJQUFJLEVBQUU7Z0JBQ0YsT0FBTyxFQUFFO29CQUNMLGFBQWE7b0JBQ2IsR0FBRyxFQUFFLE9BQU8sQ0FBQyxTQUFTO2lCQUN6QjthQUNKO1NBQ0o7UUFDRDs7V0FFRztRQUNILFNBQVMsRUFBRTtZQUNQLFlBQVk7WUFDWixHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLElBQUksZ0JBQWdCO1lBQzVDLEdBQUcsRUFBRSxxQkFBcUI7WUFDMUIsTUFBTSxFQUFFO2dCQUNKLEdBQUc7Z0JBQ0gsNkJBQTZCO2FBQ2hDO1NBQ0o7UUFDRCxRQUFRO1FBQ1IsUUFBUSxFQUFFO1lBQ04sU0FBUyxFQUFFO2dCQUNQLFdBQVc7Z0JBQ1gsS0FBSztnQkFDTCxTQUFTO2dCQUNULElBQUk7Z0JBQ0osV0FBVztnQkFDWCxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFFLEVBQUUsQ0FBQzthQUNqRDtTQUNKO1FBQ0QsU0FBUztRQUNULElBQUksRUFBRTtZQUNGLFFBQVEsRUFBRSxZQUFZO1NBQ3pCO1FBQ0QsS0FBSyxFQUFFO1lBQ0gsT0FBTyxFQUFFO1lBQ0wsWUFBWTthQUNmO1lBQ0QsT0FBTyxFQUFFO2dCQUNMLFVBQVU7Z0JBQ1YsT0FBTyxFQUFFO29CQUNMLDBDQUEwQztvQkFDMUMsT0FBTyxFQUFFO3dCQUNMLGtCQUFrQixFQUFFLGdCQUFnQjtxQkFDdkM7b0JBQ0QsT0FBTyxFQUFFLElBQUksRUFBRSw4QkFBOEI7b0JBRTdDLGdGQUFnRjtvQkFDaEYsbUNBQW1DO29CQUNuQyxlQUFlLEVBQUUsS0FBSyxFQUFFLFVBQVU7aUJBQ3JDO2FBQ0o7U0FDSjtRQUNELE9BQU87UUFDUCxXQUFXLEVBQUU7WUFDVCxPQUFPLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBQyxRQUFRO1lBQzNCLEtBQUssRUFBRSxPQUFPLENBQUMsS0FBSztZQUNwQixHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLElBQUksRUFBRTtTQUN6QztRQUNELE9BQU8sRUFBRTtZQUNMLGVBQWU7WUFDZixPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxJQUFJO1lBQzlELFNBQVMsRUFBRSxvQkFBb0I7WUFDL0IsZ0NBQWdDO1NBQ25DO1FBQ0QsVUFBVTtRQUNWLElBQUksRUFBRTtZQUNGLFVBQVU7WUFDVixPQUFPLEVBQUU7Z0JBQ0wsZ0JBQWdCO2dCQUNoQixrQkFBa0I7YUFDckI7U0FDSjtRQUNELFNBQVM7UUFDVCxHQUFHLEVBQUU7WUFDRCxPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLElBQUksRUFBRTtZQUNsQyxLQUFLLEVBQUUsT0FBTyxDQUFDLEtBQUs7U0FDdkI7UUFDRCxpQkFBaUIsRUFBRTtZQUNmLFFBQVEsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLDJCQUEyQixJQUFJLEVBQUU7WUFDdkQsU0FBUyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLElBQUksRUFBRTtTQUM1RDtRQUNELE1BQU0sRUFBRTtZQUNKLElBQUksRUFBRSxNQUFNO1NBQ2Y7UUFDRCxVQUFVLEVBQUU7WUFDUixTQUFTLEVBQUUsTUFBTTtZQUNqQixTQUFTLEVBQUUsTUFBTTtTQUNwQjtRQUNELFlBQVksRUFBRTtZQUNWLE9BQU8sRUFBRTtnQkFDUCxPQUFPLEVBQUU7b0JBQ1AsS0FBSyxFQUFFLFFBQVE7b0JBQ2YsT0FBTyxFQUFFO3dCQUNQLEdBQUcsRUFBRSxLQUFLLEVBQUUsaUJBQWlCO3dCQUM3QixHQUFHLEVBQUUsTUFBTSxFQUFFLGdCQUFnQjtxQkFDOUI7aUJBQ0Y7YUFDRjtZQUNELE9BQU8sRUFBRTtnQkFDUCxLQUFLLEVBQUUsUUFBUTtnQkFDZixPQUFPLEVBQUU7b0JBQ1AsR0FBRyxFQUFFLEtBQUssRUFBRSxpQkFBaUI7b0JBQzdCLEdBQUcsRUFBRSxNQUFNLEVBQUUsZ0JBQWdCO2lCQUM5QjthQUNGO1NBQ0o7UUFDRCxNQUFNLEVBQUU7WUFDSixPQUFPO1lBQ1AsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxJQUFJLE1BQU07WUFDdEMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxJQUFJLE1BQU07WUFDN0MsU0FBUyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLElBQUksRUFBRTtTQUNqRDtLQUNZLENBQUM7SUFDbEIsT0FBTyxNQUFNLENBQUM7QUFDbEIsQ0FBQyxDQUFDIn0=
|
package/dist/guard/auth.js
CHANGED
|
@@ -30,7 +30,7 @@ let AuthGuard = class AuthGuard {
|
|
|
30
30
|
console.log('init auth guard');
|
|
31
31
|
// 如果用户自定义了session service的实现，则使用用户自定义的
|
|
32
32
|
this.sessionService = await appContext.getAsync(session_service_interface_1.DEFAULT_SESSION_SERVICE_KEY);
|
|
33
|
-
if (this.sessionService?.sessionOption.serviceKey !== session_service_interface_1.DEFAULT_SESSION_SERVICE_KEY) {
|
|
33
|
+
if (this.sessionService?.sessionOption?.serviceKey && this.sessionService?.sessionOption.serviceKey !== session_service_interface_1.DEFAULT_SESSION_SERVICE_KEY) {
|
|
34
34
|
//尝试获取用户自定义的实现
|
|
35
35
|
const sessionServiceObj = await appContext.getAsync(this.sessionService.sessionOption.serviceKey);
|
|
36
36
|
if (sessionServiceObj) {
|
|
@@ -201,4 +201,4 @@ __decorate([
|
|
|
201
201
|
exports.AuthGuard = AuthGuard = __decorate([
|
|
202
202
|
(0, core_1.Guard)()
|
|
203
203
|
], AuthGuard);
|
|
204
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
204
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ndWFyZC9hdXRoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBMEU7QUFFMUUsZ0RBQWlEO0FBQ2pELHdDQUFxRTtBQUNyRSxrRkFBa0c7QUFFbEc7O0dBRUc7QUFFSSxJQUFNLFNBQVMsR0FBZixNQUFNLFNBQVM7SUFFUixHQUFHLENBQWM7SUFFM0IsY0FBYyxDQUFrQjtJQUdoQyxTQUFTLENBQU07SUFHZixVQUFVLENBRVI7SUFHRixTQUFTLENBQU07SUFHZixHQUFHLENBQU07SUFHSCxBQUFOLEtBQUssQ0FBQyxJQUFJO1FBQ04sTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO1FBQ3BELE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUMvQix1Q0FBdUM7UUFDdkMsSUFBSSxDQUFDLGNBQWMsR0FBRyxNQUFNLFVBQVUsQ0FBQyxRQUFRLENBQWtCLHVEQUEyQixDQUFDLENBQUM7UUFDOUYsSUFBRyxJQUFJLENBQUMsY0FBYyxFQUFFLGFBQWEsRUFBRSxVQUFVLElBQUksSUFBSSxDQUFDLGNBQWMsRUFBRSxhQUFhLENBQUMsVUFBVSxLQUFLLHVEQUEyQixFQUFFLENBQUM7WUFDakksY0FBYztZQUNkLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxVQUFVLENBQUMsUUFBUSxDQUFrQixJQUFJLENBQUMsY0FBYyxDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNuSCxJQUFJLGlCQUFpQixFQUFFLENBQUM7Z0JBQ3BCLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkNBQTJDLEVBQUUsSUFBSSxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBQ3ZHLElBQUksQ0FBQyxjQUFjLEdBQUcsaUJBQWlCLENBQUM7WUFDNUMsQ0FBQztRQUNM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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cicctencent/midwayjs-base",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.31",
|
|
4
4
|
"description": "基础框架，服务",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "index.d.ts",
|
|
@@ -25,7 +25,6 @@
|
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@jest/globals": "^30.0.5",
|
|
28
|
-
"@midwayjs/cli": "^2.1.1",
|
|
29
28
|
"@midwayjs/mock": "^3.20.11",
|
|
30
29
|
"@types/jest": "^30.0.0",
|
|
31
30
|
"@types/koa": "^3.0.0",
|
|
@@ -44,23 +43,25 @@
|
|
|
44
43
|
"@midwayjs/axios": "^3.20.11",
|
|
45
44
|
"@midwayjs/bootstrap": "^3.20.11",
|
|
46
45
|
"@midwayjs/cache-manager": "^3.20.11",
|
|
46
|
+
"@midwayjs/cli": "^2.1.1",
|
|
47
47
|
"@midwayjs/cookies": "^1.3.0",
|
|
48
48
|
"@midwayjs/core": "^3.20.11",
|
|
49
49
|
"@midwayjs/decorator": "^3.20.11",
|
|
50
|
-
"@midwayjs/info": "^3.20.
|
|
51
|
-
"@midwayjs/koa": "^3.20.
|
|
52
|
-
"@midwayjs/logger": "^
|
|
53
|
-
"@midwayjs/static-file": "^3.20.
|
|
50
|
+
"@midwayjs/info": "^3.20.16",
|
|
51
|
+
"@midwayjs/koa": "^3.20.16",
|
|
52
|
+
"@midwayjs/logger": "^4.0.1",
|
|
53
|
+
"@midwayjs/static-file": "^3.20.16",
|
|
54
54
|
"@midwayjs/typeorm": "^3.20.11",
|
|
55
|
-
"@midwayjs/view-nunjucks": "^3.20.
|
|
56
|
-
"axios": "^1.
|
|
55
|
+
"@midwayjs/view-nunjucks": "^3.20.16",
|
|
56
|
+
"axios": "^1.12.2",
|
|
57
57
|
"dayjs": "^1.11.18",
|
|
58
|
-
"dotenv": "^17.2.
|
|
58
|
+
"dotenv": "^17.2.3",
|
|
59
59
|
"ip": "^2.0.1",
|
|
60
60
|
"jsonwebtoken": "^9.0.2",
|
|
61
61
|
"lodash": "^4.17.21",
|
|
62
|
-
"mysql2": "^3.
|
|
63
|
-
"
|
|
62
|
+
"mysql2": "^3.15.2",
|
|
63
|
+
"reflect-metadata": "^0.2.2",
|
|
64
|
+
"typeorm": "^0.3.27",
|
|
64
65
|
"uuid": "^13.0.0"
|
|
65
66
|
}
|
|
66
67
|
}
|
package/typings/midway.d.ts
CHANGED
|
@@ -1,54 +1,54 @@
|
|
|
1
|
-
import { type Session } from '@fefeding/common/dist/models/account/session';
|
|
2
|
-
import { type LoggerOption } from '@fefeding/common/dist/utils/logger';
|
|
3
|
-
import { ILogger, MidwayAppInfo } from '@midwayjs/core';
|
|
4
|
-
|
|
5
|
-
declare module '@midwayjs/core/dist/interface' {
|
|
6
|
-
interface MidwayConfig {
|
|
7
|
-
|
|
8
|
-
}
|
|
9
|
-
interface Context {
|
|
10
|
-
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
// 扩展 MidwayAppInfo 接口，添加自定义属性
|
|
15
|
-
declare module '@midwayjs/core' {
|
|
16
|
-
interface MidwayAppInfo {
|
|
17
|
-
dist: string;
|
|
18
|
-
webDist: string;
|
|
19
|
-
webPublic: string;
|
|
20
|
-
appId: number;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
declare module '@midwayjs/koa/dist/interface' {
|
|
25
|
-
// eslint-disable-next-line @typescript-eslint/no-empty-interface
|
|
26
|
-
interface Context {
|
|
27
|
-
/**
|
|
28
|
-
* 当前登陆态
|
|
29
|
-
*/
|
|
30
|
-
currentSession?: Session;
|
|
31
|
-
/**
|
|
32
|
-
* 当前登陆态token
|
|
33
|
-
*/
|
|
34
|
-
auth_token?: string;
|
|
35
|
-
clientIP?: string; // 客户IP
|
|
36
|
-
// 当当请
|
|
37
|
-
detect: {
|
|
38
|
-
IS_MOBILE: boolean,
|
|
39
|
-
IS_MQQ: boolean,
|
|
40
|
-
IS_WEIXIN: boolean,
|
|
41
|
-
IS_WECHATTOOLS: boolean,
|
|
42
|
-
IS_PCWEIXIN: boolean,
|
|
43
|
-
IS_WXWORK: boolean,
|
|
44
|
-
IS_MINA: boolean,
|
|
45
|
-
REQUESTIP: string,
|
|
46
|
-
HOSTNAME: string,
|
|
47
|
-
CLIENTIP: string,
|
|
48
|
-
},
|
|
49
|
-
logger: ILogger & {
|
|
50
|
-
// 设置环境变量
|
|
51
|
-
setOptions(options: LoggerOption): void;
|
|
52
|
-
};
|
|
53
|
-
}
|
|
54
|
-
}
|
|
1
|
+
import { type Session } from '@fefeding/common/dist/models/account/session';
|
|
2
|
+
import { type LoggerOption } from '@fefeding/common/dist/utils/logger';
|
|
3
|
+
import { ILogger, MidwayAppInfo } from '@midwayjs/core';
|
|
4
|
+
|
|
5
|
+
declare module '@midwayjs/core/dist/interface' {
|
|
6
|
+
interface MidwayConfig {
|
|
7
|
+
|
|
8
|
+
}
|
|
9
|
+
interface Context {
|
|
10
|
+
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
// 扩展 MidwayAppInfo 接口，添加自定义属性
|
|
15
|
+
declare module '@midwayjs/core' {
|
|
16
|
+
interface MidwayAppInfo {
|
|
17
|
+
dist: string;
|
|
18
|
+
webDist: string;
|
|
19
|
+
webPublic: string;
|
|
20
|
+
appId: number;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
declare module '@midwayjs/koa/dist/interface' {
|
|
25
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-interface
|
|
26
|
+
interface Context {
|
|
27
|
+
/**
|
|
28
|
+
* 当前登陆态
|
|
29
|
+
*/
|
|
30
|
+
currentSession?: Session;
|
|
31
|
+
/**
|
|
32
|
+
* 当前登陆态token
|
|
33
|
+
*/
|
|
34
|
+
auth_token?: string;
|
|
35
|
+
clientIP?: string; // 客户IP
|
|
36
|
+
// 当当请
|
|
37
|
+
detect: {
|
|
38
|
+
IS_MOBILE: boolean,
|
|
39
|
+
IS_MQQ: boolean,
|
|
40
|
+
IS_WEIXIN: boolean,
|
|
41
|
+
IS_WECHATTOOLS: boolean,
|
|
42
|
+
IS_PCWEIXIN: boolean,
|
|
43
|
+
IS_WXWORK: boolean,
|
|
44
|
+
IS_MINA: boolean,
|
|
45
|
+
REQUESTIP: string,
|
|
46
|
+
HOSTNAME: string,
|
|
47
|
+
CLIENTIP: string,
|
|
48
|
+
},
|
|
49
|
+
logger: ILogger & {
|
|
50
|
+
// 设置环境变量
|
|
51
|
+
setOptions(options: LoggerOption): void;
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
}
|