midway-fatcms 0.0.11 → 0.0.13

package/src/controller/gateway/PublicApiController.ts

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

package/src/controller/gateway/StaticController.ts

@@ -31,9 +31,8 @@ function getPathConfig(ossName: string) {
   };
 }
 
-// 404列表缓存
+// 404列表缓存: 只再内存中记录。重启后继续
 let notFoundList = new Set();
-let notFoundListIsInit = false;
 
 /**
  * 静态文件代理功能
@@ -47,33 +46,11 @@ export class StaticController extends BaseApiController {
     const app = 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,
     };
   }
 
-  private 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);
-      }
-    }
-  }
 
   private async responseLocalFile(localFilePath: string, localHeaderPath: string, relativePath: string): Promise<boolean> {
     const headers = {
@@ -87,13 +64,18 @@ export class StaticController extends BaseApiController {
       if (stats.isFile()) {
         const headerDataStr = await fs.readFile(localHeaderPath, 'utf8');
         const headerData = parseJsonObject(headerDataStr);
-        if (headerData) {
+
+        if (headerData && headerData['last-modified']) {
           headers['last-modified'] = headerData['last-modified'];
+        }
+
+        if (headerData && headerData['etag']) {
           headers['etag'] = headerData['etag'];
         }
+
       }
     } catch (error) {
-      this.logDebug('[StaticController]responseLocalFile not found header file => ' + localHeaderPath );
+      this.logDebug('[StaticController]responseLocalFile not found header file => ' + localHeaderPath);
     }
 
     try {
@@ -125,7 +107,7 @@ export class StaticController extends BaseApiController {
 
   @All('/:ossName/:relativePath+')
   async proxyStaticFile(@Param('ossName') ossName: string, @Param('relativePath') relativePath: string) {
-    await this.initNotFoundList();
+
     const { localDir } = this.getLocalPaths();
     const PATH_CONFIG = getPathConfig(ossName);
 
@@ -161,9 +143,10 @@ export class StaticController extends BaseApiController {
           return;
         }
       } 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' });
@@ -185,19 +168,7 @@ export class StaticController extends BaseApiController {
     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: string): Promise<HttpGetRes> {

package/src/controller/home.controller.ts

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

package/src/controller/manage/AccountRoleManageApi.ts

@@ -7,6 +7,9 @@ import { refreshCache } from '@/middleware/cacherefresh.middleware';
 import { CacheNameEnum } from '@/models/bizmodels';
 import { SystemFuncCode } from '@/models/SystemPerm';
 import { RelatedType } from '@/service/curd/CurdMixUtils';
+import { SystemTables } from '@/models/SystemTables';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { CommonResult } from '@/libs/utils/common-dto';
 
 @Controller('/ns/api/manage/accountRole', { middleware: [checkPermission(SystemFuncCode.AccountRoleManageRead)] })
 export class AccountRoleManageApi extends BaseApiController {
@@ -39,6 +42,41 @@ export class AccountRoleManageApi extends BaseApiController {
 
   @Post('/createAccountRole', { middleware: [checkPermission(SystemFuncCode.AccountRoleManageWrite), refreshCache(CacheNameEnum.CurdMixByAccount)] })
   async createAccountRole() {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const body = this.ctx.request.body as any;
+    const accountId = body.data?.account_id;
+    const roleCode = body.data?.role_code;
+
+    // 校验 account_id 是否存在
+    if (accountId) {
+      const accountInfoRes = await this.curdMixService.getQuickCrud({
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+        sqlTable: SystemTables.sys_user_account,
+      }).isExist({
+        condition: { account_id: accountId }
+      });
+      
+      if (!accountInfoRes.exists) {
+        return CommonResult.errorRes(`账户ID '${accountId}' 不存在`);
+      }
+    }
+
+    // 校验 role_code 是否存在
+    if (roleCode) {
+      const roleInfoRes = await this.curdMixService.getQuickCrud({
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+        sqlTable: SystemTables.sys_perm_role,
+      }).isExist({
+        condition: { role_code: roleCode }
+      });
+      
+      if (!roleInfoRes.exists) {
+        return CommonResult.errorRes(`角色编码 '${roleCode}' 不存在`);
+      }
+    }
+
     return this.executeSysSimpleSQL('sys_perm_user_role', KeysOfSimpleSQL.SIMPLE_INSERT, {
       validateCfg: {
         'data.account_id': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],

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/manage/UserAccountManageApi.ts

@@ -2,13 +2,13 @@ import { Controller, Inject, Post } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { KeysOfSimpleSQL, KeysOfValidators } from '../../libs/crud-pro/models/keys';
 import { BaseApiController } from '../base/BaseApiController';
-import { createUniqueId } from '../../libs/utils/functions';
 import { checkPermission } from '../../middleware/permission.middleware';
 import { SystemFuncCode } from '../../models/SystemPerm';
 import { CommonException, Exceptions } from '../../libs/crud-pro/exceptions';
 import { SystemTables } from '../../models/SystemTables';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { CommonResult } from "@/libs/utils/common-dto";
+import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 
 const accountNameBlacklist = new Set(['sa', 'root', 'admin', 'superadmin', 'administrator', 'sys', 'sysop', 'schedule_user']);
 function checkAccountCreateBlacklist(value: string) {
@@ -80,23 +80,24 @@ export class UserAccountManageApi extends BaseApiController {
   @Post('/createUserAccount', { middleware: [checkPermission(SystemFuncCode.UserAccountMangeWrite)] })
   async createUserAccount() {
     const body = this.ctx.request.body as any;
-    body.data.account_id = createUniqueId();
 
     const { generateUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
     if (typeof generateUserAccountId === 'function') {
       body.data.account_id = await generateUserAccountId(body.data);
+    } else {
+      body.data.account_id = MixinUtils.generateSnowflakeId();
     }
 
     const result = await this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_INSERT, {
       validateCfg: {
         'data.login_name': LOGIN_NAME_VALIDATE,
         'data.nick_name': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING, 'length:2,20', checkAccountCreateBlacklist],
-        'data.avatar': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });
     return result;
   }
 
+
   @Post('/deleteUserAccount', { middleware: [checkPermission(SystemFuncCode.UserAccountMangeWrite)] })
   async deleteUserAccount() {
     const result = await this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_DELETE, {

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/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/models/keys.ts

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

package/src/libs/crud-pro/services/CrudProExecuteFuncService.ts

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

package/src/libs/crud-pro/services/CrudProFieldUpdateService.ts

@@ -49,7 +49,12 @@ class CrudProFieldUpdateService extends CrudProServiceBase {
 
       result = this.serviceHub.executeFuncCfg(updateCfg, exeFunCtx);
     } catch (e) {
+
       this.logger.error('getUpdateNewValueByCfg->executeFuncCfg', e);
+      if (e instanceof CommonException) {
+        throw e;
+      }
+
       throw new CommonException(Exceptions.UPDATE_EXCEPTION, key + '.' + e);
     }
 

package/src/libs/crud-pro/services/CrudProTableMetaService.ts

@@ -166,12 +166,12 @@ class CrudProTableMetaService extends CrudProServiceBase {
     const dbUtil = { sqlDatabase: query.sqlDatabase, sqlDbType: query.sqlDbType } as IExecuteUnsafeQueryCtx;
 
     // 获取物理表
-    const tableSql = `SHOW TABLES FROM ${query.sqlDatabase}`;
+    const tableSql = `SHOW TABLES`;
     const tableRes = await this.executeUnsafeQuery(dbUtil, tableSql);
     const tableNames: string[] = (tableRes.rows || []).map((row: any) => Object.values(row)[0] as string);
 
     // 获取视图
-    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: string[] = (viewRes.rows || []).map((row: any) => Object.values(row)[0] as string);
 

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

@@ -1,4 +1,5 @@
 import { SqlDbType } from '../models/keys';
+import { GLOBAL_STATIC_CONFIG } from '../../global-config/global-config'
 
 interface IDbTypeAndName {
   dbType: SqlDbType;
@@ -35,6 +36,17 @@ function parseDatabaseName(databaseName: string): IDbTypeAndName {
     };
   }
 
+  const gConfig = 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: SqlDbType.mysql, // 默认

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

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