midway-fatcms 0.0.1-beta.22 → 0.0.1-beta.24

package/src/service/curd/CurdProService.ts

@@ -1,33 +1,24 @@
 import * as _ from 'lodash';
-import {Config, Inject, Provide} from '@midwayjs/core';
-import {CrudPro} from '@/libs/crud-pro/CrudPro';
-import {Context} from '@midwayjs/koa';
-import {
-  IConnectionPool,
-  ICrudProCfg,
-  IRequestCfgModel,
-  IRequestModel,
-  ISqlCfgModel
-} from '@/libs/crud-pro/interfaces';
-import {SqlCfgModel} from '@/libs/crud-pro/models/SqlCfgModel';
-import {getConnectionPool as getMySQLConnectionPool} from '../../libs/crud-pro/utils/pool/MySQLUtils';
-import {getConnectionPool as getPostgresConnectionPool} from '../../libs/crud-pro/utils/pool/PostgresUtils';
-import {getConnectionPool as getSqlServerConnectionPool} from '../../libs/crud-pro/utils/pool/SqlServerUtils';
-import { SqlDbType} from '@/libs/crud-pro/models/keys';
-import {CommonException, Exceptions} from '@/libs/crud-pro/exceptions';
-import {UserSessionInfo} from '@/models/userSession';
-import {BaseExecuteContextFunc} from '@/libs/crud-pro/models/ExecuteContextFunc';
-import {ExecuteContext, IExecuteContextHandler} from '@/libs/crud-pro/models/ExecuteContext';
-import {RelatedType} from './CurdMixUtils';
-import {BaseService} from '../base/BaseService';
-import {
-  IRequestCfgModel2,
-  IVisitorExt,
-} from '@/models/bizmodels';
-import {IWorkbenchEntity} from '@/models/SystemEntities';
-import {CrudProQuick} from "@/service/curd/CrudProQuick";
-import {fixCfgModel} from "./fixCfgModel";
-import {GLOBAL_STATIC_CONFIG} from "@/libs/global-config/global-config";
+import { Config, Inject, Provide } from '@midwayjs/core';
+import { CrudPro } from '@/libs/crud-pro/CrudPro';
+import { Context } from '@midwayjs/koa';
+import { IConnectionPool, ICrudProCfg, IRequestCfgModel, IRequestModel, ISqlCfgModel } from '@/libs/crud-pro/interfaces';
+import { SqlCfgModel } from '@/libs/crud-pro/models/SqlCfgModel';
+import { getConnectionPool as getMySQLConnectionPool } from '../../libs/crud-pro/utils/pool/MySQLUtils';
+import { getConnectionPool as getPostgresConnectionPool } from '../../libs/crud-pro/utils/pool/PostgresUtils';
+import { getConnectionPool as getSqlServerConnectionPool } from '../../libs/crud-pro/utils/pool/SqlServerUtils';
+import { SqlDbType } from '@/libs/crud-pro/models/keys';
+import { CommonException, Exceptions } from '@/libs/crud-pro/exceptions';
+import { UserSessionInfo } from '@/models/userSession';
+import { BaseExecuteContextFunc } from '@/libs/crud-pro/models/ExecuteContextFunc';
+import { ExecuteContext, IExecuteContextHandler } from '@/libs/crud-pro/models/ExecuteContext';
+import { RelatedType } from './CurdMixUtils';
+import { BaseService } from '../base/BaseService';
+import { IRequestCfgModel2, IVisitorExt } from '@/models/bizmodels';
+import { IWorkbenchEntity } from '@/models/SystemEntities';
+import { CrudProQuick } from '@/service/curd/CrudProQuick';
+import { fixCfgModel } from './fixCfgModel';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 function toVisitor(ctx: Context): IVisitorExt {
   const workbenchInfo: IWorkbenchEntity = ctx.workbenchInfo;
@@ -68,7 +59,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
 
   constructor(cfgMap: any, responseCfgHandlers: Record<string, IExecuteContextHandler>) {
     super();
-    const {mysql2Config, postgres2Config, sqlserver2Config} = cfgMap;
+    const { mysql2Config, postgres2Config, sqlserver2Config } = cfgMap;
     this.mysql2Config = mysql2Config;
     this.postgres2Config = postgres2Config;
     this.sqlserver2Config = sqlserver2Config;
@@ -77,7 +68,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
 
   async getConnectionPool(sqlCfgModel: SqlCfgModel): Promise<IConnectionPool> {
     if (!sqlCfgModel.sqlDatabase) {
-      console.error('查询语句中未指定数据库', sqlCfgModel.executeSql);
+      console.error('[MyContextFunc]查询语句中未指定数据库', sqlCfgModel.executeSql);
       throw new CommonException(Exceptions.DB_QUERY_PARAM_EMPTY, '查询语句中未指定数据库');
     }
     const dataBaseName = sqlCfgModel.sqlDatabase;
@@ -86,7 +77,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
     if (sqlDbType === SqlDbType.postgres) {
       const dbConfig = _.get(this.postgres2Config, dataBaseName);
       if (!dbConfig) {
-        console.error('postgres配置中不存在此数据库', JSON.stringify(sqlCfgModel));
+        console.error('[MyContextFunc]postgres配置中不存在此数据库', JSON.stringify(sqlCfgModel));
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
       }
       return getPostgresConnectionPool(dataBaseName, dbConfig);
@@ -95,7 +86,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
     if (sqlDbType === SqlDbType.sqlserver) {
       const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
       if (!dbConfig) {
-        console.error('sqlserver配置中不存在此数据库', JSON.stringify(sqlCfgModel));
+        console.error('[MyContextFunc]sqlserver配置中不存在此数据库', JSON.stringify(sqlCfgModel));
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'sqlserver配置中不存在此数据库:' + dataBaseName);
       }
       return getSqlServerConnectionPool(dataBaseName, dbConfig);
@@ -103,13 +94,12 @@ class MyContextFunc extends BaseExecuteContextFunc {
 
     const dbConfig = _.get(this.mysql2Config, dataBaseName);
     if (!dbConfig) {
-      console.error('MySQL配置中不存在此数据库', JSON.stringify(sqlCfgModel));
+      console.error('[MyContextFunc]MySQL配置中不存在此数据库', JSON.stringify(sqlCfgModel));
       throw new CommonException(Exceptions.DB_NOT_FOUND, 'MySQL配置中不存在此数据库:' + dataBaseName);
     }
     return getMySQLConnectionPool(dataBaseName, dbConfig);
   }
 
-
   async afterExecuteSQLList(): Promise<any> {
     const exeCtx = this.getExecuteContext();
     const handlers = Object.values(this.responseCfgHandlers);
@@ -121,7 +111,6 @@ class MyContextFunc extends BaseExecuteContextFunc {
     return null;
   }
 
-
   /**
    * 在执行之前可以根据业务需要修改需要执行的内容
    * @param reqJson
@@ -129,15 +118,13 @@ class MyContextFunc extends BaseExecuteContextFunc {
    */
   async beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any> {
     const { bizUpdateCfgModelForCrudPro } = GLOBAL_STATIC_CONFIG.getConfig();
-    if (typeof bizUpdateCfgModelForCrudPro === "function") {
-      await bizUpdateCfgModelForCrudPro(reqJson, cfgJson)
+    if (typeof bizUpdateCfgModelForCrudPro === 'function') {
+      await bizUpdateCfgModelForCrudPro(reqJson, cfgJson);
     }
     return Promise.resolve();
   }
-
 }
 
-
 @Provide()
 export class CurdProService extends BaseService {
   @Inject()
@@ -161,6 +148,10 @@ export class CurdProService extends BaseService {
     this.responseCfgHandlers[key] = handler;
   }
 
+  public getResponseCfgHandlers(): Record<RelatedType, IExecuteContextHandler> {
+    return this.responseCfgHandlers;
+  }
+
   /**
    * Execute级别：每次调用都会产生新的
    * @private
@@ -181,11 +172,14 @@ export class CurdProService extends BaseService {
 
     crudPro.contextCfg = crudProCfg;
 
-    crudPro.contextFunc = new MyContextFunc({
-      mysql2Config: this.mysql2Config,
-      postgres2Config: this.postgres2Config,
-      sqlserver2Config: this.sqlserver2Config
-    }, this.responseCfgHandlers);
+    crudPro.contextFunc = new MyContextFunc(
+      {
+        mysql2Config: this.mysql2Config,
+        postgres2Config: this.postgres2Config,
+        sqlserver2Config: this.sqlserver2Config,
+      },
+      this.responseCfgHandlers
+    );
 
     return crudPro;
   }
@@ -213,7 +207,7 @@ export class CurdProService extends BaseService {
   }
 
   // 直接执行一个请求
-  async executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext> {
+  public async executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext> {
     this.logInfo('executeCrudByCfg', cfgModel);
     const curdPro = this.getCrudPro();
 
@@ -222,14 +216,14 @@ export class CurdProService extends BaseService {
     return await curdPro.executeCrudByCfg(reqJson, cfgModel);
   }
 
-  getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick {
+  public getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick {
     const curdPro = this.getCrudPro();
     return new CrudProQuick(curdPro, sqlDatabase, sqlDbType, sqlTable);
   }
 
   public async getCachedCfgByMethod(method: string): Promise<IRequestCfgModel> {
     const curdPro = this.getCrudPro();
-    const isEnableCache = !this.isEnableDebug();  // 开发环境不使用缓存
+    const isEnableCache = !this.isEnableDebug(); // 开发环境不使用缓存
     return curdPro.getCachedCfgByMethod(method, isEnableCache);
   }
 }

package/src/service/curd/fixCfgModel.ts

@@ -1,139 +1,139 @@
-import {
-  CTX_VISITOR_ACCOUNT_TYPE,
-  CTX_VISITOR_AVATAR,
-  CTX_VISITOR_ID,
-  CTX_VISITOR_NICKNAME,
-  IRequestCfgModel2
-} from "@/models/bizmodels";
-import {KeysOfSimpleSQL} from "@/libs/crud-pro/models/keys";
-
-function isSimpleQuery(sqlSimpleName: KeysOfSimpleSQL): boolean {
-  return sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY ||
-    sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_COUNT ||
-    sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_PAGE ||
-    sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_ONE
-}
-
-
-
-function fixCfgModel(cfgModel: IRequestCfgModel2 ){
-
-  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: CTX_VISITOR_ID},
-    'condition.created_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
-
-    'data.created_by': {contextAsString: CTX_VISITOR_ID},
-    'data.created_avatar': {contextAsString: CTX_VISITOR_AVATAR},
-    'data.created_nickname': {contextAsString: CTX_VISITOR_NICKNAME},
-    'data.created_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
-
-    'data.modified_by': {contextAsString: CTX_VISITOR_ID},
-    'data.modified_avatar': {contextAsString: CTX_VISITOR_AVATAR},
-    'data.modified_nickname': {contextAsString: CTX_VISITOR_NICKNAME},
-    'data.modified_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
-  };
-
-
-  const buildUpdateCfgBy = (cfgArray: string[], prefix: string): any => {
-    const obj: any = {};
-    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 === KeysOfSimpleSQL.SIMPLE_DELETE) {
-    const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 删除用户本人创建的
-    Object.assign(cfgModel.updateCfg, updateCfgObj);
-  }
-
-  // 插入语句
-  if (sqlSimpleName === KeysOfSimpleSQL.SIMPLE_INSERT) {
-    const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray,'data.created')
-    Object.assign(cfgModel.updateCfg, updateCfgObj1);
-  }
-
-  // 更新语句
-  if (sqlSimpleName === 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 === KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE ||
-    sqlSimpleName === 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);
-  }
-}
-
-
-
-export {
-  fixCfgModel
-}
+import {
+  CTX_VISITOR_ACCOUNT_TYPE,
+  CTX_VISITOR_AVATAR,
+  CTX_VISITOR_ID,
+  CTX_VISITOR_NICKNAME,
+  IRequestCfgModel2
+} from "@/models/bizmodels";
+import {KeysOfSimpleSQL} from "@/libs/crud-pro/models/keys";
+
+function isSimpleQuery(sqlSimpleName: KeysOfSimpleSQL): boolean {
+  return sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY ||
+    sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_COUNT ||
+    sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_PAGE ||
+    sqlSimpleName === KeysOfSimpleSQL.SIMPLE_QUERY_ONE
+}
+
+
+
+function fixCfgModel(cfgModel: IRequestCfgModel2 ){
+
+  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: CTX_VISITOR_ID},
+    'condition.created_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
+
+    'data.created_by': {contextAsString: CTX_VISITOR_ID},
+    'data.created_avatar': {contextAsString: CTX_VISITOR_AVATAR},
+    'data.created_nickname': {contextAsString: CTX_VISITOR_NICKNAME},
+    'data.created_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
+
+    'data.modified_by': {contextAsString: CTX_VISITOR_ID},
+    'data.modified_avatar': {contextAsString: CTX_VISITOR_AVATAR},
+    'data.modified_nickname': {contextAsString: CTX_VISITOR_NICKNAME},
+    'data.modified_account_type': {contextAsString: CTX_VISITOR_ACCOUNT_TYPE},
+  };
+
+
+  const buildUpdateCfgBy = (cfgArray: string[], prefix: string): any => {
+    const obj: any = {};
+    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 === KeysOfSimpleSQL.SIMPLE_DELETE) {
+    const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 删除用户本人创建的
+    Object.assign(cfgModel.updateCfg, updateCfgObj);
+  }
+
+  // 插入语句
+  if (sqlSimpleName === KeysOfSimpleSQL.SIMPLE_INSERT) {
+    const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray,'data.created')
+    Object.assign(cfgModel.updateCfg, updateCfgObj1);
+  }
+
+  // 更新语句
+  if (sqlSimpleName === 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 === KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE ||
+    sqlSimpleName === 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);
+  }
+}
+
+
+
+export {
+  fixCfgModel
+}