midway-fatcms 0.0.1-beta.13 → 0.0.1-beta.16

package/dist/service/curd/fixCfgModel.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixCfgModel = void 0;
+const bizmodels_1 = require("../../models/bizmodels");
+const keys_1 = require("../../libs/crud-pro/models/keys");
+function isSimpleQuery(sqlSimpleName) {
+    return sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY ||
+        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT ||
+        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE ||
+        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE;
+}
+function fixCfgModel(cfgModel) {
+    if (!cfgModel.method) {
+        cfgModel.method = 'anonymous';
+    }
+    if (!cfgModel.updateCfg) {
+        cfgModel.updateCfg = {};
+    }
+    const sqlSimpleName = cfgModel.sqlSimpleName;
+    const enableStandardUpdateCfg = cfgModel.enableStandardUpdateCfg; // 用于设置data字段
+    const enableStandardUpdateCfgCondition = cfgModel.enableStandardUpdateCfgCondition; // 用于设置condition字段
+    // 彻底关闭
+    if (enableStandardUpdateCfg === false) {
+        return;
+    }
+    const getDataCfgArray = () => {
+        // 明确有配置
+        if (Array.isArray(enableStandardUpdateCfg)) {
+            if (enableStandardUpdateCfg.includes('null')) {
+                return [];
+            }
+            return enableStandardUpdateCfg;
+        }
+        // update 、insert 添加 by
+        return ['by']; // 创建/修改语句默认添加by
+    };
+    const getConditionCfgArray = () => {
+        // 明确有配置
+        if (Array.isArray(enableStandardUpdateCfgCondition)) {
+            if (enableStandardUpdateCfgCondition.includes('null')) {
+                return [];
+            }
+            return enableStandardUpdateCfgCondition;
+        }
+        return [];
+    };
+    const dataCfgArray = getDataCfgArray();
+    const conditionCfgArray = getConditionCfgArray();
+    const mapping = {
+        'condition.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'condition.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+        'data.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'data.created_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
+        'data.created_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
+        'data.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+        'data.modified_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'data.modified_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
+        'data.modified_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
+        'data.modified_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+    };
+    const buildUpdateCfgBy = (cfgArray, prefix) => {
+        const obj = {};
+        if (Array.isArray(cfgArray)) {
+            for (let i = 0; i < cfgArray.length; i++) {
+                const suffix = cfgArray[i];
+                if (suffix) {
+                    const key = `${prefix}_${suffix}`;
+                    obj[key] = mapping[key];
+                }
+            }
+        }
+        return obj;
+    };
+    // 查询语句
+    if (isSimpleQuery(sqlSimpleName)) {
+        const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 查询用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj);
+    }
+    // 删除语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_DELETE) {
+        const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 删除用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj);
+    }
+    // 插入语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+    }
+    // 更新语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
+        const updateCfgObj2 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+        Object.assign(cfgModel.updateCfg, updateCfgObj2);
+    }
+    // 插入或更新
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE ||
+        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
+        const updateCfgObj2 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
+        const updateCfgObj3 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+        Object.assign(cfgModel.updateCfg, updateCfgObj2);
+        Object.assign(cfgModel.updateCfg, updateCfgObj3);
+    }
+}
+exports.fixCfgModel = fixCfgModel;

package/package.json

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

package/src/configuration.ts

@@ -13,8 +13,9 @@ import { join } from 'path';
 // import { NotFoundFilter } from './filter/notfound.filter';
 import { GlobalMiddleware } from './middleware/global.middleware';
 import { ForbiddenMiddleware } from './middleware/forbidden.middleware';
-import { startSchedule } from './schedule';
+import { startScheduleLoop } from './schedule';
 import { privateAES } from './libs/utils/crypto-utils';
+import { ALL_SCHEDULE_NAMES } from "@/schedule/scheduleNames";
 
 @Configuration({
   // namespace: 'fatcms',
@@ -63,16 +64,11 @@ export class ContainerLifeCycle {
   }
 
   async onReady() {
-    const logger = this.app.getLogger();
-    const config = this.app.getConfig();
-
-    if (config.fatcmsScheduleService) {
-      // 启动定时任务
-      const scheduleServiceList = ['proxyApiLoadService', 'workbenchService', 'visitStatService', 'asyncTaskRunnerService'];
-      await startSchedule(this.app, scheduleServiceList);
-      logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ' );
-    }
 
+    /**
+     * 启动定时任务
+     */
+    await this.startScheduleOnReady();
 
     // add middleware
     this.app.useMiddleware(ForbiddenMiddleware);
@@ -81,4 +77,28 @@ export class ContainerLifeCycle {
     // add filter
     // this.app.useFilter([NotFoundFilter, DefaultErrorFilter]);
   }
+
+  private async startScheduleOnReady(){
+    const logger = this.app.getLogger();
+    const config = this.app.getConfig();
+    const fatcmsScheduleService: boolean | string[] = config.fatcmsScheduleService;
+
+    // 关闭定时任务
+    if (fatcmsScheduleService === false || fatcmsScheduleService === null) {
+      return;
+    }
+
+
+    let scheduleServiceList = ALL_SCHEDULE_NAMES
+
+    // 启动部分定时任务
+    if (Array.isArray(fatcmsScheduleService)){
+      scheduleServiceList = fatcmsScheduleService;
+    }
+    await startScheduleLoop(scheduleServiceList);
+    logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ： ' + JSON.stringify(scheduleServiceList) );
+  }
+
+
+
 }

package/src/controller/gateway/AnyApiGatewayController.ts

@@ -2,7 +2,7 @@ import { All, Controller, Inject, Param } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
 import * as _ from 'lodash';
-import { AnyApiService } from '../../service/anyapi/AnyApiService';
+import { AnyApiService } from '@/service/anyapi/AnyApiService';
 
 /**
  * FaaS方式配置的接口

package/src/controller/gateway/AsyncTaskController.ts

@@ -1,12 +1,21 @@
-import { Controller, Inject, Get, Post, Query } from '@midwayjs/core';
+import { Controller, Inject, Post, Query } from '@midwayjs/core';
 
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
 import {AsyncTaskService} from "@/service/asyncTask/AsyncTaskService";
-import {SysAsyncTaskEntity, TaskStatus} from "@/models/AsyncTaskModel";
+import {SysAsyncTaskEntity, SysAsyncTaskStatus} from "@/models/AsyncTaskModel";
 import {KeysOfSimpleSQL} from "@/libs/crud-pro/models/keys";
 import {SystemTables} from "@/models/SystemTables";
 import {CommonException} from "@/libs/crud-pro/exceptions";
+import {checkLogin} from "@/middleware/permission.middleware";
+
+
+function fixMyTasksCondition(body:any,ctx: Context){
+  if(!body.condition) {
+    throw new CommonException("参数不正确");
+  }
+  body.condition.created_by = ctx.userSession.getSessionInfo().accountId;
+}
 
 
 function fixCancelBodyData(body:any, id: number) {
@@ -21,26 +30,29 @@ function fixCancelBodyData(body:any, id: number) {
 
   // fix data
   const dataObj: SysAsyncTaskEntity = (body.data || {}) as any;
-  dataObj.task_status = TaskStatus.CANCELLED;
+  dataObj.task_status = SysAsyncTaskStatus.CANCELLED;
   body.data = dataObj;
 }
 
 
-function fixCreateBodyData(body:any) {
+function fixCreateBodyData(body:any, ctx: Context) {
   if(!body.data) {
     throw new CommonException("参数不正确");
   }
 
+  const sessionInfo = ctx.userSession.getSessionInfo();
   // fix data
   const dataObj: SysAsyncTaskEntity = (body.data || {}) as any;
-  dataObj.task_status = TaskStatus.PENDING;
+  dataObj.task_status = SysAsyncTaskStatus.PENDING;
+  dataObj.created_by = sessionInfo.accountId;
+  dataObj.created_user_session = JSON.stringify(sessionInfo); // 创建人的session信息。用于执行时的鉴权。
 }
 
 
 /**
  * 异步任务框架
  */
-@Controller('/ns/gw/AsyncTask')
+@Controller('/ns/gw/AsyncTask', { middleware: [checkLogin()] })
 export class AsyncTaskController extends BaseApiController {
   @Inject()
   protected ctx: Context;
@@ -49,15 +61,16 @@ export class AsyncTaskController extends BaseApiController {
   private asyncTaskService: AsyncTaskService;
 
   // 获取任务列表
-  @Get('/getMyTasks')
+  @Post('/getMyTasks')
   async getMyTasks() {
+    fixMyTasksCondition(this.ctx.request.body, this.ctx);
     return this.executeSysSimpleSQL(SystemTables.sys_async_tasks, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
   }
 
   // 创建任务
   @Post('/createTask')
   async createTask() {
-    fixCreateBodyData(this.ctx.request.body);
+    fixCreateBodyData(this.ctx.request.body, this.ctx);
     const res = await this.executeSysSimpleSQL(SystemTables.sys_async_tasks, KeysOfSimpleSQL.SIMPLE_INSERT);
     await this.asyncTaskService.startTask();
     return res;

package/src/controller/gateway/CrudMtdGatewayController.ts

@@ -21,11 +21,11 @@ function pickAsQuery(query_as_pick: string, query: any): any {
   return query;
 }
 
-// /ns/gw/api/crudMtd/getUser?__query_as_condition__=id&_query_as_data__=name&&id=1&name=22
+// /ns/gw/crudApi/getUser?__query_as_condition__=id&_query_as_data__=name&&id=1&name=22
 /**
- *    query形式1：GET: /ns/gw/api/crudMtd/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
- *    query形式2：GET: /ns/gw/api/crudMtd/getUser?__query_as__=condition&id=1&name=22
- *    query形式3：GET: /ns/gw/api/crudMtd/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
+ *    query形式1：GET: /ns/gw/crudApi/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
+ *    query形式2：GET: /ns/gw/crudApi/getUser?__query_as__=condition&id=1&name=22
+ *    query形式3：GET: /ns/gw/crudApi/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
  *
  * 执行单个配置的接口
  */
@@ -57,7 +57,7 @@ export class CrudMtdGatewayController extends ApiBaseService {
       return CommonResult.errorRes('接口不存在或已下线: ' + methodCode);
     }
 
-    this.logInfo("methodInfo=== ", methodInfo)
+    this.logInfo('methodInfo=== ', methodInfo);
 
     const workbench_code_array = methodInfo.workbench_code_array || methodInfo.workbenchCodeArray;
     const isSupport = await this.workbenchService.isSupportCurrentWorkbench(workbench_code_array);

package/src/controller/manage/DocManageApi.ts

@@ -1,11 +1,11 @@
 import { Controller, Inject, Post } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL, KeysOfValidators } from '../../libs/crud-pro/models/keys';
+import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
 import { BaseApiController } from '../base/BaseApiController';
-import { checkPermission } from '../../middleware/permission.middleware';
-import { SystemFuncCode } from '../../models/SystemPerm';
-import { SystemTables } from '../../models/SystemTables';
-import { CTX_VISITOR_ID, CTX_WORKBENCH_CODE } from '../../models/bizmodels';
+import { checkPermission } from '@/middleware/permission.middleware';
+import { SystemFuncCode } from '@/models/SystemPerm';
+import { SystemTables } from '@/models/SystemTables';
+import { CTX_VISITOR_ID, CTX_WORKBENCH_CODE } from '@/models/bizmodels';
 
 const publishUpdateCfg = {
   'data.last_publish_by': { contextAsString: CTX_VISITOR_ID },

package/src/index.ts

@@ -8,6 +8,7 @@ export * from './controller/gateway/FileController';
 export * from './controller/gateway/ProxyApiGatewayController';
 export * from './controller/gateway/PublicApiController';
 export * from './controller/gateway/StaticController';
+export * from './controller/gateway/AsyncTaskController';
 export * from './controller/helpers.controller';
 export * from './controller/home.controller';
 export * from './controller/manage/AnyApiMangeApi';
@@ -63,8 +64,11 @@ export * from './service/curd/CurdMixBySysConfigService';
 export * from './service/curd/CurdMixByWorkbenchService';
 export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdProService';
+export * from './service/curd/CrudProQuick';
 export * from './service/proxyapi/ProxyApiLoadService';
 export * from './service/proxyapi/ProxyApiService';
+export * from './service/asyncTask/AsyncTaskService';
+export * from './service/asyncTask/AsyncTaskRunnerService';
 export * from './models/userSession';
 export * from './models/bizmodels';
 export * from './models/SystemEntities';
@@ -72,6 +76,8 @@ export * from './models/SystemPerm';
 export * from './models/contextLogger';
 export * from './models/devops';
 export * from './models/SystemTables';
+export * from './models/AsyncTaskModel';
+export * from './schedule/index';
 
 
 export * from './libs/utils/common-dto';
@@ -95,5 +101,6 @@ export * from './libs/crud-pro/models/keys';
 export * from './libs/crud-pro/models/ExecuteContextFunc';
 export * from './libs/crud-pro/models/RequestCfgModel';
 export * from './libs/crud-pro/models/SqlSegArg';
+export * from './libs/crud-pro/models/ResModel';
 
 export * from './libs/global-config/global-config';

package/src/libs/crud-pro/CrudPro.ts

@@ -89,6 +89,9 @@ class CrudPro {
     const logger = this.executeContext.getLogger();
     logger.info('CurdPro executeCrudByCfg', cfgJson);
 
+    // 在执行之前可以根据业务需要修改需要执行的内容。
+    await this.beforeExecuteSQLList(reqJson, cfgJson);
+
     const exeCtx = this.executeContext;
 
     if (!cfgJson.method) {
@@ -153,6 +156,11 @@ class CrudPro {
   private async afterExecuteSQLList() {
     return this.executeContext.contextFunc.afterExecuteSQLList();
   }
+
+  private async beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel) {
+    return this.executeContext.contextFunc.beforeExecuteSQLList(reqJson, cfgJson);
+  }
+
 }
 
 export { CrudPro };

package/src/libs/crud-pro/defaultConfigs.ts

@@ -1,7 +1,9 @@
 import { ICrudProCfg } from './interfaces';
+import { SqlDbType } from './models/keys';
 
 export const defaultCrudProCfg: ICrudProCfg = {
   sysDatabaseName: 'fatcms',
+  sysDatabaseDbType: SqlDbType.mysql, // 默认系统数据库名称，默认 mysql
   sysConfigTableName: 'sys_configs', // 数据表：通用配置
   dictItemTableName: 'sys_data_dict_item', // 数据表：数据字典，字典项。
   methodsTableName: 'sys_crud_methods',

package/src/libs/crud-pro/interfaces.ts

@@ -4,6 +4,7 @@ import {KeysOfAuthType, KeysOfSimpleSQL, KeysOfValidators, SqlDbType} from './mo
 
 export interface ICrudProCfg {
   sysDatabaseName?: string; // 默认系统数据库名称，默认 fatcms
+  sysDatabaseDbType?: SqlDbType; // 默认系统数据库名称，默认 mysql
   methodsTableName?: string; // 方法配置的表名，默认 sys_crud_methods
   methodsCacheTime?: number; //内存缓存时间默认 1分钟
   dictItemTableName?: string; // 字典项表名称，默认：sys_data_dict_item
@@ -133,7 +134,7 @@ export interface ISqlCfgModel extends IBaseCfgModel {
   originSql?: string; // 有特殊占位符的SQL, 原始的SQL
   validate?: IFuncCfgModel; //执行前，进行校验，校验不通过就抛出异常. 校验函数可以返回 boolean或直接抛出异常
   executeWhen?: IFuncCfgModel; //满足表达式的结果，才能执行。 默认：true 校验函数必须返回 boolean
-  executeSql?: string; // 可以运行的SQL
+  executeSql?: string; // 可以运行的SQL。在postgres/sqlserver环境下也可以使用问号。
   executeSqlArgs?: any[]; //可以运行的SQL的参数
   crudType?: string;
 }
@@ -181,3 +182,11 @@ export interface ILogger {
   error(msg: any, ...args: any[]): void;
   warn(msg: any, ...args: any[]): void;
 }
+
+
+
+export interface IExecuteUnsafeQueryCtx {
+  sqlTable: string;
+  sqlDatabase: string;
+  sqlDbType: SqlDbType;
+}

package/src/libs/crud-pro/models/ExecuteContext.ts

@@ -7,6 +7,7 @@ import { Transaction } from './Transaction';
 import { ICrudProCfg, ILogger, IVisitor } from '../interfaces';
 import { IExecuteContextFunc } from './ExecuteContextFunc';
 import { defaultCrudProCfg } from '../defaultConfigs';
+import { ResModelFlexible } from "./ResModel";
 
 
 class ExecuteContext {
@@ -20,7 +21,7 @@ class ExecuteContext {
   // 运行时设置的。
   private sqlCfgModels: SqlCfgModel[] = [];
   private reqModel: RequestModel = null;
-  private resModel: Record<string, any> = {};
+  private resModel: ResModelFlexible = {};
   private cfgModel: RequestCfgModel = null;
 
   setTransaction(transaction: Transaction) {
@@ -62,7 +63,7 @@ class ExecuteContext {
     this.reqModel = reqModel;
   }
 
-  getResModel(): Record<string, any> {
+  getResModel(): ResModelFlexible {
     return this.resModel;
   }
 
@@ -108,4 +109,6 @@ interface IExecuteContextHandler {
   handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
 }
 
+
+
 export { ExecuteContext, IExecuteContextHandler };

package/src/libs/crud-pro/models/ExecuteContextFunc.ts

@@ -1,4 +1,4 @@
-import { IConnectionPool } from '../interfaces';
+import {IConnectionPool, IRequestCfgModel, IRequestModel} from '../interfaces';
 import { ExecuteContext } from './ExecuteContext';
 import { SqlCfgModel } from './SqlCfgModel';
 import { RequestCfgModel } from './RequestCfgModel';
@@ -14,6 +14,7 @@ export interface IExecuteContextFunc {
   getFunctionMap(): any;
   validateByAuthCfg(cfgModel: RequestCfgModel, reqModel: RequestModel): Promise<any>;
   afterExecuteSQLList(): Promise<any>;
+  beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any>;
 }
 
 export class BaseExecuteContextFunc implements IExecuteContextFunc {
@@ -76,6 +77,16 @@ export class BaseExecuteContextFunc implements IExecuteContextFunc {
     return null;
   }
 
+
+  /**
+   * 在执行之前可以根据业务需要修改需要执行的内容
+   * @param reqJson
+   * @param cfgJson
+   */
+  beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any> {
+    return Promise.resolve();
+  }
+
   getExecuteContext(): ExecuteContext {
     return this.executeContext;
   }

package/src/libs/crud-pro/models/ResModel.ts

@@ -0,0 +1,24 @@
+
+interface ResModelAffected {
+  insertId?: string | number;
+  affectedRows: number;
+}
+
+interface ResModelStandard {
+  row?: any,
+  rows?: any[],
+  total_count?: number,
+  affected?: ResModelAffected,
+  insert_affected?: ResModelAffected,
+  update_affected?: ResModelAffected,
+}
+
+type ResModelFlexible = ResModelStandard & {
+  [key: string]: any;
+};
+
+export {
+  ResModelAffected,
+  ResModelStandard,
+  ResModelFlexible
+}

package/src/libs/crud-pro/services/CrudProCachedCfgService.ts

@@ -7,46 +7,54 @@ import MemoryRefreshCache from '../utils/MemoryRefreshCache';
 
 const methodCache = new MemoryRefreshCache();
 
-
 function parseMethodInfo(methodInfo: any): any {
   const row: any = camelizeKeys(methodInfo as object); //转换成驼峰
   const configObject = MixinUtils.parseJsonObject(row.moreConfig) || {};
   const sqlCfgList = MixinUtils.parseJsonObject(row.sqlCfgList) || [];
-  return {...configObject, ...row, sqlCfgList};
+  return { ...configObject, ...row, sqlCfgList };
 }
 
-
-
 class CrudProCachedCfgService extends CrudProServiceBase {
   constructor(serviceHub: ICurdProServiceHub) {
     super(serviceHub);
   }
 
   public async getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null> {
+    const methodInfo = await this.getCachedCfgByMethodInner(method, isEnableCache);
+    if (!methodInfo) {
+      return null;
+    }
+    return { ...methodInfo };
+  }
 
+  private async getCachedCfgByMethodInner(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null> {
     // 不使用缓存
     if (!isEnableCache) {
-      return await this.loadMethodInfo(method)
+      return await this.loadMethodInfo(method);
     }
 
     methodCache.setProps({
-      keepTime: 2000,
+      keepTime: 1000 * 60 * 2, // 2分钟
       requestFn: () => this.loadMethodInfoList(),
       getKeyFn: item => item.method,
     });
-    return await methodCache.getItem(method);
+    const methodInfo = await methodCache.getItem(method);
+    if (methodInfo) {
+      return methodInfo;
+    }
+    return await this.loadMethodInfo(method);
   }
 
-
   private async loadMethodInfo(method: string): Promise<any> {
-    const {methodsTableName, sysDatabaseName} = this.getContextCfg();
-    const sql = `select *
-                 from ${methodsTableName}
-                 where method = ? `; // 全部加载到内存
+    const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
+    const sql = `select * from ${methodsTableName} where method = ? `; // 全部加载到内存
+
     const baseInfo = {
-      tableName: methodsTableName, // // 方法配置的表名，默认 sys_crud_pro_methods
-      dbName: sysDatabaseName,
+      sqlTable: methodsTableName,
+      sqlDatabase: sysDatabaseName,
+      sqlDbType: sysDatabaseDbType,
     };
+
     const [rows] = await this.executeUnsafeQuery(baseInfo, sql, [method]);
     const rows2: any[] = rows as object[];
     if (rows2.length > 0) {
@@ -58,11 +66,12 @@ class CrudProCachedCfgService extends CrudProServiceBase {
 
 
   private async loadMethodInfoList(): Promise<any[]> {
-    const { methodsTableName, sysDatabaseName } = this.getContextCfg();
+    const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
     const sql = `select * from ${methodsTableName}`; // 全部加载到内存
     const baseInfo = {
-      tableName: methodsTableName, // // 方法配置的表名，默认 sys_crud_pro_methods
-      dbName: sysDatabaseName,
+      sqlTable: methodsTableName,
+      sqlDatabase: sysDatabaseName,
+      sqlDbType: sysDatabaseDbType
     };
     const [rows] = await this.executeUnsafeQuery(baseInfo, sql);
     const rows2: any[] = rows as object[];

package/src/libs/crud-pro/services/CrudProServiceBase.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 import { ICurdProServiceHub } from '../models/ServiceHub';
-import {ICrudProCfg, ILogger, IPoolConnectionClient} from '../interfaces';
+import {ICrudProCfg, IExecuteUnsafeQueryCtx, ILogger, IPoolConnectionClient} from '../interfaces';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { ExecuteContext } from '../models/ExecuteContext';
 import { MixinUtils } from '../utils/MixinUtils';
@@ -19,10 +19,6 @@ function createBuildInExecuteFuncMap() {
   };
 }
 
-interface ExecuteUnsafeQueryCtx {
-  tableName: string;
-  dbName: string;
-}
 
 const buildInExecuteFuncMap = createBuildInExecuteFuncMap();
 
@@ -60,10 +56,11 @@ class CrudProServiceBase {
    * @param values
    * @protected
    */
-  protected async executeUnsafeQuery(obj: ExecuteUnsafeQueryCtx, sql: string, values?: any) {
+  protected async executeUnsafeQuery(obj: IExecuteUnsafeQueryCtx, sql: string, values?: any) {
     const sqlCfgModel: any = {
-      sqlTable: obj.tableName,
-      sqlDatabase: obj.dbName,
+      sqlTable: obj.sqlTable,
+      sqlDatabase: obj.sqlDatabase,
+      sqlDbType: obj.sqlDbType,
       columns: [],
       columnsRelation: [],
       maxLimit: DEFAULT_MAX_LIMIT,