@ticatec/common-express-server 0.0.8 → 0.1.2

package/lib/LoggedUser.d.ts

@@ -1,25 +1,21 @@
+/**
+ * Common user interface representing basic user information
+ */
 export interface CommonUser {
     /**
-     *
-     */
-    id: string;
-    /**
-     *  编码
+     * Account code
      */
-    code: string;
+    accountCode: string;
     /**
-     * 姓名
+     * User name
      */
     name: string;
     /**
-     * 部门
+     * Additional properties
      */
-    dept: {
-        id: string;
-        name: string;
-    };
+    [key: string]: any;
     /**
-     * 租户
+     * Tenant information
      */
     tenant: {
         code: string;
@@ -27,11 +23,11 @@ export interface CommonUser {
     };
 }
 /**
- * 当前登陆的用户
+ * Interface for currently logged in user
  */
 export default interface LoggedUser extends CommonUser {
     /**
-     * 扮演用户
+     * User being acted as (for user impersonation)
      */
     actAs?: CommonUser;
 }

package/lib/common/AdminBaseController.d.ts

@@ -1,26 +1,30 @@
 import { ValidationRules } from "@ticatec/bean-validator";
 import CommonController from "./CommonController";
+import { Request } from "express";
 /**
- * 和租户无关的平台管理接口的基础类
+ * Base class for platform admin interfaces that are tenant-independent
+ * @template T The service type this controller depends on
  */
 export default abstract class AdminBaseController<T> extends CommonController<T> {
     /**
-     * 构造方法
-     * @param service
-     * @param rules 实体检验规则
+     * Constructor for admin base controller
+     * @param service The service instance to inject
+     * @param rules Entity validation rules
      * @protected
      */
     protected constructor(service: T, rules: ValidationRules);
     /**
-     * 新增的参数
-     * @param req
+     * Gets arguments for creating new entity
+     * @param req Express request object
+     * @returns Array containing request body as the only argument
      * @protected
      */
-    protected getCreateNewArguments(req: any): Array<any>;
+    protected getCreateNewArguments(req: Request): Array<any>;
     /**
-     * 更新方法的参数
-     * @param req
+     * Gets arguments for updating entity
+     * @param req Express request object
+     * @returns Array containing request body as the only argument
      * @protected
      */
-    protected getUpdateArguments(req: any): any[];
+    protected getUpdateArguments(req: Request): any[];
 }

package/lib/common/AdminBaseController.js

@@ -5,29 +5,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const CommonController_1 = __importDefault(require("./CommonController"));
 /**
- * 和租户无关的平台管理接口的基础类
+ * Base class for platform admin interfaces that are tenant-independent
+ * @template T The service type this controller depends on
  */
 class AdminBaseController extends CommonController_1.default {
     /**
-     * 构造方法
-     * @param service
-     * @param rules 实体检验规则
+     * Constructor for admin base controller
+     * @param service The service instance to inject
+     * @param rules Entity validation rules
      * @protected
      */
     constructor(service, rules) {
         super(service, rules);
     }
     /**
-     * 新增的参数
-     * @param req
+     * Gets arguments for creating new entity
+     * @param req Express request object
+     * @returns Array containing request body as the only argument
      * @protected
      */
     getCreateNewArguments(req) {
         return [req.body];
     }
     /**
-     * 更新方法的参数
-     * @param req
+     * Gets arguments for updating entity
+     * @param req Express request object
+     * @returns Array containing request body as the only argument
      * @protected
      */
     getUpdateArguments(req) {

package/lib/common/AdminBaseController.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdminBaseController.js","sourceRoot":"src/","sources":["common/AdminBaseController.ts"],"names":[],"mappings":";;;;;AACA,0EAAkD;AAElD;;GAEG;AACH,MAA8B,mBAAuB,SAAQ,0BAAmB;IAE5E;;;;;OAKG;IACH,YAAsB,OAAU,EAAE,KAAsB;QACpD,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACO,qBAAqB,CAAC,GAAQ;QACpC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IAED;;;;OAIG;IACO,kBAAkB,CAAC,GAAQ;QACjC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;CACJ;AA7BD,sCA6BC"}
+{"version":3,"file":"AdminBaseController.js","sourceRoot":"src/","sources":["common/AdminBaseController.ts"],"names":[],"mappings":";;;;;AACA,0EAAkD;AAGlD;;;GAGG;AACH,MAA8B,mBAAuB,SAAQ,0BAAmB;IAE5E;;;;;OAKG;IACH,YAAsB,OAAU,EAAE,KAAsB;QACpD,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACO,qBAAqB,CAAC,GAAY;QACxC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IAED;;;;;OAKG;IACO,kBAAkB,CAAC,GAAY;QACrC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC;CACJ;AA/BD,sCA+BC"}

package/lib/common/AdminSearchController.d.ts

@@ -1,8 +1,13 @@
 import { Request } from "express";
 import AdminBaseController from "./AdminBaseController";
 /**
- * 和租户无关的代查询的平台管理接口的基础类
+ * Base class for tenant-independent search interfaces for platform admin
+ * @template T The service type this controller depends on
  */
 export default abstract class AdminSearchController<T> extends AdminBaseController<T> {
+    /**
+     * Search method for querying entities
+     * @returns Function that handles search requests
+     */
     search(): (req: Request) => Promise<any>;
 }

package/lib/common/AdminSearchController.js

@@ -6,13 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AdminBaseController_1 = __importDefault(require("./AdminBaseController"));
 const BaseController_1 = __importDefault(require("./BaseController"));
 /**
- * 和租户无关的代查询的平台管理接口的基础类
+ * Base class for tenant-independent search interfaces for platform admin
+ * @template T The service type this controller depends on
  */
 class AdminSearchController extends AdminBaseController_1.default {
+    /**
+     * Search method for querying entities
+     * @returns Function that handles search requests
+     */
     search() {
         return (req) => {
             let query = req.query;
-            BaseController_1.default.debugEnabled && this.logger.debug(`path: ${req.path}, query by criteria:`, query);
+            BaseController_1.default.debugEnabled && this.logger.debug(`Path: ${req.path}, query by criteria:`, query);
             return this.invokeServiceInterface('search', [query]);
         };
     }

package/lib/common/AdminSearchController.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdminSearchController.js","sourceRoot":"src/","sources":["common/AdminSearchController.ts"],"names":[],"mappings":";;;;;AACA,gFAAwD;AACxD,sEAA8C;AAE9C;;GAEG;AACH,MAA8B,qBAAyB,SAAQ,6BAAsB;IAEjF,MAAM;QACF,OAAO,CAAC,GAAW,EAAE,EAAE;YACnB,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YACtB,wBAAc,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,IAAI,sBAAsB,EAAE,KAAK,CAAC,CAAC;YACjG,OAAO,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAA;IACL,CAAC;CACJ;AATD,wCASC"}
+{"version":3,"file":"AdminSearchController.js","sourceRoot":"src/","sources":["common/AdminSearchController.ts"],"names":[],"mappings":";;;;;AACA,gFAAwD;AACxD,sEAA8C;AAG9C;;;GAGG;AACH,MAA8B,qBAAyB,SAAQ,6BAAsB;IAEjF;;;OAGG;IACH,MAAM;QACF,OAAO,CAAC,GAAW,EAAE,EAAE;YACnB,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YACtB,wBAAc,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,IAAI,sBAAsB,EAAE,KAAK,CAAC,CAAC;YACjG,OAAO,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAA;IACL,CAAC;CACJ;AAbD,wCAaC"}

package/lib/common/BaseController.d.ts

@@ -1,12 +1,28 @@
 import { Logger } from "log4js";
+import { CommonUser } from "../LoggedUser";
+import { Request } from "express";
+/**
+ * Abstract base controller class providing common functionality for all controllers
+ * @template T The service type this controller depends on
+ */
 export default abstract class BaseController<T> {
+    /** Flag to enable debug logging */
     static debugEnabled: boolean;
+    /** The service instance this controller uses */
     protected readonly service: T;
+    /** Logger instance for this controller */
     protected readonly logger: Logger;
     /**
-     * 构造方法
-     * @param service
+     * Constructor for base controller
+     * @param service The service instance to inject
      * @protected
      */
     protected constructor(service: T);
+    /**
+     * Gets the current logged user, if acting as another user, returns the acted user,
+     * returns null for requests without user injection
+     * @param req Express request object
+     * @returns The current user or null if no user is logged in
+     */
+    protected getLoggedUser: (req: Request) => CommonUser;
 }

package/lib/common/BaseController.js

@@ -4,17 +4,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const log4js_1 = __importDefault(require("log4js"));
+/**
+ * Abstract base controller class providing common functionality for all controllers
+ * @template T The service type this controller depends on
+ */
 class BaseController {
     /**
-     * 构造方法
-     * @param service
+     * Constructor for base controller
+     * @param service The service instance to inject
      * @protected
      */
     constructor(service) {
+        /**
+         * Gets the current logged user, if acting as another user, returns the acted user,
+         * returns null for requests without user injection
+         * @param req Express request object
+         * @returns The current user or null if no user is logged in
+         */
+        this.getLoggedUser = (req) => {
+            let user = req['user'];
+            return (user === null || user === void 0 ? void 0 : user.actAs) || user;
+        };
         this.logger = log4js_1.default.getLogger(this.constructor.name);
         this.service = service;
     }
 }
-exports.default = BaseController;
+/** Flag to enable debug logging */
 BaseController.debugEnabled = false;
+exports.default = BaseController;
 //# sourceMappingURL=BaseController.js.map

package/lib/common/BaseController.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseController.js","sourceRoot":"src/","sources":["common/BaseController.ts"],"names":[],"mappings":";;;;;AACA,oDAAsC;AAEtC,MAA8B,cAAc;IAMxC;;;;OAIG;IACH,YAAsB,OAAU;QAC5B,IAAI,CAAC,MAAM,GAAG,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;;AAdL,iCAeC;AAbU,2BAAY,GAAY,KAAK,CAAC"}
+{"version":3,"file":"BaseController.js","sourceRoot":"src/","sources":["common/BaseController.ts"],"names":[],"mappings":";;;;;AACA,oDAAsC;AAItC;;;GAGG;AACH,MAA8B,cAAc;IASxC;;;;OAIG;IACH,YAAsB,OAAU;QAKhC;;;;;WAKG;QACO,kBAAa,GAAG,CAAC,GAAY,EAAc,EAAE;YACnD,IAAI,IAAI,GAAe,GAAG,CAAC,MAAM,CAAC,CAAC;YACnC,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,IAAI,CAAC;QAC/B,CAAC,CAAA;QAbG,IAAI,CAAC,MAAM,GAAG,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;;AAfD,mCAAmC;AAC5B,2BAAY,GAAY,KAAK,AAAjB,CAAkB;kBAHX,cAAc"}

package/lib/common/CommonController.d.ts

@@ -1,70 +1,94 @@
 import BaseController from "./BaseController";
 import { ValidationRules } from "@ticatec/bean-validator";
 import { RestfulFunction } from "../CommonRouterHelper";
+import { Request } from "express";
 /**
- * 实现了增/删/改的控制类
+ * Controller class that implements Create/Read/Update/Delete operations
+ * @template T The service type this controller depends on
  */
 export default abstract class CommonController<T> extends BaseController<T> {
     /**
-     * 实体检验规则
+     * Entity validation rules
      * @protected
      */
     protected readonly rules: ValidationRules;
+    /**
+     * Constructor for common controller
+     * @param service The service instance to inject
+     * @param rules Validation rules for entities (optional)
+     * @protected
+     */
     protected constructor(service: T, rules?: ValidationRules);
     /**
-     * 验证实体
-     * @param data
+     * Validates entity data
+     * @param data The data to validate
      * @protected
      */
     protected validateEntity(data: any): void;
     /**
-     * 新增实体接口
+     * Creates new entity endpoint
+     * @returns RESTful function for creating new entities
      */
     createNew(): RestfulFunction;
     /**
-     * 更新实体接口
+     * Updates entity endpoint
+     * @returns RESTful function for updating entities
      */
     update(): RestfulFunction;
     /**
-     * 删除实体接口
+     * Deletes entity endpoint
+     * @returns RESTful function for deleting entities
      */
     del(): RestfulFunction;
+    /**
+     * Checks if a service interface method exists
+     * @param name The method name to check
+     * @protected
+     */
     protected checkInterface(name: string): void;
     /**
-     * 根据名称调用服务接口
-     * @param name
-     * @param args
+     * Invokes service interface by name
+     * @param name The method name to invoke
+     * @param args Arguments to pass to the method
+     * @returns Promise resolving to the method result
      * @protected
      */
     protected invokeServiceInterface(name: string, args?: Array<any>): Promise<any>;
     /**
-     * 新建实体
-     * @param req
+     * Creates a new entity
+     * @param req Express request object
+     * @returns Promise resolving to the created entity
      * @protected
      */
-    protected _createNew(req: any): Promise<any>;
+    protected _createNew(req: Request): Promise<any>;
     /**
-     * 更新实体
-     * @param req
+     * Updates an entity
+     * @param req Express request object
+     * @returns Promise resolving to the updated entity
      * @protected
      */
-    protected _update(req: any): Promise<any>;
+    protected _update(req: Request): Promise<any>;
     /**
-     * 删除实体
-     * @param req
+     * Deletes an entity
+     * @param req Express request object
+     * @returns Promise resolving when entity is deleted
      * @protected
      */
-    protected _del(req: any): Promise<any>;
+    protected _del(req: Request): Promise<any>;
     /**
-     * 新增实体的参数
-     * @param req
+     * Gets arguments for creating new entity
+     * @param req Express request object
+     * @returns Array of arguments to pass to service create method
      * @protected
+     * @abstract
      */
-    protected abstract getCreateNewArguments(req: any): Array<any>;
+    protected abstract getCreateNewArguments(req: Request): Array<any>;
     /**
-     * 更新实体的参数
-     * @param req
+     * Gets arguments for updating entity
+     * @param req Express request object
+     * @returns Array of arguments to pass to service update method
      * @protected
+     * @abstract
      */
-    protected abstract getUpdateArguments(req: any): Array<any>;
+    protected abstract getUpdateArguments(req: Request): Array<any>;
 }

package/lib/common/CommonController.js

@@ -7,27 +7,35 @@ const express_exception_1 = require("@ticatec/express-exception");
 const BaseController_1 = __importDefault(require("./BaseController"));
 const bean_validator_1 = __importDefault(require("@ticatec/bean-validator"));
 /**
- * 实现了增/删/改的控制类
+ * Controller class that implements Create/Read/Update/Delete operations
+ * @template T The service type this controller depends on
  */
 class CommonController extends BaseController_1.default {
+    /**
+     * Constructor for common controller
+     * @param service The service instance to inject
+     * @param rules Validation rules for entities (optional)
+     * @protected
+     */
     constructor(service, rules = null) {
         super(service);
         this.rules = rules;
     }
     /**
-     * 验证实体
-     * @param data
+     * Validates entity data
+     * @param data The data to validate
      * @protected
      */
     validateEntity(data) {
         let result = bean_validator_1.default.validate(data, this.rules);
         if (!result.valid) {
-            BaseController_1.default.debugEnabled && this.logger.debug(`invalid data: ${result.errorMessage}`);
+            BaseController_1.default.debugEnabled && this.logger.debug(`Invalid data: ${result.errorMessage}`);
             throw new express_exception_1.IllegalParameterError(result.errorMessage);
         }
     }
     /**
-     * 新增实体接口
+     * Creates new entity endpoint
+     * @returns RESTful function for creating new entities
      */
     createNew() {
         return async (req) => {
@@ -35,7 +43,8 @@ class CommonController extends BaseController_1.default {
         };
     }
     /**
-     * 更新实体接口
+     * Updates entity endpoint
+     * @returns RESTful function for updating entities
      */
     update() {
         return async (req) => {
@@ -43,61 +52,71 @@ class CommonController extends BaseController_1.default {
         };
     }
     /**
-     * 删除实体接口
+     * Deletes entity endpoint
+     * @returns RESTful function for deleting entities
      */
     del() {
         return async (req) => {
             return this._del(req);
         };
     }
+    /**
+     * Checks if a service interface method exists
+     * @param name The method name to check
+     * @protected
+     */
     checkInterface(name) {
         if (this.service[name] == null) {
-            this.logger.warn(`当前服务没有新增接口:${name}`);
-            throw new express_exception_1.ActionNotFoundError(`当前服务没有新增接口:${name}`);
+            this.logger.warn(`Current service does not have interface: ${name}`);
+            throw new express_exception_1.ActionNotFoundError(`Current service does not have interface: ${name}`);
         }
     }
     /**
-     * 根据名称调用服务接口
-     * @param name
-     * @param args
+     * Invokes service interface by name
+     * @param name The method name to invoke
+     * @param args Arguments to pass to the method
+     * @returns Promise resolving to the method result
      * @protected
      */
     async invokeServiceInterface(name, args = []) {
         return await this.service[name](...args);
     }
     /**
-     * 新建实体
-     * @param req
+     * Creates a new entity
+     * @param req Express request object
+     * @returns Promise resolving to the created entity
      * @protected
      */
     _createNew(req) {
         let data = req.body;
-        BaseController_1.default.debugEnabled && this.logger.debug(`${req.method} ${req.originalUrl} 申请创建一个实体`, data);
+        BaseController_1.default.debugEnabled && this.logger.debug(`${req.method} ${req.originalUrl} Request to create an entity`, data);
         this.checkInterface('createNew');
         this.validateEntity(data);
         return this.invokeServiceInterface('createNew', this.getCreateNewArguments(req));
     }
     /**
-     * 更新实体
-     * @param req
+     * Updates an entity
+     * @param req Express request object
+     * @returns Promise resolving to the updated entity
      * @protected
      */
     _update(req) {
         let data = req.body;
-        BaseController_1.default.debugEnabled && this.logger.debug(`${req.method} ${req.originalUrl} 申请更新一个实体,`, data);
+        BaseController_1.default.debugEnabled && this.logger.debug(`${req.method} ${req.originalUrl} Request to update an entity`, data);
         this.checkInterface('update');
         this.validateEntity(data);
         return this.invokeServiceInterface('update', this.getUpdateArguments(req));
     }
     /**
-     * 删除实体
-     * @param req
+     * Deletes an entity
+     * @param req Express request object
+     * @returns Promise resolving when entity is deleted
      * @protected
      */
     _del(req) {
-        //请在子类实现删除接口，否则会抛出系统异常
-        this.logger.warn('当前服务没有删除接口');
-        throw new express_exception_1.ActionNotFoundError('当前服务没有删除接口');
+        // Please implement delete interface in subclass, otherwise system exception will be thrown
+        this.logger.warn('Current service does not have delete interface');
+        throw new express_exception_1.ActionNotFoundError('Current service does not have delete interface');
     }
 }
 exports.default = CommonController;

package/lib/common/CommonController.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommonController.js","sourceRoot":"src/","sources":["common/CommonController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommonController.js","sourceRoot":"src/","sources":["common/CommonController.ts"],"names":[],"mappings":"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"}

package/lib/common/TenantBaseController.d.ts

@@ -1,25 +1,30 @@
 import CommonController from "./CommonController";
 import { ValidationRules } from "@ticatec/bean-validator";
+import { Request } from "express";
 /**
- * 租户的基础接口
+ * Base class for tenant-specific interfaces
+ * @template T The service type this controller depends on
  */
 export default abstract class TenantBaseController<T> extends CommonController<T> {
-    protected constructor(service: any, rules: ValidationRules);
     /**
-     * 获取当前登录用户，如果有扮演，获取扮演用户
-     * @param req
+     * Constructor for tenant base controller
+     * @param service The service instance to inject
+     * @param rules Entity validation rules
+     * @protected
      */
-    protected getLoggedUser: (req: any) => any;
+    protected constructor(service: any, rules: ValidationRules);
     /**
-     * 获取新增接口的参数，第一个参数为登录用户，第二个参数为请求数据
-     * @param req
+     * Gets arguments for creating new entity, first parameter is logged user, second is request data
+     * @param req Express request object
+     * @returns Array containing logged user and request body
      * @protected
      */
-    protected getCreateNewArguments(req: any): Array<any>;
+    protected getCreateNewArguments(req: Request): Array<any>;
     /**
-     * 获取更新接口的参数，第一个参数为登录用户，第二个参数为请求数据
-     * @param req
+     * Gets arguments for updating entity, first parameter is logged user, second is request data
+     * @param req Express request object
+     * @returns Array containing logged user and request body
      * @protected
      */
-    protected getUpdateArguments(req: any): any[];
+    protected getUpdateArguments(req: Request): any[];
 }

package/lib/common/TenantBaseController.js

@@ -5,31 +5,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const CommonController_1 = __importDefault(require("./CommonController"));
 /**
- * 租户的基础接口
+ * Base class for tenant-specific interfaces
+ * @template T The service type this controller depends on
  */
 class TenantBaseController extends CommonController_1.default {
+    /**
+     * Constructor for tenant base controller
+     * @param service The service instance to inject
+     * @param rules Entity validation rules
+     * @protected
+     */
     constructor(service, rules) {
         super(service, rules);
-        /**
-         * 获取当前登录用户，如果有扮演，获取扮演用户
-         * @param req
-         */
-        this.getLoggedUser = (req) => {
-            let user = req.user;
-            return user.actAs || user;
-        };
     }
     /**
-     * 获取新增接口的参数，第一个参数为登录用户，第二个参数为请求数据
-     * @param req
+     * Gets arguments for creating new entity, first parameter is logged user, second is request data
+     * @param req Express request object
+     * @returns Array containing logged user and request body
      * @protected
      */
     getCreateNewArguments(req) {
         return [this.getLoggedUser(req), req.body];
     }
     /**
-     * 获取更新接口的参数，第一个参数为登录用户，第二个参数为请求数据
-     * @param req
+     * Gets arguments for updating entity, first parameter is logged user, second is request data
+     * @param req Express request object
+     * @returns Array containing logged user and request body
      * @protected
      */
     getUpdateArguments(req) {

package/lib/common/TenantBaseController.js.map

@@ -1 +1 @@
-{"version":3,"file":"TenantBaseController.js","sourceRoot":"src/","sources":["common/TenantBaseController.ts"],"names":[],"mappings":";;;;;AACA,0EAAkD;AAGlD;;GAEG;AACH,MAA8B,oBAAwB,SAAQ,0BAAmB;IAE7E,YAAsB,OAAY,EAAE,KAAsB;QACtD,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAG1B;;;WAGG;QACO,kBAAa,GAAG,CAAC,GAAG,EAAE,EAAE;YAC9B,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACpB,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC;QAC9B,CAAC,CAAA;IATD,CAAC;IAWD;;;;OAIG;IACO,qBAAqB,CAAC,GAAQ;QACpC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED;;;;OAIG;IACO,kBAAkB,CAAC,GAAQ;QACjC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;CAEJ;AAjCD,uCAiCC"}
+{"version":3,"file":"TenantBaseController.js","sourceRoot":"src/","sources":["common/TenantBaseController.ts"],"names":[],"mappings":";;;;;AACA,0EAAkD;AAIlD;;;GAGG;AACH,MAA8B,oBAAwB,SAAQ,0BAAmB;IAE7E;;;;;OAKG;IACH,YAAsB,OAAY,EAAE,KAAsB;QACtD,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACO,qBAAqB,CAAC,GAAY;QACxC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED;;;;;OAKG;IACO,kBAAkB,CAAC,GAAY;QACrC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;CAEJ;AAhCD,uCAgCC"}

package/lib/common/TenantSearchController.d.ts

@@ -1,8 +1,13 @@
 import { Request } from "express";
 import TenantBaseController from "./TenantBaseController";
 /**
- * 供租户使用带查询的接口
+ * Interface with search capabilities for tenant use
+ * @template T The service type this controller depends on
  */
 export default abstract class TenantSearchController<T> extends TenantBaseController<T> {
+    /**
+     * Search method for querying entities with tenant context
+     * @returns Function that handles tenant-specific search requests
+     */
     search(): (req: Request) => Promise<any>;
 }