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

package/src/service/curd/CurdProService.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 import {Config, Inject, Provide} from '@midwayjs/core';
-import {CrudPro} from '../../libs/crud-pro/CrudPro';
+import {CrudPro} from '@/libs/crud-pro/CrudPro';
 import {Context} from '@midwayjs/koa';
 import {
   IConnectionPool,
@@ -8,27 +8,26 @@ import {
   IRequestCfgModel,
   IRequestModel,
   ISqlCfgModel
-} from '../../libs/crud-pro/interfaces';
-import {SqlCfgModel} from '../../libs/crud-pro/models/SqlCfgModel';
+} 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 {KeysOfSimpleSQL, 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 { 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 {
-  CTX_VISITOR_ACCOUNT_TYPE,
-  CTX_VISITOR_AVATAR,
-  CTX_VISITOR_ID,
-  CTX_VISITOR_NICKNAME,
   IRequestCfgModel2,
   IVisitorExt,
-} from '../../models/bizmodels';
-import {IWorkbenchEntity} from '../../models/SystemEntities';
+} 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;
@@ -87,6 +86,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
     if (sqlDbType === SqlDbType.postgres) {
       const dbConfig = _.get(this.postgres2Config, dataBaseName);
       if (!dbConfig) {
+        console.error('postgres配置中不存在此数据库', JSON.stringify(sqlCfgModel));
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
       }
       return getPostgresConnectionPool(dataBaseName, dbConfig);
@@ -95,6 +95,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
     if (sqlDbType === SqlDbType.sqlserver) {
       const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
       if (!dbConfig) {
+        console.error('sqlserver配置中不存在此数据库', JSON.stringify(sqlCfgModel));
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'sqlserver配置中不存在此数据库:' + dataBaseName);
       }
       return getSqlServerConnectionPool(dataBaseName, dbConfig);
@@ -102,6 +103,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
 
     const dbConfig = _.get(this.mysql2Config, dataBaseName);
     if (!dbConfig) {
+      console.error('MySQL配置中不存在此数据库', JSON.stringify(sqlCfgModel));
       throw new CommonException(Exceptions.DB_NOT_FOUND, 'MySQL配置中不存在此数据库:' + dataBaseName);
     }
     return getMySQLConnectionPool(dataBaseName, dbConfig);
@@ -118,50 +120,23 @@ class MyContextFunc extends BaseExecuteContextFunc {
     }
     return null;
   }
-}
-
-export class DBUtils {
-  private readonly sqlDatabase: string;
-  private readonly sqlDbType: SqlDbType;
-  private readonly curdProService: CurdProService;
 
-  constructor(sqlDatabase: string, sqlDbType: SqlDbType, curdProService: CurdProService) {
-    this.sqlDatabase = sqlDatabase;
-    this.sqlDbType = sqlDbType;
-    this.curdProService = curdProService;
-  }
 
-  public async getOne(reqJson: IRequestModel, sqlTable: string): Promise<any> {
-    const cfgModel: IRequestCfgModel = {
-      sqlTable,
-      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-      sqlDatabase: this.sqlDatabase,
-      sqlDbType: this.sqlDbType,
-      updateCfg: {},
-    };
-    const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-    return res.getOneObj();
+  /**
+   * 在执行之前可以根据业务需要修改需要执行的内容
+   * @param reqJson
+   * @param cfgJson
+   */
+  async beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any> {
+    const { bizUpdateCfgModelForCrudPro } = GLOBAL_STATIC_CONFIG.getConfig();
+    if (typeof bizUpdateCfgModelForCrudPro === "function") {
+      await bizUpdateCfgModelForCrudPro(reqJson, cfgJson)
+    }
+    return Promise.resolve();
   }
 
-  public async getList(reqJson: IRequestModel, sqlTable: string): Promise<any[]> {
-    const cfgModel: IRequestCfgModel = {
-      sqlTable,
-      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      sqlDatabase: this.sqlDatabase,
-      sqlDbType: this.sqlDbType,
-      updateCfg: {},
-    };
-    const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-    return res.getResRows();
-  }
 }
 
-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
-}
 
 @Provide()
 export class CurdProService extends BaseService {
@@ -196,9 +171,15 @@ export class CurdProService extends BaseService {
 
     const crudPro = new CrudPro();
     crudPro.transaction = this.ctx.transaction;
-    crudPro.logger = this.getContextLogger();
+    crudPro.logger = this.getContextLogger() as any;
     crudPro.visitor = visitor;
-    crudPro.contextCfg = this.crudProCfg;
+
+    const crudProCfg: ICrudProCfg = this.crudProCfg || {};
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    crudProCfg.sysDatabaseName = SystemDbName;
+    crudProCfg.sysDatabaseDbType = SystemDbType;
+
+    crudPro.contextCfg = crudProCfg;
 
     crudPro.contextFunc = new MyContextFunc({
       mysql2Config: this.mysql2Config,
@@ -213,7 +194,7 @@ export class CurdProService extends BaseService {
    * 依赖缓存中与加载的配置
    * @param reqJson
    */
-  async executeCrud(reqJson: IRequestModel) {
+  async executeCrud(reqJson: IRequestModel): Promise<ExecuteContext> {
     if (!reqJson.method) {
       throw new Error('Method not implemented');
     }
@@ -234,141 +215,16 @@ export class CurdProService extends BaseService {
   // 直接执行一个请求
   async executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext> {
     this.logInfo('executeCrudByCfg', cfgModel);
-
-    if (!cfgModel.method) {
-      const req = this.ctx.req;
-      if (req) {
-        cfgModel.method = `${req.method}:${req.url}`;
-      } else {
-        cfgModel.method = 'anonymous';
-      }
-    }
-
-    if (!cfgModel.updateCfg) {
-      cfgModel.updateCfg = {};
-    }
-
-    // 应用标准的updateCfg
-    this.applyStandardUpdateCfg(cfgModel);
-
     const curdPro = this.getCrudPro();
-    return await curdPro.executeCrudByCfg(reqJson, cfgModel);
-  }
-
 
-  private applyStandardUpdateCfg( cfgModel: IRequestCfgModel2 ){
-
-    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);
-    }
+    // 应用标准的updateCfg。
+    fixCfgModel(cfgModel);
+    return await curdPro.executeCrudByCfg(reqJson, cfgModel);
   }
 
-
-
-
-  getBbUtil(database: string, sqlDbType: SqlDbType): DBUtils {
-    return new DBUtils(database, sqlDbType, this);
+  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> {

package/src/service/curd/fixCfgModel.ts

@@ -0,0 +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
+}