midway-fatcms 0.0.12 → 0.0.15

package/src/controller/manage/DataDictManageApi.ts

@@ -6,7 +6,9 @@ import { checkPermission } from '@/middleware/permission.middleware';
 import { refreshCache } from '@/middleware/cacherefresh.middleware';
 import { CacheNameEnum } from '@/models/bizmodels';
 import { SystemFuncCode } from '@/models/SystemPerm';
-import {CommonResult} from "@/libs/utils/common-dto";
+import { CommonResult } from "@/libs/utils/common-dto";
+import { CommonException, Exceptions } from '@/libs/crud-pro/exceptions';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Controller('/ns/api/manage/dataDict', { middleware: [checkPermission(SystemFuncCode.DataDictMangeRead)] })
 export class DataDictManageApi extends BaseApiController {
@@ -29,12 +31,47 @@ export class DataDictManageApi extends BaseApiController {
 
   @Post('/createDataDict', { middleware: [checkPermission(SystemFuncCode.DataDictMangeWrite), refreshCache(CacheNameEnum.GetDataDictItemsByDictCode)] })
   async createDataDict() {
-    return this.executeSysSimpleSQL('sys_data_dict', KeysOfSimpleSQL.SIMPLE_INSERT, {
-      enableSoftDelete: true,
-      validateCfg: {
-        'data.dict_code': [KeysOfValidators.REQUIRED],
-      },
-    });
+    const body = this.ctx.request.body as any;
+    const dict_code = body?.data?.dict_code;
+    try {
+      return await this.executeSysSimpleSQL('sys_data_dict', KeysOfSimpleSQL.SIMPLE_INSERT, {
+        enableSoftDelete: true,
+        validateCfg: {
+          'data.dict_code': [KeysOfValidators.REQUIRED],
+        },
+      });
+    } catch (e) {
+      if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY && dict_code) {
+        const isSoftDeleted = await this.isSoftDeletedDictCode(dict_code);
+        if (isSoftDeleted) {
+          throw new CommonException(
+            Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY,
+            '该 dict_code 对应的数据曾被软删除，无法直接创建。请联系 DBA 处理，或更换 dict_code 后重试。'
+          );
+        }
+      }
+      throw e;
+    }
+  }
+
+  /** 查询 dict_code 是否仅被软删除记录占用（不含 deleted_at=0 的活跃记录） */
+  private async isSoftDeletedDictCode(dict_code: string): Promise<boolean> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const result = await this.curdMixService.executeCrudByCfg(
+      { condition: { dict_code } },
+      {
+        sqlTable: 'sys_data_dict',
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+        enableSoftDelete: false,
+      }
+    );
+    const row = result.getOneObj();
+    if (!row) {
+      return false;
+    }
+    return Number(row.deleted_at) !== 0;
   }
 
   @Post('/updateDataDict', { middleware: [checkPermission(SystemFuncCode.DataDictMangeWrite), refreshCache(CacheNameEnum.GetDataDictItemsByDictCode)] })
@@ -42,7 +79,7 @@ export class DataDictManageApi extends BaseApiController {
     return this.executeSysSimpleSQL('sys_data_dict', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       enableSoftDelete: true,
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
+        'condition.id': [KeysOfValidators.REQUIRED],
       },
     });
   }
@@ -57,7 +94,7 @@ export class DataDictManageApi extends BaseApiController {
     return this.executeSysSimpleSQL('sys_data_dict', KeysOfSimpleSQL.SIMPLE_DELETE, {
       enableSoftDelete: true,
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
+        'condition.id': [KeysOfValidators.REQUIRED],
         'condition.dict_code': [KeysOfValidators.REQUIRED],
       },
     });
@@ -94,7 +131,7 @@ export class DataDictManageApi extends BaseApiController {
     return this.executeSysSimpleSQL('sys_data_dict_item', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       enableSoftDelete: true,
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
+        'condition.id': [KeysOfValidators.REQUIRED],
       },
     });
   }
@@ -104,7 +141,7 @@ export class DataDictManageApi extends BaseApiController {
     return this.executeSysSimpleSQL('sys_data_dict_item', KeysOfSimpleSQL.SIMPLE_DELETE, {
       enableSoftDelete: true,
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
+        'condition.id': [KeysOfValidators.REQUIRED],
         'condition.dict_code': [KeysOfValidators.REQUIRED],
       },
     });

package/src/controller/manage/DocManageApi.ts

@@ -80,7 +80,7 @@ export class DocManageApi extends BaseApiController {
     return this.executeSysSimpleSQL('sys_doc', KeysOfSimpleSQL.SIMPLE_UPDATE, {
       enableSoftDelete: true,
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
+        'condition.id': [KeysOfValidators.REQUIRED],
       },
       updateCfg: {
         ...updateCfg,
@@ -94,7 +94,7 @@ export class DocManageApi extends BaseApiController {
     return this.executeSysSimpleSQL('sys_doc', KeysOfSimpleSQL.SIMPLE_DELETE, {
       enableSoftDelete: true,
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
+        'condition.id': [KeysOfValidators.REQUIRED],
       },
       updateCfg: {
         'condition.workbench_code': { contextAsString: CTX_WORKBENCH_CODE },

package/src/controller/myinfo/AuthController.ts

@@ -60,6 +60,15 @@ export class AuthController extends BaseApiController {
 
     const userSessionInfo = await this.authService.createUserSession(loginName, workbench.workbench_code);
     this.ctx.cookies.set(SESSION_ID_KEY, userSessionInfo.sessionId, sessionCookieCfg);
+
+
+    await this.actionLogService.insertActionLogTable({
+      actionModule: '用户账号',
+      actionName: '登录',
+      actionMessage: '登录成功',
+      actionTarget: `${userSessionInfo?.nickName}(${userSessionInfo?.accountId})`
+    });
+
     return CommonResult.successMsg('登录成功', removePrivateField(userSessionInfo));
   }
 
@@ -112,7 +121,20 @@ export class AuthController extends BaseApiController {
       return CommonResult.errorRes('开放体验账号不支持修改密码');
     }
 
-    return this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
+
+
+    const res = await this.userAccountService.chgUserPassword(loginName, unsaltedPwd);
+
+    if (res.success) {
+      await this.actionLogService.insertActionLogTable({
+        actionModule: '用户账号',
+        actionName: '修改密码',
+        actionMessage: '修改密码成功',
+        actionTarget: this.ctx.userSession.getSessionInfo()?.nickName
+      });
+    }
+
+    return res;
   }
 
   /**

package/src/controller/render/AppRenderController.ts

@@ -7,6 +7,7 @@ import { privateAES } from '@/libs/utils/crypto-utils';
 import { SysAppService } from "@/service/SysAppService";
 import { ISessionInfo } from '@/models/userSession';
 import { AuthService } from '@/service/AuthService';
+import { isEntityOK } from '@/libs/utils/functions';
 
 /**
  * 渲染独立外部应用
@@ -33,14 +34,9 @@ export class AppRenderController extends BaseApiController {
 
     const appInfo = await this.sysAppService.getSysAppOne(appCode);
 
-    if (!appInfo) {
+    if (!isEntityOK(appInfo)) {
       this.ctx.status = 404;
-      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用不存在' });
-    }
-
-    if (appInfo.status !== 1) {
-      this.ctx.status = 404;
-      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用已下线' });
+      return this.ctx.render('404_app', { appCode, errorMsg: '应用不存在或已下线' });
     }
 
     const isSupportWorkbench = await this.isSupportCurrentWorkbench(appInfo);
@@ -51,6 +47,12 @@ export class AppRenderController extends BaseApiController {
 
     const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
 
+    if (!isEntityOK(workbenchInfo)) {
+      this.ctx.status = 404;
+      return this.ctx.render('404_app', { appCode, errorMsg: '站点不存在或已下线' });
+    }
+
+
     const html_content = appInfo.html_content || '<b style="color: red">错误：未配置HTML模版，请检查!!</b>';
     const userInfo = await this.getUserAndRefreshSessionInfo();
 

package/src/index.ts

@@ -12,7 +12,6 @@ export * from './controller/gateway/AsyncTaskController';
 export * from './controller/helpers.controller';
 export * from './controller/home.controller';
 export * from './controller/manage/AnyApiMangeApi';
-export * from './controller/manage/AppLogMangeApi';
 export * from './controller/manage/AppMangeApi';
 export * from './controller/manage/AppPageMangeApi';
 export * from './controller/manage/AppSchemaHistoryApi';
@@ -49,6 +48,7 @@ export * from './middleware/tx.middleware';
 export * from './middleware/permission.middleware';
 export * from './middleware/redislock.middleware';
 export * from './service/AuthService';
+export * from './service/ActionLogService';
 export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
 export * from './service/SysConfigService';

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

@@ -5,6 +5,7 @@ import { CurdProServiceHub } from './services/CurdProServiceHub';
 import { CommonException, Exceptions } from './exceptions';
 import { RequestCfgModel } from './models/RequestCfgModel';
 import { MixinUtils } from './utils/MixinUtils';
+import { SqlErrorParseUtils } from './utils/SqlErrorParseUtils';
 import { Transaction } from './models/Transaction';
 import { IExecuteContextFunc } from './models/ExecuteContextFunc';
 import { KeysOfSimpleSQL } from './models/keys';
@@ -417,21 +418,10 @@ class CrudPro {
       const message = MixinUtils.getErrorMessage(e);
       const logger = this.executeContext.getLogger();
       logger.error('RUN_SQL_EXCEPTION', message);
-      throw this.parseRunSqlException(e || {});
+      throw SqlErrorParseUtils.parseRunSqlException(e || {});
     }
   }
 
-  private parseRunSqlException(e: any): CommonException {
-    const sqlMessage = '' + e.sqlMessage;
-    if (e.code === 'ER_DUP_ENTRY' && sqlMessage.startsWith('Duplicate entry')) {
-      return new CommonException(Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY, '此对象实体已存在，不能创建重复对象');
-    }
-    if (e.code === 'ER_NO_SUCH_TABLE') {
-      return new CommonException(Exceptions.RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE, '查询的表不存在：' + sqlMessage);
-    }
-    return e;
-  }
-
   private async afterExecuteSQLList() {
     return this.executeContext.contextFunc.afterExecuteSQLList();
   }

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

@@ -86,6 +86,12 @@ export enum Exceptions {
   RUN_SQL_EXCEPTION = 'RUN_SQL_EXCEPTION',
   RUN_SQL_EXCEPTION_ER_DUP_ENTRY = 'RUN_SQL_EXCEPTION_ER_DUP_ENTRY',
   RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE = 'RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE',
+  RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED = 'RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED',
+  RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND = 'RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND',
+  RUN_SQL_EXCEPTION_ER_NOT_NULL = 'RUN_SQL_EXCEPTION_ER_NOT_NULL',
+  RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG = 'RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG',
+  RUN_SQL_EXCEPTION_ER_BAD_FIELD = 'RUN_SQL_EXCEPTION_ER_BAD_FIELD',
+  RUN_SQL_EXCEPTION_ER_DEADLOCK = 'RUN_SQL_EXCEPTION_ER_DEADLOCK',
   RUN_IS_NEED_EXECUTE_ERR = 'RUN_IS_NEED_EXECUTE_ERR',
   RUN_PICK_ERR_VISITOR_NULL = 'RUN_PICK_ERR_VISITOR_NULL',
   RUN_PICK_ERR_VISITOR_FIELD = 'RUN_PICK_ERR_VISITOR_FIELD',

package/src/libs/crud-pro/utils/SqlErrorParseUtils.ts

@@ -0,0 +1,236 @@
+import { CommonException, Exceptions } from '../exceptions';
+
+interface ISqlErrorRule {
+  code: string;
+  match: (e: any, message: string) => boolean;
+  message: string | ((message: string) => string);
+}
+
+const SqlErrorParseUtils = {
+  /**
+   * 从驱动原始错误中提取可读 SQL 错误信息（兼容 MySQL / PostgreSQL / SQL Server）
+   */
+  getSqlErrorMessage(e: any): string {
+    return '' + (e?.sqlMessage || e?.message || '');
+  },
+
+  isDuplicateEntryError(e: any, sqlMessage?: string): boolean {
+    const message = sqlMessage ?? SqlErrorParseUtils.getSqlErrorMessage(e);
+    if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY) {
+      return true;
+    }
+    // MySQL
+    if (e?.code === 'ER_DUP_ENTRY' || e?.errno === 1062) {
+      return true;
+    }
+    // PostgreSQL
+    if (e?.code === '23505') {
+      return true;
+    }
+    // SQL Server
+    if (e?.number === 2627 || 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: any, sqlMessage?: string): boolean {
+    const message = sqlMessage ?? SqlErrorParseUtils.getSqlErrorMessage(e);
+    if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE) {
+      return true;
+    }
+    // MySQL
+    if (e?.code === 'ER_NO_SUCH_TABLE' || e?.errno === 1146) {
+      return true;
+    }
+    // PostgreSQL
+    if (e?.code === '42P01') {
+      return true;
+    }
+    // SQL Server
+    if (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: any, sqlMessage?: string): boolean {
+    const message = sqlMessage ?? SqlErrorParseUtils.getSqlErrorMessage(e);
+    if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED) {
+      return true;
+    }
+    if (e?.code === 'ER_ROW_IS_REFERENCED_2' || 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: any, sqlMessage?: string): boolean {
+    const message = sqlMessage ?? SqlErrorParseUtils.getSqlErrorMessage(e);
+    if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND) {
+      return true;
+    }
+    if (e?.code === 'ER_NO_REFERENCED_ROW_2' || e?.errno === 1452) {
+      return true;
+    }
+    // PostgreSQL / SQL Server 与父记录被引用共用错误码，需靠消息区分
+    if (e?.code === '23503' || 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: any, sqlMessage?: string): boolean {
+    const message = sqlMessage ?? SqlErrorParseUtils.getSqlErrorMessage(e);
+    if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_NOT_NULL) {
+      return true;
+    }
+    if (e?.code === 'ER_BAD_NULL_ERROR' || e?.errno === 1048) {
+      return true;
+    }
+    if (e?.code === '23502') {
+      return true;
+    }
+    if (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: any, sqlMessage?: string): boolean {
+    const message = sqlMessage ?? SqlErrorParseUtils.getSqlErrorMessage(e);
+    if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG) {
+      return true;
+    }
+    if (e?.code === 'ER_DATA_TOO_LONG' || e?.errno === 1406) {
+      return true;
+    }
+    if (e?.code === '22001') {
+      return true;
+    }
+    if (e?.number === 2628 || 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: any, sqlMessage?: string): boolean {
+    const message = sqlMessage ?? SqlErrorParseUtils.getSqlErrorMessage(e);
+    if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_BAD_FIELD) {
+      return true;
+    }
+    if (e?.code === 'ER_BAD_FIELD_ERROR' || e?.errno === 1054) {
+      return true;
+    }
+    if (e?.code === '42703') {
+      return true;
+    }
+    if (e?.number === 207) {
+      return true;
+    }
+    return /unknown column/i.test(message)
+      || /Invalid column name/i.test(message);
+  },
+
+  isDeadlockError(e: any, sqlMessage?: string): boolean {
+    const message = sqlMessage ?? SqlErrorParseUtils.getSqlErrorMessage(e);
+    if (e?.code === Exceptions.RUN_SQL_EXCEPTION_ER_DEADLOCK) {
+      return true;
+    }
+    if (e?.code === 'ER_LOCK_DEADLOCK' || e?.errno === 1213) {
+      return true;
+    }
+    if (e?.code === '40P01') {
+      return true;
+    }
+    if (e?.number === 1205) {
+      return true;
+    }
+    return /deadlock/i.test(message);
+  },
+
+  /**
+   * 将数据库驱动原始错误规范化为 CommonException
+   */
+  parseRunSqlException(e: any): CommonException {
+    if (e instanceof CommonException) {
+      return e;
+    }
+
+    const sqlMessage = SqlErrorParseUtils.getSqlErrorMessage(e);
+    const rules: ISqlErrorRule[] = [
+      {
+        code: Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY,
+        match: SqlErrorParseUtils.isDuplicateEntryError,
+        message: '此条数据已存在，不能重复创建',
+      },
+      {
+        code: Exceptions.RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE,
+        match: SqlErrorParseUtils.isNoSuchTableError,
+        message: (message) => '查询的表不存在：' + message,
+      },
+      {
+        code: Exceptions.RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED,
+        match: SqlErrorParseUtils.isForeignKeyParentReferencedError,
+        message: '无法删除或修改：该数据已被其他记录引用，请先解除关联后再试',
+      },
+      {
+        code: Exceptions.RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND,
+        match: SqlErrorParseUtils.isForeignKeyParentNotFoundError,
+        message: '无法保存：所关联的数据不存在或已被删除',
+      },
+      {
+        code: Exceptions.RUN_SQL_EXCEPTION_ER_NOT_NULL,
+        match: SqlErrorParseUtils.isNotNullViolationError,
+        message: '操作失败：必填字段不能为空',
+      },
+      {
+        code: Exceptions.RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG,
+        match: SqlErrorParseUtils.isDataTooLongError,
+        message: '操作失败：输入内容超出字段长度限制',
+      },
+      {
+        code: Exceptions.RUN_SQL_EXCEPTION_ER_BAD_FIELD,
+        match: SqlErrorParseUtils.isBadFieldError,
+        message: '操作失败：字段配置有误，请联系管理员检查表结构或接口配置',
+      },
+      {
+        code: 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 CommonException(rule.code, message);
+      }
+    }
+
+    return e;
+  },
+};
+
+export { SqlErrorParseUtils };

package/src/libs/utils/functions.ts

@@ -130,6 +130,9 @@ function isEntityDeleted(entity: any): boolean {
 
 
 function isEntityOK(entity: any): boolean {
+  if(!entity) {
+    return false;
+  }
   const isOK = entity?.status === 1 ||  entity?.status === '1';
   return isOK && !isEntityDeleted(entity); 
 }

package/src/models/SystemTables.ts

@@ -22,8 +22,7 @@ export const 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',
 };
 
 export const SystemDevOpsWorkbench = 'devops';

package/src/service/ActionLogService.ts

@@ -0,0 +1,52 @@
+import { Inject, Provide } from '@midwayjs/core';
+import { CurdMixService } from './curd/CurdMixService';
+import { SystemTables } from '@/models/SystemTables';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { BaseService } from "@/service/base/BaseService";
+import { DateTimeUtils } from '@/libs/crud-pro/utils/DateTimeUtils';
+import { CrudWriteResult } from '@/libs/crud-pro/models/CrudResult';
+
+
+export interface IActionLoginInfo {
+  actionModule: string;
+  actionName: string;
+  actionMessage: string;
+  actionTarget: string;
+  createdBy?: string;
+  modifiedBy?: string;
+}
+
+@Provide()
+export class ActionLogService extends BaseService {
+
+  @Inject()
+  private curdMixService: CurdMixService;
+
+  public async insertActionLogTable(logInfo: IActionLoginInfo): Promise<CrudWriteResult> {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const actionTable = this.curdMixService.getQuickCrud({
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+      sqlTable: 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?.accountId || '',
+        created_at: DateTimeUtils.getCurrentTimeString(),
+        modified_at: DateTimeUtils.getCurrentTimeString(),
+        modified_by: logInfo.modifiedBy || sessionInfo?.accountId || '',
+        status: 1,
+        action_target: logInfo.actionTarget
+      }
+    });
+  }
+
+
+
+}

package/src/service/anyapi/AnyApiService.ts

@@ -7,7 +7,7 @@ import { BizException } from '@/models/devops';
 import { CurdMixService } from '../curd/CurdMixService';
 import { ISysAnyApiEntity } from '@/models/SystemEntities';
 import { AnyApiSandboxService, IRunInSandboxParams } from './AnyApiSandboxService';
-import { parseJsonObject } from '@/libs/utils/functions';
+import { isEntityOK, parseJsonObject } from '@/libs/utils/functions';
 import * as _ from 'lodash';
 import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 import { WorkbenchService } from '../WorkbenchService';
@@ -37,7 +37,7 @@ export class AnyApiService extends ApiBaseService {
 
   async executeAnyApiMethod(methodCode: string, headers: any, body: any, query: any) {
     const anyApi = await this.getAnyApiMethod(methodCode);
-    if (!anyApi || anyApi.status !== 1) {
+    if (!isEntityOK(anyApi)) {
       throw new BizException('接口不存在或已下线：' + methodCode);
     }
 

package/src/service/crudstd/CrudStdService.ts

@@ -6,7 +6,7 @@ import { Context } from '@midwayjs/koa';
 import { CurdMixService } from '../curd/CurdMixService';
 import { IRequestCfgModel, IRequestModel } from '@/libs/crud-pro/interfaces';
 import { KeysOfAuthType, KeysOfSimpleSQL, SqlDbType } from '@/libs/crud-pro/models/keys';
-import { parseJsonObject } from '@/libs/utils/functions';
+import { isEntityOK, parseJsonObject } from '@/libs/utils/functions';
 import { ICrudStdAppInfo, ICrudStdAppInfoForSettingKey, IRequestCfgModel2 } from '@/models/bizmodels';
 import { BizException } from '@/models/devops';
 import { ExecuteContext } from '@/libs/crud-pro/models/ExecuteContext';
@@ -95,7 +95,7 @@ export class CrudStdService extends ApiBaseService {
     const appCode = stdAction.appCode;
     const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
 
-    if (!appInfo || appInfo.status !== 1) {
+    if (!isEntityOK(appInfo)) {
       throw new BizException('应用不存在或已下线：' + appCode);
     }
 
@@ -219,8 +219,7 @@ export class CrudStdService extends ApiBaseService {
 
   /**
    * 获取appInfo 并且拿到当前settingKey相关的信息
-   * @param appCode
-   * @param settingKey
+   * @param stdAction
    */
   public async getParsedCrudStdAppForSettingKey(stdAction: ICrudStdActionParams): Promise<ICrudStdAppInfoForSettingKey> {
     const { appCode, settingKey, buttonSettingKey } = stdAction || {};
@@ -279,7 +278,7 @@ export class CrudStdService extends ApiBaseService {
    */
   public async executeStdActionByReq(stdAction: ICrudStdActionParams, params: IRequestModelCrudProExt): Promise<ExecuteContext> {
     const appInfo = await this.getParsedCrudStdAppForSettingKey(stdAction);
-    if (!appInfo || appInfo.status !== 1) {
+    if (!isEntityOK(appInfo)) {
       throw new BizException('应用不存在或已下线：' + stdAction.appCode);
     }
 

package/src/service/curd/CurdMixByDictService.ts

@@ -68,7 +68,8 @@ export class CurdMixByDictService implements IExecuteContextHandler {
     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.sys_data_dict_item,

package/src/service/curd/CurdMixBySysConfigService.ts

@@ -60,7 +60,7 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
     const { SystemDbName, SystemDbType } = 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.sys_configs,

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -38,7 +38,7 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
         const service: CurdMixByWorkbenchService = await ctx.requestContext.getAsync(CurdMixByWorkbenchService);
         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.sys_workbench,