midway-fatcms 0.0.11 → 0.0.13

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

@@ -7,7 +7,7 @@ function createUniqueId(): string {
   if (createUniqueIdIndex > Date.now()) {
     createUniqueIdIndex = 0;
   }
-  const p1 = md5(Date.now() + '' + Math.random() + '_' + createUniqueIdIndex + '_' +  Math.random());
+  const p1 = md5(Date.now() + '' + Math.random() + '_' + createUniqueIdIndex + '_' + Math.random());
   const p2 = `${Date.now().toString(32)}`.padStart(10, '0');
   const p3 = `${createUniqueIdIndex.toString(32)}`.padStart(10, '0');
   return p1 + p2 + p3;
@@ -106,4 +106,39 @@ function isOnlyAscii(str: string): boolean {
 }
 
 
-export { createUniqueId, parseJsonObject, parseStringTrimArray, getCurrentFullMoment , isOnlyAscii };
+/**
+ * 如果entity不存在删除属性或属性为0，表示未删除
+ * @param entity 
+ * @returns 
+ */
+function isEntityDeleted(entity: any): boolean {
+  if (!entity) {
+    return true;
+  }
+
+  const deletedAt = Number(entity.deleted_at);
+  if (deletedAt && deletedAt > 0) {
+    return true;
+  }
+
+  const deletedAt2 = Number(entity.deletedAt);
+  if (deletedAt2 && deletedAt2 > 0) {
+    return true;
+  }
+  return false;
+}
+
+
+function isEntityOK(entity: any): boolean {
+  if(!entity) {
+    return false;
+  }
+  const isOK = entity?.status === 1 ||  entity?.status === '1';
+  return isOK && !isEntityDeleted(entity); 
+}
+
+
+
+
+
+export { createUniqueId, parseJsonObject, parseStringTrimArray, getCurrentFullMoment, isOnlyAscii, isEntityDeleted, isEntityOK };

package/src/service/AuthService.ts

@@ -142,8 +142,8 @@ export class AuthService extends BaseService {
     const { publicKey, privateKey } = await AsymmetricCrypto.generateKeyPair();
 
     const sessionInfo: ISessionInfo = {
-      nickName: userAccount.nick_name,
-      avatar: userAccount.avatar,
+      nickName: userAccount.nick_name ,
+      avatar: userAccount.avatar || "",
       roleCodes,
       functionCodes,
       loginName,

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);
     }
 
@@ -103,6 +103,9 @@ export class CrudStdService extends ApiBaseService {
 
     //删除策略
     const deleteStrategy = _.get(stdCrudCfgObj, 'othersSetting.values.deleteStrategy');
+    // 自动
+    const enableStandardUpdateCfg: string[] = _.get(stdCrudCfgObj, 'othersSetting.values.enableStandardUpdateCfg');
+    const enableStandardUpdateCfgCondition: string[] = _.get(stdCrudCfgObj, 'othersSetting.values.enableStandardUpdateCfgCondition');
 
     const databaseName = stdCrudCfgObj.tableBaseInfo.databaseName;
 
@@ -114,7 +117,9 @@ export class CrudStdService extends ApiBaseService {
       sqlTable: getExecuteTableNameBySettingKey(appInfo, stdAction, sqlSimpleName),
       sqlSimpleName,
       updateCfg: {},
-      enableSoftDelete: deleteStrategy === 'soft' // 软删除
+      enableSoftDelete: deleteStrategy === 'soft', // 软删除
+      enableStandardUpdateCfg: Array.isArray(enableStandardUpdateCfg) && enableStandardUpdateCfg.length > 0 ? enableStandardUpdateCfg : ['by', 'at'], // 默认为 ['by', 'at']
+      enableStandardUpdateCfgCondition: Array.isArray(enableStandardUpdateCfgCondition) && enableStandardUpdateCfgCondition.length > 0 ? enableStandardUpdateCfgCondition : false, // 默认为false
     };
 
     // 接口返回最大值
@@ -274,7 +279,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,7 @@ export class CurdMixByDictService implements IExecuteContextHandler {
     if (noCacheCodes.length > 0) {
       const res1 = await this.curdProService.executeCrudByCfg(
         {
-          condition: { dict_code: { $in: noCacheCodes }, deleted_at: 0 },
+          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,

package/src/service/curd/fixCfgModel.ts

@@ -34,7 +34,7 @@ function fixCfgModel(cfgModel: IRequestCfgModel2) {
       return enableStandardUpdateCfg;
     }
     // update 、insert 添加 by
-    return ['by']; // 创建/修改语句默认添加by
+    return ['by', 'at']; // 创建/修改语句默认添加by
   };
 
   const getConditionCfgArray = () => {
@@ -55,11 +55,13 @@ function fixCfgModel(cfgModel: IRequestCfgModel2) {
     'condition.created_by': { contextAsString: CTX_VISITOR_ID },
     'condition.created_account_type': { contextAsString: CTX_VISITOR_ACCOUNT_TYPE },
 
+    'data.created_at': { functionName: 'getCurrentTimeString' },
     'data.created_by': { contextAsString: CTX_VISITOR_ID },
     'data.created_avatar': { contextAsString: CTX_VISITOR_AVATAR },
     'data.created_nickname': { contextAsString: CTX_VISITOR_NICKNAME },
     'data.created_account_type': { contextAsString: CTX_VISITOR_ACCOUNT_TYPE },
 
+    'data.modified_at': { functionName: 'getCurrentTimeString' },
     'data.modified_by': { contextAsString: CTX_VISITOR_ID },
     'data.modified_avatar': { contextAsString: CTX_VISITOR_AVATAR },
     'data.modified_nickname': { contextAsString: CTX_VISITOR_NICKNAME },

package/src/service/proxyapi/ProxyApiLoadService.ts

@@ -8,7 +8,7 @@ import { CurdProService } from '../curd/CurdProService';
 import { SystemTables } from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { IProxyApiEntity, IUpstreamInfo } from '../../models/SystemEntities';
-import { parseJsonObject } from '../../libs/utils/functions';
+import { isEntityOK, parseJsonObject } from '../../libs/utils/functions';
 import { BALANCE_STRATEGY } from './ProxyApiUtils';
 import { WeightedRandom } from './WeightedRandom';
 import { WeightedRoundRobin } from './WeightedRoundRobin';
@@ -131,6 +131,9 @@ export class ProxyApiLoadService extends BaseService {
     const rows0 = res.getResRows() as IProxyApiEntity[];
 
     const rows = rows0.filter(s => {
+      if (!isEntityOK(s)) {
+        return false;
+      }
       if (!s.workbench_code_array) {
         throw new CommonException('IS_SUPPORT_CURRENT_WORKBENCH', '未配置支持的站点字段');
       }