midway-fatcms 0.0.1-beta.17 → 0.0.1-beta.18
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/configuration.js +18 -7
- package/dist/schedule/index.d.ts +3 -3
- package/dist/schedule/index.js +3 -4
- package/dist/schedule/runSchedule.d.ts +10 -2
- package/dist/schedule/runSchedule.js +46 -15
- package/dist/schedule/scheduleNames.d.ts +8 -3
- package/dist/schedule/scheduleNames.js +12 -12
- package/dist/service/asyncTask/AsyncTaskService.js +1 -1
- package/package.json +1 -1
- package/src/configuration.ts +23 -11
- package/src/schedule/index.ts +4 -6
- package/src/schedule/runSchedule.ts +60 -17
- package/src/schedule/scheduleNames.ts +12 -11
- package/src/service/VisitStatService.ts +0 -1
- package/src/service/anyapi/AnyApiService.ts +7 -7
- package/src/service/asyncTask/AsyncTaskRunnerService.ts +1 -1
- package/src/service/asyncTask/AsyncTaskService.ts +2 -2
- package/src/service/proxyapi/ProxyApiLoadService.ts +4 -3
package/dist/configuration.js
CHANGED
|
@@ -27,7 +27,6 @@ const global_middleware_1 = require("./middleware/global.middleware");
|
|
|
27
27
|
const forbidden_middleware_1 = require("./middleware/forbidden.middleware");
|
|
28
28
|
const schedule_1 = require("./schedule");
|
|
29
29
|
const crypto_utils_1 = require("./libs/utils/crypto-utils");
|
|
30
|
-
const scheduleNames_1 = require("./schedule/scheduleNames");
|
|
31
30
|
let ContainerLifeCycle = class ContainerLifeCycle {
|
|
32
31
|
async onConfigLoad() {
|
|
33
32
|
const config = this.app.getConfig();
|
|
@@ -51,6 +50,10 @@ let ContainerLifeCycle = class ContainerLifeCycle {
|
|
|
51
50
|
return newConfig;
|
|
52
51
|
}
|
|
53
52
|
async onReady() {
|
|
53
|
+
/**
|
|
54
|
+
* 让ANONYMOUS_CONTEXT获取app对象
|
|
55
|
+
*/
|
|
56
|
+
schedule_1.ANONYMOUS_CONTEXT.setApp(this.app);
|
|
54
57
|
/**
|
|
55
58
|
* 启动定时任务
|
|
56
59
|
*/
|
|
@@ -69,13 +72,21 @@ let ContainerLifeCycle = class ContainerLifeCycle {
|
|
|
69
72
|
if (fatcmsScheduleService === false || fatcmsScheduleService === null) {
|
|
70
73
|
return;
|
|
71
74
|
}
|
|
72
|
-
let
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
75
|
+
let scheduleIntervalCfg = schedule_1.INNER_SCHEDULE_INTERVAL;
|
|
76
|
+
if (typeof fatcmsScheduleService === "object") {
|
|
77
|
+
scheduleIntervalCfg = fatcmsScheduleService;
|
|
78
|
+
}
|
|
79
|
+
const keys = Object.keys(scheduleIntervalCfg);
|
|
80
|
+
for (let i = 0; i < keys.length; i++) {
|
|
81
|
+
const service = keys[i];
|
|
82
|
+
const interval = scheduleIntervalCfg[service];
|
|
83
|
+
if (typeof interval !== "number") {
|
|
84
|
+
throw new Error('Invalid scheduleIntervalCfg ' + service + ", interval must be a number");
|
|
85
|
+
}
|
|
86
|
+
schedule_1.SCHEDULE_QUEUE.setScheduleTask(service, interval);
|
|
76
87
|
}
|
|
77
|
-
await
|
|
78
|
-
logger.info('ContainerLifeCycle ==> onReady 启动定时任务 : ' + JSON.stringify(
|
|
88
|
+
await schedule_1.SCHEDULE_QUEUE.startScheduleLoop();
|
|
89
|
+
logger.info('ContainerLifeCycle ==> onReady 启动定时任务 : ' + JSON.stringify(scheduleIntervalCfg));
|
|
79
90
|
}
|
|
80
91
|
};
|
|
81
92
|
__decorate([
|
package/dist/schedule/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SCHEDULE_QUEUE, runScheduleTaskOnce } from './runSchedule';
|
|
2
2
|
import { ANONYMOUS_CONTEXT } from './anonymousContext';
|
|
3
|
-
import {
|
|
4
|
-
export {
|
|
3
|
+
import { INNER_SCHEDULE_INTERVAL } from './scheduleNames';
|
|
4
|
+
export { INNER_SCHEDULE_INTERVAL, ANONYMOUS_CONTEXT, SCHEDULE_QUEUE, runScheduleTaskOnce };
|
package/dist/schedule/index.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runScheduleTaskOnce = exports.
|
|
3
|
+
exports.runScheduleTaskOnce = exports.SCHEDULE_QUEUE = exports.ANONYMOUS_CONTEXT = exports.INNER_SCHEDULE_INTERVAL = void 0;
|
|
4
4
|
const runSchedule_1 = require("./runSchedule");
|
|
5
|
-
Object.defineProperty(exports, "
|
|
5
|
+
Object.defineProperty(exports, "SCHEDULE_QUEUE", { enumerable: true, get: function () { return runSchedule_1.SCHEDULE_QUEUE; } });
|
|
6
6
|
Object.defineProperty(exports, "runScheduleTaskOnce", { enumerable: true, get: function () { return runSchedule_1.runScheduleTaskOnce; } });
|
|
7
7
|
const anonymousContext_1 = require("./anonymousContext");
|
|
8
8
|
Object.defineProperty(exports, "ANONYMOUS_CONTEXT", { enumerable: true, get: function () { return anonymousContext_1.ANONYMOUS_CONTEXT; } });
|
|
9
9
|
const scheduleNames_1 = require("./scheduleNames");
|
|
10
|
-
Object.defineProperty(exports, "
|
|
11
|
-
Object.defineProperty(exports, "SCHEDULE_NAMES", { enumerable: true, get: function () { return scheduleNames_1.SCHEDULE_NAMES; } });
|
|
10
|
+
Object.defineProperty(exports, "INNER_SCHEDULE_INTERVAL", { enumerable: true, get: function () { return scheduleNames_1.INNER_SCHEDULE_INTERVAL; } });
|
|
@@ -2,5 +2,13 @@ declare function runScheduleTaskOnce(serviceName: string): Promise<{
|
|
|
2
2
|
result: any;
|
|
3
3
|
error: any;
|
|
4
4
|
}>;
|
|
5
|
-
declare
|
|
6
|
-
|
|
5
|
+
declare class ScheduleQueue {
|
|
6
|
+
private scheduleIntervalMap;
|
|
7
|
+
setScheduleTask(serviceName: string, intervalTime: number): void;
|
|
8
|
+
removeScheduleTask(serviceName: string): void;
|
|
9
|
+
private isAlreadyTimeToExecute;
|
|
10
|
+
private runScheduleServiceList;
|
|
11
|
+
startScheduleLoop(): Promise<void>;
|
|
12
|
+
}
|
|
13
|
+
declare const SCHEDULE_QUEUE: ScheduleQueue;
|
|
14
|
+
export { SCHEDULE_QUEUE, runScheduleTaskOnce };
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runScheduleTaskOnce = exports.
|
|
3
|
+
exports.runScheduleTaskOnce = exports.SCHEDULE_QUEUE = void 0;
|
|
4
4
|
const anonymousContext_1 = require("./anonymousContext");
|
|
5
|
+
// 上次执行时间
|
|
6
|
+
const lastExecuteTimeMap = {};
|
|
7
|
+
const DEFAULT_SCHEDULE_INTERVAL = 2 * 60 * 1000;
|
|
5
8
|
async function runScheduleTaskOnce(serviceName) {
|
|
6
9
|
return await anonymousContext_1.ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx) => {
|
|
7
10
|
const serviceObject = await ctx.requestContext.getAsync(serviceName);
|
|
@@ -14,21 +17,49 @@ async function runScheduleTaskOnce(serviceName) {
|
|
|
14
17
|
});
|
|
15
18
|
}
|
|
16
19
|
exports.runScheduleTaskOnce = runScheduleTaskOnce;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
class ScheduleQueue {
|
|
21
|
+
constructor() {
|
|
22
|
+
this.scheduleIntervalMap = new Map();
|
|
23
|
+
}
|
|
24
|
+
setScheduleTask(serviceName, intervalTime) {
|
|
25
|
+
this.scheduleIntervalMap.set(serviceName, intervalTime);
|
|
26
|
+
}
|
|
27
|
+
removeScheduleTask(serviceName) {
|
|
28
|
+
this.scheduleIntervalMap.delete(serviceName);
|
|
29
|
+
}
|
|
30
|
+
isAlreadyTimeToExecute(serviceName) {
|
|
31
|
+
if (!lastExecuteTimeMap[serviceName]) {
|
|
32
|
+
return true; // 可以执行
|
|
22
33
|
}
|
|
23
|
-
|
|
24
|
-
|
|
34
|
+
const intervalTime1 = this.scheduleIntervalMap.get(serviceName);
|
|
35
|
+
const intervalTime = intervalTime1 || DEFAULT_SCHEDULE_INTERVAL; // 时间间隔
|
|
36
|
+
const lastExecuteTime = lastExecuteTimeMap[serviceName];
|
|
37
|
+
return (Date.now() - lastExecuteTime) >= intervalTime;
|
|
38
|
+
}
|
|
39
|
+
async runScheduleServiceList() {
|
|
40
|
+
const serviceListKeys = this.scheduleIntervalMap.keys();
|
|
41
|
+
const serviceList = [...serviceListKeys];
|
|
42
|
+
for (let i = 0; i < serviceList.length; i++) {
|
|
43
|
+
const serviceName = serviceList[i];
|
|
44
|
+
// 还没有到可以执行时间
|
|
45
|
+
if (!this.isAlreadyTimeToExecute(serviceName)) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
lastExecuteTimeMap[serviceName] = Date.now();
|
|
49
|
+
try {
|
|
50
|
+
await runScheduleTaskOnce(serviceName);
|
|
51
|
+
}
|
|
52
|
+
catch (e) {
|
|
53
|
+
anonymousContext_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error(`runSchedule error , serviceName = ${serviceName}`, e);
|
|
54
|
+
}
|
|
25
55
|
}
|
|
26
56
|
}
|
|
57
|
+
async startScheduleLoop() {
|
|
58
|
+
await this.runScheduleServiceList();
|
|
59
|
+
setInterval(() => {
|
|
60
|
+
this.runScheduleServiceList();
|
|
61
|
+
}, 1000); // 最少1秒执行一次
|
|
62
|
+
}
|
|
27
63
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
setInterval(() => {
|
|
31
|
-
runScheduleServiceList(serviceList);
|
|
32
|
-
}, 2 * 60 * 1000);
|
|
33
|
-
}
|
|
34
|
-
exports.startScheduleLoop = startScheduleLoop;
|
|
64
|
+
const SCHEDULE_QUEUE = new ScheduleQueue();
|
|
65
|
+
exports.SCHEDULE_QUEUE = SCHEDULE_QUEUE;
|
|
@@ -1,8 +1,13 @@
|
|
|
1
|
-
declare const
|
|
1
|
+
declare const INNER_SCHEDULE_INTERVAL: {
|
|
2
|
+
proxyApiLoadService: number;
|
|
3
|
+
workbenchService: number;
|
|
4
|
+
visitStatService: number;
|
|
5
|
+
asyncTaskRunnerService: number;
|
|
6
|
+
};
|
|
7
|
+
declare const INNER_SCHEDULE_NAMES: {
|
|
2
8
|
proxyApiLoadService: string;
|
|
3
9
|
workbenchService: string;
|
|
4
10
|
visitStatService: string;
|
|
5
11
|
asyncTaskRunnerService: string;
|
|
6
12
|
};
|
|
7
|
-
|
|
8
|
-
export { ALL_SCHEDULE_NAMES, SCHEDULE_NAMES, };
|
|
13
|
+
export { INNER_SCHEDULE_INTERVAL, INNER_SCHEDULE_NAMES };
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const
|
|
3
|
+
exports.INNER_SCHEDULE_NAMES = exports.INNER_SCHEDULE_INTERVAL = void 0;
|
|
4
|
+
const INNER_SCHEDULE_INTERVAL = {
|
|
5
|
+
proxyApiLoadService: 2 * 60 * 1000,
|
|
6
|
+
workbenchService: 60 * 1000,
|
|
7
|
+
visitStatService: 10 * 60 * 1000,
|
|
8
|
+
asyncTaskRunnerService: 1000, // 1s可以执行
|
|
9
|
+
};
|
|
10
|
+
exports.INNER_SCHEDULE_INTERVAL = INNER_SCHEDULE_INTERVAL;
|
|
11
|
+
const INNER_SCHEDULE_NAMES = {
|
|
5
12
|
proxyApiLoadService: 'proxyApiLoadService',
|
|
6
13
|
workbenchService: 'workbenchService',
|
|
7
|
-
visitStatService:
|
|
8
|
-
asyncTaskRunnerService:
|
|
14
|
+
visitStatService: "visitStatService",
|
|
15
|
+
asyncTaskRunnerService: "asyncTaskRunnerService",
|
|
9
16
|
};
|
|
10
|
-
exports.
|
|
11
|
-
const ALL_SCHEDULE_NAMES = [
|
|
12
|
-
SCHEDULE_NAMES.proxyApiLoadService,
|
|
13
|
-
SCHEDULE_NAMES.workbenchService,
|
|
14
|
-
SCHEDULE_NAMES.visitStatService,
|
|
15
|
-
SCHEDULE_NAMES.asyncTaskRunnerService
|
|
16
|
-
];
|
|
17
|
-
exports.ALL_SCHEDULE_NAMES = ALL_SCHEDULE_NAMES;
|
|
17
|
+
exports.INNER_SCHEDULE_NAMES = INNER_SCHEDULE_NAMES;
|
|
@@ -16,7 +16,7 @@ const schedule_1 = require("../../schedule");
|
|
|
16
16
|
const scheduleNames_1 = require("../../schedule/scheduleNames");
|
|
17
17
|
let AsyncTaskService = class AsyncTaskService extends BaseService_1.BaseService {
|
|
18
18
|
async startTask() {
|
|
19
|
-
(0, schedule_1.runScheduleTaskOnce)(scheduleNames_1.
|
|
19
|
+
(0, schedule_1.runScheduleTaskOnce)(scheduleNames_1.INNER_SCHEDULE_NAMES.asyncTaskRunnerService).then(schedule => {
|
|
20
20
|
console.log(schedule);
|
|
21
21
|
});
|
|
22
22
|
}
|
package/package.json
CHANGED
package/src/configuration.ts
CHANGED
|
@@ -13,9 +13,8 @@ import { join } from 'path';
|
|
|
13
13
|
// import { NotFoundFilter } from './filter/notfound.filter';
|
|
14
14
|
import { GlobalMiddleware } from './middleware/global.middleware';
|
|
15
15
|
import { ForbiddenMiddleware } from './middleware/forbidden.middleware';
|
|
16
|
-
import {
|
|
16
|
+
import { SCHEDULE_QUEUE , ANONYMOUS_CONTEXT, INNER_SCHEDULE_INTERVAL } from './schedule';
|
|
17
17
|
import { privateAES } from './libs/utils/crypto-utils';
|
|
18
|
-
import { ALL_SCHEDULE_NAMES } from "@/schedule/scheduleNames";
|
|
19
18
|
|
|
20
19
|
@Configuration({
|
|
21
20
|
// namespace: 'fatcms',
|
|
@@ -65,6 +64,11 @@ export class ContainerLifeCycle {
|
|
|
65
64
|
|
|
66
65
|
async onReady() {
|
|
67
66
|
|
|
67
|
+
/**
|
|
68
|
+
* 让ANONYMOUS_CONTEXT获取app对象
|
|
69
|
+
*/
|
|
70
|
+
ANONYMOUS_CONTEXT.setApp(this.app);
|
|
71
|
+
|
|
68
72
|
/**
|
|
69
73
|
* 启动定时任务
|
|
70
74
|
*/
|
|
@@ -78,25 +82,33 @@ export class ContainerLifeCycle {
|
|
|
78
82
|
// this.app.useFilter([NotFoundFilter, DefaultErrorFilter]);
|
|
79
83
|
}
|
|
80
84
|
|
|
81
|
-
private async startScheduleOnReady(){
|
|
85
|
+
private async startScheduleOnReady() {
|
|
82
86
|
const logger = this.app.getLogger();
|
|
83
87
|
const config = this.app.getConfig();
|
|
84
|
-
const fatcmsScheduleService: boolean |
|
|
88
|
+
const fatcmsScheduleService: boolean | any = config.fatcmsScheduleService;
|
|
85
89
|
|
|
86
90
|
// 关闭定时任务
|
|
87
91
|
if (fatcmsScheduleService === false || fatcmsScheduleService === null) {
|
|
88
92
|
return;
|
|
89
93
|
}
|
|
90
94
|
|
|
95
|
+
let scheduleIntervalCfg = INNER_SCHEDULE_INTERVAL;
|
|
96
|
+
if (typeof fatcmsScheduleService === "object") {
|
|
97
|
+
scheduleIntervalCfg = fatcmsScheduleService
|
|
98
|
+
}
|
|
91
99
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
100
|
+
const keys = Object.keys(scheduleIntervalCfg);
|
|
101
|
+
for (let i = 0; i < keys.length; i++) {
|
|
102
|
+
const service = keys[i];
|
|
103
|
+
const interval = scheduleIntervalCfg[service];
|
|
104
|
+
if (typeof interval !== "number") {
|
|
105
|
+
throw new Error('Invalid scheduleIntervalCfg ' + service + ", interval must be a number");
|
|
106
|
+
}
|
|
107
|
+
SCHEDULE_QUEUE.setScheduleTask(service, interval);
|
|
97
108
|
}
|
|
98
|
-
|
|
99
|
-
|
|
109
|
+
|
|
110
|
+
await SCHEDULE_QUEUE.startScheduleLoop();
|
|
111
|
+
logger.info('ContainerLifeCycle ==> onReady 启动定时任务 : ' + JSON.stringify(scheduleIntervalCfg));
|
|
100
112
|
}
|
|
101
113
|
|
|
102
114
|
|
package/src/schedule/index.ts
CHANGED
|
@@ -1,14 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {SCHEDULE_QUEUE, runScheduleTaskOnce} from './runSchedule'
|
|
2
2
|
import {ANONYMOUS_CONTEXT} from './anonymousContext'
|
|
3
3
|
import {
|
|
4
|
-
|
|
5
|
-
SCHEDULE_NAMES,
|
|
4
|
+
INNER_SCHEDULE_INTERVAL
|
|
6
5
|
} from './scheduleNames'
|
|
7
6
|
|
|
8
7
|
export {
|
|
9
|
-
|
|
10
|
-
SCHEDULE_NAMES,
|
|
8
|
+
INNER_SCHEDULE_INTERVAL,
|
|
11
9
|
ANONYMOUS_CONTEXT,
|
|
12
|
-
|
|
10
|
+
SCHEDULE_QUEUE,
|
|
13
11
|
runScheduleTaskOnce
|
|
14
12
|
}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
import * as koa from '@midwayjs/koa';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import {IScheduleService} from '@/interface';
|
|
3
|
+
import {ANONYMOUS_CONTEXT} from "./anonymousContext";
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
// 上次执行时间
|
|
7
|
+
const lastExecuteTimeMap = {};
|
|
8
|
+
|
|
9
|
+
const DEFAULT_SCHEDULE_INTERVAL = 2 * 60 * 1000;
|
|
10
|
+
|
|
4
11
|
|
|
5
12
|
|
|
6
13
|
async function runScheduleTaskOnce(serviceName: string) {
|
|
7
|
-
return await ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx: koa.IMidwayKoaContext)=>{
|
|
14
|
+
return await ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx: koa.IMidwayKoaContext) => {
|
|
8
15
|
const serviceObject: IScheduleService = await ctx.requestContext.getAsync(serviceName);
|
|
9
16
|
if (serviceObject && serviceObject.runBySchedule) {
|
|
10
17
|
await serviceObject.runBySchedule();
|
|
@@ -14,22 +21,58 @@ async function runScheduleTaskOnce(serviceName: string) {
|
|
|
14
21
|
});
|
|
15
22
|
}
|
|
16
23
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
class ScheduleQueue {
|
|
25
|
+
private scheduleIntervalMap: Map<string, number> = new Map();
|
|
26
|
+
public setScheduleTask(serviceName: string, intervalTime: number){
|
|
27
|
+
this.scheduleIntervalMap.set(serviceName, intervalTime);
|
|
28
|
+
}
|
|
29
|
+
public removeScheduleTask(serviceName: string){
|
|
30
|
+
this.scheduleIntervalMap.delete(serviceName);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
private isAlreadyTimeToExecute(serviceName: string): boolean {
|
|
34
|
+
if (!lastExecuteTimeMap[serviceName]) {
|
|
35
|
+
return true; // 可以执行
|
|
24
36
|
}
|
|
37
|
+
const intervalTime1 = this.scheduleIntervalMap.get(serviceName);
|
|
38
|
+
const intervalTime = intervalTime1 || DEFAULT_SCHEDULE_INTERVAL; // 时间间隔
|
|
39
|
+
const lastExecuteTime = lastExecuteTimeMap[serviceName];
|
|
40
|
+
return (Date.now() - lastExecuteTime) >= intervalTime;
|
|
25
41
|
}
|
|
26
|
-
}
|
|
27
42
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
43
|
+
|
|
44
|
+
private async runScheduleServiceList() {
|
|
45
|
+
const serviceListKeys = this.scheduleIntervalMap.keys();
|
|
46
|
+
const serviceList = [...serviceListKeys];
|
|
47
|
+
for (let i = 0; i < serviceList.length; i++) {
|
|
48
|
+
const serviceName = serviceList[i];
|
|
49
|
+
|
|
50
|
+
// 还没有到可以执行时间
|
|
51
|
+
if (!this.isAlreadyTimeToExecute(serviceName)) {
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
lastExecuteTimeMap[serviceName] = Date.now();
|
|
55
|
+
|
|
56
|
+
try {
|
|
57
|
+
await runScheduleTaskOnce(serviceName);
|
|
58
|
+
} catch (e) {
|
|
59
|
+
ANONYMOUS_CONTEXT.getApp().getCoreLogger().error(`runSchedule error , serviceName = ${serviceName}`, e);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
public async startScheduleLoop() {
|
|
66
|
+
await this.runScheduleServiceList();
|
|
67
|
+
setInterval(() => {
|
|
68
|
+
this.runScheduleServiceList();
|
|
69
|
+
}, 1000); // 最少1秒执行一次
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
|
|
33
73
|
}
|
|
34
74
|
|
|
35
|
-
|
|
75
|
+
|
|
76
|
+
const SCHEDULE_QUEUE = new ScheduleQueue();
|
|
77
|
+
|
|
78
|
+
export {SCHEDULE_QUEUE, runScheduleTaskOnce};
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
|
|
2
|
+
const INNER_SCHEDULE_INTERVAL = {
|
|
3
|
+
proxyApiLoadService: 2 * 60 * 1000, // 2分钟重新加载一次,
|
|
4
|
+
workbenchService: 60 * 1000, // 1分钟重新加载一次,
|
|
5
|
+
visitStatService: 10 * 60 * 1000, // 10分钟重新加载一次,
|
|
6
|
+
asyncTaskRunnerService: 1000, // 1s可以执行
|
|
7
|
+
}
|
|
2
8
|
|
|
3
|
-
const
|
|
9
|
+
const INNER_SCHEDULE_NAMES = {
|
|
4
10
|
proxyApiLoadService: 'proxyApiLoadService',
|
|
5
11
|
workbenchService: 'workbenchService',
|
|
6
|
-
visitStatService:
|
|
7
|
-
asyncTaskRunnerService:
|
|
12
|
+
visitStatService: "visitStatService",
|
|
13
|
+
asyncTaskRunnerService: "asyncTaskRunnerService",
|
|
8
14
|
}
|
|
9
15
|
|
|
10
|
-
|
|
11
|
-
SCHEDULE_NAMES.proxyApiLoadService,
|
|
12
|
-
SCHEDULE_NAMES.workbenchService,
|
|
13
|
-
SCHEDULE_NAMES.visitStatService,
|
|
14
|
-
SCHEDULE_NAMES.asyncTaskRunnerService
|
|
15
|
-
];
|
|
16
|
+
|
|
16
17
|
|
|
17
18
|
export {
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
INNER_SCHEDULE_INTERVAL,
|
|
20
|
+
INNER_SCHEDULE_NAMES
|
|
20
21
|
}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { Inject, Provide } from '@midwayjs/core';
|
|
2
2
|
import { Context } from '@midwayjs/koa';
|
|
3
|
-
import { KeysOfSimpleSQL } from '
|
|
4
|
-
import { SystemTables} from '
|
|
3
|
+
import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
|
|
4
|
+
import { SystemTables} from '@/models/SystemTables';
|
|
5
5
|
import { LRUCache } from 'lru-cache';
|
|
6
|
-
import { BizException } from '
|
|
6
|
+
import { BizException } from '@/models/devops';
|
|
7
7
|
import { CurdMixService } from '../curd/CurdMixService';
|
|
8
|
-
import { ISysAnyApiEntity } from '
|
|
8
|
+
import { ISysAnyApiEntity } from '@/models/SystemEntities';
|
|
9
9
|
import { AnyApiSandboxService, IRunInSandboxParams } from './AnyApiSandboxService';
|
|
10
|
-
import { parseJsonObject } from '
|
|
10
|
+
import { parseJsonObject } from '@/libs/utils/functions';
|
|
11
11
|
import * as _ from 'lodash';
|
|
12
|
-
import { MixinUtils } from '
|
|
12
|
+
import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
|
|
13
13
|
import { WorkbenchService } from '../WorkbenchService';
|
|
14
|
-
import { validateByCfgString } from '
|
|
14
|
+
import { validateByCfgString } from '@/libs/crud-pro/utils/ValidateUtils';
|
|
15
15
|
import { API_BASE_TYPE, ApiBaseService } from '../base/ApiBaseService';
|
|
16
16
|
import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
|
|
17
17
|
|
|
@@ -112,6 +112,7 @@ const LOCK_KEY_ASYNC_TASK_RUNNER = "LOCK_KEY_ASYNC_TASK_RUNNER"
|
|
|
112
112
|
@Provide()
|
|
113
113
|
export class AsyncTaskRunnerService extends BaseService implements IScheduleService {
|
|
114
114
|
|
|
115
|
+
|
|
115
116
|
@Inject()
|
|
116
117
|
protected ctx: Context;
|
|
117
118
|
|
|
@@ -204,5 +205,4 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
|
|
|
204
205
|
return Promise.resolve();
|
|
205
206
|
}
|
|
206
207
|
|
|
207
|
-
|
|
208
208
|
}
|
|
@@ -2,7 +2,7 @@ import {Inject, Provide} from '@midwayjs/core';
|
|
|
2
2
|
import {Context} from '@midwayjs/koa';
|
|
3
3
|
import {BaseService} from "@/service/base/BaseService";
|
|
4
4
|
import {runScheduleTaskOnce} from "@/schedule";
|
|
5
|
-
import {
|
|
5
|
+
import {INNER_SCHEDULE_NAMES} from "@/schedule/scheduleNames";
|
|
6
6
|
|
|
7
7
|
@Provide()
|
|
8
8
|
export class AsyncTaskService extends BaseService {
|
|
@@ -10,7 +10,7 @@ export class AsyncTaskService extends BaseService {
|
|
|
10
10
|
protected ctx: Context;
|
|
11
11
|
|
|
12
12
|
async startTask() {
|
|
13
|
-
runScheduleTaskOnce(
|
|
13
|
+
runScheduleTaskOnce(INNER_SCHEDULE_NAMES.asyncTaskRunnerService).then(schedule => {
|
|
14
14
|
console.log(schedule);
|
|
15
15
|
})
|
|
16
16
|
}
|
|
@@ -86,7 +86,7 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
|
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
private async buildUpstreamMap() {
|
|
89
|
-
|
|
89
|
+
|
|
90
90
|
const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
|
|
91
91
|
|
|
92
92
|
// biz_tag={'upstream'}
|
|
@@ -114,10 +114,10 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
|
|
|
114
114
|
}
|
|
115
115
|
|
|
116
116
|
private async loadProxyApiEntity(workbench_code: string, upstreamMap: Record<string, IUpstreamInfo>): Promise<IProxyApiEntity[]> {
|
|
117
|
-
|
|
117
|
+
|
|
118
118
|
const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
|
|
119
119
|
|
|
120
|
-
|
|
120
|
+
|
|
121
121
|
const res = await this.curdProService.executeCrudByCfg(
|
|
122
122
|
{
|
|
123
123
|
condition: {},
|
|
@@ -170,4 +170,5 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
|
|
|
170
170
|
}
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
|
+
|
|
173
174
|
}
|