midway-fatcms 0.0.1-beta.10 → 0.0.1-beta.12

package/src/service/crudstd/CrudStdService.ts

@@ -51,7 +51,7 @@ export class CrudStdService extends ApiBaseService {
 
     const cfgModel: IRequestCfgModel = {
       sqlDatabase: dbName,
-      sqlDdType: dbType,
+      sqlDbType: dbType,
       sqlTable: stdCrudCfgObj.tableBaseInfo.tableName,
       sqlSimpleName,
     };
@@ -149,7 +149,7 @@ export class CrudStdService extends ApiBaseService {
       sqlTable: SystemTables.sys_app,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
     return await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, ss);
   }

package/src/service/curd/CurdMixByAccountService.ts

@@ -53,7 +53,7 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
       sqlTable: SystemTables.sys_user_account,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
 
     const reqJson: IRequestModel = {

package/src/service/curd/CurdMixByDictService.ts

@@ -78,7 +78,7 @@ export class CurdMixByDictService implements IExecuteContextHandler {
           sqlTable: SystemTables.sys_data_dict_item,
           sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
           sqlDatabase: SystemDbName,
-          sqlDdType: SystemDbType,
+          sqlDbType: SystemDbType,
         }
       );
       selectedRows = res1.getResRows();

package/src/service/curd/CurdMixByLinkToCustomService.ts

@@ -124,7 +124,7 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
         sqlTable,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: dbName,
-        sqlDdType: dbType,
+        sqlDbType: dbType,
         maxLimit: 4000,
       }
     );

package/src/service/curd/CurdMixBySysConfigService.ts

@@ -43,7 +43,7 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
         sqlTable: SystemTables.sys_configs,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const rows = res1.getResRows();

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -43,7 +43,7 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
         sqlTable: SystemTables.sys_workbench,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       });
       const workbenchList = res.getResRows();
       workbenchListMap = MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);

package/src/service/curd/CurdMixService.ts

@@ -44,9 +44,9 @@ export class CurdMixService {
     return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
   }
 
-  getBbUtil(database: string, sqlDdType: SqlDbType) {
+  getBbUtil(database: string, sqlDbType: SqlDbType) {
     this.prepare();
-    return this.curdProService.getBbUtil(database, sqlDdType);
+    return this.curdProService.getBbUtil(database, sqlDbType);
   }
 
   async executeSQL(sqlCfgModel: ISqlCfgModel) {

package/src/service/curd/CurdProService.ts

@@ -82,9 +82,9 @@ class MyContextFunc extends BaseExecuteContextFunc {
       throw new CommonException(Exceptions.DB_QUERY_PARAM_EMPTY, '查询语句中未指定数据库');
     }
     const dataBaseName = sqlCfgModel.sqlDatabase;
-    const sqlDdType = sqlCfgModel.sqlDdType;
+    const sqlDbType = sqlCfgModel.sqlDbType;
 
-    if (sqlDdType === SqlDbType.postgres) {
+    if (sqlDbType === SqlDbType.postgres) {
       const dbConfig = _.get(this.postgres2Config, dataBaseName);
       if (!dbConfig) {
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'postgres配置中不存在此数据库:' + dataBaseName);
@@ -92,7 +92,7 @@ class MyContextFunc extends BaseExecuteContextFunc {
       return getPostgresConnectionPool(dataBaseName, dbConfig);
     }
 
-    if (sqlDdType === SqlDbType.sqlserver) {
+    if (sqlDbType === SqlDbType.sqlserver) {
       const dbConfig = _.get(this.sqlserver2Config, dataBaseName);
       if (!dbConfig) {
         throw new CommonException(Exceptions.DB_NOT_FOUND, 'sqlserver配置中不存在此数据库:' + dataBaseName);
@@ -122,12 +122,12 @@ class MyContextFunc extends BaseExecuteContextFunc {
 
 export class DBUtils {
   private readonly sqlDatabase: string;
-  private readonly sqlDdType: SqlDbType;
+  private readonly sqlDbType: SqlDbType;
   private readonly curdProService: CurdProService;
 
-  constructor(sqlDatabase: string, sqlDdType: SqlDbType, curdProService: CurdProService) {
+  constructor(sqlDatabase: string, sqlDbType: SqlDbType, curdProService: CurdProService) {
     this.sqlDatabase = sqlDatabase;
-    this.sqlDdType = sqlDdType;
+    this.sqlDbType = sqlDbType;
     this.curdProService = curdProService;
   }
 
@@ -136,7 +136,7 @@ export class DBUtils {
       sqlTable,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
       sqlDatabase: this.sqlDatabase,
-      sqlDdType: this.sqlDdType,
+      sqlDbType: this.sqlDbType,
       updateCfg: {},
     };
     const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
@@ -148,7 +148,7 @@ export class DBUtils {
       sqlTable,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: this.sqlDatabase,
-      sqlDdType: this.sqlDdType,
+      sqlDbType: this.sqlDbType,
       updateCfg: {},
     };
     const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
@@ -367,8 +367,8 @@ export class CurdProService extends BaseService {
 
 
 
-  getBbUtil(database: string, sqlDdType: SqlDbType): DBUtils {
-    return new DBUtils(database, sqlDdType, this);
+  getBbUtil(database: string, sqlDbType: SqlDbType): DBUtils {
+    return new DBUtils(database, sqlDbType, this);
   }
 
   public async getCachedCfgByMethod(method: string): Promise<IRequestCfgModel> {

package/src/service/proxyapi/ProxyApiLoadService.ts

@@ -99,7 +99,7 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
       {
         sqlTable: SystemTables.sys_configs,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       }
     );
@@ -125,7 +125,7 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
       {
         sqlTable: SystemTables.sys_proxyapi,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       }
     );