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

package/dist/config/config.default.js

@@ -156,6 +156,7 @@ exports.default = (appInfo) => {
             cacheConfig: {
                 UserSessionBySessionId: { cacheLevel: 'REDIS', cacheSecond: 3600 * 24 * 30 },
                 UserSessionByAsyncTaskId: { cacheLevel: 'REDIS', cacheSecond: 3600 },
+                CurdMixByLinkToCustom: { cacheLevel: 'MEMORY', cacheSecond: 60 * 5 },
             }
         },
         // 用户会话保持时间，单位秒

package/dist/controller/gateway/CrudStdGatewayController.d.ts

@@ -7,6 +7,7 @@ import { CommonResult } from '../../libs/utils/common-dto';
 export declare class CrudStdGatewayController extends BaseApiController {
     protected ctx: Context;
     private crudStdService;
+    private sysAppService;
     /**
      * 获取零代码应用基本信息
      */

package/dist/controller/gateway/CrudStdGatewayController.js

@@ -16,6 +16,7 @@ const CrudStdService_1 = require("../../service/crudstd/CrudStdService");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const common_dto_1 = require("../../libs/utils/common-dto");
 const permission_middleware_1 = require("../../middleware/permission.middleware");
+const SysAppService_1 = require("../../service/SysAppService");
 /**
  * 零代码配置的界面，相关的接口的执行。这里的接口都需要登录。
  */
@@ -28,19 +29,8 @@ let CrudStdGatewayController = class CrudStdGatewayController extends BaseApiCon
         const body = decodeBody;
         const appCode = body.stdAction.appCode;
         const parsedAppInfo = await this.crudStdService.getParsedCrudStdAppInfo(appCode);
-        if (parsedAppInfo) {
-            const parsedAppInfo2 = { ...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 common_dto_1.CommonResult.successNotNull(parsedAppInfo2);
-        }
-        return common_dto_1.CommonResult.successNotNull(null);
+        const parsedAppInfo2 = await this.sysAppService.deletePrivateField(parsedAppInfo);
+        return common_dto_1.CommonResult.successNotNull(parsedAppInfo2);
     }
     /**
      * 列表查询: 分页查询
@@ -107,6 +97,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", CrudStdService_1.CrudStdService)
 ], CrudStdGatewayController.prototype, "crudStdService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", SysAppService_1.SysAppService)
+], CrudStdGatewayController.prototype, "sysAppService", void 0);
 __decorate([
     (0, core_1.Post)('/getParsedCrudStdAppInfo'),
     __metadata("design:type", Function),

package/dist/controller/gateway/PublicApiController.d.ts

@@ -9,6 +9,7 @@ export declare class PublicApiController extends BaseApiController {
     private enumInfoService;
     private workbenchService;
     private cacheServiceFactory;
+    private sysAppService;
     /**
      * 获取所有站点列表
      */
@@ -28,5 +29,5 @@ export declare class PublicApiController extends BaseApiController {
     /**
     * 获取应用配置信息
     */
-    getSysAppInfoByAppCode(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    getSysAppInfoByAppCode(): Promise<CommonResult>;
 }

package/dist/controller/gateway/PublicApiController.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PublicApiController = void 0;
 const core_1 = require("@midwayjs/core");
 const _ = require("lodash");
-const keys_1 = require("../../libs/crud-pro/models/keys");
 const BaseApiController_1 = require("../base/BaseApiController");
 const SystemTables_1 = require("../../models/SystemTables");
 const EnumInfoService_1 = require("../../service/EnumInfoService");
@@ -20,10 +19,11 @@ const common_dto_1 = require("../../libs/utils/common-dto");
 const functions_1 = require("../../libs/utils/functions");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
 const SystemPerm_1 = require("../../models/SystemPerm");
-const keys_2 = require("../../libs/crud-pro/models/keys");
+const keys_1 = require("../../libs/crud-pro/models/keys");
 const CacheServiceFactory_1 = require("../../service/base/cache/CacheServiceFactory");
-const md5 = require("md5");
 const bizmodels_1 = require("../../models/bizmodels");
+const permission_middleware_1 = require("../../middleware/permission.middleware");
+const SysAppService_1 = require("../../service/SysAppService");
 /**
  * 公开的API，无需鉴权，所有人可以直接访问
  */
@@ -32,7 +32,7 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
      * 获取所有站点列表
      */
     async getAllWorkbenchInfoList() {
-        const entities = await this.workbenchService.getAllWorkbenchInfoList(false);
+        const entities = await this.workbenchService.getAllWorkbenchInfoList();
         const entities2 = entities.map(e => {
             return {
                 workbench_domain: e.workbench_domain,
@@ -79,7 +79,7 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
                 // 特殊的devops菜单
                 map['devops'] = {
                     menu_list: [],
-                    hasPermission: this.ctx.userSession.isAuthPass(keys_2.KeysOfAuthType.byRoleCode, [SystemPerm_1.SystemRoleCode.DevOpsWriter, SystemPerm_1.SystemRoleCode.DevOpsViewer, SystemPerm_1.SystemRoleCode.SuperAdmin]),
+                    hasPermission: this.ctx.userSession.isAuthPass(keys_1.KeysOfAuthType.byRoleCode, [SystemPerm_1.SystemRoleCode.DevOpsWriter, SystemPerm_1.SystemRoleCode.DevOpsViewer, SystemPerm_1.SystemRoleCode.SuperAdmin]),
                 };
                 return map;
             }
@@ -92,34 +92,23 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
     async getNavPageInfo() {
         const body = this.ctx.request.body;
         const { workbenchCode, appCode, pathname } = body;
-        const resultData = {};
-        const getOneImpl = async (condition, tableName) => {
-            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'] = (0, functions_1.parseJsonObject)(oneData['app_schema']);
-                }
-                return oneData;
-            }
-            return null;
+        const resultData = {
+            appData: null,
+            pageData: null,
         };
-        const getOne = async (condition, tableName, key) => {
-            const cacheKey = md5(tableName + ':' + JSON.stringify(condition) + ":" + key);
-            const oneData = await this.cacheServiceFactory.getJsonObjectCache({
-                cacheKey,
-                cacheName: bizmodels_1.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'] = (0, functions_1.parseJsonObject)(appInfo['app_schema']);
             }
-        };
-        await getOne({ app_code: appCode }, SystemTables_1.SystemTables.sys_app, 'appData');
-        await getOne({ page_path: pathname, workbench_code: workbenchCode }, SystemTables_1.SystemTables.sys_app_page, 'pageData');
+            resultData.appData = await this.sysAppService.deletePrivateField(appInfo);
+        }
+        if (pathname && workbenchCode) {
+            resultData.pageData = await this.sysAppService.getSysAppPageOne({
+                page_path: pathname,
+                workbench_code: workbenchCode
+            });
+        }
         return common_dto_1.CommonResult.successRes(resultData);
     }
     /**
@@ -148,11 +137,12 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
     * 获取应用配置信息
     */
     async getSysAppInfoByAppCode() {
-        return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE, {
-            validateCfg: {
-                'condition.app_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
-            },
-        });
+        var _a;
+        const body = this.ctx.request.body;
+        const app_code = (_a = body === null || body === void 0 ? void 0 : body.condition) === null || _a === void 0 ? void 0 : _a.app_code;
+        const appInfo = await this.sysAppService.getSysAppOne(app_code);
+        const appInfo2 = await this.sysAppService.deletePrivateField(appInfo);
+        return common_dto_1.CommonResult.successRes({ row: appInfo2 });
     }
 };
 __decorate([
@@ -171,6 +161,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
 ], PublicApiController.prototype, "cacheServiceFactory", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", SysAppService_1.SysAppService)
+], PublicApiController.prototype, "sysAppService", void 0);
 __decorate([
     (0, core_1.Get)('/getAllWorkbenchInfoList'),
     __metadata("design:type", Function),
@@ -202,6 +196,6 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], PublicApiController.prototype, "getSysAppInfoByAppCode", null);
 PublicApiController = __decorate([
-    (0, core_1.Controller)('/ns/gw/api/publicApi')
+    (0, core_1.Controller)('/ns/gw/api/publicApi', { middleware: [(0, permission_middleware_1.checkLogin)()] })
 ], PublicApiController);
 exports.PublicApiController = PublicApiController;

package/dist/controller/manage/AppMangeApi.d.ts

@@ -1,7 +1,9 @@
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
+import { SysAppService } from "../../service/SysAppService";
 export declare class AppMangeApi extends BaseApiController {
-    ctx: Context;
+    protected ctx: Context;
+    protected sysAppService: SysAppService;
     getAppList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getAppOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     createApp(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;

package/dist/controller/manage/AppMangeApi.js

@@ -15,6 +15,7 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const BaseApiController_1 = require("../base/BaseApiController");
 const permission_middleware_1 = require("../../middleware/permission.middleware");
 const SystemPerm_1 = require("../../models/SystemPerm");
+const SysAppService_1 = require("../../service/SysAppService");
 let AppMangeApi = class AppMangeApi extends BaseApiController_1.BaseApiController {
     async getAppList() {
         return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
@@ -32,6 +33,10 @@ let AppMangeApi = class AppMangeApi extends BaseApiController_1.BaseApiControlle
         });
     }
     async updateApp() {
+        var _a;
+        const body = this.ctx.request.body;
+        const appCode = (_a = body === null || body === void 0 ? void 0 : body.condition) === null || _a === void 0 ? void 0 : _a.app_code;
+        await this.sysAppService.removeSysAppOneCache(appCode);
         return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
                 'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
@@ -40,6 +45,10 @@ let AppMangeApi = class AppMangeApi extends BaseApiController_1.BaseApiControlle
         });
     }
     async deleteApp() {
+        var _a;
+        const body = this.ctx.request.body;
+        const appCode = (_a = body === null || body === void 0 ? void 0 : body.condition) === null || _a === void 0 ? void 0 : _a.app_code;
+        await this.sysAppService.removeSysAppOneCache(appCode);
         return this.executeSysSimpleSQL('sys_app', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             validateCfg: {
                 'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
@@ -52,6 +61,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], AppMangeApi.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", SysAppService_1.SysAppService)
+], AppMangeApi.prototype, "sysAppService", void 0);
 __decorate([
     (0, core_1.Post)('/getAppList'),
     __metadata("design:type", Function),

package/dist/controller/manage/SysConfigMangeApi.d.ts

@@ -3,6 +3,7 @@ import { BaseApiController } from '../base/BaseApiController';
 import { CommonResult } from '../../libs/utils/common-dto';
 export declare class SysConfigMangeApi extends BaseApiController {
     ctx: Context;
+    private sysConfigService;
     getSysConfigList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getSysConfigOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     createSysConfig(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;

package/dist/controller/manage/SysConfigMangeApi.js

@@ -19,6 +19,7 @@ const bizmodels_1 = require("../../models/bizmodels");
 const SystemTables_1 = require("../../models/SystemTables");
 const common_dto_1 = require("../../libs/utils/common-dto");
 const global_config_1 = require("../../libs/global-config/global-config");
+const SysConfigService_1 = require("../../service/SysConfigService");
 let SysConfigMangeApi = class SysConfigMangeApi extends BaseApiController_1.BaseApiController {
     async getSysConfigList() {
         return this.executeSysSimpleSQL('sys_configs', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, {
@@ -54,17 +55,19 @@ let SysConfigMangeApi = class SysConfigMangeApi extends BaseApiController_1.Base
         if (!id) {
             return common_dto_1.CommonResult.errorRes('id不能为空');
         }
-        const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getOne({ condition: body.condition }, SystemTables_1.SystemTables.sys_configs);
+        const sysConfig = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getUniqueOne({ condition: body.condition }, SystemTables_1.SystemTables.sys_configs);
         if (!sysConfig) {
             return common_dto_1.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) {
                 return common_dto_1.CommonResult.errorRes('编辑权限校验不通过：' + JSON.stringify({ edit_auth_type, edit_auth_config }));
             }
         }
+        // 移除缓存
+        await this.sysConfigService.removeSysConfigOneCache(config_code);
         return this.executeSysSimpleSQL('sys_configs', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
                 'data.workbench_code': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING, 'length:1,64'],
@@ -90,6 +93,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], SysConfigMangeApi.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", SysConfigService_1.SysConfigService)
+], SysConfigMangeApi.prototype, "sysConfigService", void 0);
 __decorate([
     (0, core_1.Post)('/getSysConfigList'),
     __metadata("design:type", Function),

package/dist/controller/manage/UserAccountManageApi.d.ts

@@ -1,14 +1,16 @@
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
+import { CommonResult } from "../../libs/utils/common-dto";
 export declare class UserAccountManageApi extends BaseApiController {
     protected ctx: Context;
+    private cacheServiceFactory;
     getUserAccountList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getUserAccountOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
-    updateUserAccount(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    updateUserAccount(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext | CommonResult>;
     createUserAccount(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     deleteUserAccount(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     /**
      * 重置密码
      */
-    chgUserPassword(): Promise<import("../..").CommonResult>;
+    chgUserPassword(): Promise<CommonResult>;
 }

package/dist/controller/manage/UserAccountManageApi.js

@@ -19,6 +19,9 @@ const SystemPerm_1 = require("../../models/SystemPerm");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const SystemTables_1 = require("../../models/SystemTables");
 const global_config_1 = require("../../libs/global-config/global-config");
+const CacheServiceFactory_1 = require("../../service/base/cache/CacheServiceFactory");
+const bizmodels_1 = require("../../models/bizmodels");
+const common_dto_1 = require("../../libs/utils/common-dto");
 const accountNameBlacklist = new Set(['sa', 'root', 'admin', 'superadmin', 'administrator', 'sys', 'sysop', 'schedule_user']);
 function checkAccountCreateBlacklist(value) {
     if (!value) {
@@ -41,6 +44,23 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
         });
     }
     async updateUserAccount() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const body = this.ctx.request.body;
+        const id = body.condition.id;
+        if (!id) {
+            return common_dto_1.CommonResult.errorRes('id不能为空');
+        }
+        const userAccountInfo = await this.curdMixService.getBbUtil(SystemDbName, SystemDbType).getUniqueOne({
+            condition: body.condition
+        }, SystemTables_1.SystemTables.sys_user_account);
+        if (!userAccountInfo) {
+            return common_dto_1.CommonResult.errorRes('用户信息不存在');
+        }
+        const accountId = userAccountInfo.account_id;
+        await this.cacheServiceFactory.removeItemCache({
+            cacheName: bizmodels_1.CacheNameEnum.CurdMixByAccount,
+            cacheKey: accountId,
+        });
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
                 'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
@@ -87,6 +107,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], UserAccountManageApi.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
+], UserAccountManageApi.prototype, "cacheServiceFactory", void 0);
 __decorate([
     (0, core_1.Post)('/getUserAccountList'),
     __metadata("design:type", Function),

package/dist/controller/manage/WorkbenchMangeApi.js

@@ -26,7 +26,7 @@ let WorkbenchMangeApi = class WorkbenchMangeApi extends BaseApiController_1.Base
     }
     async createWorkbench() {
         // 清除运行时缓存
-        this.workbenchService.clearCache();
+        await this.workbenchService.clearCache();
         const body = this.ctx.request.body;
         const dataObj = body.data || {};
         dataObj.html_content = dataObj.html_content || '<html>hello</html>';
@@ -40,7 +40,7 @@ let WorkbenchMangeApi = class WorkbenchMangeApi extends BaseApiController_1.Base
     }
     async updateWorkbench() {
         // 清除运行时缓存
-        this.workbenchService.clearCache();
+        await this.workbenchService.clearCache();
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_workbench, keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             validateCfg: {
                 'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],

package/dist/controller/render/AppRenderController.d.ts

@@ -6,6 +6,7 @@ import { BaseApiController } from '../base/BaseApiController';
 export declare class AppRenderController extends BaseApiController {
     protected ctx: Context;
     private workbenchService;
+    private sysAppService;
     home(appPath: string): Promise<string>;
     private isSupportCurrentWorkbench;
 }

package/dist/controller/render/AppRenderController.js

@@ -15,27 +15,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppRenderController = void 0;
 const core_1 = require("@midwayjs/core");
 const BaseApiController_1 = require("../base/BaseApiController");
-const keys_1 = require("../../libs/crud-pro/models/keys");
-const SystemTables_1 = require("../../models/SystemTables");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
 const render_utils_1 = require("../../libs/utils/render-utils");
 const crypto_utils_1 = require("../../libs/utils/crypto-utils");
-const global_config_1 = require("../../libs/global-config/global-config");
+const SysAppService_1 = require("../../service/SysAppService");
 /**
  * 渲染独立外部应用
  */
 let AppRenderController = class AppRenderController extends BaseApiController_1.BaseApiController {
     async home(appPath) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const appPathArr = appPath.split('/');
         const appCode = appPathArr[0];
-        const res = await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, {
-            sqlTable: SystemTables_1.SystemTables.sys_app,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-        });
-        const { row: appInfo } = res.getResModel();
+        const appInfo = await this.sysAppService.getSysAppOne(appCode);
         if (!appInfo) {
             this.ctx.status = 404;
             return this.ctx.render('404_app', { appCode, errorMsg: ' 应用不存在' });
@@ -79,6 +70,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", WorkbenchService_1.WorkbenchService)
 ], AppRenderController.prototype, "workbenchService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", SysAppService_1.SysAppService)
+], AppRenderController.prototype, "sysAppService", void 0);
 __decorate([
     (0, core_1.Get)('/:appPath+'),
     __param(0, (0, core_1.Param)('appPath')),

package/dist/index.d.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/dist/index.js

@@ -64,6 +64,7 @@ __exportStar(require("./service/AuthService"), exports);
 __exportStar(require("./service/EnumInfoService"), exports);
 __exportStar(require("./service/FileCenterService"), exports);
 __exportStar(require("./service/SysConfigService"), exports);
+__exportStar(require("./service/SysAppService"), exports);
 __exportStar(require("./service/UserAccountService"), exports);
 __exportStar(require("./service/UserSessionService"), exports);
 __exportStar(require("./service/VisitStatService"), exports);

package/dist/libs/crud-pro/interfaces.d.ts

@@ -115,6 +115,7 @@ export interface ISqlCfgModel extends IBaseCfgModel {
     originSql?: string;
     validate?: IFuncCfgModel;
     executeWhen?: IFuncCfgModel;
+    isNativeSQL?: boolean;
     executeSql?: string;
     executeSqlArgs?: any[];
     crudType?: string;

package/dist/libs/crud-pro/models/SqlCfgModel.d.ts

@@ -13,6 +13,7 @@ declare class SqlCfgModel {
     originSql: string;
     validate: IFuncCfgModel;
     executeWhen: IFuncCfgModel;
+    isNativeSQL?: boolean;
     executeSql: string;
     executeSqlArgs: any[];
     crudType: KeyOfCrudTypes;

package/dist/libs/crud-pro/services/CrudProExecuteSqlService.js

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

package/dist/libs/crud-pro/services/CrudProServiceBase.js

@@ -61,12 +61,10 @@ class CrudProServiceBase {
             crudType: null,
         };
         if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
-            const pgSql = (0, convertPgSql_1.replaceQuestionMarks)(sqlCfgModel.executeSql);
-            sqlCfgModel.executeSql = pgSql;
+            sqlCfgModel.executeSql = (0, convertPgSql_1.replaceQuestionMarks)(sqlCfgModel.executeSql, false);
         }
         else if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
-            const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
-            sqlCfgModel.executeSql = mssql;
+            sqlCfgModel.executeSql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql, false);
         }
         const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
         return await connection.query(sqlCfgModel.executeSql, values);

package/dist/libs/crud-pro/utils/sqlConvert/convertMsSql.d.ts

@@ -1,2 +1,2 @@
-declare function replaceQuestionMarksForMssql(sql: string): string;
+declare function replaceQuestionMarksForMssql(sql: string, isNativeSQL: boolean): string;
 export { replaceQuestionMarksForMssql };

package/dist/libs/crud-pro/utils/sqlConvert/convertMsSql.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceQuestionMarksForMssql = void 0;
-function replaceQuestionMarksForMssql(sql) {
+function replaceQuestionMarksForMssql(sql, isNativeSQL) {
+    if (isNativeSQL === true) {
+        return sql;
+    }
     let count = 0;
     return sql.replace(/\?/g, () => {
         count = count + 1;

package/dist/libs/crud-pro/utils/sqlConvert/convertPgSql.d.ts

@@ -1,2 +1,2 @@
-declare function replaceQuestionMarks(sql: string): string;
+declare function replaceQuestionMarks(sql: string, isNativeSQL: boolean): string;
 export { replaceQuestionMarks };

package/dist/libs/crud-pro/utils/sqlConvert/convertPgSql.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceQuestionMarks = void 0;
-function replaceQuestionMarks(sql) {
+function replaceQuestionMarks(sql, isNativeSQL) {
+    if (isNativeSQL === true) {
+        return sql;
+    }
     let count = 0;
     return sql.replace(/\?/g, () => {
         count = count + 1;

package/dist/models/bizmodels.d.ts

@@ -112,11 +112,12 @@ export declare 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",
     UserSessionByAsyncTaskId = "UserSessionByAsyncTaskId"

package/dist/models/bizmodels.js

@@ -42,11 +42,12 @@ var CacheNameEnum;
     CacheNameEnum["CurdMixByAccount"] = "CurdMixByAccount";
     CacheNameEnum["CurdMixByDict"] = "CurdMixByDict";
     CacheNameEnum["CurdMixByLinkToCustom"] = "CurdMixByLinkToCustom";
-    CacheNameEnum["CurdMixBySysConfig"] = "CurdMixBySysConfig";
     CacheNameEnum["CurdMixByWorkbench"] = "CurdMixByWorkbench";
-    CacheNameEnum["GetParsedCrudStdAppInfo"] = "GetParsedCrudStdAppInfo";
+    CacheNameEnum["GetSysConfigOne"] = "GetSysConfigOne";
+    CacheNameEnum["GetWorkbenchCachedObj"] = "GetWorkbenchCachedObj";
+    CacheNameEnum["GetSysAppOne"] = "GetSysAppOne";
+    CacheNameEnum["GetSysAppPageOne"] = "GetSysAppPageOne";
     CacheNameEnum["GetWorkbenchMenu"] = "GetWorkbenchMenu";
-    CacheNameEnum["GetNavPageInfo"] = "GetNavPageInfo";
     CacheNameEnum["GetEnumInfoByCode"] = "GetEnumInfoByCode";
     CacheNameEnum["UserSessionBySessionId"] = "UserSessionBySessionId";
     CacheNameEnum["UserSessionByAsyncTaskId"] = "UserSessionByAsyncTaskId";

package/dist/service/EnumInfoService.d.ts

@@ -15,6 +15,7 @@ export declare class EnumInfoService {
     private curdProService;
     private curdMixByLinkToCustomService;
     private cacheServiceFactory;
+    private sysConfigService;
     queryEnumInfo(codeList: IQueryEnumInfo[], refreshCache: boolean): Promise<IQueryEnumResult[]>;
     /**
      * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name