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

package/dist/libs/crud-pro/services/CrudProGenSqlCondition.js

@@ -16,10 +16,8 @@ const createFunc = (sqlCfg) => {
         },
         toMatchSqlColumnName: (columnName) => {
             const arr = columnName.split(',');
-            return arr
-                .map(s => (0, convertColumnName_1.toSqlColumnName)(s.trim(), sqlCfg))
-                .join(',');
-        }
+            return arr.map(s => (0, convertColumnName_1.toSqlColumnName)(s.trim(), sqlCfg)).join(',');
+        },
     };
 };
 class ValueChecker {

package/dist/libs/crud-pro/services/CrudProGenSqlService.js

@@ -110,9 +110,11 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
             if (!Array.isArray(uniqueColumn) || uniqueColumn.length === 0) {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL);
             }
-            const unique_column = uniqueColumn.map((s) => {
+            const unique_column = uniqueColumn
+                .map(s => {
                 return `"${s}"`;
-            }).join(",");
+            })
+                .join(',');
             return `insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) ON CONFLICT (${unique_column}) DO UPDATE set @@asUpdate:data `; // 关键字的前后，必须有空格
         }
         if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
@@ -121,19 +123,8 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_UNIQUE_COLUMN_COUNT_MUST_ONE);
             }
             const uniqueColumnStr = uniqueColumn[0];
-            const uniqueColumnVal = "@@data." + uniqueColumnStr;
-            const sql = "" +
-                `IF EXISTS (SELECT 1 FROM @@table WHERE [${uniqueColumnStr}] = ${uniqueColumnVal})` +
-                "BEGIN\n" +
-                "    UPDATE @@table\n" +
-                "    SET @@asUpdate:data\n" +
-                `    WHERE [${uniqueColumnStr}] = ${uniqueColumnVal} ;\n` +
-                "END\n" +
-                "ELSE\n" +
-                "BEGIN\n" +
-                "    INSERT INTO @@table ( @@asInsertKeys:data )\n" +
-                "    VALUES ( @@asInsertValues:data );\n" +
-                "END";
+            const uniqueColumnVal = '@@data.' + uniqueColumnStr;
+            const sql = '' + `IF EXISTS (SELECT 1 FROM @@table WHERE [${uniqueColumnStr}] = ${uniqueColumnVal})` + 'BEGIN\n' + '    UPDATE @@table\n' + '    SET @@asUpdate:data\n' + `    WHERE [${uniqueColumnStr}] = ${uniqueColumnVal} ;\n` + 'END\n' + 'ELSE\n' + 'BEGIN\n' + '    INSERT INTO @@table ( @@asInsertKeys:data )\n' + '    VALUES ( @@asInsertValues:data );\n' + 'END';
             return sql;
         }
         return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )  on duplicate key update @@asUpdate:data '; // 关键字的前后，必须有空格

package/dist/libs/crud-pro/services/CrudProOriginToExecuteSql.js

@@ -100,8 +100,7 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         else if (word === keys_1.KeysOfCustomSQL.SQL_ORDER_BYS) {
             return this.generateOrderBys(reqModel, sqlCfg);
         }
-        else if ((word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) ||
-            word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
+        else if ((word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) || word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
             return this.generateGetAttr(reqModel, word); //// data.xxx, condition.xxx
         }
         else if (word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER) || word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)) {
@@ -219,9 +218,11 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         return new SqlSegArg_1.SqlSegArg(sql);
     }
     generatePickResAs(req, world) {
-        return new SqlSegArg_1.SqlSegArg(' ? ', [{
+        return new SqlSegArg_1.SqlSegArg(' ? ', [
+            {
                 ___GENERATE_GET_RES_ATTR___: world,
-            }]);
+            },
+        ]);
     }
     generateGetAttr(req, word) {
         const attrName = MixinUtils_1.MixinUtils.removeStringPrefix(word, '@@');

package/dist/libs/crud-pro/services/CrudProTableMetaService.js

@@ -43,7 +43,7 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
         const baseInfo = {
             sqlTable: sqlCfgModel.sqlTable,
             sqlDatabase: sqlCfgModel.sqlDatabase,
-            sqlDbType: sqlCfgModel.sqlDbType
+            sqlDbType: sqlCfgModel.sqlDbType,
         };
         obj.tableColumns = await this.loadTableColumnInfo(baseInfo);
         return obj;
@@ -71,7 +71,7 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
                 return fieldObj['column_name'];
             });
         }
-        throw new Error("暂不支持的数据库类型：" + baseInfo.sqlDbType);
+        throw new Error('暂不支持的数据库类型：' + baseInfo.sqlDbType);
     }
 }
 exports.CrudProTableMetaService = CrudProTableMetaService;

package/dist/libs/crud-pro/utils/MixinUtils.js

@@ -43,7 +43,7 @@ const MixinUtils = {
         return !str1 && !str2;
     },
     startsWith(str1, str2) {
-        if (typeof str1 === "string" && typeof str2 === "string") {
+        if (typeof str1 === 'string' && typeof str2 === 'string') {
             return str1.startsWith(str2);
         }
         return false;

package/dist/libs/crud-pro/utils/ValidateUtils.js

@@ -147,7 +147,7 @@ function validateByCfgString(validateCfg, itemValue, errPath) {
         return;
     }
     // 必填
-    if ("required" === validateCfg) {
+    if ('required' === validateCfg) {
         if (isEmpty(itemValue)) {
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, "'参数校验错误，字段 " + errPath + ' 不满足校验配置：' + validateCfg);
         }

package/dist/libs/utils/fatcms-request.js

@@ -84,7 +84,7 @@ async function isCsrfTokenValid(ctx) {
         const depryptToken = await crypto_utils_1.privateAES.time_decrypt_base64_utf8(fatcmscsrftoken);
         if (depryptToken) {
             const num = Number(depryptToken);
-            if (num && ((num + 6 * 3600 * 1000) > Date.now())) {
+            if (num && num + 6 * 3600 * 1000 > Date.now()) {
                 return true;
             }
         }
@@ -98,7 +98,7 @@ exports.isCsrfTokenValid = isCsrfTokenValid;
 async function assertCsrfToken(ctx) {
     const isOK = await isCsrfTokenValid(ctx);
     if (!isOK) {
-        throw new exceptions_1.CommonException("ASSERT_CSRF_TOKEN_ERROR", "CSRF_TOKEN 验证失败");
+        throw new exceptions_1.CommonException('ASSERT_CSRF_TOKEN_ERROR', 'CSRF_TOKEN 验证失败');
     }
 }
 exports.assertCsrfToken = assertCsrfToken;

package/dist/middleware/forbidden.middleware.js

@@ -9,24 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ForbiddenMiddleware = void 0;
 const core_1 = require("@midwayjs/core");
 // 一些爬虫/漏洞分析工具会来请求这玩意。
-const blackEqualList = [
-    '/config.json',
-    '/backend/.env',
-    '/application.yml',
-    '/db.ini',
-    '/.well-known/security.txt',
-];
-const blackPrefixList = [
-    '/.aws/',
-    '/.git/',
-    '/.svn/',
-    '/.env/',
-    '/src/',
-    '/var/logs/',
-    '/var/log/',
-    '/cgi-bin/',
-    '/php-cgi/',
-];
+const blackEqualList = ['/config.json', '/backend/.env', '/application.yml', '/db.ini', '/.well-known/security.txt'];
+const blackPrefixList = ['/.aws/', '/.git/', '/.svn/', '/.env/', '/src/', '/var/logs/', '/var/log/', '/cgi-bin/', '/php-cgi/'];
 /**
  * 针对一些路径禁止访问。避免一些爬虫抓取网站内容，实际上这里枚举的路径，本身就是不存在的。只是为了提前拦截，为了服务器性能考虑。
  */
@@ -55,9 +39,9 @@ let ForbiddenMiddleware = class ForbiddenMiddleware {
     }
     resolve() {
         return async (ctx, next) => {
-            ctx.set({ "content-type": "text/html; charset=utf-8" });
+            ctx.set({ 'content-type': 'text/html; charset=utf-8' });
             ctx.status = 404;
-            ctx.body = "404！404！404！重要的事情说三遍！";
+            ctx.body = '404！404！404！重要的事情说三遍！';
         };
     }
     static getName() {

package/dist/middleware/global.middleware.js

@@ -186,10 +186,7 @@ async function trackRequest(ctx) {
         console.error('trackRequestError', e);
     }
 }
-const excludePathPrefix = [
-    '/ns/static/',
-    '/ns/api/helpers'
-];
+const excludePathPrefix = ['/ns/static/', '/ns/api/helpers'];
 /**
  * 全局中间件
  */

package/dist/models/AsyncTaskModel.d.ts

@@ -31,6 +31,7 @@ export interface SysAsyncTaskEntity {
     completed_at: Date | null;
     created_user_session: string;
 }
+export declare type SysAsyncTaskPartial = Partial<SysAsyncTaskEntity>;
 export declare enum SysAsyncTaskStatus {
     PENDING = "PENDING",
     RUNNING = "RUNNING",
@@ -56,7 +57,7 @@ export interface ISysAsyncTaskHandler {
 }
 export interface SysAsyncTaskContext {
     task: SysAsyncTaskEntity;
-    updateTaskStatus: () => any;
+    updateTaskStatus: (sysAsyncTaskPartial: SysAsyncTaskPartial) => any;
 }
 export interface SysAsyncTaskHandlerConfig {
     taskType: string;

package/dist/models/RedisKeys.d.ts

@@ -0,0 +1,8 @@
+declare const RedisKeys: {
+    ASYNC_TASK_LOCK: string;
+    ASYNC_TASK_UPDATE_TIME: string;
+    USER_SESSION_PREFIX: string;
+    VISIT_STAT_LOCK_PREFIX: string;
+    VISIT_STAT_DATE_PREFIX: string;
+};
+export { RedisKeys };

package/dist/models/RedisKeys.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisKeys = void 0;
+const RedisKeys = {
+    ASYNC_TASK_LOCK: "FatAsyncTaskLock",
+    ASYNC_TASK_UPDATE_TIME: "FatAsyncTaskUpdateTime",
+    USER_SESSION_PREFIX: "FatUserSession_",
+    VISIT_STAT_LOCK_PREFIX: "FatVsLock_",
+    VISIT_STAT_DATE_PREFIX: "FatVsDate_",
+};
+exports.RedisKeys = RedisKeys;

package/dist/schedule/runSchedule.d.ts

@@ -7,6 +7,7 @@ declare class ScheduleQueue {
     setScheduleTask(serviceName: string, intervalTime: number): void;
     removeScheduleTask(serviceName: string): void;
     private isAlreadyTimeToExecute;
+    private runScheduleTaskOnceCheckTime;
     private runScheduleServiceList;
     startScheduleLoop(): Promise<void>;
 }

package/dist/schedule/runSchedule.js

@@ -36,18 +36,21 @@ class ScheduleQueue {
         const lastExecuteTime = lastExecuteTimeMap[serviceName];
         return (Date.now() - lastExecuteTime) >= intervalTime;
     }
+    async runScheduleTaskOnceCheckTime(serviceName) {
+        // 还没有到可以执行时间
+        if (!this.isAlreadyTimeToExecute(serviceName)) {
+            return;
+        }
+        lastExecuteTimeMap[serviceName] = Date.now();
+        await runScheduleTaskOnce(serviceName);
+    }
     async runScheduleServiceList() {
         const serviceListKeys = this.scheduleIntervalMap.keys();
         const serviceList = [...serviceListKeys];
         for (let i = 0; i < serviceList.length; i++) {
             const serviceName = serviceList[i];
-            // 还没有到可以执行时间
-            if (!this.isAlreadyTimeToExecute(serviceName)) {
-                return;
-            }
-            lastExecuteTimeMap[serviceName] = Date.now();
             try {
-                await runScheduleTaskOnce(serviceName);
+                await this.runScheduleTaskOnceCheckTime(serviceName);
             }
             catch (e) {
                 anonymousContext_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error(`runSchedule error , serviceName = ${serviceName}`, e);

package/dist/service/UserSessionService.js

@@ -14,6 +14,7 @@ const core_1 = require("@midwayjs/core");
 const functions_1 = require("../libs/utils/functions");
 const userSession_1 = require("../models/userSession");
 const RedisCacheService_1 = require("./base/RedisCacheService");
+const RedisKeys_1 = require("../models/RedisKeys");
 function pickUserAvatar(avatar) {
     if (!avatar) {
         return null;
@@ -41,7 +42,7 @@ function pickUserAvatar(avatar) {
 }
 const SESSION_KEEP_TIME_SECOND = 3600 * 24 * 30;
 const toCacheKey = (sessionId) => {
-    return `UserSession@@${sessionId}`;
+    return `${RedisKeys_1.RedisKeys.USER_SESSION_PREFIX}${sessionId}`;
 };
 let UserSessionService = class UserSessionService {
     async saveUserSession(sessionInfo) {

package/dist/service/VisitStatService.d.ts

@@ -1,6 +1,6 @@
 import { Context } from '@midwayjs/koa';
 import { IScheduleService } from '../interface';
-import { BaseService } from "./base/BaseService";
+import { BaseService } from './base/BaseService';
 export declare class VisitStatService extends BaseService implements IScheduleService {
     protected ctx: Context;
     private curdProService;

package/dist/service/VisitStatService.js

@@ -18,6 +18,7 @@ const keys_1 = require("../libs/crud-pro/models/keys");
 const bizmodels_1 = require("../models/bizmodels");
 const common_dto_1 = require("../libs/utils/common-dto");
 const global_config_1 = require("../libs/global-config/global-config");
+const RedisKeys_1 = require("../models/RedisKeys");
 // 3天 的秒数
 const EXPIRE_TIME = 3 * 24 * 60 * 60;
 const STAT_TYPES = {
@@ -28,26 +29,26 @@ const STAT_TYPES = {
 let VisitStatService = class VisitStatService extends BaseService_1.BaseService {
     async runBySchedule() {
         const hours = new Date().getHours();
-        this.logInfo("[VisitStatService] runBySchedule called, hours = " + hours);
+        this.logInfo('[VisitStatService] runBySchedule called, hours = ' + hours);
         return this.flushVisitStatToDB();
     }
     async flushVisitStatToDB() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         //  统计昨天的数据。
         const stat_date = new Date(Date.now() - 24 * 3600 * 1000).toISOString().split('T')[0];
-        const lockKey = `vs_lock_${stat_date}`;
+        const lockKey = `${RedisKeys_1.RedisKeys.VISIT_STAT_LOCK_PREFIX}${stat_date}`;
         // 每天只能执行一次
         const client = this.redisService;
         const nxRes = await client.set(lockKey, 1, 'EX', EXPIRE_TIME, 'NX');
         if (nxRes !== 'OK') {
-            this.logInfo("[VisitStatService] flushVisitStatToDB 每天只能执行一次 ");
-            return common_dto_1.CommonResult.errorRes("每天只能执行一次");
+            this.logInfo('[VisitStatService] flushVisitStatToDB 每天只能执行一次 ');
+            return common_dto_1.CommonResult.errorRes('每天只能执行一次');
         }
-        this.logInfo("[VisitStatService] flushVisitStatToDB start ");
+        this.logInfo('[VisitStatService] flushVisitStatToDB start ');
         let totalCount = 0;
         let successCount = 0;
         try {
-            const keys = await client.keys(`vs_${stat_date}::*`);
+            const keys = await client.keys(`${RedisKeys_1.RedisKeys.VISIT_STAT_DATE_PREFIX}${stat_date}::*`);
             // `vs_${date}::${req_host}::${resource_type}::${stat_type}::${resource}`;
             totalCount = keys.length;
             for (const key of keys) {
@@ -59,7 +60,7 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
                         const stat_type = parts[3];
                         const stat_resource = parts[4];
                         let stat_count;
-                        if (stat_type === STAT_TYPES.uv_ip || stat_type == STAT_TYPES.uv_uid) {
+                        if (stat_type === STAT_TYPES.uv_ip || stat_type === STAT_TYPES.uv_uid) {
                             stat_count = await client.scard(key);
                         }
                         else {
@@ -72,8 +73,8 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
                                 stat_type,
                                 resource_type,
                                 stat_count,
-                                req_host
-                            }
+                                req_host,
+                            },
                         }, {
                             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
                             sqlDatabase: SystemDbName,
@@ -94,7 +95,7 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
             this.logError('[VisitStatService] flushVisitStatToDB', error);
             console.log('[VisitStatService] flushVisitStatToDB', error);
         }
-        this.logInfo("[VisitStatService] flushVisitStatToDB end ");
+        this.logInfo('[VisitStatService] flushVisitStatToDB end ');
         return common_dto_1.CommonResult.successRes({ successCount, totalCount });
     }
     /**
@@ -124,34 +125,24 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
         const client = this.redisService;
         const ip = this.ctx.headers['x-real-ip'];
         const userSession = this.ctx.userSession;
-        const req_host = ((_b = (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.host) || "null"; // 域名
+        const req_host = ((_b = (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.host) || 'null'; // 域名
         const date = new Date().toISOString().split('T')[0];
         const toDateResourceKey = (stat_type) => {
-            return `vs_${date}::${req_host}::${resource_type}::${stat_type}::${resource}`;
+            return `${RedisKeys_1.RedisKeys.VISIT_STAT_DATE_PREFIX}${date}::${req_host}::${resource_type}::${stat_type}::${resource}`;
         };
         const pv_key = toDateResourceKey(STAT_TYPES.pv);
         const uv_ip_key = toDateResourceKey(STAT_TYPES.uv_ip);
         const uv_uid_key = toDateResourceKey(STAT_TYPES.uv_uid);
         // 统计 PV
-        await Promise.all([
-            client.incr(pv_key),
-            client.expire(pv_key, EXPIRE_TIME)
-        ]);
+        await Promise.all([client.incr(pv_key), client.expire(pv_key, EXPIRE_TIME)]);
         // IP 访问 UV
-        await Promise.all([
-            client.sadd(uv_ip_key, `${ip}`),
-            client.expire(uv_ip_key, EXPIRE_TIME)
-        ]);
+        await Promise.all([client.sadd(uv_ip_key, `${ip}`), client.expire(uv_ip_key, EXPIRE_TIME)]);
         if (userSession && userSession.isLogin()) {
             const accountId = userSession.getSessionInfo().accountId;
             // 统计 UV
-            await Promise.all([
-                client.sadd(uv_uid_key, accountId),
-                client.expire(uv_uid_key, EXPIRE_TIME)
-            ]);
+            await Promise.all([client.sadd(uv_uid_key, accountId), client.expire(uv_uid_key, EXPIRE_TIME)]);
         }
     }
-    ;
 };
 __decorate([
     (0, core_1.Inject)(),

package/dist/service/asyncTask/AsyncTaskRunnerService.d.ts

@@ -1,7 +1,7 @@
 import { Context } from '@midwayjs/koa';
-import { BaseService } from "../../service/base/BaseService";
-import { IScheduleService } from "../../interface";
-import { ISysAsyncTaskHandler, SysAsyncTaskEntity } from "../../models/AsyncTaskModel";
+import { BaseService } from '../../service/base/BaseService';
+import { IScheduleService } from '../../interface';
+import { ISysAsyncTaskHandler, SysAsyncTaskEntity } from '../../models/AsyncTaskModel';
 declare class AsyncTaskRunner {
     isBusy: boolean;
     taskHandlerMap: Map<string, ISysAsyncTaskHandler>;
@@ -10,6 +10,7 @@ declare class AsyncTaskRunner {
     /**
      * 更新任务状态或任务进度
      * @param taskElement
+     * @param updatePartials
      * @private
      */
     private updateTaskStatus;
@@ -27,5 +28,10 @@ export declare class AsyncTaskRunnerService extends BaseService implements ISche
     private curdProService;
     fetchPendingTasks(): Promise<void>;
     runBySchedule(): Promise<void>;
+    /**
+     * 是否存在新任务
+     * @private
+     */
+    private isExistNewTask;
 }
 export {};

package/dist/service/asyncTask/AsyncTaskRunnerService.js

@@ -19,6 +19,7 @@ const SystemTables_1 = require("../../models/SystemTables");
 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");
 class AsyncTaskRunner {
     constructor() {
         this.isBusy = false;
@@ -40,10 +41,13 @@ class AsyncTaskRunner {
                 taskElement.error_message = (0, errorToString_1.errorToString)(error);
             }
             try {
-                await this.updateTaskStatus(taskElement);
+                await this.updateTaskStatus(taskElement, {
+                    task_status: taskElement.task_status,
+                    error_message: taskElement.error_message,
+                });
             }
             catch (error) {
-                schedule_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error("executeTaskList error", error);
+                schedule_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error('executeTaskList error', error);
             }
         }
         this.isBusy = false;
@@ -54,26 +58,29 @@ class AsyncTaskRunner {
         if (!taskHandler) {
             throw new Error('TaskHandler not found , taskType = ' + taskType);
         }
-        const updateTaskStatus = () => {
-            return this.updateTaskStatus(taskElement);
+        const updateTaskStatus = (updatePartials) => {
+            return this.updateTaskStatus(taskElement, updatePartials);
         };
         await taskHandler.execute({ task: taskElement, updateTaskStatus });
     }
     /**
      * 更新任务状态或任务进度
      * @param taskElement
+     * @param updatePartials
      * @private
      */
-    async updateTaskStatus(taskElement) {
+    async updateTaskStatus(taskElement, updatePartials) {
+        if (!updatePartials) {
+            throw new Error('updatePartials not found');
+        }
         return await schedule_1.ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx) => {
-            const curdProService = await ctx.requestContext.getAsync("curdProService");
+            const curdProService = await ctx.requestContext.getAsync('curdProService');
             const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-            const { id, ...otherTaskProps } = taskElement;
             const res = await curdProService.executeCrudByCfg({
                 condition: {
-                    id: id
+                    id: taskElement.id,
                 },
-                data: otherTaskProps
+                data: updatePartials,
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
@@ -98,7 +105,10 @@ exports.ASYNC_TASK_RUNNER = new AsyncTaskRunner();
 /**
  * Redis锁
  */
-const LOCK_KEY_ASYNC_TASK_RUNNER = "LOCK_KEY_ASYNC_TASK_RUNNER";
+const ASYNC_TASK_LOCK = RedisKeys_1.RedisKeys.ASYNC_TASK_LOCK;
+const ASYNC_TASK_RUNTIME_OBJ = {
+    LAST_CHECK_ASYNC_TASK_UPDATE_TIME: 0,
+};
 let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.BaseService {
     async fetchPendingTasks() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
@@ -112,11 +122,11 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
             condition: {
                 task_status: AsyncTaskModel_1.SysAsyncTaskStatus.PENDING,
                 task_type: {
-                    "$in": taskTypeList
-                }
+                    $in: taskTypeList,
+                },
             },
             orderBy: 'id+',
-            limit: 10
+            limit: 10,
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
@@ -132,12 +142,12 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
         await this.curdProService.executeCrudByCfg({
             condition: {
                 id: {
-                    "$in": taskIds
-                }
+                    $in: taskIds,
+                },
             },
             data: {
-                task_status: AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING
-            }
+                task_status: AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING,
+            },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
@@ -146,16 +156,22 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
         });
         // 开始执行。
         exports.ASYNC_TASK_RUNNER.executeTaskList(taskList).then(() => {
-            console.log("ASYNC_TASK_RUNNER finished taskIds ==> " + JSON.stringify(taskIds));
+            console.log('ASYNC_TASK_RUNNER finished taskIds ==> ' + JSON.stringify(taskIds));
         });
     }
     async runBySchedule() {
+        // 1. 当前很忙
         if (exports.ASYNC_TASK_RUNNER.isBusy) {
             return Promise.resolve();
         }
+        // 2. 发现了新任务
+        const isExistNewTask = await this.isExistNewTask();
+        if (!isExistNewTask) {
+            return Promise.resolve();
+        }
         // 这里的过期时间1分钟即可。fetchPendingTasks函数不可能超过一分钟。
         // 因为这里只是从数据库中获取一批任务，放到自己的任务队列里。还没触发执行。
-        const lock = await this.redisService.set(LOCK_KEY_ASYNC_TASK_RUNNER, 1, "EX", 60, "NX");
+        const lock = await this.redisService.set(ASYNC_TASK_LOCK, 1, 'EX', 60, 'NX');
         if (lock !== 'OK') {
             return Promise.resolve();
         }
@@ -163,11 +179,31 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
             await this.fetchPendingTasks();
         }
         catch (e) {
-            console.error("fetchPendingTasks error", (0, errorToString_1.errorToString)(e));
+            console.error('fetchPendingTasks error', (0, errorToString_1.errorToString)(e));
         }
-        await this.redisService.del(LOCK_KEY_ASYNC_TASK_RUNNER);
+        await this.redisService.del(ASYNC_TASK_LOCK);
         return Promise.resolve();
     }
+    /**
+     * 是否存在新任务
+     * @private
+     */
+    async isExistNewTask() {
+        // 刚启动，没有检查过。
+        if (!ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME) {
+            return true;
+        }
+        //Redis没有任何内容
+        const updateTime = await this.redisService.get(RedisKeys_1.RedisKeys.ASYNC_TASK_UPDATE_TIME);
+        if (!updateTime) {
+            ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = Date.now();
+            return false;
+        }
+        const updateTimeNumber = Number.parseInt(updateTime, 10);
+        const isExistNewTask = updateTimeNumber > ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME;
+        ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = updateTimeNumber;
+        return isExistNewTask;
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

package/dist/service/asyncTask/AsyncTaskService.d.ts

@@ -1,5 +1,5 @@
 import { Context } from '@midwayjs/koa';
-import { BaseService } from "../../service/base/BaseService";
+import { BaseService } from '../../service/base/BaseService';
 export declare class AsyncTaskService extends BaseService {
     protected ctx: Context;
     startTask(): Promise<void>;

package/dist/service/asyncTask/AsyncTaskService.js

@@ -14,14 +14,15 @@ const core_1 = require("@midwayjs/core");
 const BaseService_1 = require("../../service/base/BaseService");
 const schedule_1 = require("../../schedule");
 const scheduleNames_1 = require("../../schedule/scheduleNames");
+const RedisKeys_1 = require("../../models/RedisKeys");
 let AsyncTaskService = class AsyncTaskService extends BaseService_1.BaseService {
     async startTask() {
+        await this.redisService.set(RedisKeys_1.RedisKeys.ASYNC_TASK_UPDATE_TIME, `${Date.now()}`);
         (0, schedule_1.runScheduleTaskOnce)(scheduleNames_1.INNER_SCHEDULE_NAMES.asyncTaskRunnerService).then(schedule => {
             console.log(schedule);
         });
     }
-    async cancelTask(id) {
-    }
+    async cancelTask(id) { }
 };
 __decorate([
     (0, core_1.Inject)(),

package/package.json

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

package/src/controller/base/BaseApiController.ts

@@ -1,12 +1,12 @@
 import { Controller, Inject } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { CurdMixService } from '../../service/curd/CurdMixService';
-import { IFuncCfgModel, IRequestCfgModel, IValidatorCfgItem } from '../../libs/crud-pro/interfaces';
-import { KeyOfCrudTypes, KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
+import { CurdMixService } from '@/service/curd/CurdMixService';
+import { IFuncCfgModel, IRequestCfgModel, IValidatorCfgItem } from '@/libs/crud-pro/interfaces';
+import { KeyOfCrudTypes, KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-import { UserAccountService } from '../../service/UserAccountService';
-import { RelatedType } from '../../service/curd/CurdMixUtils';
-import { BaseService } from '../../service/base/BaseService';
+import { UserAccountService } from '@/service/UserAccountService';
+import { RelatedType } from '@/service/curd/CurdMixUtils';
+import { BaseService } from '@/service/base/BaseService';
 
 export interface IExecuteSimpleSqlParams {
   updateCfg?: Record<string, IFuncCfgModel>;