midway-fatcms 0.0.11 → 0.0.13

package/dist/configuration.d.ts

@@ -1,8 +1,6 @@
 import * as koa from '@midwayjs/koa';
-import { RedisService } from '@midwayjs/redis';
 export declare class ContainerLifeCycle {
     app: koa.Application;
-    redisService: RedisService;
     onConfigLoad(): Promise<any>;
     onReady(): Promise<void>;
     /**

package/dist/configuration.js

@@ -89,14 +89,20 @@ let ContainerLifeCycle = class ContainerLifeCycle {
      * 会通过 Redis 广播通知所有节点刷新缓存。
      */
     async initCacheRefreshRedis() {
-        try {
-            (0, CacheRefreshRedisSubscriber_1.initCacheRefreshPublishClient)(this.redisService);
-            (0, CacheRefreshRedisSubscriber_1.initCacheRefreshSubscriber)(this.redisService);
-        }
-        catch (e) {
-            // Redis 未配置或不可用时，降级为单节点模式（仅刷新本节点缓存）
-            this.app.getLogger().warn('ContainerLifeCycle ==> initCacheRefreshRedis Redis不可用，降级为单节点模式:', e.message);
-        }
+        setTimeout(async () => {
+            const app = this.app;
+            const ctx = app.createAnonymousContext();
+            const redisService = await ctx.requestContext.getAsync(redis_1.RedisService);
+            try {
+                (0, CacheRefreshRedisSubscriber_1.initCacheRefreshPublishClient)(redisService);
+                (0, CacheRefreshRedisSubscriber_1.initCacheRefreshSubscriber)(redisService);
+                this.app.getLogger().info('ContainerLifeCycle ==> initCacheRefreshRedis success');
+            }
+            catch (e) {
+                // Redis 未配置或不可用时，降级为单节点模式（仅刷新本节点缓存）
+                this.app.getLogger().warn('ContainerLifeCycle ==> initCacheRefreshRedis Redis不可用，降级为单节点模式:', e.message);
+            }
+        }, 1000 * 60);
     }
     /**
      * 注册各类型缓存的刷新器到 CacheRefreshHub
@@ -159,10 +165,6 @@ __decorate([
     (0, core_1.App)(),
     __metadata("design:type", Object)
 ], ContainerLifeCycle.prototype, "app", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", redis_1.RedisService)
-], ContainerLifeCycle.prototype, "redisService", void 0);
 ContainerLifeCycle = __decorate([
     (0, core_1.Configuration)({
         // namespace: 'fatcms',

package/dist/controller/gateway/CrudMtdGatewayController.js

@@ -23,6 +23,7 @@ const CurdProService_1 = require("../../service/curd/CurdProService");
 const CurdMixService_1 = require("../../service/curd/CurdMixService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
 const global_config_1 = require("../../libs/global-config/global-config");
+const functions_1 = require("../../libs/utils/functions");
 const QUERY_AS_LIST = ['condition', 'data'];
 function pickAsQuery(query_as_pick, query) {
     if (query_as_pick && typeof query_as_pick === 'string') {
@@ -48,7 +49,7 @@ let CrudMtdGatewayController = class CrudMtdGatewayController extends ApiBaseSer
             return common_dto_1.CommonResult.errorRes('method参数不存在');
         }
         const methodInfo = (await this.curdProService.getCachedCfgByMethod(methodCode));
-        if (!methodInfo || methodInfo.status !== 1 || methodInfo.deletedAt || methodInfo.deleted_at) {
+        if (!methodInfo || !(0, functions_1.isEntityOK)(methodInfo)) {
             return common_dto_1.CommonResult.errorRes('接口不存在或已下线: ' + methodCode);
         }
         this.logInfo('methodInfo=== ', methodInfo);

package/dist/controller/gateway/DocGatewayController.js

@@ -20,6 +20,7 @@ const global_config_1 = require("../../libs/global-config/global-config");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const WorkbenchService_1 = require("../../service/WorkbenchService");
 const common_dto_1 = require("../../libs/utils/common-dto");
+const functions_1 = require("../../libs/utils/functions");
 const fatcms_request_1 = require("../../libs/utils/fatcms-request");
 function checkIsNumber(value, name) {
     if (value === null || value === '' || typeof value === 'undefined') {
@@ -82,12 +83,13 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
             sqlDatabase: SystemDbName,
             sqlDbType: SystemDbType,
         });
-        // 更新PV数据
         const docObj = res.getOneObj();
-        if (docObj) {
-            const pv = parseInt(docObj.pv) || 0;
-            await this.updateDocPV(docId, docLibId, pv);
+        if (!(0, functions_1.isEntityOK)(docObj)) {
+            return common_dto_1.CommonResult.errorRes("文档不存在");
         }
+        // 更新PV数据
+        const pv = parseInt(docObj.pv) || 0;
+        await this.updateDocPV(docId, docLibId, pv);
         return res;
     }
     /**
@@ -134,7 +136,7 @@ let DocGatewayController = class DocGatewayController extends BaseApiController_
             sqlDbType: SystemDbType,
         });
         const docLibInfo = s.getOneObj();
-        if (!docLibInfo) {
+        if (!(0, functions_1.isEntityOK)(docLibInfo)) {
             throw '此文档库查询失败';
         }
         const workbench_code_array = docLibInfo.workbench_code_array;

package/dist/controller/gateway/PublicApiController.js

@@ -58,8 +58,28 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
         const workbenchMenuCodeSet = new Set(workbenchMenuCodeArray);
         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) && (0, functions_1.isEntityOK)(e);
         });
+        const addPermissionInfo = (menu_list, level) => {
+            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 = e.view_auth_type || keys_1.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 = {};
         for (let i = 0; i < menuList.length; i++) {
             const rowElement = cloneObject(menuList[i]);
@@ -69,7 +89,8 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
             const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
             const menu_config_content = rowElement.menu_config_content;
             delete rowElement.menu_config_content;
-            const menu_list = (0, functions_1.parseJsonObject)(menu_config_content) || [];
+            let menu_list = (0, functions_1.parseJsonObject)(menu_config_content) || [];
+            menu_list = addPermissionInfo(menu_list, 0);
             mapResult[menu_code] = { ...rowElement, menu_list, hasPermission };
         }
         // 特殊的devops菜单
@@ -97,10 +118,18 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
             resultData.appData = await this.sysAppService.deletePrivateField(appInfo);
         }
         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 = clonePageInfo.view_auth_type;
+                const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
+                clonePageInfo.hasPermission = hasPermission;
+                resultData.pageData = clonePageInfo;
+            }
         }
         return common_dto_1.CommonResult.successRes(resultData);
     }

package/dist/controller/gateway/StaticController.d.ts

@@ -12,10 +12,8 @@ interface HttpGetRes {
 export declare class StaticController extends BaseApiController {
     protected ctx: Context;
     private getLocalPaths;
-    private initNotFoundList;
     private responseLocalFile;
     proxyStaticFile(ossName: string, relativePath: string): Promise<string>;
-    saveNotFoundList(): Promise<void>;
     httpsGet(url: string): Promise<HttpGetRes>;
     writeResponseToFile(httpsGetRes: HttpGetRes, localFilePath: string, localHeaderPath: string): Promise<void>;
     getMimeType(filePath: string): any;

package/dist/controller/gateway/StaticController.js

@@ -37,9 +37,8 @@ function getPathConfig(ossName) {
         remoteBaseUrl,
     };
 }
-// 404列表缓存
+// 404列表缓存: 只再内存中记录。重启后继续
 let notFoundList = new Set();
-let notFoundListIsInit = false;
 /**
  * 静态文件代理功能
  */
@@ -48,31 +47,10 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
         const app = schedule_1.ANONYMOUS_CONTEXT.getApp();
         const appDir = app.getAppDir();
         const localDir = path.join(appDir, './public/static'); // 本地文件存储目录
-        const notFoundListFile = path.join(localDir, '__404__list.json'); // 404列表文件
         return {
             localDir,
-            notFoundListFile,
         };
     }
-    async initNotFoundList() {
-        if (notFoundListIsInit) {
-            return;
-        }
-        notFoundListIsInit = true;
-        const { localDir, notFoundListFile } = this.getLocalPaths();
-        try {
-            // 确保本地存储目录存在
-            await fs.mkdir(localDir, { recursive: true });
-            const data = await fs.readFile(notFoundListFile, 'utf8');
-            notFoundList = new Set(JSON.parse(data));
-            console.log(`已加载${notFoundList.size}个404记录`);
-        }
-        catch (error) {
-            if (error.code !== 'ENOENT') {
-                console.error('读取404列表失败:', error);
-            }
-        }
-    }
     async responseLocalFile(localFilePath, localHeaderPath, relativePath) {
         const headers = {
             'Cache-Control': 'public, max-age=31536000',
@@ -84,8 +62,10 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
             if (stats.isFile()) {
                 const headerDataStr = await fs.readFile(localHeaderPath, 'utf8');
                 const headerData = (0, functions_1.parseJsonObject)(headerDataStr);
-                if (headerData) {
+                if (headerData && headerData['last-modified']) {
                     headers['last-modified'] = headerData['last-modified'];
+                }
+                if (headerData && headerData['etag']) {
                     headers['etag'] = headerData['etag'];
                 }
             }
@@ -117,7 +97,6 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
         return false;
     }
     async proxyStaticFile(ossName, relativePath) {
-        await this.initNotFoundList();
         const { localDir } = this.getLocalPaths();
         const PATH_CONFIG = getPathConfig(ossName);
         // 构建本地路径和远程路径
@@ -149,7 +128,6 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
             else if (remoteRes.statusCode === 404) {
                 // 记录404并返回
                 notFoundList.add(relativePath);
-                await this.saveNotFoundList();
                 this.logInfo(`[StaticController]远程文件不存在，已记录404: ${relativePath}`);
                 this.ctx.status = 404;
                 return this.ctx.render('500', { errorMsg: ' 远程文件不存在，已记录404' });
@@ -171,19 +149,6 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
         this.ctx.status = 500;
         return this.ctx.render('500', { errorMsg: '未知异常' });
     }
-    // 保存404列表
-    async saveNotFoundList() {
-        const { notFoundListFile } = this.getLocalPaths();
-        try {
-            // 确保存储404列表的目录存在
-            const dir = path.dirname(notFoundListFile);
-            await fs.mkdir(dir, { recursive: true });
-            await fs.writeFile(notFoundListFile, JSON.stringify(Array.from(notFoundList), null), 'utf8');
-        }
-        catch (error) {
-            this.logError('[StaticController]保存404列表失败:', error);
-        }
-    }
     // 封装https请求为异步函数
     async httpsGet(url) {
         return new Promise((resolve, reject) => {

package/dist/controller/home.controller.js

@@ -16,12 +16,13 @@ const WorkbenchService_1 = require("../service/WorkbenchService");
 const render_utils_1 = require("../libs/utils/render-utils");
 const crypto_utils_1 = require("../libs/utils/crypto-utils");
 const AuthService_1 = require("../service/AuthService");
+const functions_1 = require("../libs/utils/functions");
 let HomeController = class HomeController extends BaseApiController_1.BaseApiController {
     async home() {
         const host = this.ctx.request.host;
         const hostname = this.ctx.request.hostname;
         const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
-        if (!workbenchInfo || workbenchInfo.status !== 1) {
+        if (!(0, functions_1.isEntityOK)(workbenchInfo)) {
             this.logInfo(`域名不存在：hostname = ${hostname}, host=${host}`);
             const infos = {
                 host,

package/dist/controller/manage/AccountRoleManageApi.d.ts

@@ -1,10 +1,11 @@
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
+import { CommonResult } from '../../libs/utils/common-dto';
 export declare class AccountRoleManageApi extends BaseApiController {
     protected ctx: Context;
     getAccountRoleList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getAccountRoleOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
-    createAccountRole(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    createAccountRole(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext | CommonResult>;
     updateAccountRole(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     deleteAccountRole(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
 }

package/dist/controller/manage/AccountRoleManageApi.js

@@ -18,6 +18,9 @@ const cacherefresh_middleware_1 = require("../../middleware/cacherefresh.middlew
 const bizmodels_1 = require("../../models/bizmodels");
 const SystemPerm_1 = require("../../models/SystemPerm");
 const CurdMixUtils_1 = require("../../service/curd/CurdMixUtils");
+const SystemTables_1 = require("../../models/SystemTables");
+const global_config_1 = require("../../libs/global-config/global-config");
+const common_dto_1 = require("../../libs/utils/common-dto");
 let AccountRoleManageApi = class AccountRoleManageApi extends BaseApiController_1.BaseApiController {
     async getAccountRoleList() {
         return this.executeSysSimpleSQL('sys_perm_user_role', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, {
@@ -40,6 +43,37 @@ let AccountRoleManageApi = class AccountRoleManageApi extends BaseApiController_
         return this.executeSysSimpleSQL('sys_perm_user_role', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE);
     }
     async createAccountRole() {
+        var _a, _b;
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const body = this.ctx.request.body;
+        const accountId = (_a = body.data) === null || _a === void 0 ? void 0 : _a.account_id;
+        const roleCode = (_b = body.data) === null || _b === void 0 ? void 0 : _b.role_code;
+        // 校验 account_id 是否存在
+        if (accountId) {
+            const accountInfoRes = await this.curdMixService.getQuickCrud({
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
+                sqlTable: SystemTables_1.SystemTables.sys_user_account,
+            }).isExist({
+                condition: { account_id: accountId }
+            });
+            if (!accountInfoRes.exists) {
+                return common_dto_1.CommonResult.errorRes(`账户ID '${accountId}' 不存在`);
+            }
+        }
+        // 校验 role_code 是否存在
+        if (roleCode) {
+            const roleInfoRes = await this.curdMixService.getQuickCrud({
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
+                sqlTable: SystemTables_1.SystemTables.sys_perm_role,
+            }).isExist({
+                condition: { role_code: roleCode }
+            });
+            if (!roleInfoRes.exists) {
+                return common_dto_1.CommonResult.errorRes(`角色编码 '${roleCode}' 不存在`);
+            }
+        }
         return this.executeSysSimpleSQL('sys_perm_user_role', keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
             validateCfg: {
                 'data.account_id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],

package/dist/controller/manage/DataDictManageApi.d.ts

@@ -6,6 +6,8 @@ export declare class DataDictManageApi extends BaseApiController {
     getDataDictList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     getDataDictOne(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     createDataDict(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
+    /** 查询 dict_code 是否仅被软删除记录占用（不含 deleted_at=0 的活跃记录） */
+    private isSoftDeletedDictCode;
     updateDataDict(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     deleteDataDict(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext | CommonResult>;
     getDataDictItemList(): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;

package/dist/controller/manage/DataDictManageApi.js

@@ -18,6 +18,8 @@ const cacherefresh_middleware_1 = require("../../middleware/cacherefresh.middlew
 const bizmodels_1 = require("../../models/bizmodels");
 const SystemPerm_1 = require("../../models/SystemPerm");
 const common_dto_1 = require("../../libs/utils/common-dto");
+const exceptions_1 = require("../../libs/crud-pro/exceptions");
+const global_config_1 = require("../../libs/global-config/global-config");
 let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.BaseApiController {
     async getDataDictList() {
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, {
@@ -30,18 +32,48 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
         });
     }
     async createDataDict() {
-        return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
-            enableSoftDelete: true,
-            validateCfg: {
-                'data.dict_code': [keys_1.KeysOfValidators.REQUIRED],
-            },
+        var _a;
+        const body = this.ctx.request.body;
+        const dict_code = (_a = body === null || body === void 0 ? void 0 : body.data) === null || _a === void 0 ? void 0 : _a.dict_code;
+        try {
+            return await this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
+                enableSoftDelete: true,
+                validateCfg: {
+                    'data.dict_code': [keys_1.KeysOfValidators.REQUIRED],
+                },
+            });
+        }
+        catch (e) {
+            if ((e === null || e === void 0 ? void 0 : e.code) === exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY && dict_code) {
+                const isSoftDeleted = await this.isSoftDeletedDictCode(dict_code);
+                if (isSoftDeleted) {
+                    throw new exceptions_1.CommonException(exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY, '该 dict_code 对应的数据曾被软删除，无法直接创建。请联系 DBA 处理，或更换 dict_code 后重试。');
+                }
+            }
+            throw e;
+        }
+    }
+    /** 查询 dict_code 是否仅被软删除记录占用（不含 deleted_at=0 的活跃记录） */
+    async isSoftDeletedDictCode(dict_code) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const result = await this.curdMixService.executeCrudByCfg({ condition: { dict_code } }, {
+            sqlTable: 'sys_data_dict',
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+            enableSoftDelete: false,
         });
+        const row = result.getOneObj();
+        if (!row) {
+            return false;
+        }
+        return Number(row.deleted_at) !== 0;
     }
     async updateDataDict() {
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
             },
         });
     }
@@ -55,7 +87,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
         return this.executeSysSimpleSQL('sys_data_dict', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
                 'condition.dict_code': [keys_1.KeysOfValidators.REQUIRED],
             },
         });
@@ -85,7 +117,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
         return this.executeSysSimpleSQL('sys_data_dict_item', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
             },
         });
     }
@@ -93,7 +125,7 @@ let DataDictManageApi = class DataDictManageApi extends BaseApiController_1.Base
         return this.executeSysSimpleSQL('sys_data_dict_item', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
                 'condition.dict_code': [keys_1.KeysOfValidators.REQUIRED],
             },
         });

package/dist/controller/manage/DocManageApi.js

@@ -75,7 +75,7 @@ let DocManageApi = class DocManageApi extends BaseApiController_1.BaseApiControl
         return this.executeSysSimpleSQL('sys_doc', keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
             },
             updateCfg: {
                 ...updateCfg,
@@ -87,7 +87,7 @@ let DocManageApi = class DocManageApi extends BaseApiController_1.BaseApiControl
         return this.executeSysSimpleSQL('sys_doc', keys_1.KeysOfSimpleSQL.SIMPLE_DELETE, {
             enableSoftDelete: true,
             validateCfg: {
-                'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMERIC],
+                'condition.id': [keys_1.KeysOfValidators.REQUIRED],
             },
             updateCfg: {
                 'condition.workbench_code': { contextAsString: bizmodels_1.CTX_WORKBENCH_CODE },

package/dist/controller/manage/UserAccountManageApi.js

@@ -13,13 +13,13 @@ exports.UserAccountManageApi = void 0;
 const core_1 = require("@midwayjs/core");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const BaseApiController_1 = require("../base/BaseApiController");
-const functions_1 = require("../../libs/utils/functions");
 const permission_middleware_1 = require("../../middleware/permission.middleware");
 const SystemPerm_1 = require("../../models/SystemPerm");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const SystemTables_1 = require("../../models/SystemTables");
 const global_config_1 = require("../../libs/global-config/global-config");
 const common_dto_1 = require("../../libs/utils/common-dto");
+const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 const accountNameBlacklist = new Set(['sa', 'root', 'admin', 'superadmin', 'administrator', 'sys', 'sysop', 'schedule_user']);
 function checkAccountCreateBlacklist(value) {
     if (!value) {
@@ -73,16 +73,17 @@ let UserAccountManageApi = class UserAccountManageApi extends BaseApiController_
     }
     async createUserAccount() {
         const body = this.ctx.request.body;
-        body.data.account_id = (0, functions_1.createUniqueId)();
         const { generateUserAccountId } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         if (typeof generateUserAccountId === 'function') {
             body.data.account_id = await generateUserAccountId(body.data);
         }
+        else {
+            body.data.account_id = MixinUtils_1.MixinUtils.generateSnowflakeId();
+        }
         const result = await this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_user_account, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT, {
             validateCfg: {
                 'data.login_name': LOGIN_NAME_VALIDATE,
                 'data.nick_name': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING, 'length:2,20', checkAccountCreateBlacklist],
-                'data.avatar': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
         });
         return result;

package/dist/controller/render/AppRenderController.js

@@ -20,6 +20,7 @@ const render_utils_1 = require("../../libs/utils/render-utils");
 const crypto_utils_1 = require("../../libs/utils/crypto-utils");
 const SysAppService_1 = require("../../service/SysAppService");
 const AuthService_1 = require("../../service/AuthService");
+const functions_1 = require("../../libs/utils/functions");
 /**
  * 渲染独立外部应用
  */
@@ -28,13 +29,9 @@ let AppRenderController = class AppRenderController extends BaseApiController_1.
         const appPathArr = appPath.split('/');
         const appCode = appPathArr[0];
         const appInfo = await this.sysAppService.getSysAppOne(appCode);
-        if (!appInfo) {
+        if (!(0, functions_1.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);
         if (!isSupportWorkbench) {
@@ -42,6 +39,10 @@ let AppRenderController = class AppRenderController extends BaseApiController_1.
             return this.ctx.render('404_app', { appCode, errorMsg: ' 应用没有绑定此站点' });
         }
         const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
+        if (!(0, functions_1.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();
         // 形如(不带域名)：/ns/app/abc-app-path?aa=2332

package/dist/libs/crud-pro/CrudPro.d.ts

@@ -119,7 +119,6 @@ declare class CrudPro {
      */
     private convertConditionTypeIfNeeded;
     private executeSQLList;
-    private parseRunSqlException;
     private afterExecuteSQLList;
     private beforeExecuteSQLList;
 }

package/dist/libs/crud-pro/CrudPro.js

@@ -7,6 +7,7 @@ const CurdProServiceHub_1 = require("./services/CurdProServiceHub");
 const exceptions_1 = require("./exceptions");
 const RequestCfgModel_1 = require("./models/RequestCfgModel");
 const MixinUtils_1 = require("./utils/MixinUtils");
+const SqlErrorParseUtils_1 = require("./utils/SqlErrorParseUtils");
 const keys_1 = require("./models/keys");
 class CrudPro {
     constructor() {
@@ -355,19 +356,9 @@ class CrudPro {
             const message = MixinUtils_1.MixinUtils.getErrorMessage(e);
             const logger = this.executeContext.getLogger();
             logger.error('RUN_SQL_EXCEPTION', message);
-            throw this.parseRunSqlException(e || {});
+            throw SqlErrorParseUtils_1.SqlErrorParseUtils.parseRunSqlException(e || {});
         }
     }
-    parseRunSqlException(e) {
-        const sqlMessage = '' + e.sqlMessage;
-        if (e.code === 'ER_DUP_ENTRY' && sqlMessage.startsWith('Duplicate entry')) {
-            return new exceptions_1.CommonException(exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_DUP_ENTRY, '此对象实体已存在，不能创建重复对象');
-        }
-        if (e.code === 'ER_NO_SUCH_TABLE') {
-            return new exceptions_1.CommonException(exceptions_1.Exceptions.RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE, '查询的表不存在：' + sqlMessage);
-        }
-        return e;
-    }
     async afterExecuteSQLList() {
         return this.executeContext.contextFunc.afterExecuteSQLList();
     }

package/dist/libs/crud-pro/exceptions.d.ts

@@ -79,6 +79,12 @@ export declare 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/dist/libs/crud-pro/exceptions.js

@@ -83,6 +83,12 @@ var Exceptions;
     Exceptions["RUN_SQL_EXCEPTION"] = "RUN_SQL_EXCEPTION";
     Exceptions["RUN_SQL_EXCEPTION_ER_DUP_ENTRY"] = "RUN_SQL_EXCEPTION_ER_DUP_ENTRY";
     Exceptions["RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE"] = "RUN_SQL_EXCEPTION_ER_NO_SUCH_TABLE";
+    Exceptions["RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED"] = "RUN_SQL_EXCEPTION_ER_FK_PARENT_REFERENCED";
+    Exceptions["RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND"] = "RUN_SQL_EXCEPTION_ER_FK_PARENT_NOT_FOUND";
+    Exceptions["RUN_SQL_EXCEPTION_ER_NOT_NULL"] = "RUN_SQL_EXCEPTION_ER_NOT_NULL";
+    Exceptions["RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG"] = "RUN_SQL_EXCEPTION_ER_DATA_TOO_LONG";
+    Exceptions["RUN_SQL_EXCEPTION_ER_BAD_FIELD"] = "RUN_SQL_EXCEPTION_ER_BAD_FIELD";
+    Exceptions["RUN_SQL_EXCEPTION_ER_DEADLOCK"] = "RUN_SQL_EXCEPTION_ER_DEADLOCK";
     Exceptions["RUN_IS_NEED_EXECUTE_ERR"] = "RUN_IS_NEED_EXECUTE_ERR";
     Exceptions["RUN_PICK_ERR_VISITOR_NULL"] = "RUN_PICK_ERR_VISITOR_NULL";
     Exceptions["RUN_PICK_ERR_VISITOR_FIELD"] = "RUN_PICK_ERR_VISITOR_FIELD";

package/dist/libs/crud-pro/models/keys.d.ts

@@ -8,6 +8,7 @@ export declare enum KeysOfFunCtx {
     CURRENT_VALUE = "$current",
     VISITOR = "visitor",
     VISITOR_ATTR = "visitor.",
+    VISITOR_AVATAR = "visitor.avatar",
     REQUEST = "req.",
     RESULT = "res."
 }

package/dist/libs/crud-pro/models/keys.js

@@ -13,6 +13,7 @@ var KeysOfFunCtx;
     KeysOfFunCtx["CURRENT_VALUE"] = "$current";
     KeysOfFunCtx["VISITOR"] = "visitor";
     KeysOfFunCtx["VISITOR_ATTR"] = "visitor.";
+    KeysOfFunCtx["VISITOR_AVATAR"] = "visitor.avatar";
     KeysOfFunCtx["REQUEST"] = "req.";
     KeysOfFunCtx["RESULT"] = "res.";
 })(KeysOfFunCtx = exports.KeysOfFunCtx || (exports.KeysOfFunCtx = {}));

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

@@ -82,8 +82,8 @@ class CrudProExecuteFuncService extends CrudProServiceBase_1.CrudProServiceBase
         if (pickString.startsWith(keys_1.KeysOfFunCtx.VISITOR_ATTR)) {
             const reqModel = funcCtx === null || funcCtx === void 0 ? void 0 : funcCtx.reqModel;
             const attrValue = _.get(reqModel, pickString); // visitor.nickName
-            if (isNil(attrValue)) {
-                throw new exceptions_1.CommonException(exceptions_1.Exceptions.RUN_PICK_ERR_VISITOR_NULL, '获取用户ID失败, 可能用户没有登陆');
+            if (isNil(attrValue) && ![`${keys_1.KeysOfFunCtx.VISITOR_AVATAR}`].includes(pickString)) {
+                throw new exceptions_1.CommonException(exceptions_1.Exceptions.RUN_PICK_ERR_VISITOR_NULL, '获取用户字段${pickString}失败, 可能用户没有登陆');
             }
             return attrValue;
         }