midway-fatcms 0.0.1-beta.56 → 0.0.1-beta.57

package/src/libs/utils/render-utils.ts

@@ -1,16 +1,15 @@
 import * as _ from 'lodash';
 import * as moment from 'moment';
-import {Context} from '@midwayjs/koa';
-import {parseJsonObject} from "./functions";
-import {getExtLocalLoaderPort} from "./fatcms-request";
-import {TypeUtils} from "../crud-pro/utils/TypeUtils";
+import { Context } from '@midwayjs/koa';
+import { parseJsonObject } from './functions';
+import { getExtLocalLoaderPort } from './fatcms-request';
+import { TypeUtils } from '../crud-pro/utils/TypeUtils';
 
 // const demo = {"schema":[
 //   {"title":"资源配置","name":"fileList","type":"array","properties":{"fileUrl":{"label":"文件URL","component":"Input","xProps":{"hasClear":true},"width":500}}}],
 //   "data":{"fileList":[{"settingKey":"n1iqmu8qnc_1","fileUrl":"aa"},{"settingKey":"n1iqmu8rml_2","fileUrl":"aa"}]
 // }}
 
-
 interface IFileElement {
   fileUrl: string;
   fileType?: string;
@@ -26,7 +25,7 @@ interface IRenderUtilsProps {
   fatcmscsrftoken: string;
 }
 
-function parseCookie(cookieStr:string) : any {
+function parseCookie(cookieStr: string): any {
   const cookies = {};
 
   if (!cookieStr) {
@@ -64,7 +63,6 @@ function parseCookie(cookieStr:string) : any {
   return cookies;
 }
 
-
 class RenderUtils {
   private readonly ctx: Context;
   private readonly fileList: IFileElement[];
@@ -82,16 +80,20 @@ class RenderUtils {
     const packageAssets = parseJsonObject(props.package_assets) || {};
     const fileList = _.get(packageAssets, 'data.fileList');
     if (Array.isArray(fileList)) {
-      this.fileList = fileList.filter((f)=> {
+      this.fileList = fileList.filter(f => {
         return f && f.fileUrl && typeof f.fileUrl === 'string' && f.fileUrl.length > 5; // 至少五个字符。
       });
     } else {
       this.fileList = [];
       const time = moment().format('YYYY-MM-DD HH:mm:ss.SSS');
-      console.info(time + ' 解析fileList为空==>' + JSON.stringify({
-        workbench_code: this.workbenchInfo?.workbench_code,
-        app_code: this.appInfo?.app_code,
-      }))
+      console.info(
+        time +
+          ' 解析fileList为空==>' +
+          JSON.stringify({
+            workbench_code: this.workbenchInfo?.workbench_code,
+            app_code: this.appInfo?.app_code,
+          })
+      );
     }
   }
 
@@ -104,22 +106,18 @@ class RenderUtils {
   }
 
   renderWorkbenchInfo() {
-    const infoPick = _.pick(this.workbenchInfo, [
-      'id', 'workbench_code', 'workbench_name', 'workbench_domain', 'workbench_desc', 'config_type', 'config_content'
-    ]);
+    const infoPick = _.pick(this.workbenchInfo, ['id', 'workbench_code', 'workbench_name', 'workbench_domain', 'workbench_desc', 'config_type', 'config_content']);
     return `<script>window.__workbench_info = ${JSON.stringify(infoPick)}</script>`;
   }
 
   renderAppInfo() {
-    const infoPick = _.pick(this.appInfo, [
-      'id', 'app_code', 'app_name', 'app_type', 'app_desc', 'config_type', 'config_content'
-    ]);
+    const infoPick = _.pick(this.appInfo, ['id', 'app_code', 'app_name', 'app_type', 'app_desc', 'config_type', 'config_content']);
     return `<script>window.__app_info = ${JSON.stringify(infoPick)}</script>`;
   }
 
   renderCookieInfo(keys: string) {
     try {
-      const cookies = parseCookie(this.ctx.headers?.cookie)
+      const cookies = parseCookie(this.ctx.headers?.cookie);
       const cookieObj = {};
       if (typeof keys === 'string') {
         const keyArr = keys.split(',');
@@ -132,53 +130,46 @@ class RenderUtils {
     } catch (e) {
       return `<script>window.__cookie_info_error = ${e}; </script>`;
     }
-
   }
 
-
   renderJsAssets() {
-    const fileList = this.fileList.filter((s) => {
+    const fileList = this.fileList.filter(s => {
       return s.fileType === 'js' || s.fileUrl.endsWith('.js');
     });
     const arr = fileList.map(f => {
       if (f.isModule) {
-        return `<script type="module" crossorigin src="${f.fileUrl}" ></script>`
+        return `<script type="module" crossorigin src="${f.fileUrl}" ></script>`;
       }
-      return `<script src="${f.fileUrl}" ></script>`
+      return `<script src="${f.fileUrl}" ></script>`;
     });
     return arr.join('\n');
   }
 
   renderCssAssets() {
-    const fileList = this.fileList.filter((s) => {
+    const fileList = this.fileList.filter(s => {
       return s.fileType === 'css' || s.fileUrl.endsWith('.css');
     });
     const fileUrlList = fileList.map(f => {
       return f.fileUrl;
     });
 
-    const arr = fileUrlList.map((url) => {
+    const arr = fileUrlList.map(url => {
       return `<link href="${url}" rel="stylesheet" />`;
     });
     return arr.join('\n');
   }
 
-
-
-  renderExtLocalLoaderPortByDevHeader(){
+  renderExtLocalLoaderPortByDevHeader() {
     const loaderPort = getExtLocalLoaderPort(this.ctx);
     if (loaderPort && TypeUtils.isNumeric(loaderPort)) {
       return `<script>window.__local_loader_port_from_dev_header = ${loaderPort}</script>`;
     }
     return '';
   }
-
 }
 
 function createRenderUtils(props: IRenderUtilsProps) {
-  return new RenderUtils(props)
+  return new RenderUtils(props);
 }
 
-export {
-  createRenderUtils
-}
+export { createRenderUtils };

package/src/models/SystemEntities.ts

@@ -75,14 +75,12 @@ export interface IUpstreamInfo {
   balanceStrategy: string;
 }
 
-
 export enum ProxyUserContextEnum {
-  NO_PASS = 0 ,
+  NO_PASS = 0,
   BASIC_INFO = 1,
   SESSION_INFO = 2,
 }
 
-
 export interface IProxyApiEntity extends IApiBaseEntity {
   proxy_name: string; // 配置编码。2025-09-09 新增
   proxy_code: string; // 配置编码。2025-09-09 新增

package/src/models/SystemPerm.ts

@@ -1,4 +1,3 @@
-
 /**
  * 系统内置功能点
  */
@@ -73,17 +72,17 @@ export const SystemFuncCodeNameMap = {
   WorkbenchMangeWrite: '【devops】工作台配置_编辑',
   SystemInfoManageApiWrite: '【devops】系统信息_编辑',
 
-  RoleManageRead : '【devops】角色管理_查看', // role
-  RoleManageWrite : '【devops】角色管理_编辑',
-  FuncManageRead : '【devops】功能点管理_查看', // func
-  FuncManageWrite : '【devops】功能点管理_编辑',
-  RoleFuncManageRead : '【devops】角色功能点关联_查看', //role-func
-  RoleFuncManageWrite : '【devops】角色功能点关联_编辑',
-  AccountRoleManageRead : '【devops】账户角色关联_查看', // account-role
-  AccountRoleManageWrite : '【devops】账户角色关联_编辑',
+  RoleManageRead: '【devops】角色管理_查看', // role
+  RoleManageWrite: '【devops】角色管理_编辑',
+  FuncManageRead: '【devops】功能点管理_查看', // func
+  FuncManageWrite: '【devops】功能点管理_编辑',
+  RoleFuncManageRead: '【devops】角色功能点关联_查看', //role-func
+  RoleFuncManageWrite: '【devops】角色功能点关联_编辑',
+  AccountRoleManageRead: '【devops】账户角色关联_查看', // account-role
+  AccountRoleManageWrite: '【devops】账户角色关联_编辑',
 
-  MenuMangeRead : '【devops】菜单管理_查看',
-  MenuMangeWrite : '【devops】菜单管理_查看',
+  MenuMangeRead: '【devops】菜单管理_查看',
+  MenuMangeWrite: '【devops】菜单管理_查看',
 };
 
 /**

package/src/models/SystemTables.ts

@@ -23,5 +23,4 @@ export const SystemTables = {
   sys_async_tasks: 'sys_async_tasks',
 };
 
-
 export const SystemDevOpsWorkbench = 'devops';

package/src/models/bizmodels.ts

@@ -90,7 +90,6 @@ export interface IVisitorExt extends IVisitor {
 
 export const FILE_GET_TYPES = ['thumbnail', 'preview', 'download'];
 
-
 /**
  * fat-design中的TablePro组件的查询参数
  */
@@ -101,7 +100,6 @@ export interface ITableProQueryParams {
   orderBy: string | any;
 }
 
-
 export enum StdCrudExportInputParamsAppType {
   STD_CRUD = 'STD_CRUD',
   INNER_HTTP = 'INNER_HTTP',
@@ -116,8 +114,8 @@ export interface IStdCrudExportInputParams {
   innerHttpUrl?: string; // INNER_HTTP导出需要。
   columns?: any[]; // INNER_HTTP导出需要。
   lastQueryParams: ITableProQueryParams; // 公共
-  selectedRowKeys: string[] | number []; // 公共
+  selectedRowKeys: string[] | number[]; // 公共
   headers: any; // 公共
   primaryKey: any; // 公共
   pageSize: number; // 公共
-}
+}

package/src/schedule/index.ts

@@ -1,12 +1,5 @@
-import {SCHEDULE_QUEUE, runScheduleTaskOnce} from './runSchedule'
-import {ANONYMOUS_CONTEXT} from './anonymousContext'
-import {
-  INNER_SCHEDULE_INTERVAL
-} from './scheduleNames'
+import { SCHEDULE_QUEUE, runScheduleTaskOnce } from './runSchedule';
+import { ANONYMOUS_CONTEXT } from './anonymousContext';
+import { INNER_SCHEDULE_INTERVAL } from './scheduleNames';
 
-export {
-  INNER_SCHEDULE_INTERVAL,
-  ANONYMOUS_CONTEXT,
-  SCHEDULE_QUEUE,
-  runScheduleTaskOnce
-}
+export { INNER_SCHEDULE_INTERVAL, ANONYMOUS_CONTEXT, SCHEDULE_QUEUE, runScheduleTaskOnce };

package/src/schedule/runSchedule.ts

@@ -1,14 +1,12 @@
 import * as koa from '@midwayjs/koa';
-import {IScheduleService} from '@/interface';
-import {ANONYMOUS_CONTEXT} from "./anonymousContext";
-
+import { IScheduleService } from '@/interface';
+import { ANONYMOUS_CONTEXT } from './anonymousContext';
 
 // 上次执行时间
 const lastExecuteTimeMap = {};
 
 const DEFAULT_SCHEDULE_INTERVAL = 2 * 60 * 1000;
 
-
 async function runScheduleTaskOnce(serviceName: string) {
   return await ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx: koa.IMidwayKoaContext) => {
     const serviceObject: IScheduleService = await ctx.requestContext.getAsync(serviceName);
@@ -20,7 +18,6 @@ async function runScheduleTaskOnce(serviceName: string) {
   });
 }
 
-
 class ScheduleQueue {
   private scheduleIntervalMap: Map<string, number> = new Map();
 
@@ -39,10 +36,9 @@ class ScheduleQueue {
     const intervalTime1 = this.scheduleIntervalMap.get(serviceName);
     const intervalTime = intervalTime1 || DEFAULT_SCHEDULE_INTERVAL; // 时间间隔
     const lastExecuteTime = lastExecuteTimeMap[serviceName];
-    return (Date.now() - lastExecuteTime) >= intervalTime;
+    return Date.now() - lastExecuteTime >= intervalTime;
   }
 
-
   private async runScheduleTaskOnceCheckTime(serviceName: string) {
     // 还没有到可以执行时间
     if (!this.isAlreadyTimeToExecute(serviceName)) {
@@ -65,18 +61,14 @@ class ScheduleQueue {
     }
   }
 
-
   public async startScheduleLoop() {
     await this.runScheduleServiceList();
     setInterval(() => {
       this.runScheduleServiceList();
     }, 1000); // 最少1秒执行一次
   }
-
-
 }
 
-
 const SCHEDULE_QUEUE = new ScheduleQueue();
 
-export {SCHEDULE_QUEUE, runScheduleTaskOnce};
+export { SCHEDULE_QUEUE, runScheduleTaskOnce };

package/src/schedule/scheduleNames.ts

@@ -1,21 +1,15 @@
-
 const INNER_SCHEDULE_INTERVAL = {
   proxyApiLoadService: 2 * 60 * 1000, // 2分钟重新加载一次,
   workbenchService: 60 * 1000, // 1分钟重新加载一次,
   visitStatService: 10 * 60 * 1000, // 10分钟重新加载一次,
   asyncTaskRunnerService: 1000, // 1s可以执行
-}
+};
 
 const INNER_SCHEDULE_NAMES = {
   proxyApiLoadService: 'proxyApiLoadService',
   workbenchService: 'workbenchService',
-  visitStatService: "visitStatService",
-  asyncTaskRunnerService: "asyncTaskRunnerService",
-}
-
-
+  visitStatService: 'visitStatService',
+  asyncTaskRunnerService: 'asyncTaskRunnerService',
+};
 
-export {
-  INNER_SCHEDULE_INTERVAL,
-  INNER_SCHEDULE_NAMES
-}
+export { INNER_SCHEDULE_INTERVAL, INNER_SCHEDULE_NAMES };

package/src/service/AuthService.ts

@@ -87,7 +87,7 @@ export class AuthService {
    * @param consumerUserInfo
    * @param loadRoleCodes
    */
-  public async createUserSessionForConsumer(consumerUserInfo: IConsumerUserInfo, loadRoleCodes?: boolean ) {
+  public async createUserSessionForConsumer(consumerUserInfo: IConsumerUserInfo, loadRoleCodes?: boolean) {
     const sessionId = createUniqueId();
 
     const accountId = consumerUserInfo.accountId;
@@ -95,12 +95,11 @@ export class AuthService {
     let roleCodes = [];
     let functionCodes = [];
 
-    if(loadRoleCodes === true) {
+    if (loadRoleCodes === true) {
       roleCodes = await this.queryUserRoleCodeList(accountId);
       functionCodes = await this.queryFunctionCodeList(roleCodes);
     }
 
-
     const sessionInfo: ISessionInfo = {
       nickName: consumerUserInfo.nickName,
       avatar: consumerUserInfo.avatar,

package/src/service/UserSessionService.ts

@@ -57,13 +57,12 @@ export class UserSessionService {
   @Config('fatcmsUserSessionKeepTimeSecond')
   private fatcmsUserSessionKeepTimeSecond: number;
 
-
   /**
    * 获取用户会话保持时间: 单位秒
-   * @returns 
+   * @returns
    */
   private getSessionKeepTimeSecond(): number {
-    if(typeof this.fatcmsUserSessionKeepTimeSecond === 'number' && this.fatcmsUserSessionKeepTimeSecond > 0) {
+    if (typeof this.fatcmsUserSessionKeepTimeSecond === 'number' && this.fatcmsUserSessionKeepTimeSecond > 0) {
       return this.fatcmsUserSessionKeepTimeSecond;
     }
     return SESSION_KEEP_TIME_SECOND;
@@ -72,7 +71,7 @@ export class UserSessionService {
   /**
    * 保存用户会话信息。
    * 用户登录后，在业务的项目中，可以调用此函数，更新bizExt字段
-   * @param sessionInfo 
+   * @param sessionInfo
    */
   public async saveUserSession(sessionInfo: ISessionInfo) {
     sessionInfo.avatar = pickUserAvatar(sessionInfo.avatar);
@@ -89,11 +88,10 @@ export class UserSessionService {
     return await this.redisCacheService.removeItem(toCacheKey(sessionId));
   }
 
-
   /**
    * 获取用户会话信息
-   * @param sessionId 
-   * @returns 
+   * @param sessionId
+   * @returns
    */
   private async getCurrentUserSessionForMiddleware1(sessionId: string): Promise<ISessionInfo> {
     if (!sessionId) {
@@ -102,10 +100,9 @@ export class UserSessionService {
     return await this.redisCacheService.getJsonObject(toCacheKey(sessionId));
   }
 
-
   /**
    * 从异步任务队列中获取当时用户的Session信息
-   * @param asyncTaskId 
+   * @param asyncTaskId
    */
   private async getCurrentUserSessionByAsyncTaskId(asyncTaskId: string): Promise<ISessionInfo> {
     const taskSessionCacheKey = `${RedisKeys.USER_SESSION_ASYNC_TASK_ID_PREFIX}${asyncTaskId}`;
@@ -113,24 +110,27 @@ export class UserSessionService {
     const loadSessionInfo = async (): Promise<ISessionInfo> => {
       const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
-      const asyncTaskRes = await this.curdProService.executeCrudByCfg({
-        columns: ['id', 'created_user_session'],
-        condition: {
-          id: asyncTaskId,
+      const asyncTaskRes = await this.curdProService.executeCrudByCfg(
+        {
+          columns: ['id', 'created_user_session'],
+          condition: {
+            id: asyncTaskId,
+          },
+        },
+        {
+          sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+          sqlTable: SystemTables.sys_async_tasks,
+          sqlDatabase: SystemDbName,
+          sqlDbType: SystemDbType,
         }
-      }, {
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlTable: SystemTables.sys_async_tasks,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      });
+      );
 
       const asyncTaskObj = asyncTaskRes.getOneObj();
       if (!asyncTaskObj) {
         return null;
       }
       return parseJsonObject(asyncTaskObj.created_user_session);
-    }
+    };
 
     let sessionInfo1 = await this.redisCacheService.getJsonObject(taskSessionCacheKey);
     if (!sessionInfo1) {
@@ -140,12 +140,10 @@ export class UserSessionService {
     return sessionInfo1;
   }
 
-
   /**
    * 专门给中间件点调用的
    */
   public async getCurrentUserSessionForMiddleware(): Promise<ISessionInfo> {
-
     // 先从Header中获取：异步任务队列的任务ID
     const asyncTaskId = this.ctx.headers[HEADER_KEY_RUN_BY_ASYNC_TASK_ID];
     if (asyncTaskId && typeof asyncTaskId === 'string') {
@@ -156,6 +154,4 @@ export class UserSessionService {
     const sessionId = cookies.get(SESSION_ID_KEY, sessionCookieCfg);
     return this.getCurrentUserSessionForMiddleware1(sessionId);
   }
-
-
 }

package/src/service/asyncTask/AsyncTaskRunnerService.ts

@@ -152,7 +152,6 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
   @Inject()
   private curdProService: CurdProService;
 
-
   /**
    * 定时任务执行
    */
@@ -161,7 +160,6 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
     await this.runByScheduleForTimeoutTasks();
   }
 
-
   /**
    * 更新超时的任务状态
    * @returns
@@ -175,19 +173,19 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
       return Promise.resolve();
     }
 
-    const timeoutTime = moment().subtract(24, 'hours').format("YYYY-MM-DD HH:mm:ss.SSS");
+    const timeoutTime = moment().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss.SSS');
     await this.curdProService.executeCrudByCfg(
       {
         condition: {
           task_status: SysAsyncTaskStatus.RUNNING, // 虽然状态是RUNNING，但是已经超过24小时没有进展了。
           updated_at: {
             $lt: timeoutTime,
-          }
+          },
         },
         data: {
           task_status: SysAsyncTaskStatus.FAILED,
           error_message: '任务超时',
-        }
+        },
       },
       {
         sqlTable: SystemTables.sys_async_tasks,
@@ -198,14 +196,11 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
     );
   }
 
-
-
   /**
    * 检查是否有新任务。如果有，就从数据库中获取一批任务，放到自己的任务队列里。
    * @returns
    */
   private async runByScheduleForPendingTasks() {
-
     // 1. 当前很忙
     if (ASYNC_TASK_RUNNER.isBusy) {
       return Promise.resolve();
@@ -295,7 +290,6 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
     await ASYNC_TASK_RUNNER.executeTaskList(taskList).then(() => {
       console.log('[AsyncTaskRunnerService] ASYNC_TASK_RUNNER finished taskIds ==> ' + JSON.stringify(taskIds));
     });
-    
   }
 
   /**

package/src/service/asyncTask/handler/ExportExcelByStdCrudHandler.ts

@@ -8,7 +8,6 @@ import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 import { ExecuteContext } from '@/libs/crud-pro/models/ExecuteContext';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
-
 function pickData(a: any, key: string) {
   if (a && typeof a.getResModel === 'function') {
     const s = a.getResModel();

package/src/service/base/BaseService.ts

@@ -6,7 +6,6 @@ import * as koa from '@midwayjs/koa';
 import { consoleLogger, ContextLogger, ILoggerContext } from '@/models/contextLogger';
 import { isEnableDebug, isLocalEnv } from '@/libs/utils/fatcms-request';
 
-
 @Provide()
 export class BaseService {
   @Inject()
@@ -21,11 +20,10 @@ export class BaseService {
   @Inject()
   protected ossServiceFactory: OSSServiceFactory;
 
-
   /**
    * 请求级别的内存缓存
-   * @param key 
-   * @returns 
+   * @param key
+   * @returns
    */
   protected getFromCtxCache(key: string): any {
     if (!this.ctx.ctxCacheMap) {
@@ -34,11 +32,10 @@ export class BaseService {
     return this.ctx.ctxCacheMap[key];
   }
 
-
   /**
    * 请求级别的内存缓存
-   * @param key 
-   * @param obj 
+   * @param key
+   * @param obj
    */
   protected setToCtxCache(key: string, obj: any): void {
     if (!this.ctx.ctxCacheMap) {
@@ -47,7 +44,6 @@ export class BaseService {
     this.ctx.ctxCacheMap[key] = obj;
   }
 
-
   /**
    * 用户自己上传的文件，使用私有的bucket。
    * @protected
@@ -64,7 +60,6 @@ export class BaseService {
     return this.ossServiceFactory.get<OSSService>('publicBucket');
   }
 
-
   protected getContextLogger(): ILoggerContext {
     return this.ctx.contextLogger || consoleLogger;
   }

package/src/service/base/RedisCacheService.ts

@@ -3,8 +3,7 @@ import { Context } from '@midwayjs/koa';
 import { RedisService } from '@midwayjs/redis';
 import { OSSServiceFactory } from '@midwayjs/oss';
 import * as koa from '@midwayjs/koa';
-import {parseJsonObject} from "../../libs/utils/functions";
-
+import { parseJsonObject } from '../../libs/utils/functions';
 
 @Provide()
 export class RedisCacheService {
@@ -20,26 +19,24 @@ export class RedisCacheService {
   @Inject()
   protected ossServiceFactory: OSSServiceFactory;
 
-
-  async getJsonObject(key: string): Promise<any>  {
+  async getJsonObject(key: string): Promise<any> {
     const str = await this.redisService.get(key);
-    return parseJsonObject(str)
+    return parseJsonObject(str);
   }
 
   /**
    * 设置缓存对象
-   * @param key 
-   * @param obj 
+   * @param key
+   * @param obj
    * @param expireSecond 过期时间，单位秒
-   * @returns 
+   * @returns
    */
   async setJsonObject(key: string, obj: any, expireSecond: number): Promise<any> {
     const str = JSON.stringify(obj);
     return this.redisService.set(key, str, 'EX', expireSecond);
   }
 
-  async removeItem(key: string): Promise<any>  {
+  async removeItem(key: string): Promise<any> {
     return await this.redisService.del(key);
   }
-
 }