midway-fatcms 0.0.1-beta.5 → 0.0.1-beta.50

package/dist/service/VisitStatService.js

@@ -17,6 +17,8 @@ const SystemTables_1 = require("../models/SystemTables");
 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 = {
@@ -27,25 +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) {
@@ -57,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 {
@@ -70,12 +73,12 @@ 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: SystemTables_1.SystemDbName,
-                            sqlDdType: SystemTables_1.SystemDbType,
+                            sqlDatabase: SystemDbName,
+                            sqlDbType: SystemDbType,
                             sqlTable: SystemTables_1.SystemTables.sys_visit_stats,
                         });
                         await client.del(key);
@@ -92,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 });
     }
     /**
@@ -122,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/WorkbenchService.d.ts

@@ -5,15 +5,48 @@ import { IScheduleService } from '../interface';
 export declare class WorkbenchService extends BaseService implements IScheduleService {
     ctx: Context;
     private curdProService;
+    private fatcmsTargetWorkbenchCode;
     clearCache(): void;
     runBySchedule(): Promise<void>;
+    /**
+     * 获取所有站点列表
+     * @param isForceRefresh 是否强制刷新缓存
+     * @returns
+     */
     getAllWorkbenchInfoList(isForceRefresh?: boolean): Promise<IWorkbenchEntity[]>;
+    /**
+     * 获取所有站点列表，以map的形式返回。其中key为站点域名，value为站点信息
+     * @param isForceRefresh 是否强制刷新缓存
+     * @returns
+     */
     getAllWorkbenchInfoMap(isForceRefresh?: boolean): Promise<Record<any, IWorkbenchEntity>>;
+    /**
+     * 检查站点编码是否匹配
+     * @param workbench_code_array 站点编码数组
+     * @param workbench_code 站点编码
+     * @returns
+     */
     isMatchWorkbenchCode(workbench_code_array: string | string[], workbench_code: string): boolean;
+    /**
+     * 根据站点编码获取站点信息
+     * @param workbenchCode 站点编码
+     * @returns
+     */
+    private getWorkbenchInfoByCode;
+    /**
+     * 根据域名获取站点信息
+     * @param host 域名
+     * @returns
+     */
+    private getWorkbenchInfoByHost;
     /**
      * 获取当前请求的域名所对应的站点信息
      */
     getCurrentHostWorkbenchInfo(): Promise<IWorkbenchEntity>;
+    /**
+     * 获取当前请求的域名
+     * @returns
+     */
     private getCurrentHost;
     isSupportCurrentWorkbench(workbench_code_array: string | string[]): Promise<boolean>;
     isSupportCurrentHostForForMiddleware(): Promise<string | boolean>;

package/dist/service/WorkbenchService.js

@@ -20,6 +20,8 @@ const exceptions_1 = require("../libs/crud-pro/exceptions");
 const functions_1 = require("../libs/utils/functions");
 const fatcms_request_1 = require("../libs/utils/fatcms-request");
 const MixinUtils_1 = require("../libs/crud-pro/utils/MixinUtils");
+const global_config_1 = require("../libs/global-config/global-config");
+const AsyncTaskModel_1 = require("../models/AsyncTaskModel");
 //
 // const lruCache = new LRUCache<string, any>({
 //   max: 500,
@@ -37,21 +39,32 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
     async runBySchedule() {
         await this.getAllWorkbenchInfoMap(true);
     }
+    /**
+     * 获取所有站点列表
+     * @param isForceRefresh 是否强制刷新缓存
+     * @returns
+     */
     async getAllWorkbenchInfoList(isForceRefresh) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         let listData = lruCache.get(CACHE_KEY_WORKBENCH_LIST);
         if (!listData || isForceRefresh === true) {
             const reqJson = { condition: {}, pageSize: 1000, limit: 1000 };
             const res = await this.curdProService.executeCrudByCfg(reqJson, {
                 sqlTable: SystemTables_1.SystemTables.sys_workbench,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
             });
             listData = res.getResRows();
             lruCache.set(CACHE_KEY_WORKBENCH_LIST, listData);
         }
         return listData;
     }
+    /**
+     * 获取所有站点列表，以map的形式返回。其中key为站点域名，value为站点信息
+     * @param isForceRefresh 是否强制刷新缓存
+     * @returns
+     */
     async getAllWorkbenchInfoMap(isForceRefresh) {
         let listData;
         let domainMap = lruCache.get(CACHE_KEY_DOMAIN_MAP);
@@ -65,6 +78,12 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
         }
         return domainMap;
     }
+    /**
+     * 检查站点编码是否匹配
+     * @param workbench_code_array 站点编码数组
+     * @param workbench_code 站点编码
+     * @returns
+     */
     isMatchWorkbenchCode(workbench_code_array, workbench_code) {
         if (workbench_code_array === '*') {
             return true;
@@ -74,6 +93,30 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
             .filter(Boolean);
         return supportWorkbenchArray.includes('*') || supportWorkbenchArray.includes(workbench_code);
     }
+    /**
+     * 根据站点编码获取站点信息
+     * @param workbenchCode 站点编码
+     * @returns
+     */
+    async getWorkbenchInfoByCode(workbenchCode) {
+        const list = await this.getAllWorkbenchInfoList();
+        for (let i = 0; i < list.length; i++) {
+            const workbenchInfo = list[i];
+            if (workbenchInfo.workbench_code === workbenchCode) {
+                return workbenchInfo;
+            }
+        }
+        return null;
+    }
+    /**
+     * 根据域名获取站点信息
+     * @param host 域名
+     * @returns
+     */
+    async getWorkbenchInfoByHost(host) {
+        const domainMap = await this.getAllWorkbenchInfoMap();
+        return domainMap[host];
+    }
     /**
      * 获取当前请求的域名所对应的站点信息
      */
@@ -84,20 +127,31 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
             if (!debugWorkbenchCode) {
                 throw new exceptions_1.CommonException('本地环境调试时需要使用ModHeader浏览器插件，指定站点编码');
             }
-            const list = await this.getAllWorkbenchInfoList();
-            for (let i = 0; i < list.length; i++) {
-                const workbenchInfo = list[i];
-                if (workbenchInfo.workbench_code === debugWorkbenchCode) {
-                    return workbenchInfo;
-                }
-            }
-            return null;
+            return await this.getWorkbenchInfoByCode(debugWorkbenchCode);
+        }
+        // 内部异步任务，指定了workbench code
+        const asyncTaskWorkbenchCode = this.ctx.headers[AsyncTaskModel_1.HEADER_KEY_RUN_BY_ASYNC_TASK_WORKBENCH_CODE];
+        if (asyncTaskWorkbenchCode && typeof asyncTaskWorkbenchCode === 'string') {
+            return await this.getWorkbenchInfoByCode(asyncTaskWorkbenchCode);
+        }
+        // 只有一个workbench的场景。对于后台系统。不需要配置域名的场景。
+        const fatcmsTargetWorkbenchCode = this.fatcmsTargetWorkbenchCode;
+        if (typeof fatcmsTargetWorkbenchCode === 'string' && fatcmsTargetWorkbenchCode.length > 3) {
+            return await this.getWorkbenchInfoByCode(fatcmsTargetWorkbenchCode);
         }
         //正式环境： 根据域名获取站点配置
         const host = this.getCurrentHost();
-        const domainMap = await this.getAllWorkbenchInfoMap();
-        return domainMap[host];
+        const workbenchInfo = await this.getWorkbenchInfoByHost(host);
+        if (workbenchInfo) {
+            return workbenchInfo;
+        }
+        // 最后兜底
+        return await this.getWorkbenchInfoByHost('*');
     }
+    /**
+     * 获取当前请求的域名
+     * @returns
+     */
     getCurrentHost() {
         const host = this.ctx.request.host;
         if (!host) {
@@ -147,6 +201,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", CurdProService_1.CurdProService)
 ], WorkbenchService.prototype, "curdProService", void 0);
+__decorate([
+    (0, core_1.Config)('fatcmsTargetWorkbenchCode'),
+    __metadata("design:type", String)
+], WorkbenchService.prototype, "fatcmsTargetWorkbenchCode", void 0);
 WorkbenchService = __decorate([
     (0, core_1.Provide)()
 ], WorkbenchService);

package/dist/service/anyapi/AnyApiSandboxService.js

@@ -74,18 +74,18 @@ let AnyApiSandboxService = class AnyApiSandboxService extends BaseService_1.Base
             };
             const nextLine100 = new Array(10).fill('\n').join('');
             const bindCode = this.toBindCodeString('httpController', newContext, 'sandbox');
-            const code = `
-      (async () => {
-        ${nextLine100}${func_code}; // 必须有一个 class HttpController { async handleRequest(params){} }
-        ${nextLine100}
-        try {
-          const httpController = new HttpController();
-          ${bindCode}
-          const res = await httpController.handleRequest(sandbox.allParams.params);
-          sandbox.returnSuccess(res);
-        } catch (e) {
-          sandbox.returnError(e)
-        }
+            const code = `
+      (async () => {
+        ${nextLine100}${func_code}; // 必须有一个 class HttpController { async handleRequest(params){} }
+        ${nextLine100}
+        try {
+          const httpController = new HttpController();
+          ${bindCode}
+          const res = await httpController.handleRequest(sandbox.allParams.params);
+          sandbox.returnSuccess(res);
+        } catch (e) {
+          sandbox.returnError(e)
+        }
       })(); `;
             try {
                 const script = getCompiledScript(anyApi, code);

package/dist/service/anyapi/AnyApiService.js

@@ -23,6 +23,7 @@ const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 const WorkbenchService_1 = require("../WorkbenchService");
 const ValidateUtils_1 = require("../../libs/crud-pro/utils/ValidateUtils");
 const ApiBaseService_1 = require("../base/ApiBaseService");
+const global_config_1 = require("../../libs/global-config/global-config");
 const lruCache = new lru_cache_1.LRUCache({
     max: 500,
     ttl: 1000 * 60,
@@ -65,12 +66,13 @@ let AnyApiService = class AnyApiService extends ApiBaseService_1.ApiBaseService
         return anyApi;
     }
     async _getAnyApiMethod(methodCode) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdMixService.executeCrudByCfg({ condition: { method: methodCode } }, {
             sqlTable: SystemTables_1.SystemTables.sys_anyapi,
             method: `get_sys_anyapi_${methodCode}`,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             updateCfg: {},
         });
         const obj = res.getOneObj();

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

@@ -0,0 +1,50 @@
+import { Context } from '@midwayjs/koa';
+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>;
+    executeTaskList(taskList: SysAsyncTaskEntity[]): Promise<void>;
+    private executeTask;
+    /**
+     * 更新任务状态或任务进度
+     * @param taskElement
+     * @param updatePartials
+     * @private
+     */
+    private updateTaskStatus;
+    /**
+     * 获取当前进程可以处理的任务类型。
+     */
+    getHandlerTaskTypeList(): string[];
+}
+/**
+ * 业务可以扩展
+ */
+export declare const ASYNC_TASK_RUNNER: AsyncTaskRunner;
+export declare class AsyncTaskRunnerService extends BaseService implements IScheduleService {
+    protected ctx: Context;
+    private curdProService;
+    /**
+     * 定时任务执行
+     */
+    runBySchedule(): Promise<void>;
+    /**
+     * 更新超时的任务状态
+     * @returns
+     */
+    private runByScheduleForTimeoutTasks;
+    /**
+     * 检查是否有新任务。如果有，就从数据库中获取一批任务，放到自己的任务队列里。
+     * @returns
+     */
+    private runByScheduleForPendingTasks;
+    fetchPendingTasks(): Promise<void>;
+    /**
+     * 是否存在新任务
+     * @private
+     */
+    private isExistNewTask;
+}
+export {};