midway-fatcms 0.0.1-beta.1 → 0.0.1-beta.11

package/src/controller/render/AppRenderController.ts

@@ -1,11 +1,12 @@
-import {Inject, Controller, Get, Param} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {BaseApiController} from '../base/BaseApiController';
-import {KeysOfSimpleSQL} from '../../libs/crud-pro/models/keys';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
-import {WorkbenchService} from '../../service/WorkbenchService';
-import {createRenderUtils} from "../../libs/utils/render-utils";
-import {privateAES} from "../../libs/utils/crypto-utils";
+import { Inject, Controller, Get, Param } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { BaseApiController } from '../base/BaseApiController';
+import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
+import { SystemTables } from '../../models/SystemTables';
+import { WorkbenchService } from '../../service/WorkbenchService';
+import { createRenderUtils } from "../../libs/utils/render-utils";
+import { privateAES } from "../../libs/utils/crypto-utils";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 
 /**
@@ -21,34 +22,36 @@ export class AppRenderController extends BaseApiController {
 
   @Get('/:appPath+')
   async home(@Param('appPath') appPath: string): Promise<string> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const appPathArr = appPath.split('/');
     const appCode = appPathArr[0];
 
     const res = await this.curdMixService.executeCrudByCfg(
-      {condition: {app_code: appCode}},
+      { condition: { app_code: appCode } },
       {
         sqlTable: SystemTables.sys_app,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
 
-    const {row: appInfo} = res.getResModel();
+    const { row: appInfo } = res.getResModel();
     if (!appInfo) {
       this.ctx.status = 404;
-      return this.ctx.render('404_app', {appCode, errorMsg: ' 应用不存在'});
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用不存在' });
     }
 
     if (appInfo.status !== 1) {
       this.ctx.status = 404;
-      return this.ctx.render('404_app', {appCode, errorMsg: ' 应用已下线'});
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用已下线' });
     }
 
     const isSupportWorkbench = await this.isSupportCurrentWorkbench(appInfo);
     if (!isSupportWorkbench) {
       this.ctx.status = 404;
-      return this.ctx.render('404_app', {appCode, errorMsg: ' 应用没有绑定此站点'});
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用没有绑定此站点' });
     }
 
     const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
@@ -61,7 +64,7 @@ export class AppRenderController extends BaseApiController {
       ctx: this.ctx,
       appInfo, workbenchInfo, userInfo, package_assets: appInfo.package_assets, fatcmscsrftoken
     });
-    return this.ctx.renderString(html_content, {appInfo, workbenchInfo, userInfo, utils}, {viewEngine: 'ejs'});
+    return this.ctx.renderString(html_content, { appInfo, workbenchInfo, userInfo, utils }, { viewEngine: 'ejs' });
   }
 
 

package/src/controller/test.controller.ts

@@ -22,7 +22,7 @@ export class TestApiController extends BaseApiController{
       sqlTable: "test_table1",
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
       sqlDatabase: "postgres_test1",
-      sqlDdType: SqlDbType.postgres,
+      sqlDbType: SqlDbType.postgres,
       updateCfg: {},
     };
 

package/src/index.ts

@@ -30,10 +30,6 @@ export * from './controller/manage/SysConfigMangeApi';
 export * from './controller/manage/SystemInfoManageApi';
 export * from './controller/manage/UserAccountManageApi';
 export * from './controller/manage/WorkbenchMangeApi';
-export * from './controller/medstatistic/MedAdminController';
-export * from './controller/medstatistic/MedClientController';
-export * from './controller/medstatistic/MedMessageService';
-export * from './controller/medstatistic/MedScoreService';
 export * from './controller/myinfo/AuthController';
 export * from './controller/myinfo/MyInfoController';
 export * from './controller/render/AppRenderController';
@@ -43,6 +39,7 @@ export * from './filter/notfound.filter';
 export * from './middleware/forbidden.middleware';
 export * from './middleware/global.middleware';
 export * from './middleware/tx.middleware';
+export * from './middleware/permission.middleware';
 export * from './service/AuthService';
 export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
@@ -68,3 +65,35 @@ export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdProService';
 export * from './service/proxyapi/ProxyApiLoadService';
 export * from './service/proxyapi/ProxyApiService';
+export * from './models/userSession';
+export * from './models/bizmodels';
+export * from './models/SystemEntities';
+export * from './models/SystemPerm';
+export * from './models/contextLogger';
+export * from './models/devops';
+export * from './models/SystemTables';
+
+
+export * from './libs/utils/common-dto';
+export * from './libs/utils/crypto-utils';
+export * from './libs/utils/fatcms-request';
+export * from './libs/utils/functions';
+export * from './libs/utils/ordernum-utils';
+export * from './libs/utils/parseConfig';
+
+export * from './libs/crud-pro/CrudPro';
+export * from './libs/crud-pro/defaultConfigs';
+export * from './libs/crud-pro/exceptions';
+export * from './libs/crud-pro/interfaces';
+
+export * from './libs/crud-pro/models/ExecuteContext';
+export * from './libs/crud-pro/models/FuncContext';
+export * from './libs/crud-pro/models/RequestModel';
+export * from './libs/crud-pro/models/SqlCfgModel';
+export * from './libs/crud-pro/models/Transaction';
+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/global-config/global-config';

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

@@ -102,7 +102,7 @@ export interface IBaseCfgModel {
   sqlTable?: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit?: number; // 最大一次性返回的数量
   columns?: string | string[]; // "columns": "id,name,age,sex,addr",
   columnsRelation?: ColumnRelation[];

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

@@ -38,7 +38,7 @@ class RequestCfgModel {
   sqlTable: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit = DEFAULT_MAX_LIMIT; // 最大一次性返回的数量
   method: string; // 不能为空
   transactionEnable: boolean; // 是否开启事务，默认不开启，每条语句都是autocommit

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

@@ -11,7 +11,7 @@ class SqlCfgModel {
   sqlTable: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit: number; // 最大一次性返回的数量
   resName: string;
   resPicker: KeysOfSqlResPicker;

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

@@ -39,7 +39,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     let sqlRes: any;
     let queryRes : any;
 
-    if (sqlCfgModel.sqlDdType === SqlDbType.postgres) { // import { PoolClient } from 'pg';
+    if (sqlCfgModel.sqlDbType === SqlDbType.postgres) { // import { PoolClient } from 'pg';
 
       const pgClient: PoolClient = connection as any;
       const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql);
@@ -55,7 +55,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     }
 
-    else if (sqlCfgModel.sqlDdType === SqlDbType.sqlserver) {
+    else if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
 
       const mssql = replaceQuestionMarksForMssql(sqlCfgModel.executeSql);
 
@@ -245,14 +245,14 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     // 增删改res的内容是修改结果：包括： insert\delete\update
     if (KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
-      if (sqlCfgModel.sqlDdType === SqlDbType.postgres) {
+      if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
         return {
           insertId: _.get(queryRes,'rows[0].id'),
           affectedRows: _.get(queryRes,'rowCount')
         }
       }
 
-      if (sqlCfgModel.sqlDdType === SqlDbType.sqlserver) {
+      if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
         return {
           insertId: _.get(queryRes,'recordset[0].id'),
           affectedRows: _.get(queryRes,'rowsAffected[0]')

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

@@ -212,7 +212,7 @@ class CrudProGenSqlCondition {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat(?, '%')`; // like前缀匹配
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
             tmpSql = `${toSqlColumnName(key)} like concat(?, '%')`; // like前缀匹配
           }
 
@@ -221,7 +221,7 @@ class CrudProGenSqlCondition {
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat(?, '%')`;
 
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
             tmpSql = `${toSqlColumnName(key)} not like concat(?, '%')`;
           }
 
@@ -232,7 +232,7 @@ class CrudProGenSqlCondition {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat('%', ?, '%')`; // like包含
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
             tmpSql = `${toSqlColumnName(key)} like concat('%', ?, '%')`; // like包含
           }
 
@@ -240,7 +240,7 @@ class CrudProGenSqlCondition {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat('%',?, '%')`;  // like不包含
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
             tmpSql = `${toSqlColumnName(key)} not like concat('%',?, '%')`;  // like不包含
           }
 

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

@@ -97,10 +97,10 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @private
    */
   private generateOriginSqlForDelete(cfgModel: RequestCfgModel) : string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
       return 'delete from @@table where @@asWhere:condition ';
     }
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
       return 'delete from @@table where @@asWhere:condition ';
     }
     return 'delete from @@table where @@asWhere:condition limit 100 '; // 删除操作，不能一次性删除太多
@@ -112,7 +112,7 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @private
    */
   private generateOriginSqlForDuplicateInsert(cfgModel: RequestCfgModel) : string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
       const uniqueColumn = cfgModel.uniqueColumn ; // id
       if (!Array.isArray(uniqueColumn) || uniqueColumn.length === 0) {
         throw new CommonException(Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL)
@@ -124,7 +124,7 @@ class CrudProGenSqlService extends CrudProServiceBase {
     }
 
 
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
       const uniqueColumn = cfgModel.uniqueColumn ; // id
       if (uniqueColumn.length !== 1) {
         throw new CommonException(Exceptions.CFG_UNIQUE_COLUMN_COUNT_MUST_ONE);
@@ -160,10 +160,10 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @private
    */
   private generateOriginSqlForInsert(cfgModel: RequestCfgModel): string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
       return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) RETURNING * ';
     }
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
       return 'insert into @@table ( @@asInsertKeys:data ) OUTPUT INSERTED.* values( @@asInsertValues:data ) ';
     }
     return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )'; // 关键字的前后，必须有空格
@@ -177,12 +177,12 @@ class CrudProGenSqlService extends CrudProServiceBase {
 
     const reqCfgModel = exeCtx.getCfgModel();
     const sqlCfgList = reqCfgModel.sqlCfgList || [];
-    const { sqlTable, sqlSchema, sqlDatabase, sqlDdType, maxLimit, columns, columnsRelation } = reqCfgModel;
+    const { sqlTable, sqlSchema, sqlDatabase, sqlDbType, maxLimit, columns, columnsRelation } = reqCfgModel;
 
     for (let i = 0; i < sqlCfgList.length; i++) {
       const sqlCfgModel = sqlCfgList[i];
 
-      sqlCfgModel.sqlDdType = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDdType, sqlDdType);
+      sqlCfgModel.sqlDbType = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDbType, sqlDbType);
       sqlCfgModel.sqlDatabase = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDatabase, sqlDatabase);
       sqlCfgModel.sqlSchema = MixinUtils.selectNotEmpty(sqlCfgModel.sqlSchema, sqlSchema);
       sqlCfgModel.sqlTable = MixinUtils.selectNotEmpty(sqlCfgModel.sqlTable, sqlTable);

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

@@ -226,11 +226,11 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
     const reqLimit = req.limit;
     const limit = Math.min(maxLimit, reqLimit);
 
-    if (sqlCfg.sqlDdType === SqlDbType.postgres) {
+    if (sqlCfg.sqlDbType === SqlDbType.postgres) {
       return new SqlSegArg(' LIMIT ? OFFSET ? ', [limit, req.offset]);
     }
 
-    if (sqlCfg.sqlDdType === SqlDbType.sqlserver) {
+    if (sqlCfg.sqlDbType === SqlDbType.sqlserver) {
       return new SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [ req.offset, limit]);
     }
 

package/src/libs/crud-pro/utils/sqlConvert/convertColumnName.ts

@@ -3,10 +3,10 @@ import {SqlDbType} from "../../models/keys";
 
 
 function toSqlColumnName(columnName: string, sqlCfgModel: SqlCfgModel): string {
-  if (sqlCfgModel.sqlDdType === SqlDbType.postgres) {
+  if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
     return '"' + columnName + '"';
   }
-  if (sqlCfgModel.sqlDdType === SqlDbType.sqlserver) {
+  if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
     return '[' + columnName + ']';
   }
   return '`' + columnName + '`';

package/src/libs/global-config/global-config.ts

@@ -0,0 +1,72 @@
+import { SqlDbType } from '../crud-pro/models/keys';
+
+interface IGlobalStaticConfig {
+  /**
+   * CrudStd: 业务系统自定义的修改cfgModel
+   * @param reqJson
+   * @param cfgModel
+   * @param appInfo
+   * @param ctx
+   */
+  bizUpdateCfgModelForCrudStd(reqJson: any, cfgModel: any, appInfo: any, ctx: any): Promise<any>;
+
+  /**
+   * CrudMtd: 业务系统自定义的修改cfgModel
+   * @param reqJson
+   * @param cfgModel
+   * @param methodInfo
+   * @param ctx
+   */
+  bizUpdateCfgModelForCrudMtd(reqJson: any, cfgModel: any, methodInfo: any, ctx: any): Promise<any>;
+
+
+  /**
+   * 生成用户的账号ID，业务系统可以生成类似工号的ID
+   * @param userSubmitData 
+   */
+  generateUserAccountId(userSubmitData: any): Promise<string>;
+
+
+  /**
+   * 将业务系统表中的userId映射为fatcms的UserAccountId
+   * @param bizTableUserId 业余系统表中的UserId
+   */
+  toFatcmsUserAccountId(bizTableUserId: any): string;
+
+  SystemDbName: string;
+  SystemDbType: SqlDbType;
+}
+
+const noop = () => {
+  return Promise.resolve();
+};
+
+class GlobalStaticConfig {
+  private configObject: IGlobalStaticConfig;
+  constructor() {
+    this.configObject = {
+      bizUpdateCfgModelForCrudStd: noop,
+      bizUpdateCfgModelForCrudMtd: noop,
+      generateUserAccountId: null,
+      toFatcmsUserAccountId: (bizTableUserId: any) => {
+        return bizTableUserId;
+      },
+      SystemDbName: 'fatcms',
+      SystemDbType: SqlDbType.mysql,
+    };
+  }
+  public getConfig(): IGlobalStaticConfig {
+    return this.configObject as IGlobalStaticConfig;
+  }
+
+  public setConfig(configObject: any) {
+    if (!configObject || typeof configObject !== 'object') {
+      throw new Error('参数configObject不能为空');
+    }
+    Object.assign(this.configObject, configObject);
+  }
+}
+
+const GLOBAL_STATIC_CONFIG = new GlobalStaticConfig();
+
+export { GLOBAL_STATIC_CONFIG };

package/src/models/SystemTables.ts

@@ -1,5 +1,3 @@
-import {SqlDbType} from "../libs/crud-pro/models/keys";
-
 export const SystemTables = {
   sys_workbench: 'sys_workbench',
   sys_user_account: 'sys_user_account',
@@ -24,7 +22,5 @@ export const SystemTables = {
   sys_visit_stats: 'sys_visit_stats',
 };
 
-export const SystemDbName = 'fatcms';
-export const SystemDbType = SqlDbType.mysql;
 
 export const SystemDevOpsWorkbench = 'devops';

package/src/service/AuthService.ts

@@ -5,12 +5,13 @@ import { CurdMixService } from './curd/CurdMixService';
 import * as md5 from 'md5';
 import { UserAccountService } from './UserAccountService';
 import { createUniqueId } from '../libs/utils/functions';
-import {IConsumerUserInfo, ISessionInfo, SYS_ACCOUNT_TYPE} from '../models/userSession';
-import {SystemDbName, SystemDbType, SystemTables} from '../models/SystemTables';
+import { IConsumerUserInfo, ISessionInfo, SYS_ACCOUNT_TYPE } from '../models/userSession';
+import { SystemTables } from '../models/SystemTables';
 import { UserSessionService } from './UserSessionService';
 import { CommonResult } from '../libs/utils/common-dto';
 import { isEnableSuperAdmin } from "../libs/utils/fatcms-request";
-import {CommonException} from "../libs/crud-pro/exceptions";
+import { CommonException } from "../libs/crud-pro/exceptions";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Provide()
 export class AuthService {
@@ -94,7 +95,7 @@ export class AuthService {
       nickName: consumerUserInfo.nickName,
       avatar: consumerUserInfo.avatar,
       roleCodes: [],
-      functionCodes:[],
+      functionCodes: [],
       loginName: consumerUserInfo.loginName,
       sessionId,
       accountId: consumerUserInfo.accountId,
@@ -141,7 +142,7 @@ export class AuthService {
       sessionId,
       accountId,
       workbenchCode,
-      accountType: SYS_ACCOUNT_TYPE
+      accountType: SYS_ACCOUNT_TYPE,
     };
 
     await this.userSessionService.saveUserSession(sessionInfo);
@@ -203,6 +204,8 @@ export class AuthService {
    * @private
    */
   private async queryUserRoleCodeList(accountId: string): Promise<string[]> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const res = await this.curdMixService.executeCrudByCfg(
       {
         condition: { account_id: accountId },
@@ -212,7 +215,7 @@ export class AuthService {
         sqlTable: SystemTables.sys_perm_user_role,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const rows = res.getResModel().rows || [];
@@ -232,6 +235,8 @@ export class AuthService {
       return [];
     }
 
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const res = await this.curdMixService.executeCrudByCfg(
       {
         condition: { role_code: { $in: roleCodeList } },
@@ -241,7 +246,7 @@ export class AuthService {
         sqlTable: SystemTables.sys_perm_role_func,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const rows = res.getResModel().rows || [];
@@ -259,7 +264,7 @@ export class AuthService {
     const oldSessionId = sessionInfo.sessionId;
 
     const sessionId = createUniqueId();
-    const newSessionInfo: ISessionInfo = {...sessionInfo, sessionId};
+    const newSessionInfo: ISessionInfo = { ...sessionInfo, sessionId };
 
     await this.userSessionService.saveUserSession(newSessionInfo);
 

package/src/service/EnumInfoService.ts

@@ -3,10 +3,11 @@ import {Context} from '@midwayjs/koa';
 import {KeysOfSimpleSQL} from '../libs/crud-pro/models/keys';
 import {CurdProService} from './curd/CurdProService';
 import {RelatedType} from './curd/CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../models/SystemTables';
+import {SystemTables} from '../models/SystemTables';
 import {parseConfigContentToEnumInfo, IEnumInfo} from '../libs/utils/parseConfig';
 import {RedisCacheService} from "./base/RedisCacheService";
 import {CurdMixByLinkToCustomService} from "./curd/CurdMixByLinkToCustomService";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 
 interface IQueryEnumInfo {
@@ -88,6 +89,8 @@ export class EnumInfoService {
   }
 
   private async queryEnumInfoBySysCfgEnum(code: string): Promise<IEnumInfo[]> {
+    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    
     const res1 = await this.curdProService.executeCrudByCfg(
       {
         condition: { config_code: code },
@@ -96,7 +99,7 @@ export class EnumInfoService {
         sqlTable: SystemTables.sys_configs,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const obj = res1.getOneObj();
@@ -109,6 +112,8 @@ export class EnumInfoService {
   }
 
   private async queryEnumInfoItemByDict(code: string): Promise<IEnumInfo[]> {
+    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    
     const res1 = await this.curdProService.executeCrudByCfg(
       {
         condition: { dict_code: code },
@@ -117,7 +122,7 @@ export class EnumInfoService {
         sqlTable: SystemTables.sys_data_dict_item,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const obj = res1.getResRows();

package/src/service/FileCenterService.ts

@@ -10,7 +10,7 @@ import { KeysOfSimpleSQL, KeysOfValidators } from '../libs/crud-pro/models/keys'
 import { AccessType, IEntityCommonInfo, UploadCategoryType } from '../models/bizmodels';
 import { IRequestCfgModel } from '../libs/crud-pro/interfaces';
 import { BaseService } from './base/BaseService';
-import {SystemDbName, SystemDbType} from '../models/SystemTables';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 function getSuffix(s: string): string {
   if (s) {
@@ -107,12 +107,14 @@ class FileDB {
   }
 
   async getFileInfo(fileKey: string): Promise<IFileInfo> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const condition: any = { file_key: fileKey };
     const cfgModel: IRequestCfgModel = {
       sqlTable: 'sys_file',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       validateCfg: {
         'condition.file_key': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
@@ -123,11 +125,13 @@ class FileDB {
   }
 
   async saveFileInfo(fileInfo: IFileInfo) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const cfgModel = {
       sqlTable: 'sys_file',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
     return await this.curdMixService.executeCrudByCfg(
       {
@@ -141,21 +145,23 @@ class FileDB {
   }
 
   async saveAssetsLog(fileInfo: IFileInfo) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
     const cfgModel = {
       sqlTable: 'sys_assets_log',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
     };
     return await this.curdMixService.executeCrudByCfg({ data: fileInfo }, cfgModel);
   }
 
   async deleteFileInfo(id: number) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
     const cfgModel: IRequestCfgModel = {
       sqlTable: 'sys_file',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_DELETE,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       validateCfg: {
         'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMBER],
       },
@@ -200,7 +206,7 @@ function toUploadOriginByReferer(referer: string): string {
       return 'doc-editor';
     }
     if (pathname.startsWith('/pages/devops/file-manage')) {
-      return  'file-manage';
+      return 'file-manage';
     }
   } catch (error) {
     console.error('toUploadOriginByReferer', error);

package/src/service/SysConfigService.ts

@@ -1,9 +1,10 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL} from "../libs/crud-pro/models/keys";
-import {SystemDbName, SystemDbType, SystemTables} from "../models/SystemTables";
-import {BaseService} from "./base/BaseService";
-import {CurdProService} from "./curd/CurdProService";
+import { KeysOfSimpleSQL } from "../libs/crud-pro/models/keys";
+import { SystemTables } from "../models/SystemTables";
+import { BaseService } from "./base/BaseService";
+import { CurdProService } from "./curd/CurdProService";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Provide()
 export class SysConfigService extends BaseService {
@@ -14,9 +15,12 @@ export class SysConfigService extends BaseService {
   private curdProService: CurdProService;
 
   async getSysConfigOne(config_code: string): Promise<any> {
-    if (!config_code){
+    if (!config_code) {
       throw new Error('[getSysConfigOne] config_code required');
     }
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const res1 = await this.curdProService.executeCrudByCfg(
       {
         condition: { config_code },
@@ -25,7 +29,7 @@ export class SysConfigService extends BaseService {
         sqlTable: SystemTables.sys_configs,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     return res1.getOneObj();