midway-fatcms 0.0.11 → 0.0.13

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

@@ -43,6 +43,9 @@ class CrudProFieldUpdateService extends CrudProServiceBase_1.CrudProServiceBase
         }
         catch (e) {
             this.logger.error('getUpdateNewValueByCfg->executeFuncCfg', e);
+            if (e instanceof exceptions_1.CommonException) {
+                throw e;
+            }
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.UPDATE_EXCEPTION, key + '.' + e);
         }
         return result;

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

@@ -142,11 +142,11 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
     async loadMySQLAllTableInfos(query) {
         const dbUtil = { sqlDatabase: query.sqlDatabase, sqlDbType: query.sqlDbType };
         // 获取物理表
-        const tableSql = `SHOW TABLES FROM ${query.sqlDatabase}`;
+        const tableSql = `SHOW TABLES`;
         const tableRes = await this.executeUnsafeQuery(dbUtil, tableSql);
         const tableNames = (tableRes.rows || []).map((row) => Object.values(row)[0]);
         // 获取视图
-        const viewSql = `SHOW FULL TABLES FROM ${query.sqlDatabase} WHERE Table_type = 'VIEW'`;
+        const viewSql = `SHOW FULL TABLES WHERE Table_type = 'VIEW'`;
         const viewRes = await this.executeUnsafeQuery(dbUtil, viewSql);
         const viewNames = (viewRes.rows || []).map((row) => Object.values(row)[0]);
         const tables = [

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toDatabaseNameStr = exports.parseDatabaseName = exports.SPLIT_CONST = void 0;
 const keys_1 = require("../models/keys");
+const global_config_1 = require("../../global-config/global-config");
 const SPLIT_CONST = '_________';
 exports.SPLIT_CONST = SPLIT_CONST;
 const PREFIX_MYSQL = `${keys_1.SqlDbType.mysql}${SPLIT_CONST}`;
@@ -27,6 +28,16 @@ function parseDatabaseName(databaseName) {
             dbName: dbNameArr[1],
         };
     }
+    const gConfig = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+    // 访问系统库
+    if (databaseName === 'fatcms' || databaseName === gConfig.SystemDbName) {
+        if (dbNameArr.length === 1) {
+            return {
+                dbType: gConfig.SystemDbType,
+                dbName: dbNameArr[0],
+            };
+        }
+    }
     if (dbNameArr.length === 1) {
         return {
             dbType: keys_1.SqlDbType.mysql,

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

@@ -8,7 +8,7 @@ const DateTimeUtils = {
         return Date.now();
     },
     getCurrentTimeString() {
-        return moment().format('YYYY-MM-DD HH:mm:ss');
+        return moment().format('YYYY-MM-DD HH:mm:ss.SSS');
     },
     // 以秒为单位的时间戳
     getCurrentTimeStampSecond() {

package/dist/libs/crud-pro/utils/SqlErrorParseUtils.d.ts

@@ -0,0 +1,22 @@
+import { CommonException } from '../exceptions';
+declare const SqlErrorParseUtils: {
+    /**
+     * 从驱动原始错误中提取可读 SQL 错误信息（兼容 MySQL / PostgreSQL / SQL Server）
+     */
+    getSqlErrorMessage(e: any): string;
+    isDuplicateEntryError(e: any, sqlMessage?: string): boolean;
+    isNoSuchTableError(e: any, sqlMessage?: string): boolean;
+    /** 外键约束：父记录被引用，无法删除或修改 */
+    isForeignKeyParentReferencedError(e: any, sqlMessage?: string): boolean;
+    /** 外键约束：关联的主数据不存在 */
+    isForeignKeyParentNotFoundError(e: any, sqlMessage?: string): boolean;
+    isNotNullViolationError(e: any, sqlMessage?: string): boolean;
+    isDataTooLongError(e: any, sqlMessage?: string): boolean;
+    isBadFieldError(e: any, sqlMessage?: string): boolean;
+    isDeadlockError(e: any, sqlMessage?: string): boolean;
+    /**
+     * 将数据库驱动原始错误规范化为 CommonException
+     */
+    parseRunSqlException(e: any): CommonException;
+};
+export { SqlErrorParseUtils };

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.d.ts

@@ -8,4 +8,11 @@ declare function getCurrentFullMoment(): string;
  * @returns 仅包含 ASCII 字符返回 true，否则返回 false；非字符串输入返回 false
  */
 declare function isOnlyAscii(str: string): boolean;
-export { createUniqueId, parseJsonObject, parseStringTrimArray, getCurrentFullMoment, isOnlyAscii };
+/**
+ * 如果entity不存在删除属性或属性为0，表示未删除
+ * @param entity
+ * @returns
+ */
+declare function isEntityDeleted(entity: any): boolean;
+declare function isEntityOK(entity: any): boolean;
+export { createUniqueId, parseJsonObject, parseStringTrimArray, getCurrentFullMoment, isOnlyAscii, isEntityDeleted, isEntityOK };

package/dist/libs/utils/functions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isOnlyAscii = exports.getCurrentFullMoment = exports.parseStringTrimArray = exports.parseJsonObject = exports.createUniqueId = void 0;
+exports.isEntityOK = exports.isEntityDeleted = exports.isOnlyAscii = exports.getCurrentFullMoment = exports.parseStringTrimArray = exports.parseJsonObject = exports.createUniqueId = void 0;
 const md5 = require("md5");
 const moment = require("moment");
 let createUniqueIdIndex = 0;
@@ -97,3 +97,31 @@ function isOnlyAscii(str) {
     return true;
 }
 exports.isOnlyAscii = isOnlyAscii;
+/**
+ * 如果entity不存在删除属性或属性为0，表示未删除
+ * @param entity
+ * @returns
+ */
+function isEntityDeleted(entity) {
+    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;
+}
+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);
+}
+exports.isEntityOK = isEntityOK;

package/dist/service/AuthService.js

@@ -119,7 +119,7 @@ let AuthService = class AuthService extends BaseService_1.BaseService {
         const { publicKey, privateKey } = await AsymmetricCrypto_1.AsymmetricCrypto.generateKeyPair();
         const sessionInfo = {
             nickName: userAccount.nick_name,
-            avatar: userAccount.avatar,
+            avatar: userAccount.avatar || "",
             roleCodes,
             functionCodes,
             loginName,

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.js

@@ -62,12 +62,15 @@ 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;
         //删除策略
         const deleteStrategy = _.get(stdCrudCfgObj, 'othersSetting.values.deleteStrategy');
+        // 自动
+        const enableStandardUpdateCfg = _.get(stdCrudCfgObj, 'othersSetting.values.enableStandardUpdateCfg');
+        const enableStandardUpdateCfgCondition = _.get(stdCrudCfgObj, 'othersSetting.values.enableStandardUpdateCfgCondition');
         const databaseName = stdCrudCfgObj.tableBaseInfo.databaseName;
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
         const cfgModel = {
@@ -76,7 +79,9 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
             sqlTable: getExecuteTableNameBySettingKey(appInfo, stdAction, sqlSimpleName),
             sqlSimpleName,
             updateCfg: {},
-            enableSoftDelete: deleteStrategy === 'soft' // 软删除
+            enableSoftDelete: deleteStrategy === 'soft',
+            enableStandardUpdateCfg: Array.isArray(enableStandardUpdateCfg) && enableStandardUpdateCfg.length > 0 ? enableStandardUpdateCfg : ['by', 'at'],
+            enableStandardUpdateCfgCondition: Array.isArray(enableStandardUpdateCfgCondition) && enableStandardUpdateCfgCondition.length > 0 ? enableStandardUpdateCfgCondition : false, // 默认为false
         };
         // 接口返回最大值
         const maxLimit = _.get(stdCrudCfgObj, 'othersSetting.values.maxLimit');
@@ -203,7 +208,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,7 @@ let CurdMixByDictService = class CurdMixByDictService {
         let selectedRows = [];
         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_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/curd/fixCfgModel.js

@@ -30,7 +30,7 @@ function fixCfgModel(cfgModel) {
             return enableStandardUpdateCfg;
         }
         // update 、insert 添加 by
-        return ['by']; // 创建/修改语句默认添加by
+        return ['by', 'at']; // 创建/修改语句默认添加by
     };
     const getConditionCfgArray = () => {
         // 明确有配置
@@ -47,10 +47,12 @@ function fixCfgModel(cfgModel) {
     const mapping = {
         'condition.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
         'condition.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+        'data.created_at': { functionName: 'getCurrentTimeString' },
         'data.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
         'data.created_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
         'data.created_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
         'data.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+        'data.modified_at': { functionName: 'getCurrentTimeString' },
         'data.modified_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
         'data.modified_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
         'data.modified_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },

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.11",
+  "version": "0.0.13",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/configuration.ts

@@ -1,4 +1,4 @@
-import { Configuration, App, Inject } from '@midwayjs/core';
+import { Configuration, App } from '@midwayjs/core';
 import * as koa from '@midwayjs/koa';
 import * as validate from '@midwayjs/validate';
 import * as info from '@midwayjs/info';
@@ -45,9 +45,6 @@ export class ContainerLifeCycle {
   @App()
   app: koa.Application;
 
-  @Inject()
-  redisService: RedisService;
-
   async onConfigLoad(): Promise<any> {
     const config = this.app.getConfig();
     const logger = this.app.getLogger();
@@ -110,13 +107,23 @@ export class ContainerLifeCycle {
    * 会通过 Redis 广播通知所有节点刷新缓存。
    */
   private async initCacheRefreshRedis() {
-    try {
-      initCacheRefreshPublishClient(this.redisService);
-      initCacheRefreshSubscriber(this.redisService);
-    } catch (e) {
-      // Redis 未配置或不可用时，降级为单节点模式（仅刷新本节点缓存）
-      this.app.getLogger().warn('ContainerLifeCycle ==> initCacheRefreshRedis Redis不可用，降级为单节点模式:', e.message);
-    }
+    setTimeout(async () => {
+
+      const app = this.app;
+      const ctx: koa.IMidwayKoaContext = app.createAnonymousContext();
+      const redisService = await ctx.requestContext.getAsync(RedisService);
+
+      try {
+        initCacheRefreshPublishClient(redisService);
+        initCacheRefreshSubscriber(redisService);
+        this.app.getLogger().info('ContainerLifeCycle ==> initCacheRefreshRedis success');        
+      } catch (e) {
+        // Redis 未配置或不可用时，降级为单节点模式（仅刷新本节点缓存）
+        this.app.getLogger().warn('ContainerLifeCycle ==> initCacheRefreshRedis Redis不可用，降级为单节点模式:', e.message);
+      }
+
+    }, 1000 * 60);
+
   }
 
   /**

package/src/controller/gateway/CrudMtdGatewayController.ts

@@ -10,6 +10,7 @@ import { CurdMixService } from '@/service/curd/CurdMixService';
 import { IRequestCfgModel2 } from '@/models/bizmodels';
 import { parseDatabaseName } from '@/libs/crud-pro/utils/DatabaseName';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { isEntityOK } from '@/libs/utils/functions';
 
 const QUERY_AS_LIST = ['condition', 'data'];
 
@@ -53,7 +54,7 @@ export class CrudMtdGatewayController extends ApiBaseService {
     }
 
     const methodInfo = (await this.curdProService.getCachedCfgByMethod(methodCode)) as any;
-    if (!methodInfo || methodInfo.status !== 1 || methodInfo.deletedAt || methodInfo.deleted_at) {
+    if (!methodInfo || !isEntityOK(methodInfo)) {
       return CommonResult.errorRes('接口不存在或已下线: ' + methodCode);
     }
 

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 '此文档库查询失败';
     }