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

package/dist/service/EnumInfoService.js

@@ -20,6 +20,7 @@ const CurdMixByLinkToCustomService_1 = require("./curd/CurdMixByLinkToCustomServ
 const global_config_1 = require("../libs/global-config/global-config");
 const CacheServiceFactory_1 = require("./base/cache/CacheServiceFactory");
 const bizmodels_1 = require("../models/bizmodels");
+const SysConfigService_1 = require("../service/SysConfigService");
 function filterEmpty(e) {
     return e.label && typeof e.value !== 'undefined';
 }
@@ -29,16 +30,16 @@ let EnumInfoService = class EnumInfoService {
             if (type === CurdMixUtils_1.RelatedType.linkToCustom) {
                 return await this.queryEnumInfoByLinkToCustom(code);
             }
+            if (type === CurdMixUtils_1.RelatedType.sysCfgEnum) {
+                return await this.queryEnumInfoBySysCfgEnum(code);
+            }
             const cacheKey = `${type}@@${code}`;
             return await this.cacheServiceFactory.getJsonObjectCache({
                 cacheKey,
                 refreshCache,
                 cacheName: bizmodels_1.CacheNameEnum.GetEnumInfoByCode,
                 getter: async () => {
-                    if (type === CurdMixUtils_1.RelatedType.sysCfgEnum) {
-                        return await this.queryEnumInfoBySysCfgEnum(code);
-                    }
-                    else if (type === CurdMixUtils_1.RelatedType.dict) {
+                    if (type === CurdMixUtils_1.RelatedType.dict) {
                         return await this.queryEnumInfoItemByDict(code);
                     }
                     return [];
@@ -72,19 +73,7 @@ let EnumInfoService = class EnumInfoService {
         });
     }
     async queryEnumInfoBySysCfgEnum(code) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const res1 = await this.curdProService.executeCrudByCfg({
-            condition: { config_code: code },
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_configs,
-            sqlSimpleName: keys_1.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 = (0, parseConfig_1.parseConfigContentToEnumInfo)(obj);
         return rows.map(e => ({ label: e.label, value: e.value, style: e.style, children: e.children })).filter(filterEmpty);
     }
@@ -121,6 +110,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
 ], EnumInfoService.prototype, "cacheServiceFactory", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", SysConfigService_1.SysConfigService)
+], EnumInfoService.prototype, "sysConfigService", void 0);
 EnumInfoService = __decorate([
     (0, core_1.Provide)()
 ], EnumInfoService);

package/dist/service/SysAppService.d.ts

@@ -0,0 +1,14 @@
+import { BaseService } from './base/BaseService';
+export declare class SysAppService extends BaseService {
+    private curdProService;
+    private cacheServiceFactory;
+    private get sysAppDao();
+    private get sysAppPageDao();
+    getSysAppPageOne({ page_path, workbench_code }: {
+        page_path: string;
+        workbench_code: string;
+    }): Promise<any>;
+    getSysAppOne(app_code: string): Promise<any>;
+    deletePrivateField(parsedAppInfo: any): any;
+    removeSysAppOneCache(app_code: string): Promise<any>;
+}

package/dist/service/SysAppService.js

@@ -0,0 +1,96 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SysAppService = void 0;
+const core_1 = require("@midwayjs/core");
+const SystemTables_1 = require("../models/SystemTables");
+const BaseService_1 = require("./base/BaseService");
+const CurdProService_1 = require("./curd/CurdProService");
+const global_config_1 = require("../libs/global-config/global-config");
+const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
+const bizmodels_1 = require("../models/bizmodels");
+let SysAppService = class SysAppService extends BaseService_1.BaseService {
+    get sysAppDao() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables_1.SystemTables.sys_app);
+    }
+    get sysAppPageDao() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables_1.SystemTables.sys_app_page);
+    }
+    async getSysAppPageOne({ page_path, workbench_code }) {
+        if (!page_path || typeof page_path !== 'string') {
+            throw new Error('[getSysAppPageOne] page_path required');
+        }
+        if (!workbench_code || typeof workbench_code !== 'string') {
+            throw new Error('[getSysAppPageOne] workbench_code required');
+        }
+        return await this.cacheServiceFactory.getJsonObjectCache({
+            cacheKey: `${workbench_code}#${page_path}`,
+            cacheName: bizmodels_1.CacheNameEnum.GetSysAppPageOne,
+            getter: async () => {
+                return await this.sysAppPageDao.getUniqueOne({
+                    condition: { page_path, workbench_code, deleted_at: 0 }
+                });
+            },
+        });
+    }
+    async getSysAppOne(app_code) {
+        if (!app_code || typeof app_code !== 'string') {
+            throw new Error('[getSysAppOne] app_code required');
+        }
+        return await this.cacheServiceFactory.getJsonObjectCache({
+            cacheKey: app_code,
+            cacheName: bizmodels_1.CacheNameEnum.GetSysAppOne,
+            getter: async () => {
+                return await this.sysAppDao.getUniqueOne({
+                    condition: { app_code, deleted_at: 0 }
+                });
+            },
+        });
+    }
+    deletePrivateField(parsedAppInfo) {
+        if (!parsedAppInfo) {
+            return null;
+        }
+        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 parsedAppInfo2;
+    }
+    async removeSysAppOneCache(app_code) {
+        if (!app_code || typeof app_code !== 'string') {
+            throw new Error('[removeSysAppOneCache] app_code required');
+        }
+        return await this.cacheServiceFactory.removeItemCache({
+            cacheKey: app_code,
+            cacheName: bizmodels_1.CacheNameEnum.GetSysAppOne
+        });
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdProService_1.CurdProService)
+], SysAppService.prototype, "curdProService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
+], SysAppService.prototype, "cacheServiceFactory", void 0);
+SysAppService = __decorate([
+    (0, core_1.Provide)()
+], SysAppService);
+exports.SysAppService = SysAppService;

package/dist/service/SysConfigService.d.ts

@@ -3,5 +3,8 @@ import { BaseService } from './base/BaseService';
 export declare class SysConfigService extends BaseService {
     ctx: Context;
     private curdProService;
+    private cacheServiceFactory;
+    private get sysConfigsDao();
     getSysConfigOne(config_code: string): Promise<any>;
+    removeSysConfigOneCache(config_code: string): Promise<any>;
 }

package/dist/service/SysConfigService.js

@@ -11,26 +11,39 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SysConfigService = void 0;
 const core_1 = require("@midwayjs/core");
-const keys_1 = require("../libs/crud-pro/models/keys");
 const SystemTables_1 = require("../models/SystemTables");
 const BaseService_1 = require("./base/BaseService");
 const CurdProService_1 = require("./curd/CurdProService");
 const global_config_1 = require("../libs/global-config/global-config");
+const bizmodels_1 = require("../models/bizmodels");
+const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
 let SysConfigService = class SysConfigService extends BaseService_1.BaseService {
+    get sysConfigsDao() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables_1.SystemTables.sys_configs);
+    }
     async getSysConfigOne(config_code) {
-        if (!config_code) {
-            throw new Error('[getSysConfigOne] config_code required');
+        if (!config_code || typeof config_code !== 'string') {
+            throw new Error('[getSysAppOne] config_code required');
         }
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const res1 = await this.curdProService.executeCrudByCfg({
-            condition: { config_code },
-        }, {
-            sqlTable: SystemTables_1.SystemTables.sys_configs,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
+        return await this.cacheServiceFactory.getJsonObjectCache({
+            cacheKey: config_code,
+            cacheName: bizmodels_1.CacheNameEnum.GetSysConfigOne,
+            getter: async () => {
+                return await this.sysConfigsDao.getUniqueOne({
+                    condition: { config_code, deleted_at: 0 }
+                });
+            },
+        });
+    }
+    async removeSysConfigOneCache(config_code) {
+        if (!config_code || typeof config_code !== 'string') {
+            throw new Error('[removeSysConfigOneCache] config_code required');
+        }
+        return await this.cacheServiceFactory.removeItemCache({
+            cacheKey: config_code,
+            cacheName: bizmodels_1.CacheNameEnum.GetSysConfigOne,
         });
-        return res1.getOneObj();
     }
 };
 __decorate([
@@ -41,6 +54,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", CurdProService_1.CurdProService)
 ], SysConfigService.prototype, "curdProService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
+], SysConfigService.prototype, "cacheServiceFactory", void 0);
 SysConfigService = __decorate([
     (0, core_1.Provide)()
 ], SysConfigService);

package/dist/service/WorkbenchService.d.ts

@@ -5,21 +5,21 @@ import { IScheduleService } from '../interface';
 export declare class WorkbenchService extends BaseService implements IScheduleService {
     ctx: Context;
     private curdProService;
+    private cacheServiceFactory;
     private fatcmsTargetWorkbenchCode;
-    clearCache(): void;
+    clearCache(): Promise<void>;
     runBySchedule(): Promise<void>;
+    private getWorkbenchCachedObj;
     /**
      * 获取所有站点列表
-     * @param isForceRefresh 是否强制刷新缓存
      * @returns
      */
-    getAllWorkbenchInfoList(isForceRefresh?: boolean): Promise<IWorkbenchEntity[]>;
+    getAllWorkbenchInfoList(): Promise<IWorkbenchEntity[]>;
     /**
      * 获取所有站点列表，以map的形式返回。其中key为站点域名，value为站点信息
-     * @param isForceRefresh 是否强制刷新缓存
      * @returns
      */
-    getAllWorkbenchInfoMap(isForceRefresh?: boolean): Promise<Record<any, IWorkbenchEntity>>;
+    getAllWorkbenchInfoMap(): Promise<Record<string, IWorkbenchEntity>>;
     /**
      * 检查站点编码是否匹配
      * @param workbench_code_array 站点编码数组
@@ -50,5 +50,10 @@ export declare class WorkbenchService extends BaseService implements IScheduleSe
     private getCurrentHost;
     isSupportCurrentWorkbench(workbench_code_array: string | string[]): Promise<boolean>;
     isSupportCurrentHostForForMiddleware(): Promise<string | boolean>;
+    /**
+     * 根据站点，配置接口报名单模式
+     * @param workbenchInfo
+     * @param path
+     */
     isSupportTheNodePathByWorkbenchInfo(workbenchInfo: IWorkbenchEntity, path: string): boolean;
 }

package/dist/service/WorkbenchService.js

@@ -23,61 +23,64 @@ const MixinUtils_1 = require("../libs/crud-pro/utils/MixinUtils");
 const global_config_1 = require("../libs/global-config/global-config");
 const AsyncTaskModel_1 = require("../models/AsyncTaskModel");
 const format_url_1 = require("../libs/utils/format-url");
-//
-// const lruCache = new LRUCache<string, any>({
-//   max: 500,
-//   ttl: 1000 * 60 * 60,
-//   ttlAutopurge: true,
-// });
-const lruCache = new Map();
-const CACHE_KEY_WORKBENCH_LIST = 'CACHE_KEY_WORKBENCH_LIST';
-const CACHE_KEY_DOMAIN_MAP = 'CACHE_KEY_DOMAIN_MAP';
+const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
+const bizmodels_1 = require("../models/bizmodels");
 let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService {
-    clearCache() {
-        lruCache.set(CACHE_KEY_WORKBENCH_LIST, null);
-        lruCache.set(CACHE_KEY_DOMAIN_MAP, null);
+    async clearCache() {
+        await this.cacheServiceFactory.removeItemCache({
+            cacheKey: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
+            cacheName: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
+        });
+        await this.cacheServiceFactory.removeItemCache({
+            cacheKey: bizmodels_1.CacheNameEnum.GetWorkbenchCachedObj,
+            cacheName: bizmodels_1.CacheNameEnum.GetWorkbenchCachedObj,
+        });
     }
     async runBySchedule() {
-        await this.getAllWorkbenchInfoMap(true);
+        await this.getWorkbenchCachedObj(true);
+    }
+    async getWorkbenchCachedObj(isForceRefresh) {
+        return this.cacheServiceFactory.getJsonObjectCache({
+            cacheKey: bizmodels_1.CacheNameEnum.GetWorkbenchCachedObj,
+            cacheName: bizmodels_1.CacheNameEnum.GetWorkbenchCachedObj,
+            refreshCache: isForceRefresh,
+            getter: async () => {
+                const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+                const reqJson = { condition: {}, pageSize: 1000, limit: 1000 };
+                const res = await this.curdProService.executeCrudByCfg(reqJson, {
+                    sqlTable: SystemTables_1.SystemTables.sys_workbench,
+                    sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+                    sqlDatabase: SystemDbName,
+                    sqlDbType: SystemDbType,
+                });
+                const listData = res.getResRows();
+                const domainMap1 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain); // 主域名。其他两个域名。
+                const domainMap2 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain2);
+                const domainMap3 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain3);
+                const domainMap = { ...domainMap1, ...domainMap2, ...domainMap3 };
+                const cacheObj = {
+                    workbenchList: listData,
+                    workbenchDomainMap: domainMap
+                };
+                return cacheObj;
+            },
+        });
     }
     /**
      * 获取所有站点列表
-     * @param isForceRefresh 是否强制刷新缓存
      * @returns
      */
-    async getAllWorkbenchInfoList(isForceRefresh) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        let listData = lruCache.get(CACHE_KEY_WORKBENCH_LIST);
-        if (!listData || isForceRefresh === true) {
-            const reqJson = { condition: {}, pageSize: 1000, limit: 1000 };
-            const res = await this.curdProService.executeCrudByCfg(reqJson, {
-                sqlTable: SystemTables_1.SystemTables.sys_workbench,
-                sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemDbName,
-                sqlDbType: SystemDbType,
-            });
-            listData = res.getResRows();
-            lruCache.set(CACHE_KEY_WORKBENCH_LIST, listData);
-        }
-        return listData;
+    async getAllWorkbenchInfoList() {
+        const cachedObj = await this.getWorkbenchCachedObj();
+        return cachedObj.workbenchList;
     }
     /**
      * 获取所有站点列表，以map的形式返回。其中key为站点域名，value为站点信息
-     * @param isForceRefresh 是否强制刷新缓存
      * @returns
      */
-    async getAllWorkbenchInfoMap(isForceRefresh) {
-        let listData;
-        let domainMap = lruCache.get(CACHE_KEY_DOMAIN_MAP);
-        if (!domainMap || isForceRefresh === true) {
-            listData = await this.getAllWorkbenchInfoList(isForceRefresh);
-            const domainMap1 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain); // 主域名。其他两个域名。
-            const domainMap2 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain2);
-            const domainMap3 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain3);
-            domainMap = { ...domainMap1, ...domainMap2, ...domainMap3 };
-            lruCache.set(CACHE_KEY_DOMAIN_MAP, domainMap);
-        }
-        return domainMap;
+    async getAllWorkbenchInfoMap() {
+        const cachedObj = await this.getWorkbenchCachedObj();
+        return cachedObj.workbenchDomainMap;
     }
     /**
      * 检查站点编码是否匹配
@@ -194,6 +197,11 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
         }
         return true;
     }
+    /**
+     * 根据站点，配置接口报名单模式
+     * @param workbenchInfo
+     * @param path
+     */
     isSupportTheNodePathByWorkbenchInfo(workbenchInfo, path) {
         // 非node api路径，直接返回true
         if (!path.startsWith('/ns/')) {
@@ -227,6 +235,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", CurdProService_1.CurdProService)
 ], WorkbenchService.prototype, "curdProService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
+], WorkbenchService.prototype, "cacheServiceFactory", void 0);
 __decorate([
     (0, core_1.Config)('fatcmsTargetWorkbenchCode'),
     __metadata("design:type", String)

package/dist/service/base/cache/CacheServiceFactory.d.ts

@@ -7,6 +7,10 @@ interface IGetJsonObjectCacheParam {
     refreshCache?: boolean;
     getter: () => Promise<any>;
 }
+interface IRemoveItemCacheParam {
+    cacheName: CacheNameEnum;
+    cacheKey: string;
+}
 export declare class CacheServiceFactory {
     protected ctx: Context;
     private fatcmsCache;
@@ -14,5 +18,6 @@ export declare class CacheServiceFactory {
     private getCacheService;
     getCacheServiceByName(cacheName: CacheNameEnum): ICacheService;
     getJsonObjectCache(param: IGetJsonObjectCacheParam): Promise<any>;
+    removeItemCache(param: IRemoveItemCacheParam): Promise<any>;
 }
 export {};

package/dist/service/base/cache/CacheServiceFactory.js

@@ -20,7 +20,7 @@ const MemoryCache_1 = require("./MemoryCache");
 const NoneCache_1 = require("./NoneCache");
 const defaultCacheConfig = {
     cacheLevel: SystemEntities_1.CacheLevelEnum.MEMORY,
-    cacheSecond: 60 * 5
+    cacheSecond: 60 * 60 * 24 * 7
 };
 let CacheServiceFactory = class CacheServiceFactory {
     getCacheService(cacheLevelEnum, cacheName, cacheSecond) {
@@ -59,6 +59,11 @@ let CacheServiceFactory = class CacheServiceFactory {
         }
         return obj;
     }
+    async removeItemCache(param) {
+        const { cacheName, cacheKey } = param;
+        const cacheService = this.getCacheServiceByName(cacheName);
+        return await cacheService.removeItem(cacheKey);
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

package/dist/service/crudstd/CrudStdService.d.ts

@@ -7,7 +7,7 @@ import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudStdActionService } from './CrudStdActionService';
 import { CrudStdRelationService } from './CrudStdRelationService';
 import { ApiBaseService } from '../base/ApiBaseService';
-import { CacheServiceFactory } from '../base/cache/CacheServiceFactory';
+import { SysAppService } from "../../service/SysAppService";
 export declare const SPECIAL_SETTING_KEY: {
     QUERY_LIST: string;
     QUERY_ONE: string;
@@ -26,7 +26,7 @@ export declare class CrudStdService extends ApiBaseService {
     protected curdMixService: CurdMixService;
     protected crudStdActionService: CrudStdActionService;
     protected crudStdRelationService: CrudStdRelationService;
-    protected cacheServiceFactory: CacheServiceFactory;
+    protected sysAppService: SysAppService;
     /**
      * 执行普通CRUD
      */
@@ -46,24 +46,12 @@ export declare class CrudStdService extends ApiBaseService {
      * @param params
      */
     executeStdActionByReq(stdAction: ICrudStdActionParams, params: IRequestModelCrudProExt): Promise<ExecuteContext>;
-    /**
-     * 查询APP信息
-     * @param appCode
-     * @private
-     */
-    private getCrudStdAppInfo;
     /**
      * 查询APP信息
      * @param appCode
      * @private
      */
     getParsedCrudStdAppInfo(appCode: string): Promise<ICrudStdAppInfo>;
-    /**
-     * 查询APP信息
-     * @param appCode
-     * @private
-     */
-    private getParsedCrudStdAppInfoPrivate;
     private hasOperationPerm;
     private fixCfgModelAndParamBySoftDelete;
     private fixCfgModelByFilterValue;

package/dist/service/crudstd/CrudStdService.js

@@ -18,15 +18,13 @@ const CurdMixService_1 = require("../curd/CurdMixService");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const functions_1 = require("../../libs/utils/functions");
 const devops_1 = require("../../models/devops");
-const SystemTables_1 = require("../../models/SystemTables");
 const CrudStdActionService_1 = require("./CrudStdActionService");
 const CrudStdRelationService_1 = require("./CrudStdRelationService");
 const ApiBaseService_1 = require("../base/ApiBaseService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
 const global_config_1 = require("../../libs/global-config/global-config");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
-const CacheServiceFactory_1 = require("../base/cache/CacheServiceFactory");
-const bizmodels_1 = require("../../models/bizmodels");
+const SysAppService_1 = require("../../service/SysAppService");
 exports.SPECIAL_SETTING_KEY = {
     QUERY_LIST: 'QUERY_LIST',
     QUERY_ONE: 'QUERY_ONE',
@@ -213,48 +211,17 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         const actionCfg = appInfo.settingKeyActionCfg;
         return this.crudStdActionService.handleStdActionByReq({ appInfo, params, actionsMap, actionCfg });
     }
-    /**
-     * 查询APP信息
-     * @param appCode
-     * @private
-     */
-    async getCrudStdAppInfo(appCode) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        this.logInfo('getCrudStdAppInfo', appCode);
-        const ss = {
-            sqlTable: SystemTables_1.SystemTables.sys_app,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-        };
-        return await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, ss);
-    }
     /**
      * 查询APP信息
      * @param appCode
      * @private
      */
     async getParsedCrudStdAppInfo(appCode) {
-        return await this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: appCode,
-            cacheName: bizmodels_1.CacheNameEnum.GetParsedCrudStdAppInfo,
-            getter: async () => {
-                return await this.getParsedCrudStdAppInfoPrivate(appCode);
-            },
-        });
-    }
-    /**
-     * 查询APP信息
-     * @param appCode
-     * @private
-     */
-    async getParsedCrudStdAppInfoPrivate(appCode) {
-        const a = await this.getCrudStdAppInfo(appCode);
-        const { row } = a.getResModel();
-        if (!row) {
+        const appInfo = await this.sysAppService.getSysAppOne(appCode);
+        if (!appInfo) {
             return null;
         }
-        const { app_schema, ...others } = row;
+        const { app_schema, ...others } = appInfo;
         const stdCrudCfgObj = (0, functions_1.parseJsonObject)(app_schema);
         const handleArrayCfg = (arrayCfg) => {
             if (Array.isArray(arrayCfg)) {
@@ -401,8 +368,8 @@ __decorate([
 ], CrudStdService.prototype, "crudStdRelationService", void 0);
 __decorate([
     (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], CrudStdService.prototype, "cacheServiceFactory", void 0);
+    __metadata("design:type", SysAppService_1.SysAppService)
+], CrudStdService.prototype, "sysAppService", void 0);
 CrudStdService = __decorate([
     (0, core_1.Provide)()
 ], CrudStdService);

package/dist/service/curd/CrudProQuick.d.ts

@@ -17,21 +17,21 @@ export declare class CrudProQuick {
      * @deprecated
      * @param reqJson
      * @param sqlTable
-     * @returns
+     * @returns 返回一条数据对象
      */
     getOne(reqJson: IRequestModel, sqlTable?: string): Promise<any>;
     /**
      * 期望获取唯一的一个对象，如果数据库中的数量不唯一，则报错。
      * @param reqJson
      * @param sqlTable
-     * @returns
+     * @returns 返回一条数据对象
      */
     getUniqueOne(reqJson: IRequestModel, sqlTable?: string): Promise<any>;
     /**
      * 获取数据列表
      * @param reqJson
      * @param sqlTable 数据库表名称
-     * @returns
+     * @returns 返回多条数据对象组成的数组
      */
     getList(reqJson: IRequestModel, sqlTable?: string): Promise<any[]>;
     getListPage(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard>;
@@ -41,4 +41,10 @@ export declare class CrudProQuick {
     insertOrUpdate(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard>;
     deleteObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;
     executeSQL(executeSql: string, args?: any[]): Promise<any>;
+    /**
+     * 执行数据库的原生SQL语句，不做任何封装的SQL
+     * @param executeNativeSql
+     * @param args
+     */
+    executeNativeSQL(executeNativeSql: string, args?: any[]): Promise<any>;
 }

package/dist/service/curd/CrudProQuick.js

@@ -36,7 +36,7 @@ class CrudProQuick {
      * @deprecated
      * @param reqJson
      * @param sqlTable
-     * @returns
+     * @returns 返回一条数据对象
      */
     async getOne(reqJson, sqlTable) {
         const cfgModel = {
@@ -50,7 +50,7 @@ class CrudProQuick {
      * 期望获取唯一的一个对象，如果数据库中的数量不唯一，则报错。
      * @param reqJson
      * @param sqlTable
-     * @returns
+     * @returns 返回一条数据对象
      */
     async getUniqueOne(reqJson, sqlTable) {
         const cfgModel = {
@@ -75,7 +75,7 @@ class CrudProQuick {
      * 获取数据列表
      * @param reqJson
      * @param sqlTable 数据库表名称
-     * @returns
+     * @returns 返回多条数据对象组成的数组
      */
     async getList(reqJson, sqlTable) {
         const cfgModel = {
@@ -143,5 +143,21 @@ class CrudProQuick {
         };
         return await this.curdPro.executeSQL(sqlCfgModel);
     }
+    /**
+     * 执行数据库的原生SQL语句，不做任何封装的SQL
+     * @param executeNativeSql
+     * @param args
+     */
+    async executeNativeSQL(executeNativeSql, args) {
+        const sqlCfgModel = {
+            isNativeSQL: true,
+            executeSql: executeNativeSql,
+            executeSqlArgs: args,
+            sqlDatabase: this.sqlDatabase,
+            sqlDbType: this.sqlDbType,
+            maxLimit: this.baseCfgModel.maxLimit || DEFAULT_MAX_LIMIT,
+        };
+        return await this.curdPro.executeSQL(sqlCfgModel);
+    }
 }
 exports.CrudProQuick = CrudProQuick;