@cicctencent/midwayjs-base 1.0.19 → 1.0.20
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 +65 -65
- package/typings/midway.d.ts +54 -54
- package/dist/base/base.controller.d.ts +0 -5
- package/dist/base/base.controller.js +0 -28
- package/dist/base/base.model.service.d.ts +0 -29
- package/dist/base/base.model.service.js +0 -86
- package/dist/base/base.service.d.ts +0 -30
- package/dist/base/base.service.js +0 -86
- package/dist/config/config.default.d.ts +0 -3
- package/dist/config/config.default.js +0 -153
- package/dist/config/env.d.ts +0 -1
- package/dist/config/env.js +0 -19
- package/dist/configuration.d.ts +0 -5
- package/dist/configuration.js +0 -75
- package/dist/filter/default.filter.d.ts +0 -7
- package/dist/filter/default.filter.js +0 -24
- package/dist/filter/notfound.filter.d.ts +0 -5
- package/dist/filter/notfound.filter.js +0 -22
- package/dist/guard/api.d.ts +0 -16
- package/dist/guard/api.js +0 -88
- package/dist/guard/auth.d.ts +0 -19
- package/dist/guard/auth.js +0 -184
- package/dist/index.d.ts +0 -16
- package/dist/index.js +0 -37
- package/dist/lib/decorator.d.ts +0 -36
- package/dist/lib/decorator.js +0 -79
- package/dist/lib/request.d.ts +0 -7
- package/dist/lib/request.js +0 -7
- package/dist/lib/utils.d.ts +0 -15
- package/dist/lib/utils.js +0 -100
- package/dist/middleware/apiResultFormatter.d.ts +0 -8
- package/dist/middleware/apiResultFormatter.js +0 -84
- package/dist/middleware/detect.middleware.d.ts +0 -5
- package/dist/middleware/detect.middleware.js +0 -61
- package/dist/middleware/requestInit.d.ts +0 -8
- package/dist/middleware/requestInit.js +0 -100
- package/dist/service/session.service.d.ts +0 -39
- package/dist/service/session.service.js +0 -93
- package/dist/service/tencent.service.d.ts +0 -38
- package/dist/service/tencent.service.js +0 -87
package/package.json
CHANGED
|
@@ -1,65 +1,65 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "@cicctencent/midwayjs-base",
|
|
3
|
-
"version": "1.0.
|
|
4
|
-
"description": "基础框架,服务",
|
|
5
|
-
"main": "dist/index.js",
|
|
6
|
-
"typings": "index.d.ts",
|
|
7
|
-
"publishConfig": {
|
|
8
|
-
"access": "public"
|
|
9
|
-
},
|
|
10
|
-
"scripts": {
|
|
11
|
-
"build": "mwtsc --cleanOutDir",
|
|
12
|
-
"test": "cross-env NODE_ENV=unittest jest",
|
|
13
|
-
"cov": "jest --coverage",
|
|
14
|
-
"lint": "mwts check",
|
|
15
|
-
"lint:fix": "mwts fix"
|
|
16
|
-
},
|
|
17
|
-
"keywords": [],
|
|
18
|
-
"author": "",
|
|
19
|
-
"files": [
|
|
20
|
-
"dist/**/*.js",
|
|
21
|
-
"dist/**/*.d.ts",
|
|
22
|
-
"typings/**/*.d.ts",
|
|
23
|
-
"index.d.ts"
|
|
24
|
-
],
|
|
25
|
-
"license": "MIT",
|
|
26
|
-
"devDependencies": {
|
|
27
|
-
"@jest/globals": "^30.0.5",
|
|
28
|
-
"@midwayjs/cli": "^2.1.1",
|
|
29
|
-
"@midwayjs/mock": "^3.20.11",
|
|
30
|
-
"@types/jest": "^30.0.0",
|
|
31
|
-
"@types/koa": "^3.0.0",
|
|
32
|
-
"@types/lodash-es": "^4.17.12",
|
|
33
|
-
"@types/node": "^24.3.0",
|
|
34
|
-
"cross-env": "^10.0.0",
|
|
35
|
-
"jest": "^30.0.5",
|
|
36
|
-
"mwts": "^1.3.0",
|
|
37
|
-
"mwtsc": "^1.4.0",
|
|
38
|
-
"npm-run-all": "^4.1.5",
|
|
39
|
-
"ts-jest": "^29.4.1",
|
|
40
|
-
"typescript": "^5.9.2"
|
|
41
|
-
},
|
|
42
|
-
"dependencies": {
|
|
43
|
-
"@fefeding/common": "^1.0.55",
|
|
44
|
-
"@midwayjs/axios": "^3.20.11",
|
|
45
|
-
"@midwayjs/bootstrap": "^3.20.11",
|
|
46
|
-
"@midwayjs/cache-manager": "^3.20.11",
|
|
47
|
-
"@midwayjs/core": "^3.20.11",
|
|
48
|
-
"@midwayjs/decorator": "^3.20.11",
|
|
49
|
-
"@midwayjs/info": "^3.20.12",
|
|
50
|
-
"@midwayjs/koa": "^3.20.13",
|
|
51
|
-
"@midwayjs/logger": "^3.4.2",
|
|
52
|
-
"@midwayjs/static-file": "^3.20.12",
|
|
53
|
-
"@midwayjs/typeorm": "^3.20.11",
|
|
54
|
-
"@midwayjs/view-nunjucks": "^3.20.12",
|
|
55
|
-
"axios": "^1.11.0",
|
|
56
|
-
"dayjs": "^1.11.18",
|
|
57
|
-
"dotenv": "^17.2.2",
|
|
58
|
-
"ip": "^2.0.1",
|
|
59
|
-
"jsonwebtoken": "^9.0.2",
|
|
60
|
-
"lodash": "^4.17.21",
|
|
61
|
-
"mysql2": "^3.14.5",
|
|
62
|
-
"typeorm": "^0.3.26",
|
|
63
|
-
"uuid": "^13.0.0"
|
|
64
|
-
}
|
|
65
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "@cicctencent/midwayjs-base",
|
|
3
|
+
"version": "1.0.20",
|
|
4
|
+
"description": "基础框架,服务",
|
|
5
|
+
"main": "dist/index.js",
|
|
6
|
+
"typings": "index.d.ts",
|
|
7
|
+
"publishConfig": {
|
|
8
|
+
"access": "public"
|
|
9
|
+
},
|
|
10
|
+
"scripts": {
|
|
11
|
+
"build": "mwtsc --cleanOutDir",
|
|
12
|
+
"test": "cross-env NODE_ENV=unittest jest",
|
|
13
|
+
"cov": "jest --coverage",
|
|
14
|
+
"lint": "mwts check",
|
|
15
|
+
"lint:fix": "mwts fix"
|
|
16
|
+
},
|
|
17
|
+
"keywords": [],
|
|
18
|
+
"author": "",
|
|
19
|
+
"files": [
|
|
20
|
+
"dist/**/*.js",
|
|
21
|
+
"dist/**/*.d.ts",
|
|
22
|
+
"typings/**/*.d.ts",
|
|
23
|
+
"index.d.ts"
|
|
24
|
+
],
|
|
25
|
+
"license": "MIT",
|
|
26
|
+
"devDependencies": {
|
|
27
|
+
"@jest/globals": "^30.0.5",
|
|
28
|
+
"@midwayjs/cli": "^2.1.1",
|
|
29
|
+
"@midwayjs/mock": "^3.20.11",
|
|
30
|
+
"@types/jest": "^30.0.0",
|
|
31
|
+
"@types/koa": "^3.0.0",
|
|
32
|
+
"@types/lodash-es": "^4.17.12",
|
|
33
|
+
"@types/node": "^24.3.0",
|
|
34
|
+
"cross-env": "^10.0.0",
|
|
35
|
+
"jest": "^30.0.5",
|
|
36
|
+
"mwts": "^1.3.0",
|
|
37
|
+
"mwtsc": "^1.4.0",
|
|
38
|
+
"npm-run-all": "^4.1.5",
|
|
39
|
+
"ts-jest": "^29.4.1",
|
|
40
|
+
"typescript": "^5.9.2"
|
|
41
|
+
},
|
|
42
|
+
"dependencies": {
|
|
43
|
+
"@fefeding/common": "^1.0.55",
|
|
44
|
+
"@midwayjs/axios": "^3.20.11",
|
|
45
|
+
"@midwayjs/bootstrap": "^3.20.11",
|
|
46
|
+
"@midwayjs/cache-manager": "^3.20.11",
|
|
47
|
+
"@midwayjs/core": "^3.20.11",
|
|
48
|
+
"@midwayjs/decorator": "^3.20.11",
|
|
49
|
+
"@midwayjs/info": "^3.20.12",
|
|
50
|
+
"@midwayjs/koa": "^3.20.13",
|
|
51
|
+
"@midwayjs/logger": "^3.4.2",
|
|
52
|
+
"@midwayjs/static-file": "^3.20.12",
|
|
53
|
+
"@midwayjs/typeorm": "^3.20.11",
|
|
54
|
+
"@midwayjs/view-nunjucks": "^3.20.12",
|
|
55
|
+
"axios": "^1.11.0",
|
|
56
|
+
"dayjs": "^1.11.18",
|
|
57
|
+
"dotenv": "^17.2.2",
|
|
58
|
+
"ip": "^2.0.1",
|
|
59
|
+
"jsonwebtoken": "^9.0.2",
|
|
60
|
+
"lodash": "^4.17.21",
|
|
61
|
+
"mysql2": "^3.14.5",
|
|
62
|
+
"typeorm": "^0.3.26",
|
|
63
|
+
"uuid": "^13.0.0"
|
|
64
|
+
}
|
|
65
|
+
}
|
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
|
+
}
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.BaseController = void 0;
|
|
13
|
-
// @ts-ignore
|
|
14
|
-
const core_1 = require("@midwayjs/core");
|
|
15
|
-
class BaseController {
|
|
16
|
-
app;
|
|
17
|
-
ctx;
|
|
18
|
-
}
|
|
19
|
-
exports.BaseController = BaseController;
|
|
20
|
-
__decorate([
|
|
21
|
-
(0, core_1.App)(),
|
|
22
|
-
__metadata("design:type", Object)
|
|
23
|
-
], BaseController.prototype, "app", void 0);
|
|
24
|
-
__decorate([
|
|
25
|
-
(0, core_1.Inject)(),
|
|
26
|
-
__metadata("design:type", Object)
|
|
27
|
-
], BaseController.prototype, "ctx", void 0);
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5jb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jhc2UvYmFzZS5jb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUNBLGFBQWE7QUFDYix5Q0FBNkM7QUFJN0MsTUFBc0IsY0FBYztJQUV0QixHQUFHLENBQWM7SUFHakIsR0FBRyxDQUFVO0NBQzFCO0FBTkQsd0NBTUM7QUFKYTtJQURULElBQUEsVUFBRyxHQUFFOzsyQ0FDcUI7QUFHakI7SUFEVCxJQUFBLGFBQU0sR0FBRTs7MkNBQ2MifQ==
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import { Repository, DeepPartial, FindOptionsWhere, FindOptionsSelect, FindOptionsOrder, FindOptionsRelations, QueryRunner } from 'typeorm';
|
|
2
|
-
import BaseEntity from '@fefeding/common/dist/models/base/baseORM';
|
|
3
|
-
import { BaseService } from './base.service';
|
|
4
|
-
export interface Options<Entity> {
|
|
5
|
-
select?: FindOptionsSelect<Entity>;
|
|
6
|
-
order?: FindOptionsOrder<Entity>;
|
|
7
|
-
page?: number;
|
|
8
|
-
size?: number;
|
|
9
|
-
relations?: FindOptionsRelations<Entity>;
|
|
10
|
-
}
|
|
11
|
-
export declare abstract class BaseModelService<K extends BaseEntity> extends BaseService {
|
|
12
|
-
protected abstract model: Repository<K>;
|
|
13
|
-
/**
|
|
14
|
-
* 保存
|
|
15
|
-
* @param u 对象orm
|
|
16
|
-
*/
|
|
17
|
-
save(entity: K, qryRunner?: QueryRunner): Promise<K>;
|
|
18
|
-
/** update 和 create都可以用insert */
|
|
19
|
-
insert(data: DeepPartial<K> | DeepPartial<K>[]): Promise<K | K[]>;
|
|
20
|
-
update(data: DeepPartial<K> | DeepPartial<K>[], repo?: Repository<K>): Promise<K>;
|
|
21
|
-
/**
|
|
22
|
-
* 删除对象
|
|
23
|
-
*/
|
|
24
|
-
delete(data: DeepPartial<K> | DeepPartial<K>[], repo?: Repository<K>): Promise<K | DeepPartial<K>[]>;
|
|
25
|
-
findAndCount(where: FindOptionsWhere<K> | FindOptionsWhere<K>[], options?: Options<K>): Promise<{
|
|
26
|
-
rows: K[];
|
|
27
|
-
count: number;
|
|
28
|
-
}>;
|
|
29
|
-
}
|
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BaseModelService = void 0;
|
|
4
|
-
const base_service_1 = require("./base.service");
|
|
5
|
-
const enumType_1 = require("@fefeding/common/dist/models/base/enumType");
|
|
6
|
-
class BaseModelService extends base_service_1.BaseService {
|
|
7
|
-
/**
|
|
8
|
-
* 保存
|
|
9
|
-
* @param u 对象orm
|
|
10
|
-
*/
|
|
11
|
-
async save(entity, qryRunner) {
|
|
12
|
-
if (this.ctx?.currentSession?.loginId) {
|
|
13
|
-
entity.updater = this.ctx.currentSession.loginId;
|
|
14
|
-
}
|
|
15
|
-
if (qryRunner) {
|
|
16
|
-
return await qryRunner.manager.save(entity);
|
|
17
|
-
}
|
|
18
|
-
const res = await this.model.save(entity);
|
|
19
|
-
return res;
|
|
20
|
-
}
|
|
21
|
-
/** update 和 create都可以用insert */
|
|
22
|
-
async insert(data) {
|
|
23
|
-
const isArray = Array.isArray(data);
|
|
24
|
-
const updater = this.ctx.currentSession?.loginId;
|
|
25
|
-
const entities = (isArray ? data : [data]).map(it => this.model.create({
|
|
26
|
-
/** creator 优先用it的,updater优先用当前用户的 */
|
|
27
|
-
creator: updater,
|
|
28
|
-
...it,
|
|
29
|
-
updater,
|
|
30
|
-
}));
|
|
31
|
-
const models = await this.model.save(entities);
|
|
32
|
-
return isArray ? models : models[0];
|
|
33
|
-
}
|
|
34
|
-
async update(data, repo) {
|
|
35
|
-
let entities;
|
|
36
|
-
let isArray = false;
|
|
37
|
-
if (Array.isArray(data)) {
|
|
38
|
-
isArray = true;
|
|
39
|
-
entities = data;
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
entities = [data];
|
|
43
|
-
}
|
|
44
|
-
const updater = this.ctx.currentSession?.loginId;
|
|
45
|
-
repo = repo || this.model;
|
|
46
|
-
const models = await repo.save(entities.map(o => {
|
|
47
|
-
return this.model.create({
|
|
48
|
-
...o,
|
|
49
|
-
updater,
|
|
50
|
-
});
|
|
51
|
-
}));
|
|
52
|
-
return isArray ? models : models[0];
|
|
53
|
-
}
|
|
54
|
-
/**
|
|
55
|
-
* 删除对象
|
|
56
|
-
*/
|
|
57
|
-
async delete(data, repo) {
|
|
58
|
-
repo = repo || this.model;
|
|
59
|
-
if (Array.isArray(data)) {
|
|
60
|
-
for (const m of data) {
|
|
61
|
-
await this.delete(m, repo);
|
|
62
|
-
}
|
|
63
|
-
return data;
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
// 标记为已删除
|
|
67
|
-
data.valid = enumType_1.EValid.Unvalid;
|
|
68
|
-
return await repo.save(data);
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
async findAndCount(where, options) {
|
|
72
|
-
const { select, order = { createTime: 'DESC' }, page = 1, size = 20, relations, } = options || {};
|
|
73
|
-
const skip = (Number(page) - 1) * Number(size);
|
|
74
|
-
let take = Number(size);
|
|
75
|
-
if (take > 10000)
|
|
76
|
-
take = 10000;
|
|
77
|
-
console.log('find count', where, skip, take);
|
|
78
|
-
const [rows, count] = await Promise.all([
|
|
79
|
-
this.model.find({ where, select, order, skip, take, relations }),
|
|
80
|
-
this.model.countBy(where),
|
|
81
|
-
]);
|
|
82
|
-
return { rows, count };
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
exports.BaseModelService = BaseModelService;
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5tb2RlbC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jhc2UvYmFzZS5tb2RlbC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQVdBLGlEQUE2QztBQUM3Qyx5RUFBb0U7QUFjcEUsTUFBc0IsZ0JBQXVDLFNBQVEsMEJBQVc7SUFHNUU7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLElBQUksQ0FBQyxNQUFTLEVBQUUsU0FBdUI7UUFDekMsSUFBRyxJQUFJLENBQUMsR0FBRyxFQUFFLGNBQWMsRUFBRSxPQUFPLEVBQUUsQ0FBQztZQUNuQyxNQUFNLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQztRQUNyRCxDQUFDO1FBQ0QsSUFBRyxTQUFTLEVBQUUsQ0FBQztZQUNYLE9BQU8sTUFBTSxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNoRCxDQUFDO1FBQ0QsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUMxQyxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFFRCxnQ0FBZ0M7SUFDekIsS0FBSyxDQUFDLE1BQU0sQ0FDZixJQUF1QztRQUV2QyxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BDLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQztRQUNqRCxNQUFNLFFBQVEsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQ2hELElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDO1lBQ2QscUNBQXFD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
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { Application, Context } from '@midwayjs/koa';
|
|
2
|
-
import type { AxiosRequestConfig, AxiosResponse } from 'axios';
|
|
3
|
-
import request from '@fefeding/common/dist/models/base/request';
|
|
4
|
-
import response from '@fefeding/common/dist/models/base/response';
|
|
5
|
-
export declare class BaseService {
|
|
6
|
-
protected app: Application;
|
|
7
|
-
ctx: Context;
|
|
8
|
-
baseServiceOption: {
|
|
9
|
-
manager?: Array<string>;
|
|
10
|
-
appId: number;
|
|
11
|
-
url: string;
|
|
12
|
-
};
|
|
13
|
-
apiOption: {
|
|
14
|
-
key: string;
|
|
15
|
-
};
|
|
16
|
-
/**
|
|
17
|
-
* 是否是管理员帐号
|
|
18
|
-
* @param account
|
|
19
|
-
*/
|
|
20
|
-
checkManager(account?: string): Promise<boolean>;
|
|
21
|
-
/**
|
|
22
|
-
* 基础服务请求
|
|
23
|
-
* @param req
|
|
24
|
-
* @param option
|
|
25
|
-
*/
|
|
26
|
-
requestBaseApi<T extends response>(req: request | string, option?: AxiosRequestConfig): Promise<T>;
|
|
27
|
-
requestBaseServer<T extends any>(req: request | string, option?: AxiosRequestConfig & {
|
|
28
|
-
accessKey?: string;
|
|
29
|
-
}): Promise<AxiosResponse<any, T>>;
|
|
30
|
-
}
|
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.BaseService = void 0;
|
|
13
|
-
// @ts-ignore
|
|
14
|
-
const core_1 = require("@midwayjs/core");
|
|
15
|
-
const api_1 = require("@fefeding/common/dist/utils/api");
|
|
16
|
-
const request_1 = require("../lib/request");
|
|
17
|
-
class BaseService {
|
|
18
|
-
app;
|
|
19
|
-
ctx;
|
|
20
|
-
baseServiceOption;
|
|
21
|
-
// 登陆态验证配置
|
|
22
|
-
apiOption;
|
|
23
|
-
/**
|
|
24
|
-
* 是否是管理员帐号
|
|
25
|
-
* @param account
|
|
26
|
-
*/
|
|
27
|
-
async checkManager(account = this.ctx.currentSession?.account?.account) {
|
|
28
|
-
return account && this.baseServiceOption.manager?.includes(account);
|
|
29
|
-
}
|
|
30
|
-
/**
|
|
31
|
-
* 基础服务请求
|
|
32
|
-
* @param req
|
|
33
|
-
* @param option
|
|
34
|
-
*/
|
|
35
|
-
async requestBaseApi(req, option) {
|
|
36
|
-
const res = await this.requestBaseServer(req, option);
|
|
37
|
-
return res?.data || null;
|
|
38
|
-
}
|
|
39
|
-
async requestBaseServer(req, option) {
|
|
40
|
-
option = {
|
|
41
|
-
method: 'POST',
|
|
42
|
-
baseURL: this.baseServiceOption.url,
|
|
43
|
-
accessKey: this.apiOption?.key || '',
|
|
44
|
-
...option,
|
|
45
|
-
};
|
|
46
|
-
const headers = option.headers || {};
|
|
47
|
-
if (option.accessKey) {
|
|
48
|
-
const thisToken = api_1.default.createApiToken(option.accessKey);
|
|
49
|
-
headers['x-api-token'] = thisToken.sign;
|
|
50
|
-
headers['x-api-timestamp'] = thisToken.timestamp;
|
|
51
|
-
/*if(typeof req === 'object') {
|
|
52
|
-
req.api_token = thisToken.sign;
|
|
53
|
-
req.timestamp = thisToken.timestamp;
|
|
54
|
-
}*/
|
|
55
|
-
}
|
|
56
|
-
headers['x-request-id'] = this.ctx.request_id;
|
|
57
|
-
headers['x-auth-token'] = this.ctx.currentSession?.id || '';
|
|
58
|
-
const ip = this.ctx?.detect?.CLIENTIP || (this.ctx.request?.header?.['x-client-ip'] ||
|
|
59
|
-
this.ctx.request?.header?.['x-forwarded-for'] ||
|
|
60
|
-
this.ctx.request?.ip || '').toString();
|
|
61
|
-
headers['x-client-ip'] = ip;
|
|
62
|
-
//console.log(req, option);
|
|
63
|
-
option.headers = headers;
|
|
64
|
-
// @ts-ignore
|
|
65
|
-
const res = await (0, request_1.requestServer)(req, option);
|
|
66
|
-
return res;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
exports.BaseService = BaseService;
|
|
70
|
-
__decorate([
|
|
71
|
-
(0, core_1.App)(),
|
|
72
|
-
__metadata("design:type", Object)
|
|
73
|
-
], BaseService.prototype, "app", void 0);
|
|
74
|
-
__decorate([
|
|
75
|
-
(0, core_1.Inject)(),
|
|
76
|
-
__metadata("design:type", Object)
|
|
77
|
-
], BaseService.prototype, "ctx", void 0);
|
|
78
|
-
__decorate([
|
|
79
|
-
(0, core_1.Config)('baseService'),
|
|
80
|
-
__metadata("design:type", Object)
|
|
81
|
-
], BaseService.prototype, "baseServiceOption", void 0);
|
|
82
|
-
__decorate([
|
|
83
|
-
(0, core_1.Config)('apiOption'),
|
|
84
|
-
__metadata("design:type", Object)
|
|
85
|
-
], BaseService.prototype, "apiOption", void 0);
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jhc2UvYmFzZS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBcUQ7QUFPckQseURBQWtEO0FBQ2xELDRDQUErQztBQUUvQyxNQUFhLFdBQVc7SUFFVixHQUFHLENBQWM7SUFHcEIsR0FBRyxDQUFVO0lBR3BCLGlCQUFpQixDQUloQjtJQUNELFVBQVU7SUFFVixTQUFTLENBRVA7SUFFRjs7O09BR0c7SUFDSCxLQUFLLENBQUMsWUFBWSxDQUFDLFVBQWtCLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLE9BQU8sRUFBRSxPQUFPO1FBQzFFLE9BQU8sT0FBTyxJQUFJLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hFLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLGNBQWMsQ0FBcUIsR0FBbUIsRUFBRSxNQUEyQjtRQUNyRixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBSSxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDekQsT0FBTyxHQUFHLEVBQUUsSUFBSSxJQUFJLElBQUksQ0FBQztJQUM3QixDQUFDO0lBRUQsS0FBSyxDQUFDLGlCQUFpQixDQUFnQixHQUFtQixFQUFFLE1BRTNEO1FBQ0csTUFBTSxHQUFHO1lBQ0wsTUFBTSxFQUFFLE1BQU07WUFDZCxPQUFPLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUc7WUFDbkMsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxJQUFJLEVBQUU7WUFDcEMsR0FBRyxNQUFNO1NBQ1UsQ0FBQztRQUV4QixNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQztRQUNyQyxJQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNsQixNQUFNLFNBQVMsR0FBRyxhQUFHLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUN2RCxPQUFPLENBQUMsYUFBYSxDQUFDLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQztZQUN4QyxPQUFPLENBQUMsaUJBQWlCLENBQUMsR0FBRyxTQUFTLENBQUMsU0FBUyxDQUFDO1lBRWpEOzs7ZUFHRztRQUNQLENBQUM7UUFDRCxPQUFPLENBQUMsY0FBYyxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUM7UUFDOUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDNUQsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsUUFBUSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUMsYUFBYSxDQUFDO1lBQy9FLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxDQUFDLGlCQUFpQixDQUFDO1lBQzdDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUMzQyxPQUFPLENBQUMsYUFBYSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQzVCLDJCQUEyQjtRQUMzQixNQUFNLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN6QixhQUFhO1FBQ2IsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFBLHVCQUFhLEVBQXdCLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNwRSxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7Q0FDSjtBQXRFRCxrQ0FzRUM7QUFwRWE7SUFEVCxJQUFBLFVBQUcsR0FBRTs7d0NBQ3FCO0FBR3BCO0lBRE4sSUFBQSxhQUFNLEdBQUU7O3dDQUNXO0FBR3BCO0lBREMsSUFBQSxhQUFNLEVBQUMsYUFBYSxDQUFDOztzREFLckI7QUFHRDtJQURDLElBQUEsYUFBTSxFQUFDLFdBQVcsQ0FBQzs7OENBR2xCIn0=
|