midway-fatcms 0.0.1-beta.19 → 0.0.1-beta.20

package/dist/controller/gateway/StaticController.d.ts

@@ -11,7 +11,6 @@ interface HttpGetRes {
  */
 export declare class StaticController extends BaseApiController {
     protected ctx: Context;
-    constructor();
     private getLocalPaths;
     private initNotFoundList;
     private responseLocalFile;

package/dist/controller/gateway/StaticController.js

@@ -43,10 +43,6 @@ let notFoundListIsInit = false;
  * 静态文件代理功能
  */
 let StaticController = class StaticController extends BaseApiController_1.BaseApiController {
-    constructor() {
-        super();
-        this.initNotFoundList();
-    }
     getLocalPaths() {
         const appDir = this.app.getAppDir();
         const localDir = path.join(appDir, './public/static'); // 本地文件存储目录
@@ -125,6 +121,7 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
         return false;
     }
     async proxyStaticFile(ossName, relativePath) {
+        this.initNotFoundList();
         const { localDir } = this.getLocalPaths();
         const PATH_CONFIG = getPathConfig(ossName);
         // 构建本地路径和远程路径
@@ -282,7 +279,6 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], StaticController.prototype, "proxyStaticFile", null);
 StaticController = __decorate([
-    (0, core_1.Controller)('/ns/static'),
-    __metadata("design:paramtypes", [])
+    (0, core_1.Controller)('/ns/static')
 ], StaticController);
 exports.StaticController = StaticController;

package/dist/models/AsyncTaskModel.d.ts

@@ -36,6 +36,7 @@ export declare enum SysAsyncTaskStatus {
     PENDING = "PENDING",
     RUNNING = "RUNNING",
     SUCCEEDED = "SUCCEEDED",
+    PART_SUCCEEDED = "PART_SUCCEEDED",
     FAILED = "FAILED",
     CANCELLED = "CANCELLED",
     PAUSED = "PAUSED"

package/dist/models/AsyncTaskModel.js

@@ -6,6 +6,7 @@ var SysAsyncTaskStatus;
     SysAsyncTaskStatus["PENDING"] = "PENDING";
     SysAsyncTaskStatus["RUNNING"] = "RUNNING";
     SysAsyncTaskStatus["SUCCEEDED"] = "SUCCEEDED";
+    SysAsyncTaskStatus["PART_SUCCEEDED"] = "PART_SUCCEEDED";
     SysAsyncTaskStatus["FAILED"] = "FAILED";
     SysAsyncTaskStatus["CANCELLED"] = "CANCELLED";
     SysAsyncTaskStatus["PAUSED"] = "PAUSED";

package/dist/service/asyncTask/AsyncTaskRunnerService.js

@@ -20,6 +20,7 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const errorToString_1 = require("../../libs/utils/errorToString");
 const schedule_1 = require("../../schedule");
 const RedisKeys_1 = require("../../models/RedisKeys");
+const END_STATUS_LIST = [AsyncTaskModel_1.SysAsyncTaskStatus.SUCCEEDED, AsyncTaskModel_1.SysAsyncTaskStatus.FAILED, AsyncTaskModel_1.SysAsyncTaskStatus.PART_SUCCEEDED];
 class AsyncTaskRunner {
     constructor() {
         this.isBusy = false;
@@ -32,9 +33,14 @@ class AsyncTaskRunner {
         this.isBusy = true;
         for (let i = 0; i < taskList.length; i++) {
             const taskElement = taskList[i];
+            taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING;
             try {
                 // 任务状态的设置在自定义的执行器里面。
                 await this.executeTask(taskElement);
+                // 当前不是终止状态，并且没有异常就设置成成功。
+                if (!END_STATUS_LIST.includes(taskElement.task_status)) {
+                    taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.SUCCEEDED;
+                }
             }
             catch (error) {
                 taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.FAILED;
@@ -191,6 +197,7 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
     async isExistNewTask() {
         // 刚启动，没有检查过。
         if (!ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME) {
+            ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = Date.now();
             return true;
         }
         //Redis没有任何内容

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.19",
+  "version": "0.0.1-beta.20",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/controller/gateway/StaticController.ts

@@ -42,10 +42,6 @@ export class StaticController extends BaseApiController {
   @Inject()
   protected ctx: Context;
 
-  constructor() {
-    super();
-    this.initNotFoundList();
-  }
 
   private getLocalPaths(): any {
     const appDir = this.app.getAppDir();
@@ -134,6 +130,7 @@ export class StaticController extends BaseApiController {
 
   @All('/:ossName/:relativePath+')
   async proxyStaticFile(@Param('ossName') ossName: string, @Param('relativePath') relativePath: string) {
+    this.initNotFoundList();
     const { localDir } = this.getLocalPaths();
     const PATH_CONFIG = getPathConfig(ossName);
 

package/src/models/AsyncTaskModel.ts

@@ -41,8 +41,9 @@ export type SysAsyncTaskPartial = Partial<SysAsyncTaskEntity>;
 export enum SysAsyncTaskStatus {
   PENDING = 'PENDING', // 等待中，还未进入排队
   RUNNING = 'RUNNING', // 运行中
-  SUCCEEDED = 'SUCCEEDED',
-  FAILED = 'FAILED',
+  SUCCEEDED = 'SUCCEEDED', // 终止状态：全部成功
+  PART_SUCCEEDED = 'PART_SUCCEEDED',// 终止状态：部分成功
+  FAILED = 'FAILED', // 终止状态：失败
   CANCELLED = 'CANCELLED', // 取消
   PAUSED = 'PAUSED', // 暂停
 }

package/src/service/asyncTask/AsyncTaskRunnerService.ts

@@ -11,6 +11,8 @@ import { errorToString } from '@/libs/utils/errorToString';
 import { ANONYMOUS_CONTEXT } from '@/schedule';
 import { RedisKeys } from '@/models/RedisKeys';
 
+const END_STATUS_LIST = [SysAsyncTaskStatus.SUCCEEDED, SysAsyncTaskStatus.FAILED, SysAsyncTaskStatus.PART_SUCCEEDED];
+
 class AsyncTaskRunner {
   isBusy = false;
   taskHandlerMap: Map<string, ISysAsyncTaskHandler> = new Map();
@@ -24,10 +26,17 @@ class AsyncTaskRunner {
 
     for (let i = 0; i < taskList.length; i++) {
       const taskElement = taskList[i];
-
+      taskElement.task_status = SysAsyncTaskStatus.RUNNING;
+      
       try {
         // 任务状态的设置在自定义的执行器里面。
         await this.executeTask(taskElement);
+
+        // 当前不是终止状态，并且没有异常就设置成成功。
+        if (!END_STATUS_LIST.includes(taskElement.task_status)) {
+          taskElement.task_status = SysAsyncTaskStatus.SUCCEEDED;
+        }
+
       } catch (error) {
         taskElement.task_status = SysAsyncTaskStatus.FAILED;
         taskElement.error_message = errorToString(error);
@@ -220,6 +229,7 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
   private async isExistNewTask(): Promise<boolean> {
     // 刚启动，没有检查过。
     if (!ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME) {
+      ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = Date.now();
       return true;
     }