midway-fatcms 0.0.12 → 0.0.15

package/dist/libs/crud-pro/utils/SqlErrorParseUtils.js

@@ -0,0 +1,219 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SqlErrorParseUtils = void 0;
+const exceptions_1 = require("../exceptions");
+const SqlErrorParseUtils = {
+    /**
+     * 从驱动原始错误中提取可读 SQL 错误信息（兼容 MySQL / PostgreSQL / SQL Server）
+     */
+    getSqlErrorMessage(e) {
+        return '' + ((e === null || e === void 0 ? void 0 : e.sqlMessage) || (e === null || e === void 0 ? void 0 : e.message) || '');
+    },
+    isDuplicateEntryError(e, sqlMessage) {
+        const message = sqlMessage !== null && sqlMessage !== void 0 ? sqlMessage : SqlErrorParseUtils.getSqlErrorMessage(e);
+        if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY) {
+            return true;
+        }
+        // MySQL
+        if ((e === null || e === void 0 ? void 0 : e.code) === 'ER_DUP_ENTRY' || (e === null || e === void 0 ? void 0 : e.errno) === 1062) {
+            return true;
+        }
+        // PostgreSQL
+        if ((e === null || e === void 0 ? void 0 : e.code) === '23505') {
+            return true;
+        }
+        // SQL Server
+        if ((e === null || e === void 0 ? void 0 : e.number) === 2627 || (e === null || e === void 0 ? void 0 : e.number) === 2601) {
+            return true;
+        }
+        return /duplicate key/i.test(message)
+            || /unique constraint/i.test(message)
+            || /unique key constraint/i.test(message)
+            || message.startsWith('Duplicate entry');
+    },
+    isNoSuchTableError(e, sqlMessage) {
+        const message = sqlMessage !== null && sqlMessage !== void 0 ? sqlMessage : SqlErrorParseUtils.getSqlErrorMessage(e);
+        if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE) {
+            return true;
+        }
+        // MySQL
+        if ((e === null || e === void 0 ? void 0 : e.code) === 'ER_NO_SUCH_TABLE' || (e === null || e === void 0 ? void 0 : e.errno) === 1146) {
+            return true;
+        }
+        // PostgreSQL
+        if ((e === null || e === void 0 ? void 0 : e.code) === '42P01') {
+            return true;
+        }
+        // SQL Server
+        if ((e === null || e === void 0 ? void 0 : e.number) === 208) {
+            return true;
+        }
+        return /doesn't exist/i.test(message)
+            || /does not exist/i.test(message)
+            || /invalid object name/i.test(message)
+            || /no such table/i.test(message);
+    },
+    /** 外键约束：父记录被引用，无法删除或修改 */
+    isForeignKeyParentReferencedError(e, sqlMessage) {
+        const message = sqlMessage !== null && sqlMessage !== void 0 ? sqlMessage : SqlErrorParseUtils.getSqlErrorMessage(e);
+        if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === 'ER_ROW_IS_REFERENCED_2' || (e === null || e === void 0 ? void 0 : e.errno) === 1451) {
+            return true;
+        }
+        return /Cannot delete or update a parent row/i.test(message)
+            || /update or delete on table .* violates foreign key constraint/i.test(message)
+            || /DELETE statement conflicted with the REFERENCE constraint/i.test(message)
+            || /UPDATE statement conflicted with the REFERENCE constraint/i.test(message);
+    },
+    /** 外键约束：关联的主数据不存在 */
+    isForeignKeyParentNotFoundError(e, sqlMessage) {
+        const message = sqlMessage !== null && sqlMessage !== void 0 ? sqlMessage : SqlErrorParseUtils.getSqlErrorMessage(e);
+        if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === 'ER_NO_REFERENCED_ROW_2' || (e === null || e === void 0 ? void 0 : e.errno) === 1452) {
+            return true;
+        }
+        // PostgreSQL / SQL Server 与父记录被引用共用错误码，需靠消息区分
+        if ((e === null || e === void 0 ? void 0 : e.code) === '23503' || (e === null || e === void 0 ? void 0 : e.number) === 547) {
+            return /insert or update on table/i.test(message)
+                || /INSERT statement conflicted with the FOREIGN KEY constraint/i.test(message)
+                || /INSERT statement conflicted with the REFERENCE constraint/i.test(message)
+                || /violates foreign key constraint/i.test(message);
+        }
+        return /Cannot add or update a child row/i.test(message)
+            || /insert or update on table .* violates foreign key constraint/i.test(message);
+    },
+    isNotNullViolationError(e, sqlMessage) {
+        const message = sqlMessage !== null && sqlMessage !== void 0 ? sqlMessage : SqlErrorParseUtils.getSqlErrorMessage(e);
+        if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_NOT_NULL) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === 'ER_BAD_NULL_ERROR' || (e === null || e === void 0 ? void 0 : e.errno) === 1048) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === '23502') {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.number) === 515) {
+            return true;
+        }
+        return /cannot be null/i.test(message)
+            || /null value in column/i.test(message)
+            || /violates not-null constraint/i.test(message)
+            || /Cannot insert the value NULL into column/i.test(message);
+    },
+    isDataTooLongError(e, sqlMessage) {
+        const message = sqlMessage !== null && sqlMessage !== void 0 ? sqlMessage : SqlErrorParseUtils.getSqlErrorMessage(e);
+        if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === 'ER_DATA_TOO_LONG' || (e === null || e === void 0 ? void 0 : e.errno) === 1406) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === '22001') {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.number) === 2628 || (e === null || e === void 0 ? void 0 : e.number) === 8152) {
+            return true;
+        }
+        return /data too long/i.test(message)
+            || /value too long/i.test(message)
+            || /string data, right truncation/i.test(message)
+            || /would be truncated/i.test(message);
+    },
+    isBadFieldError(e, sqlMessage) {
+        const message = sqlMessage !== null && sqlMessage !== void 0 ? sqlMessage : SqlErrorParseUtils.getSqlErrorMessage(e);
+        if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_BAD_FIELD) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === 'ER_BAD_FIELD_ERROR' || (e === null || e === void 0 ? void 0 : e.errno) === 1054) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === '42703') {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.number) === 207) {
+            return true;
+        }
+        return /unknown column/i.test(message)
+            || /Invalid column name/i.test(message);
+    },
+    isDeadlockError(e, sqlMessage) {
+        const message = sqlMessage !== null && sqlMessage !== void 0 ? sqlMessage : SqlErrorParseUtils.getSqlErrorMessage(e);
+        if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DEADLOCK) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === 'ER_LOCK_DEADLOCK' || (e === null || e === void 0 ? void 0 : e.errno) === 1213) {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.code) === '40P01') {
+            return true;
+        }
+        if ((e === null || e === void 0 ? void 0 : e.number) === 1205) {
+            return true;
+        }
+        return /deadlock/i.test(message);
+    },
+    /**
+     * 将数据库驱动原始错误规范化为 CommonException
+     */
+    parseRunSqlException(e) {
+        if (e instanceof exceptions_1.CommonException) {
+            return e;
+        }
+        const sqlMessage = SqlErrorParseUtils.getSqlErrorMessage(e);
+        const rules = [
+            {
+                code: exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY,
+                match: SqlErrorParseUtils.isDuplicateEntryError,
+                message: '此条数据已存在，不能重复创建',
+            },
+            {
+                code: exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE,
+                match: SqlErrorParseUtils.isNoSuchTableError,
+                message: (message) => '查询的表不存在：' + message,
+            },
+            {
+                code: exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED,
+                match: SqlErrorParseUtils.isForeignKeyParentReferencedError,
+                message: '无法删除或修改：该数据已被其他记录引用，请先解除关联后再试',
+            },
+            {
+                code: exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND,
+                match: SqlErrorParseUtils.isForeignKeyParentNotFoundError,
+                message: '无法保存：所关联的数据不存在或已被删除',
+            },
+            {
+                code: exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_NOT_NULL,
+                match: SqlErrorParseUtils.isNotNullViolationError,
+                message: '操作失败：必填字段不能为空',
+            },
+            {
+                code: exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG,
+                match: SqlErrorParseUtils.isDataTooLongError,
+                message: '操作失败：输入内容超出字段长度限制',
+            },
+            {
+                code: exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_BAD_FIELD,
+                match: SqlErrorParseUtils.isBadFieldError,
+                message: '操作失败：字段配置有误，请联系管理员检查表结构或接口配置',
+            },
+            {
+                code: exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DEADLOCK,
+                match: SqlErrorParseUtils.isDeadlockError,
+                message: '操作失败：系统繁忙，请稍后重试',
+            },
+        ];
+        for (const rule of rules) {
+            if (rule.match(e, sqlMessage)) {
+                const message = typeof rule.message === 'function' ? rule.message(sqlMessage) : rule.message;
+                return new exceptions_1.CommonException(rule.code, message);
+            }
+        }
+        return e;
+    },
+};
+exports.SqlErrorParseUtils = SqlErrorParseUtils;

package/dist/libs/utils/functions.js

@@ -118,6 +118,9 @@ function isEntityDeleted(entity) {
 }
 exports.isEntityDeleted = isEntityDeleted;
 function isEntityOK(entity) {
+    if (!entity) {
+        return false;
+    }
     const isOK = (entity === null || entity === void 0 ? void 0 : entity.status) === 1 || (entity === null || entity === void 0 ? void 0 : entity.status) === '1';
     return isOK && !isEntityDeleted(entity);
 }

package/dist/models/SystemTables.d.ts

@@ -22,5 +22,6 @@ export declare const SystemTables: {
     sys_visit_stats: string;
     sys_async_tasks: string;
     sys_config_changelog: string;
+    sys_action_log: string;
 };
 export declare const SystemDevOpsWorkbench = "devops";

package/dist/models/SystemTables.js

@@ -25,5 +25,6 @@ exports.SystemTables = {
     sys_visit_stats: 'sys_visit_stats',
     sys_async_tasks: 'sys_async_tasks',
     sys_config_changelog: 'sys_config_changelog',
+    sys_action_log: 'sys_action_log',
 };
 exports.SystemDevOpsWorkbench = 'devops';

package/dist/service/ActionLogService.d.ts

@@ -0,0 +1,14 @@
+import { BaseService } from "../service/base/BaseService";
+import { CrudWriteResult } from '../libs/crud-pro/models/CrudResult';
+export interface IActionLoginInfo {
+    actionModule: string;
+    actionName: string;
+    actionMessage: string;
+    actionTarget: string;
+    createdBy?: string;
+    modifiedBy?: string;
+}
+export declare class ActionLogService extends BaseService {
+    private curdMixService;
+    insertActionLogTable(logInfo: IActionLoginInfo): Promise<CrudWriteResult>;
+}

package/dist/service/ActionLogService.js

@@ -0,0 +1,50 @@
+"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.ActionLogService = void 0;
+const core_1 = require("@midwayjs/core");
+const CurdMixService_1 = require("./curd/CurdMixService");
+const SystemTables_1 = require("../models/SystemTables");
+const global_config_1 = require("../libs/global-config/global-config");
+const BaseService_1 = require("../service/base/BaseService");
+const DateTimeUtils_1 = require("../libs/crud-pro/utils/DateTimeUtils");
+let ActionLogService = class ActionLogService extends BaseService_1.BaseService {
+    async insertActionLogTable(logInfo) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const actionTable = this.curdMixService.getQuickCrud({
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            sqlTable: SystemTables_1.SystemTables.sys_action_log,
+        });
+        const sessionInfo = this.ctx.userSession.getSessionInfo();
+        return actionTable.insert({
+            data: {
+                action_module: logInfo.actionModule,
+                action_name: logInfo.actionName,
+                action_message: logInfo.actionMessage,
+                created_by: logInfo.createdBy || (sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.accountId) || '',
+                created_at: DateTimeUtils_1.DateTimeUtils.getCurrentTimeString(),
+                modified_at: DateTimeUtils_1.DateTimeUtils.getCurrentTimeString(),
+                modified_by: logInfo.modifiedBy || (sessionInfo === null || sessionInfo === void 0 ? void 0 : sessionInfo.accountId) || '',
+                status: 1,
+                action_target: logInfo.actionTarget
+            }
+        });
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdMixService_1.CurdMixService)
+], ActionLogService.prototype, "curdMixService", void 0);
+ActionLogService = __decorate([
+    (0, core_1.Provide)()
+], ActionLogService);
+exports.ActionLogService = ActionLogService;

package/dist/service/anyapi/AnyApiService.js

@@ -32,7 +32,7 @@ const lruCache = new lru_cache_1.LRUCache({
 let AnyApiService = class AnyApiService extends ApiBaseService_1.ApiBaseService {
     async executeAnyApiMethod(methodCode, headers, body, query) {
         const anyApi = await this.getAnyApiMethod(methodCode);
-        if (!anyApi || anyApi.status !== 1) {
+        if (!(0, functions_1.isEntityOK)(anyApi)) {
             throw new devops_1.BizException('接口不存在或已下线：' + methodCode);
         }
         const isSupport = await this.workbenchService.isSupportCurrentWorkbench(anyApi.workbench_code_array);

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

@@ -35,8 +35,7 @@ export declare class CrudStdService extends ApiBaseService {
     private handleResultDataPermissionBySettingKey;
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
-     * @param appCode
-     * @param settingKey
+     * @param stdAction
      */
     getParsedCrudStdAppForSettingKey(stdAction: ICrudStdActionParams): Promise<ICrudStdAppInfoForSettingKey>;
     /**

package/dist/service/crudstd/CrudStdService.js

@@ -62,7 +62,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         var _a;
         const appCode = stdAction.appCode;
         const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
-        if (!appInfo || appInfo.status !== 1) {
+        if (!(0, functions_1.isEntityOK)(appInfo)) {
             throw new devops_1.BizException('应用不存在或已下线：' + appCode);
         }
         const stdCrudCfgObj = appInfo.stdCrudCfgObj;
@@ -155,8 +155,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
     }
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
-     * @param appCode
-     * @param settingKey
+     * @param stdAction
      */
     async getParsedCrudStdAppForSettingKey(stdAction) {
         const { appCode, settingKey, buttonSettingKey } = stdAction || {};
@@ -208,7 +207,7 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
      */
     async executeStdActionByReq(stdAction, params) {
         const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
-        if (!appInfo || appInfo.status !== 1) {
+        if (!(0, functions_1.isEntityOK)(appInfo)) {
             throw new devops_1.BizException('应用不存在或已下线：' + stdAction.appCode);
         }
         const actionsMap = appInfo.actionsMap;

package/dist/service/curd/CurdMixByDictService.js

@@ -59,7 +59,8 @@ let CurdMixByDictService = class CurdMixByDictService {
         let selectedRows = [];
         if (noCacheCodes.length > 0) {
             const res1 = await this.curdProService.executeCrudByCfg({
-                condition: { dict_code: { $in: noCacheCodes }, deleted_at: 0 },
+                columns: ['dict_code', 'label', 'value', 'style', 'code'],
+                condition: { dict_code: { $in: noCacheCodes }, deleted_at: 0, status: 1 },
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,

package/dist/service/curd/CurdMixBySysConfigService.js

@@ -47,7 +47,7 @@ let CurdMixBySysConfigService = class CurdMixBySysConfigService {
         }
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res1 = await this.curdProService.executeCrudByCfg({
-            condition: { config_code: { $in: notCachedCodes }, deleted_at: 0 },
+            condition: { config_code: { $in: notCachedCodes }, deleted_at: 0, status: 1 },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,

package/dist/service/curd/CurdMixByWorkbenchService.js

@@ -34,7 +34,7 @@ let CurdMixByWorkbenchService = CurdMixByWorkbenchService_1 = class CurdMixByWor
                 const service = await ctx.requestContext.getAsync(CurdMixByWorkbenchService_1);
                 const reqJson = {
                     columns: 'workbench_code,workbench_name,workbench_domain',
-                    condition: { deleted_at: 0 },
+                    condition: { deleted_at: 0, status: 1 },
                 };
                 const res = await service.curdProService.executeCrudByCfg(reqJson, {
                     sqlTable: SystemTables_1.SystemTables.sys_workbench,

package/dist/service/proxyapi/ProxyApiLoadService.js

@@ -115,6 +115,9 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         });
         const rows0 = res.getResRows();
         const rows = rows0.filter(s => {
+            if (!(0, functions_1.isEntityOK)(s)) {
+                return false;
+            }
             if (!s.workbench_code_array) {
                 throw new exceptions_1.CommonException('IS_SUPPORT_CURRENT_WORKBENCH', '未配置支持的站点字段');
             }

package/package.json

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

package/src/controller/base/BaseApiController.ts

@@ -15,6 +15,7 @@ import * as md5 from 'md5';
 import { AsymmetricCrypto } from '@/libs/utils/AsymmetricCrypto';
 import { IRequestCfgModel2 } from "@/models/bizmodels";
 import { ConfigChangelogService, isChangelogTable, ChangelogAction } from '@/service/ConfigChangelogService';
+import { ActionLogService } from '@/service/ActionLogService'
 
 export interface IExecuteSimpleSqlParams {
   updateCfg?: Record<string, IFuncCfgModel>;
@@ -49,7 +50,8 @@ export class BaseApiController extends BaseService {
   @Inject()
   protected userAccountService: UserAccountService;
 
-  
+  @Inject()
+  protected actionLogService: ActionLogService;
 
   @Inject()
   protected configChangelogService: ConfigChangelogService;

package/src/controller/gateway/DocGatewayController.ts

@@ -6,6 +6,7 @@ import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 import { WorkbenchService } from '@/service/WorkbenchService';
 import { CommonResult } from '@/libs/utils/common-dto';
+import { isEntityOK } from '@/libs/utils/functions';
 import { getRealIpSafe } from '@/libs/utils/fatcms-request';
 
 function checkIsNumber(value: string, name: string) {
@@ -91,13 +92,16 @@ export class DocGatewayController extends BaseApiController {
       }
     );
 
-    // 更新PV数据
+
     const docObj = res.getOneObj();
-    if (docObj) {
-      const pv: number = parseInt(docObj.pv) || 0;
-      await this.updateDocPV(docId, docLibId, pv);
+    
+    if (!isEntityOK(docObj)) {
+      return CommonResult.errorRes("文档不存在");
     }
 
+    // 更新PV数据
+    const pv: number = parseInt(docObj.pv) || 0;
+    await this.updateDocPV(docId, docLibId, pv);
     return res;
   }
 
@@ -160,7 +164,7 @@ export class DocGatewayController extends BaseApiController {
     );
     const docLibInfo = s.getOneObj();
 
-    if (!docLibInfo) {
+    if (!isEntityOK(docLibInfo)) {
       throw '此文档库查询失败';
     }
 

package/src/controller/gateway/PublicApiController.ts

@@ -4,7 +4,7 @@ import * as _ from 'lodash';
 import { BaseApiController } from '../base/BaseApiController';
 import { EnumInfoService } from '@/service/EnumInfoService';
 import { CommonResult } from '@/libs/utils/common-dto';
-import { parseJsonObject } from '@/libs/utils/functions';
+import { isEntityOK, parseJsonObject } from '@/libs/utils/functions';
 import { WorkbenchService } from '@/service/WorkbenchService';
 import { SystemRoleCode } from '@/models/SystemPerm';
 import { KeysOfAuthType } from '@/libs/crud-pro/models/keys';
@@ -71,10 +71,33 @@ export class PublicApiController extends BaseApiController {
     const allMenuList = await this.sysMenuService.getCachedMenusList();
 
     const menuList = allMenuList.filter(e => {
-      return workbenchMenuCodeSet.has(e.menu_code) && e.status === 1;
+      return workbenchMenuCodeSet.has(e.menu_code) && isEntityOK(e);
     });
 
 
+    const addPermissionInfo = (menu_list: any[], level: number) => {
+      if (!Array.isArray(menu_list)) {
+        return [];
+      }
+      if (level > 10) {
+        return menu_list;
+      }
+      return menu_list.map(e => {
+        if (Array.isArray(e.children)) {
+          e.children = addPermissionInfo(e.children, level + 1);
+        }
+        const view_auth_config = e.view_auth_config;
+        const view_auth_type: KeysOfAuthType = e.view_auth_type || KeysOfAuthType.byFuncCode;
+        if (!view_auth_config) {
+          return { ...e, hasPermission: true };
+        }
+        const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
+        return { ...e, hasPermission };
+      });
+    };
+
+
+
     const mapResult: any = {};
     for (let i = 0; i < menuList.length; i++) {
       const rowElement = cloneObject(menuList[i]);
@@ -86,7 +109,8 @@ export class PublicApiController extends BaseApiController {
 
       const menu_config_content = rowElement.menu_config_content;
       delete rowElement.menu_config_content;
-      const menu_list = parseJsonObject(menu_config_content) || [];
+      let menu_list = parseJsonObject(menu_config_content) || [];
+      menu_list = addPermissionInfo(menu_list, 0);
       mapResult[menu_code] = { ...rowElement, menu_list, hasPermission };
     }
 
@@ -121,10 +145,21 @@ export class PublicApiController extends BaseApiController {
     }
 
     if (pathname && workbenchCode) {
-      resultData.pageData = await this.sysAppService.getSysAppPageOne({
+
+      const pageData = await this.sysAppService.getSysAppPageOne({
         page_path: pathname,
         workbench_code: workbenchCode
       });
+
+      if (pageData) {
+        const clonePageInfo = { ...pageData };
+        const view_auth_config = clonePageInfo.view_auth_config;
+        const view_auth_type: KeysOfAuthType = clonePageInfo.view_auth_type;
+        const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
+        clonePageInfo.hasPermission = hasPermission;
+        resultData.pageData = clonePageInfo;
+      }
+
     }
 
     return CommonResult.successRes(resultData);

package/src/controller/helpers.controller.ts

@@ -6,12 +6,13 @@ import { CommonException, Exceptions } from '@/libs/crud-pro/exceptions';
 import { createUniqueId } from '@/libs/utils/functions';
 import { privateAES } from '@/libs/utils/crypto-utils';
 import { CommonResult } from '@/libs/utils/common-dto';
-import {SystemFuncCode, SystemRoleCode} from "@/models/SystemPerm";
+import { SystemFuncCode, SystemRoleCode } from "@/models/SystemPerm";
 import { checkPermission } from '@/middleware/permission.middleware';
 import { refreshCacheWithBroadcast } from '@/service/base/cache-refresh/CacheRefreshRedisSubscriber';
 import { CacheRefreshCategory } from '@/models/CacheRefreshCategory';
 import { CacheNameEnum } from '@/models/bizmodels';
 import { CacheServiceFactory } from '@/service/base/cache/CacheServiceFactory';
+import { ActionLogService } from '@/service/ActionLogService';
 
 // http://127.0.0.1:7002/ns/api/helpers/getApiScript?prefix=/ns/api/manage
 // http://127.0.0.1:7002/ns/api/helpers/getApiScript
@@ -26,6 +27,9 @@ export class HelpersApi {
   @Inject()
   private midwayWebRouterService: MidwayWebRouterService;
 
+  @Inject()
+  protected actionLogService: ActionLogService;
+
 
   @Get('/getApiEnv')
   async getApiEnv() {
@@ -166,6 +170,15 @@ export class HelpersApi {
       const cacheName = cacheNameParam as CacheNameEnum;
       const cacheServiceFactory = await this.ctx.requestContext.getAsync(CacheServiceFactory);
       await cacheServiceFactory.refreshByCacheName(cacheName, this.ctx as any);
+
+
+      await this.actionLogService.insertActionLogTable({
+        actionModule: '系统工具',
+        actionName: '刷新缓存',
+        actionMessage: '刷新缓存成功',
+        actionTarget: cacheNameParam
+      });
+
       return CommonResult.successRes({
         message: `业务缓存 ${cacheName} 已刷新`,
         cacheName,
@@ -174,6 +187,15 @@ export class HelpersApi {
 
     const category = categoryParam ? categoryParam as CacheRefreshCategory : undefined;
     await refreshCacheWithBroadcast(this.ctx, category);
+
+
+    await this.actionLogService.insertActionLogTable({
+      actionModule: '系统工具',
+      actionName: '刷新缓存',
+      actionMessage: '刷新缓存成功',
+      actionTarget: cacheNameParam
+    });
+
     return CommonResult.successRes({
       message: `缓存已刷新${category ? '(' + category + ')' : '(全部)'}（已广播集群）`,
       category: category || 'ALL',
@@ -183,7 +205,7 @@ export class HelpersApi {
   private checkLocalPermissionEnv() {
 
     //是否是开发者
-   const isDevelopUser = (): boolean=> {
+    const isDevelopUser = (): boolean => {
       const isDevOpsWriter = this.ctx.userSession?.hasRole(SystemRoleCode.DevOpsWriter);
       const isSuperAdmin = this.ctx.userSession?.hasRole(SystemRoleCode.SuperAdmin);
       const isHelpersTools = this.ctx.userSession?.hasPermission(SystemFuncCode.HelpersTools);

package/src/controller/home.controller.ts

@@ -6,6 +6,7 @@ import { createRenderUtils } from '@/libs/utils/render-utils';
 import { privateAES } from '@/libs/utils/crypto-utils';
 import { AuthService } from '@/service/AuthService';
 import { ISessionInfo } from '@/models/userSession';
+import { isEntityOK } from '@/libs/utils/functions';
 
 @Controller('/')
 export class HomeController extends BaseApiController {
@@ -25,7 +26,7 @@ export class HomeController extends BaseApiController {
 
     const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
 
-    if (!workbenchInfo || workbenchInfo.status !== 1) {
+    if (!isEntityOK(workbenchInfo)) {
       this.logInfo(`域名不存在：hostname = ${hostname}, host=${host}`);
       const infos = {
         host,
@@ -35,6 +36,7 @@ export class HomeController extends BaseApiController {
       return this.ctx.render('404_workbench', infos);
     }
 
+
     const html_content = workbenchInfo.html_content || '未配置HTML模版';
 
     const userInfo = await this.getUserAndRefreshSessionInfo();