midway-fatcms 0.0.1-beta.68 → 0.0.1-beta.70

package/dist/service/curd/CurdMixByAccountService.js

@@ -54,13 +54,13 @@ let CurdMixByAccountService = class CurdMixByAccountService {
         executeContext[TMP_CTX_KEY] = MixinUtils_1.MixinUtils.toNewMap(userInfos, (obj) => obj.account_id);
         executeContext[TMP_CTX_KEY2] = isArrayModeMap;
     }
-    async getFromCache(code) {
+    async getFromCache(accountId) {
         const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByAccount);
-        return cacheService.getJsonObject(code);
+        return cacheService.getJsonObject(accountId);
     }
-    async setToCache(code, value) {
+    async setToCache(accountId, value) {
         const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByAccount);
-        return cacheService.setJsonObject(code, value);
+        return cacheService.setJsonObject(accountId, value);
     }
     async queryUserAccountIdList(accountIds) {
         const resultRowMap = {};

package/dist/service/curd/CurdMixBySysConfigService.js

@@ -25,11 +25,11 @@ const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.
 const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
 let CurdMixBySysConfigService = class CurdMixBySysConfigService {
     async getFromCache(code) {
-        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixBySysConfig);
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.GetSysConfigOne);
         return cacheService.getJsonObject(code);
     }
     async setToCache(code, value) {
-        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixBySysConfig);
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.GetSysConfigOne);
         return cacheService.setJsonObject(code, value);
     }
     async queryConfigRowsUseCache(codes) {

package/dist/service/curd/CurdMixByWorkbenchService.js

@@ -26,9 +26,9 @@ let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
     async loadWorkbenchListMap() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         return await this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: 'loadWorkbenchListMap',
-            refreshCache: false,
+            cacheKey: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
             cacheName: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
+            refreshCache: false,
             getter: async () => {
                 const reqJson = {
                     columns: 'workbench_code,workbench_name,workbench_domain',

package/package.json

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

package/src/config/config.default.ts

@@ -172,6 +172,7 @@ export default (appInfo: any) => {
       cacheConfig: {
         UserSessionBySessionId: {   cacheLevel: 'REDIS', cacheSecond: 3600 * 24 * 30 },
         UserSessionByAsyncTaskId: {  cacheLevel: 'REDIS', cacheSecond: 3600 },
+        CurdMixByLinkToCustom: {  cacheLevel: 'MEMORY', cacheSecond: 60 * 5 },
       }
     },
 

package/src/controller/gateway/CrudStdGatewayController.ts

@@ -5,6 +5,7 @@ import { CrudStdService, SPECIAL_SETTING_KEY, ICrudStdActionParams, IRequestMode
 import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 import { CommonResult } from '@/libs/utils/common-dto';
 import { checkLogin } from '@/middleware/permission.middleware';
+import {SysAppService} from "@/service/SysAppService";
 
 type ICrudStdParams = { stdAction: ICrudStdActionParams } & IRequestModelCrudProExt;
 
@@ -21,6 +22,9 @@ export class CrudStdGatewayController extends BaseApiController {
   @Inject()
   private crudStdService: CrudStdService;
 
+  @Inject()
+  private sysAppService: SysAppService;
+
   /**
    * 获取零代码应用基本信息
    */
@@ -30,19 +34,9 @@ export class CrudStdGatewayController extends BaseApiController {
     const body = decodeBody as ICrudStdParams;
     const appCode = body.stdAction.appCode;
     const parsedAppInfo = await this.crudStdService.getParsedCrudStdAppInfo(appCode);
-    if (parsedAppInfo) {
-      const parsedAppInfo2: any = { ...parsedAppInfo };
-      delete parsedAppInfo2.created_at;
-      delete parsedAppInfo2.created_by;
-      delete parsedAppInfo2.workbench_code_array;
-      delete parsedAppInfo2.modified_at;
-      delete parsedAppInfo2.modified_by;
-      delete parsedAppInfo2.modified_desc;
-      delete parsedAppInfo2.std_crud_db;
-      delete parsedAppInfo2.std_crud_tbl;
-      return CommonResult.successNotNull(parsedAppInfo2);
-    }
-    return CommonResult.successNotNull(null);
+
+    const parsedAppInfo2 = await this.sysAppService.deletePrivateField(parsedAppInfo);
+    return CommonResult.successNotNull(parsedAppInfo2);
   }
 
 

package/src/controller/gateway/PublicApiController.ts

@@ -1,24 +1,24 @@
-import { Controller, Get, Inject, Post } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
+import {Controller, Get, Inject, Post} from '@midwayjs/core';
+import {Context} from '@midwayjs/koa';
 import * as _ from 'lodash';
-import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
-import { BaseApiController } from '../base/BaseApiController';
-import { SystemTables } from '@/models/SystemTables';
-import { EnumInfoService } from '@/service/EnumInfoService';
-import { CommonResult } from '@/libs/utils/common-dto';
-import { parseJsonObject } from '@/libs/utils/functions';
-import { WorkbenchService } from '@/service/WorkbenchService';
-import { SystemRoleCode } from '@/models/SystemPerm';
-import { KeysOfAuthType } from '@/libs/crud-pro/models/keys';
-import { CacheServiceFactory } from '@/service/base/cache/CacheServiceFactory';
-import * as md5 from 'md5';
-import { CacheNameEnum} from "@/models/bizmodels";
+import {BaseApiController} from '../base/BaseApiController';
+import {SystemTables} from '@/models/SystemTables';
+import {EnumInfoService} from '@/service/EnumInfoService';
+import {CommonResult} from '@/libs/utils/common-dto';
+import {parseJsonObject} from '@/libs/utils/functions';
+import {WorkbenchService} from '@/service/WorkbenchService';
+import {SystemRoleCode} from '@/models/SystemPerm';
+import {KeysOfAuthType} from '@/libs/crud-pro/models/keys';
+import {CacheServiceFactory} from '@/service/base/cache/CacheServiceFactory';
+import {CacheNameEnum} from "@/models/bizmodels";
+import {checkLogin} from "@/middleware/permission.middleware";
+import {SysAppService} from "@/service/SysAppService";
 
 
 /**
  * 公开的API，无需鉴权，所有人可以直接访问
  */
-@Controller('/ns/gw/api/publicApi')
+@Controller('/ns/gw/api/publicApi', { middleware: [checkLogin()] })
 export class PublicApiController extends BaseApiController {
   @Inject()
   protected ctx: Context;
@@ -32,12 +32,15 @@ export class PublicApiController extends BaseApiController {
   @Inject()
   private cacheServiceFactory: CacheServiceFactory;
 
+  @Inject()
+  private sysAppService: SysAppService;
+
   /**
    * 获取所有站点列表
    */
   @Get('/getAllWorkbenchInfoList')
   async getAllWorkbenchInfoList(): Promise<CommonResult> {
-    const entities = await this.workbenchService.getAllWorkbenchInfoList(false);
+    const entities = await this.workbenchService.getAllWorkbenchInfoList();
     const entities2 = entities.map(e => {
       return {
         workbench_domain: e.workbench_domain,
@@ -110,38 +113,25 @@ export class PublicApiController extends BaseApiController {
   async getNavPageInfo(): Promise<CommonResult> {
     const body = this.ctx.request.body as any;
     const { workbenchCode, appCode, pathname } = body;
-    const resultData: any = {};
-
-    const getOneImpl = async (condition: any, tableName: string) => {
-      const values = Object.values(condition).filter(Boolean);
-      // 查询条件不能为空
-      if (values.length > 0) {
-        const oneData = await this.sysDBUtil.getOne({ condition }, tableName);
-        if (oneData && oneData['app_schema']) {
-          oneData['app_schema'] = parseJsonObject(oneData['app_schema']);
-        }
-        return oneData;
-      }
-      return null;
+    const resultData: any = {
+      appData: null,
+      pageData: null,
     };
 
-
-    const getOne = async (condition: any, tableName: string, key: string) => {
-      const cacheKey = md5(tableName + ':' + JSON.stringify(condition) + ":" + key);
-      const oneData = await this.cacheServiceFactory.getJsonObjectCache({
-        cacheKey,
-        cacheName: CacheNameEnum.GetNavPageInfo,
-        getter: async () => {
-          return await getOneImpl(condition, tableName);
-        },
-      });
-      if (oneData) {
-        resultData[key] = oneData;
+    if (appCode) {
+      const appInfo = await this.sysAppService.getSysAppOne(appCode);
+      if (appInfo && appInfo['app_schema']) {
+        appInfo['app_schema'] = parseJsonObject(appInfo['app_schema']);
       }
-    };
+      resultData.appData = await this.sysAppService.deletePrivateField(appInfo);
+    }
 
-    await getOne({ app_code: appCode }, SystemTables.sys_app, 'appData');
-    await getOne({ page_path: pathname, workbench_code: workbenchCode }, SystemTables.sys_app_page, 'pageData');
+    if (pathname && workbenchCode) {
+      resultData.pageData = await this.sysAppService.getSysAppPageOne({
+        page_path: pathname,
+        workbench_code: workbenchCode
+      });
+    }
 
     return CommonResult.successRes(resultData);
   }
@@ -178,11 +168,11 @@ export class PublicApiController extends BaseApiController {
   */
   @Post('/getSysAppInfoByAppCode')
   async getSysAppInfoByAppCode() {
-    return this.executeSysSimpleSQL('sys_app', KeysOfSimpleSQL.SIMPLE_QUERY_ONE, {
-      validateCfg: {
-        'condition.app_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
-      },
-    });
+    const body = this.ctx.request.body as any;
+    const app_code = body?.condition?.app_code;
+    const appInfo =  await this.sysAppService.getSysAppOne(app_code);
+    const appInfo2 = await this.sysAppService.deletePrivateField(appInfo);
+    return CommonResult.successRes({  row: appInfo2 });
   }
 
 

package/src/controller/manage/AppMangeApi.ts

@@ -4,11 +4,15 @@ 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 {SysAppService} from "@/service/SysAppService";
 
 @Controller('/ns/api/manage/app', { middleware: [checkPermission(SystemFuncCode.AppMangeRead)] })
 export class AppMangeApi extends BaseApiController {
   @Inject()
-  ctx: Context;
+  protected ctx: Context;
+
+  @Inject()
+  protected sysAppService: SysAppService
 
   @Post('/getAppList')
   async getAppList() {
@@ -33,6 +37,11 @@ export class AppMangeApi extends BaseApiController {
 
   @Post('/updateApp', { middleware: [checkPermission(SystemFuncCode.AppMangeWrite)] })
   async updateApp() {
+    const body = this.ctx.request.body as any;
+    const appCode = body?.condition?.app_code;
+
+    await this.sysAppService.removeSysAppOneCache(appCode);
+
     return this.executeSysSimpleSQL('sys_app', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
         'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
@@ -43,6 +52,10 @@ export class AppMangeApi extends BaseApiController {
 
   @Post('/deleteApp', { middleware: [checkPermission(SystemFuncCode.AppMangeWrite)] })
   async deleteApp() {
+    const body = this.ctx.request.body as any;
+    const appCode = body?.condition?.app_code;
+    await this.sysAppService.removeSysAppOneCache(appCode);
+
     return this.executeSysSimpleSQL('sys_app', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
         'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],

package/src/controller/manage/SysConfigMangeApi.ts

@@ -1,19 +1,23 @@
 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 { CTX_WORKBENCH_CODE } from '../../models/bizmodels';
-import { SystemTables } from '../../models/SystemTables';
-import { CommonResult } from '../../libs/utils/common-dto';
+import { checkPermission } from '@/middleware/permission.middleware';
+import { SystemFuncCode } from '@/models/SystemPerm';
+import { CTX_WORKBENCH_CODE } from '@/models/bizmodels';
+import { SystemTables } from '@/models/SystemTables';
+import { CommonResult } from '@/libs/utils/common-dto';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import {SysConfigService} from "@/service/SysConfigService";
 
 @Controller('/ns/api/manage/sysconfig', { middleware: [checkPermission(SystemFuncCode.SysConfigMangeRead)] })
 export class SysConfigMangeApi extends BaseApiController {
   @Inject()
   ctx: Context;
 
+  @Inject()
+  private sysConfigService: SysConfigService
+
   @Post('/getSysConfigList')
   async getSysConfigList() {
     return this.executeSysSimpleSQL('sys_configs', KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, {
@@ -57,12 +61,12 @@ export class SysConfigMangeApi extends BaseApiController {
       return CommonResult.errorRes('id不能为空');
     }
 
-    const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getOne({ condition: body.condition }, SystemTables.sys_configs);
+    const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getUniqueOne({ condition: body.condition }, SystemTables.sys_configs);
     if (!sysConfig) {
       return CommonResult.errorRes('配置项不存在');
     }
 
-    const { edit_auth_type, edit_auth_config } = sysConfig;
+    const { edit_auth_type, edit_auth_config, config_code } = sysConfig;
     if (edit_auth_type) {
       const isOK = this.ctx.userSession.isAuthPass(edit_auth_type, edit_auth_config);
       if (!isOK) {
@@ -70,6 +74,10 @@ export class SysConfigMangeApi extends BaseApiController {
       }
     }
 
+    // 移除缓存
+    await this.sysConfigService.removeSysConfigOneCache(config_code);
+
+
     return this.executeSysSimpleSQL('sys_configs', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
         'data.workbench_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING, 'length:1,64'],

package/src/controller/manage/UserAccountManageApi.ts

@@ -8,6 +8,9 @@ import { SystemFuncCode } from '../../models/SystemPerm';
 import { CommonException, Exceptions } from '../../libs/crud-pro/exceptions';
 import { SystemTables } from '../../models/SystemTables';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import {CacheServiceFactory} from "@/service/base/cache/CacheServiceFactory";
+import {CacheNameEnum} from "@/models/bizmodels";
+import {CommonResult} from "@/libs/utils/common-dto";
 
 const accountNameBlacklist = new Set(['sa', 'root', 'admin', 'superadmin', 'administrator', 'sys', 'sysop', 'schedule_user']);
 function checkAccountCreateBlacklist(value: string) {
@@ -26,6 +29,9 @@ export class UserAccountManageApi extends BaseApiController {
   @Inject()
   protected ctx: Context;
 
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
   @Post('/getUserAccountList')
   async getUserAccountList() {
     return this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, {
@@ -42,6 +48,28 @@ export class UserAccountManageApi extends BaseApiController {
 
   @Post('/updateUserAccount', { middleware: [checkPermission(SystemFuncCode.UserAccountMangeWrite)] })
   async updateUserAccount() {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const body = this.ctx.request.body as any;
+    const id = body.condition.id;
+    if (!id) {
+      return CommonResult.errorRes('id不能为空');
+    }
+
+    const userAccountInfo = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getUniqueOne({
+      condition: body.condition
+    }, SystemTables.sys_user_account);
+
+    if (!userAccountInfo) {
+      return CommonResult.errorRes('用户信息不存在');
+    }
+
+    const accountId = userAccountInfo.account_id;
+
+    await this.cacheServiceFactory.removeItemCache({
+      cacheName: CacheNameEnum.CurdMixByAccount,
+      cacheKey: accountId,
+    });
+
     return this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
         'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],

package/src/controller/manage/WorkbenchMangeApi.ts

@@ -28,7 +28,7 @@ export class WorkbenchMangeApi extends BaseApiController {
   @Post('/createWorkbench', { middleware: [checkPermission(SystemFuncCode.WorkbenchMangeWrite)] })
   async createWorkbench() {
     // 清除运行时缓存
-    this.workbenchService.clearCache();
+    await this.workbenchService.clearCache();
 
     const body = this.ctx.request.body as any;
     const dataObj: any = body.data || {};
@@ -47,7 +47,7 @@ export class WorkbenchMangeApi extends BaseApiController {
   @Post('/updateWorkbench', { middleware: [checkPermission(SystemFuncCode.WorkbenchMangeWrite)] })
   async updateWorkbench() {
     // 清除运行时缓存
-    this.workbenchService.clearCache();
+    await this.workbenchService.clearCache();
 
     return this.executeSysSimpleSQL(SystemTables.sys_workbench, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {

package/src/controller/render/AppRenderController.ts

@@ -1,12 +1,10 @@
 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';
+import { SysAppService } from "@/service/SysAppService";
 
 /**
  * 渲染独立外部应用
@@ -19,24 +17,17 @@ export class AppRenderController extends BaseApiController {
   @Inject()
   private workbenchService: WorkbenchService;
 
+  @Inject()
+  private sysAppService: SysAppService
+
   @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 } },
-      {
-        sqlTable: SystemTables.sys_app,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      }
-    );
+    const appInfo = await this.sysAppService.getSysAppOne(appCode);
 
-    const { row: appInfo } = res.getResModel();
     if (!appInfo) {
       this.ctx.status = 404;
       return this.ctx.render('404_app', { appCode, errorMsg: ' 应用不存在' });

package/src/index.ts

@@ -46,6 +46,7 @@ export * from './service/AuthService';
 export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
 export * from './service/SysConfigService';
+export * from './service/SysAppService';
 export * from './service/UserAccountService';
 export * from './service/UserSessionService';
 export * from './service/VisitStatService';

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

@@ -137,6 +137,7 @@ export interface ISqlCfgModel extends IBaseCfgModel {
   originSql?: string; // 有特殊占位符的SQL, 原始的SQL
   validate?: IFuncCfgModel; //执行前，进行校验，校验不通过就抛出异常. 校验函数可以返回 boolean或直接抛出异常
   executeWhen?: IFuncCfgModel; //满足表达式的结果，才能执行。 默认：true 校验函数必须返回 boolean
+  isNativeSQL?: boolean; // 可以运行的SQL。在postgres/sqlserver环境下也可以使用问号。
   executeSql?: string; // 可以运行的SQL。在postgres/sqlserver环境下也可以使用问号。
   executeSqlArgs?: any[]; //可以运行的SQL的参数
   crudType?: string;

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

@@ -18,6 +18,7 @@ class SqlCfgModel {
   originSql: string; // 有特殊占位符的SQL, 原始的SQL constructor(resName: string, originSql: string) {}
   validate: IFuncCfgModel; //执行前，进行校验，校验不通过就抛出异常. 校验函数可以返回 boolean或直接抛出异常
   executeWhen: IFuncCfgModel; //满足表达式的结果，才能执行。 默认：true 校验函数必须返回 booleansetResPicker(resPicker: string) {}
+  isNativeSQL?: boolean; // 可以运行的SQL。在postgres/sqlserver环境下也可以使用问号。
   executeSql: string; // 可以运行的SQL
   executeSqlArgs: any[]; //可以运行的SQL的参数setExecuteWhen(executeWhenFunCfg: IFuncCfgModel) {}
   crudType: KeyOfCrudTypes = null;

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

@@ -41,7 +41,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
       // import { PoolClient } from 'pg';
 
       const pgClient: PoolClient = connection as any;
-      const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql);
+      const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql, sqlCfgModel.isNativeSQL);
       queryRes = await pgClient.query({
         text: pgSql,
         values: executeSqlArgs || [],
@@ -52,7 +52,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     } else if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
       // SQLServer
 
-      const mssql = replaceQuestionMarksForMssql(sqlCfgModel.executeSql);
+      const mssql = replaceQuestionMarksForMssql(sqlCfgModel.executeSql, sqlCfgModel.isNativeSQL);
       queryRes = await connection.query(mssql, executeSqlArgs);
       this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
 

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

@@ -1,17 +1,17 @@
 import * as _ from 'lodash';
-import { ICurdProServiceHub } from '../models/ServiceHub';
-import { ICrudProCfg, IExecuteUnsafeQueryCtx, ILogger, IPoolConnectionClient } from '../interfaces';
-import { SqlCfgModel } from '../models/SqlCfgModel';
-import { ExecuteContext } from '../models/ExecuteContext';
-import { MixinUtils } from '../utils/MixinUtils';
-import { TypeUtils } from '../utils/TypeUtils';
-import { CompareUtils } from '../utils/CompareUtils';
-import { DateTimeUtils } from '../utils/DateTimeUtils';
-import { IExecuteContextFunc } from '../models/ExecuteContextFunc';
-import { DEFAULT_MAX_LIMIT } from '../defaultConfigs';
-import { SqlDbType } from '../models/keys';
-import { replaceQuestionMarks } from '../utils/sqlConvert/convertPgSql';
-import { replaceQuestionMarksForMssql } from '../utils/sqlConvert/convertMsSql';
+import {ICurdProServiceHub} from '../models/ServiceHub';
+import {ICrudProCfg, IExecuteUnsafeQueryCtx, ILogger, IPoolConnectionClient} from '../interfaces';
+import {SqlCfgModel} from '../models/SqlCfgModel';
+import {ExecuteContext} from '../models/ExecuteContext';
+import {MixinUtils} from '../utils/MixinUtils';
+import {TypeUtils} from '../utils/TypeUtils';
+import {CompareUtils} from '../utils/CompareUtils';
+import {DateTimeUtils} from '../utils/DateTimeUtils';
+import {IExecuteContextFunc} from '../models/ExecuteContextFunc';
+import {DEFAULT_MAX_LIMIT} from '../defaultConfigs';
+import {SqlDbType} from '../models/keys';
+import {replaceQuestionMarks} from '../utils/sqlConvert/convertPgSql';
+import {replaceQuestionMarksForMssql} from '../utils/sqlConvert/convertMsSql';
 
 function createBuildInExecuteFuncMap() {
   return {
@@ -74,11 +74,9 @@ class CrudProServiceBase {
     };
 
     if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
-      const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql);
-      sqlCfgModel.executeSql = pgSql;
+      sqlCfgModel.executeSql = replaceQuestionMarks(sqlCfgModel.executeSql, false);
     } else if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
-      const mssql = replaceQuestionMarksForMssql(sqlCfgModel.executeSql);
-      sqlCfgModel.executeSql = mssql;
+      sqlCfgModel.executeSql = replaceQuestionMarksForMssql(sqlCfgModel.executeSql, false);
     }
 
     const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);

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

@@ -1,4 +1,8 @@
-function replaceQuestionMarksForMssql(sql: string): string {
+function replaceQuestionMarksForMssql(sql: string, isNativeSQL: boolean): string {
+  if (isNativeSQL === true) {
+    return sql;
+  }
+
   let count = 0;
   return sql.replace(/\?/g, () => {
     count = count + 1;

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

@@ -1,4 +1,9 @@
-function replaceQuestionMarks(sql: string): string {
+function replaceQuestionMarks(sql: string, isNativeSQL: boolean): string {
+
+  if (isNativeSQL === true) {
+    return sql;
+  }
+
   let count = 0;
   return sql.replace(/\?/g, () => {
     count = count + 1;

package/src/models/bizmodels.ts

@@ -138,12 +138,14 @@ export enum CacheNameEnum {
   CurdMixByAccount = 'CurdMixByAccount',
   CurdMixByDict = 'CurdMixByDict',
   CurdMixByLinkToCustom = 'CurdMixByLinkToCustom',
-  CurdMixBySysConfig = 'CurdMixBySysConfig',
   CurdMixByWorkbench = 'CurdMixByWorkbench',
-  GetParsedCrudStdAppInfo = 'GetParsedCrudStdAppInfo',
+  GetSysConfigOne = 'GetSysConfigOne',
+  GetWorkbenchCachedObj = 'GetWorkbenchCachedObj',
+  GetSysAppOne = 'GetSysAppOne',
+  GetSysAppPageOne = 'GetSysAppPageOne',
   GetWorkbenchMenu = 'GetWorkbenchMenu',
-  GetNavPageInfo = 'GetNavPageInfo',
   GetEnumInfoByCode = 'GetEnumInfoByCode',
+
   UserSessionBySessionId = 'UserSessionBySessionId', // 只能是Redis
   UserSessionByAsyncTaskId = 'UserSessionByAsyncTaskId', // 只能是Redis
 }

package/src/service/EnumInfoService.ts

@@ -9,6 +9,7 @@ import {CurdMixByLinkToCustomService} from './curd/CurdMixByLinkToCustomService'
 import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
 import {CacheServiceFactory} from './base/cache/CacheServiceFactory';
 import { CacheNameEnum } from "@/models/bizmodels";
+import { SysConfigService } from "@/service/SysConfigService";
 
 interface IQueryEnumInfo {
   type: RelatedType;
@@ -25,7 +26,6 @@ function filterEmpty(e: IEnumInfo): boolean {
 }
 
 
-
 @Provide()
 export class EnumInfoService {
   @Inject()
@@ -39,12 +39,18 @@ export class EnumInfoService {
   @Inject()
   private cacheServiceFactory: CacheServiceFactory;
 
+  @Inject()
+  private sysConfigService: SysConfigService
+
   async queryEnumInfo(codeList: IQueryEnumInfo[], refreshCache: boolean): Promise<IQueryEnumResult[]> {
 
     const getEnumInfoByCode = async (type: RelatedType, code: string) => {
       if (type === RelatedType.linkToCustom) {
         return await this.queryEnumInfoByLinkToCustom(code);
       }
+      if (type === RelatedType.sysCfgEnum) {
+        return await this.queryEnumInfoBySysCfgEnum(code);
+      }
 
       const cacheKey = `${type}@@${code}`;
       return await this.cacheServiceFactory.getJsonObjectCache({
@@ -52,9 +58,7 @@ export class EnumInfoService {
         refreshCache,
         cacheName: CacheNameEnum.GetEnumInfoByCode,
         getter: async () => {
-          if (type === RelatedType.sysCfgEnum) {
-            return await this.queryEnumInfoBySysCfgEnum(code);
-          } else if (type === RelatedType.dict) {
+          if (type === RelatedType.dict) {
             return await this.queryEnumInfoItemByDict(code);
           }
           return [];
@@ -92,24 +96,7 @@ 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 },
-      },
-      {
-        sqlTable: SystemTables.sys_configs,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      }
-    );
-    const obj = res1.getOneObj();
-    if (!obj) {
-      return null;
-    }
-
+    const obj = await this.sysConfigService.getSysConfigOne(code);
     const rows = parseConfigContentToEnumInfo(obj);
     return rows.map(e => ({ label: e.label, value: e.value, style: e.style, children: e.children })).filter(filterEmpty);
   }