From d772fb80e4e769aef34178c591077f9cca08a99c Mon Sep 17 00:00:00 2001 From: wkj <278599135@.com> Date: Tue, 16 Dec 2025 11:46:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20AppLoader=E9=87=8C=E5=87=A0=E5=A4=84?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=BE=93=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/AppLoader.d.ts | 5 +++-- lib/AppLoader.js | 6 +++--- lib/Synchronizer.d.ts | 2 +- lib/Synchronizer.js | 2 +- lib/cluster/env.js | 3 ++- lib/routines/i18n.js | 5 +++-- lib/utils/requirePrj.js | 2 +- src/AppLoader.ts | 6 +++--- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/lib/AppLoader.d.ts b/lib/AppLoader.d.ts index 94d2300..9432c53 100644 --- a/lib/AppLoader.d.ts +++ b/lib/AppLoader.d.ts @@ -1,3 +1,4 @@ +/// import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { AppLoader as GeneralAppLoader, Trigger, EntityDict, Watcher, OpRecord, FreeTimer, OperationResult } from "oak-domain/lib/types"; import { DbStore } from "./DbStore"; @@ -49,9 +50,9 @@ export declare class AppLoader; getStore(): DbStore; getEndpoints(prefix: string): [string, "post" | "get" | "put" | "delete", string, (params: Record, headers: IncomingHttpHeaders, req: IncomingMessage, body?: any) => Promise<{ - headers?: Record; + headers?: Record | undefined; data: any; - statusCode?: number; + statusCode?: number | undefined; }>][]; protected operateInWatcher(entity: T, operation: ED[T]['Update'], context: Cxt, singleton?: true): Promise>; protected selectInWatcher(entity: T, selection: ED[T]['Selection'], context: Cxt, forUpdate?: true, singleton?: true): Promise[]>; diff --git a/lib/AppLoader.js b/lib/AppLoader.js index bf17670..0630f76 100644 --- a/lib/AppLoader.js +++ b/lib/AppLoader.js @@ -484,7 +484,7 @@ class AppLoader extends types_1.AppLoader { try { const result = await this.execFreeTimer(timer, context); if (result) { - console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); + console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result); } await context.commit(); } @@ -536,7 +536,7 @@ class AppLoader extends types_1.AppLoader { socket: this.nsSocket, contextBuilder: () => this.makeContext(), }); - console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); + console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result); await context.commit(); } catch (err) { @@ -571,7 +571,7 @@ class AppLoader extends types_1.AppLoader { socket: this.nsSocket, contextBuilder: () => this.makeContext(), }); - console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); + console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result); await context.commit(); } catch (err) { diff --git a/lib/Synchronizer.d.ts b/lib/Synchronizer.d.ts index eca40d7..2283d42 100644 --- a/lib/Synchronizer.d.ts +++ b/lib/Synchronizer.d.ts @@ -27,7 +27,7 @@ export default class Synchronizer>; + getSyncTriggers(): VolatileTrigger[]; getSelfEndpoint(): EndpointItem; tryCreateSyncProcess(): void; } diff --git a/lib/Synchronizer.js b/lib/Synchronizer.js index ed4fecf..99d48fe 100644 --- a/lib/Synchronizer.js +++ b/lib/Synchronizer.js @@ -114,7 +114,7 @@ class Synchronizer { remoteEntityId: entityId, data: queue.map((ele) => ({ entity: ele.oper.targetEntity, - rowIds: ele.oper.filter.id.$in, // 暂时应该没什么用 + rowIds: ele.oper.filter.id.$in, action: ele.oper.action, data: ele.oper.data, })), diff --git a/lib/cluster/env.js b/lib/cluster/env.js index 7503829..63fef08 100644 --- a/lib/cluster/env.js +++ b/lib/cluster/env.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getClusterInfo = getClusterInfo; +exports.getClusterInfo = void 0; function getProcessEnvOption(option) { if (process.env.hasOwnProperty(option)) { return process.env[option]; @@ -54,3 +54,4 @@ const MyClusterInfo = initialize(); function getClusterInfo() { return MyClusterInfo; } +exports.getClusterInfo = getClusterInfo; diff --git a/lib/routines/i18n.js b/lib/routines/i18n.js index 6356d35..e396e0c 100644 --- a/lib/routines/i18n.js +++ b/lib/routines/i18n.js @@ -1,7 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.checkI18n = checkI18n; -exports.checkAndUpdateI18n = checkAndUpdateI18n; +exports.checkAndUpdateI18n = exports.checkI18n = void 0; const tslib_1 = require("tslib"); const node_path_1 = require("node:path"); const requirePrj_1 = tslib_1.__importDefault(require("../utils/requirePrj")); @@ -67,6 +66,7 @@ async function checkAndUpdateI18nInner(context, onlyCheck) { function checkI18n(context) { return checkAndUpdateI18nInner(context, true); } +exports.checkI18n = checkI18n; /** * 检查项目目录下的i18n数据和数据库中的差异，并更新 * @param context @@ -75,3 +75,4 @@ function checkI18n(context) { function checkAndUpdateI18n(context) { return checkAndUpdateI18nInner(context); } +exports.checkAndUpdateI18n = checkAndUpdateI18n; diff --git a/lib/utils/requirePrj.js b/lib/utils/requirePrj.js index fb4a96a..df6a041 100644 --- a/lib/utils/requirePrj.js +++ b/lib/utils/requirePrj.js @@ -1,6 +1,5 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = requireSth; const fs_1 = require("fs"); const lodash_1 = require("oak-domain/lib/utils/lodash"); const path_1 = require("path"); @@ -21,3 +20,4 @@ function requireSth(prjPath, filePath, dependencies) { } return (0, lodash_1.mergeConcatMany)(sthExternal); } +exports.default = requireSth; diff --git a/src/AppLoader.ts b/src/AppLoader.ts index b3cf543..34ff51d 100644 --- a/src/AppLoader.ts +++ b/src/AppLoader.ts @@ -575,7 +575,7 @@ export class AppLoader, context); if (result) { - console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); + console.log(`定时器【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result); } await context.commit(); } @@ -629,7 +629,7 @@ export class AppLoader this.makeContext(), }); - console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); + console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result); await context.commit(); } catch (err) { @@ -666,7 +666,7 @@ export class AppLoader this.makeContext(), }); - console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是【${result}】`); + console.log(`例程【${name}】执行成功，耗时${Date.now() - start}毫秒，结果是`, result); await context.commit(); } catch (err) {