midway-fatcms 0.0.1-beta.17 → 0.0.1-beta.19

package/dist/service/asyncTask/AsyncTaskRunnerService.js

@@ -19,6 +19,7 @@ const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const errorToString_1 = require("../../libs/utils/errorToString");
 const schedule_1 = require("../../schedule");
+const RedisKeys_1 = require("../../models/RedisKeys");
 class AsyncTaskRunner {
     constructor() {
         this.isBusy = false;
@@ -40,10 +41,13 @@ class AsyncTaskRunner {
                 taskElement.error_message = (0, errorToString_1.errorToString)(error);
             }
             try {
-                await this.updateTaskStatus(taskElement);
+                await this.updateTaskStatus(taskElement, {
+                    task_status: taskElement.task_status,
+                    error_message: taskElement.error_message,
+                });
             }
             catch (error) {
-                schedule_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error("executeTaskList error", error);
+                schedule_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error('executeTaskList error', error);
             }
         }
         this.isBusy = false;
@@ -54,26 +58,29 @@ class AsyncTaskRunner {
         if (!taskHandler) {
             throw new Error('TaskHandler not found , taskType = ' + taskType);
         }
-        const updateTaskStatus = () => {
-            return this.updateTaskStatus(taskElement);
+        const updateTaskStatus = (updatePartials) => {
+            return this.updateTaskStatus(taskElement, updatePartials);
         };
         await taskHandler.execute({ task: taskElement, updateTaskStatus });
     }
     /**
      * 更新任务状态或任务进度
      * @param taskElement
+     * @param updatePartials
      * @private
      */
-    async updateTaskStatus(taskElement) {
+    async updateTaskStatus(taskElement, updatePartials) {
+        if (!updatePartials) {
+            throw new Error('updatePartials not found');
+        }
         return await schedule_1.ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx) => {
-            const curdProService = await ctx.requestContext.getAsync("curdProService");
+            const curdProService = await ctx.requestContext.getAsync('curdProService');
             const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-            const { id, ...otherTaskProps } = taskElement;
             const res = await curdProService.executeCrudByCfg({
                 condition: {
-                    id: id
+                    id: taskElement.id,
                 },
-                data: otherTaskProps
+                data: updatePartials,
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
@@ -98,7 +105,10 @@ exports.ASYNC_TASK_RUNNER = new AsyncTaskRunner();
 /**
  * Redis锁
  */
-const LOCK_KEY_ASYNC_TASK_RUNNER = "LOCK_KEY_ASYNC_TASK_RUNNER";
+const ASYNC_TASK_LOCK = RedisKeys_1.RedisKeys.ASYNC_TASK_LOCK;
+const ASYNC_TASK_RUNTIME_OBJ = {
+    LAST_CHECK_ASYNC_TASK_UPDATE_TIME: 0,
+};
 let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.BaseService {
     async fetchPendingTasks() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
@@ -112,11 +122,11 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
             condition: {
                 task_status: AsyncTaskModel_1.SysAsyncTaskStatus.PENDING,
                 task_type: {
-                    "$in": taskTypeList
-                }
+                    $in: taskTypeList,
+                },
             },
             orderBy: 'id+',
-            limit: 10
+            limit: 10,
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
@@ -132,12 +142,12 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
         await this.curdProService.executeCrudByCfg({
             condition: {
                 id: {
-                    "$in": taskIds
-                }
+                    $in: taskIds,
+                },
             },
             data: {
-                task_status: AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING
-            }
+                task_status: AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING,
+            },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
@@ -146,16 +156,22 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
         });
         // 开始执行。
         exports.ASYNC_TASK_RUNNER.executeTaskList(taskList).then(() => {
-            console.log("ASYNC_TASK_RUNNER finished taskIds ==> " + JSON.stringify(taskIds));
+            console.log('ASYNC_TASK_RUNNER finished taskIds ==> ' + JSON.stringify(taskIds));
         });
     }
     async runBySchedule() {
+        // 1. 当前很忙
         if (exports.ASYNC_TASK_RUNNER.isBusy) {
             return Promise.resolve();
         }
+        // 2. 发现了新任务
+        const isExistNewTask = await this.isExistNewTask();
+        if (!isExistNewTask) {
+            return Promise.resolve();
+        }
         // 这里的过期时间1分钟即可。fetchPendingTasks函数不可能超过一分钟。
         // 因为这里只是从数据库中获取一批任务，放到自己的任务队列里。还没触发执行。
-        const lock = await this.redisService.set(LOCK_KEY_ASYNC_TASK_RUNNER, 1, "EX", 60, "NX");
+        const lock = await this.redisService.set(ASYNC_TASK_LOCK, 1, 'EX', 60, 'NX');
         if (lock !== 'OK') {
             return Promise.resolve();
         }
@@ -163,11 +179,31 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
             await this.fetchPendingTasks();
         }
         catch (e) {
-            console.error("fetchPendingTasks error", (0, errorToString_1.errorToString)(e));
+            console.error('fetchPendingTasks error', (0, errorToString_1.errorToString)(e));
         }
-        await this.redisService.del(LOCK_KEY_ASYNC_TASK_RUNNER);
+        await this.redisService.del(ASYNC_TASK_LOCK);
         return Promise.resolve();
     }
+    /**
+     * 是否存在新任务
+     * @private
+     */
+    async isExistNewTask() {
+        // 刚启动，没有检查过。
+        if (!ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME) {
+            return true;
+        }
+        //Redis没有任何内容
+        const updateTime = await this.redisService.get(RedisKeys_1.RedisKeys.ASYNC_TASK_UPDATE_TIME);
+        if (!updateTime) {
+            ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = Date.now();
+            return false;
+        }
+        const updateTimeNumber = Number.parseInt(updateTime, 10);
+        const isExistNewTask = updateTimeNumber > ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME;
+        ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = updateTimeNumber;
+        return isExistNewTask;
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

package/dist/service/asyncTask/AsyncTaskService.d.ts

@@ -1,5 +1,5 @@
 import { Context } from '@midwayjs/koa';
-import { BaseService } from "../../service/base/BaseService";
+import { BaseService } from '../../service/base/BaseService';
 export declare class AsyncTaskService extends BaseService {
     protected ctx: Context;
     startTask(): Promise<void>;

package/dist/service/asyncTask/AsyncTaskService.js

@@ -14,14 +14,15 @@ const core_1 = require("@midwayjs/core");
 const BaseService_1 = require("../../service/base/BaseService");
 const schedule_1 = require("../../schedule");
 const scheduleNames_1 = require("../../schedule/scheduleNames");
+const RedisKeys_1 = require("../../models/RedisKeys");
 let AsyncTaskService = class AsyncTaskService extends BaseService_1.BaseService {
     async startTask() {
-        (0, schedule_1.runScheduleTaskOnce)(scheduleNames_1.SCHEDULE_NAMES.asyncTaskRunnerService).then(schedule => {
+        await this.redisService.set(RedisKeys_1.RedisKeys.ASYNC_TASK_UPDATE_TIME, `${Date.now()}`);
+        (0, schedule_1.runScheduleTaskOnce)(scheduleNames_1.INNER_SCHEDULE_NAMES.asyncTaskRunnerService).then(schedule => {
             console.log(schedule);
         });
     }
-    async cancelTask(id) {
-    }
+    async cancelTask(id) { }
 };
 __decorate([
     (0, core_1.Inject)(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.17",
+  "version": "0.0.1-beta.19",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/configuration.ts

@@ -13,9 +13,8 @@ import { join } from 'path';
 // import { NotFoundFilter } from './filter/notfound.filter';
 import { GlobalMiddleware } from './middleware/global.middleware';
 import { ForbiddenMiddleware } from './middleware/forbidden.middleware';
-import { startScheduleLoop } from './schedule';
+import { SCHEDULE_QUEUE , ANONYMOUS_CONTEXT, INNER_SCHEDULE_INTERVAL } from './schedule';
 import { privateAES } from './libs/utils/crypto-utils';
-import { ALL_SCHEDULE_NAMES } from "@/schedule/scheduleNames";
 
 @Configuration({
   // namespace: 'fatcms',
@@ -65,6 +64,11 @@ export class ContainerLifeCycle {
 
   async onReady() {
 
+    /**
+     * 让ANONYMOUS_CONTEXT获取app对象
+     */
+    ANONYMOUS_CONTEXT.setApp(this.app);
+
     /**
      * 启动定时任务
      */
@@ -78,25 +82,33 @@ export class ContainerLifeCycle {
     // this.app.useFilter([NotFoundFilter, DefaultErrorFilter]);
   }
 
-  private async startScheduleOnReady(){
+  private async startScheduleOnReady() {
     const logger = this.app.getLogger();
     const config = this.app.getConfig();
-    const fatcmsScheduleService: boolean | string[] = config.fatcmsScheduleService;
+    const fatcmsScheduleService: boolean | any = config.fatcmsScheduleService;
 
     // 关闭定时任务
     if (fatcmsScheduleService === false || fatcmsScheduleService === null) {
       return;
     }
 
+    let scheduleIntervalCfg = INNER_SCHEDULE_INTERVAL;
+    if (typeof fatcmsScheduleService === "object") {
+      scheduleIntervalCfg = fatcmsScheduleService
+    }
 
-    let scheduleServiceList = ALL_SCHEDULE_NAMES
-
-    // 启动部分定时任务
-    if (Array.isArray(fatcmsScheduleService)){
-      scheduleServiceList = fatcmsScheduleService;
+    const keys = Object.keys(scheduleIntervalCfg);
+    for (let i = 0; i < keys.length; i++) {
+      const service = keys[i];
+      const interval = scheduleIntervalCfg[service];
+      if (typeof interval !== "number") {
+        throw new Error('Invalid scheduleIntervalCfg ' + service + ",  interval must be a number");
+      }
+      SCHEDULE_QUEUE.setScheduleTask(service, interval);
     }
-    await startScheduleLoop(scheduleServiceList);
-    logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ： ' + JSON.stringify(scheduleServiceList) );
+
+    await SCHEDULE_QUEUE.startScheduleLoop();
+    logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ： ' + JSON.stringify(scheduleIntervalCfg));
   }
 
 

package/src/controller/base/BaseApiController.ts

@@ -1,12 +1,12 @@
 import { Controller, Inject } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { CurdMixService } from '../../service/curd/CurdMixService';
-import { IFuncCfgModel, IRequestCfgModel, IValidatorCfgItem } from '../../libs/crud-pro/interfaces';
-import { KeyOfCrudTypes, KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
+import { CurdMixService } from '@/service/curd/CurdMixService';
+import { IFuncCfgModel, IRequestCfgModel, IValidatorCfgItem } from '@/libs/crud-pro/interfaces';
+import { KeyOfCrudTypes, KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-import { UserAccountService } from '../../service/UserAccountService';
-import { RelatedType } from '../../service/curd/CurdMixUtils';
-import { BaseService } from '../../service/base/BaseService';
+import { UserAccountService } from '@/service/UserAccountService';
+import { RelatedType } from '@/service/curd/CurdMixUtils';
+import { BaseService } from '@/service/base/BaseService';
 
 export interface IExecuteSimpleSqlParams {
   updateCfg?: Record<string, IFuncCfgModel>;

package/src/controller/gateway/AsyncTaskController.ts

@@ -2,31 +2,29 @@ import { Controller, Inject, Post, Query } from '@midwayjs/core';
 
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
-import {AsyncTaskService} from "@/service/asyncTask/AsyncTaskService";
-import {SysAsyncTaskEntity, SysAsyncTaskStatus} from "@/models/AsyncTaskModel";
-import {KeysOfSimpleSQL} from "@/libs/crud-pro/models/keys";
-import {SystemTables} from "@/models/SystemTables";
-import {CommonException} from "@/libs/crud-pro/exceptions";
-import {checkLogin} from "@/middleware/permission.middleware";
-
-
-function fixMyTasksCondition(body:any,ctx: Context){
-  if(!body.condition) {
-    throw new CommonException("参数不正确");
+import { AsyncTaskService } from '@/service/asyncTask/AsyncTaskService';
+import { SysAsyncTaskEntity, SysAsyncTaskStatus } from '@/models/AsyncTaskModel';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { SystemTables } from '@/models/SystemTables';
+import { CommonException } from '@/libs/crud-pro/exceptions';
+import { checkLogin } from '@/middleware/permission.middleware';
+
+function fixMyTasksCondition(body: any, ctx: Context) {
+  if (!body.condition) {
+    throw new CommonException('参数不正确');
   }
   body.condition.created_by = ctx.userSession.getSessionInfo().accountId;
 }
 
-
-function fixCancelBodyData(body:any, id: number) {
-  if(!body.data || !body.condition) {
-    throw new CommonException("参数不正确");
+function fixCancelBodyData(body: any, id: number) {
+  if (!body.data || !body.condition) {
+    throw new CommonException('参数不正确');
   }
 
   // fix condition
   const conditionObj: SysAsyncTaskEntity = (body.condition || {}) as any;
   conditionObj.id = id;
-  body.condition =  conditionObj;
+  body.condition = conditionObj;
 
   // fix data
   const dataObj: SysAsyncTaskEntity = (body.data || {}) as any;
@@ -34,10 +32,9 @@ function fixCancelBodyData(body:any, id: number) {
   body.data = dataObj;
 }
 
-
-function fixCreateBodyData(body:any, ctx: Context) {
-  if(!body.data) {
-    throw new CommonException("参数不正确");
+function fixCreateBodyData(body: any, ctx: Context) {
+  if (!body.data) {
+    throw new CommonException('参数不正确');
   }
 
   const sessionInfo = ctx.userSession.getSessionInfo();
@@ -48,7 +45,6 @@ function fixCreateBodyData(body:any, ctx: Context) {
   dataObj.created_user_session = JSON.stringify(sessionInfo); // 创建人的session信息。用于执行时的鉴权。
 }
 
-
 /**
  * 异步任务框架
  */
@@ -84,5 +80,4 @@ export class AsyncTaskController extends BaseApiController {
     await this.executeSysSimpleSQL(SystemTables.sys_async_tasks, KeysOfSimpleSQL.SIMPLE_UPDATE);
     return { success: true };
   }
-
 }

package/src/controller/gateway/CrudMtdGatewayController.ts

@@ -2,13 +2,13 @@ import * as _ from 'lodash';
 import { decamelizeKeys } from 'humps';
 import { Controller, Inject, Param, All } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { CommonResult } from '../../libs/utils/common-dto';
-import { WorkbenchService } from '../../service/WorkbenchService';
-import { API_BASE_TYPE, ApiBaseService } from '../../service/base/ApiBaseService';
-import { CurdProService } from '../../service/curd/CurdProService';
-import { CurdMixService } from '../../service/curd/CurdMixService';
-import { IRequestCfgModel2 } from '../../models/bizmodels';
-import { parseDatabaseName } from "../../libs/crud-pro/utils/DatabaseName";
+import { CommonResult } from '@/libs/utils/common-dto';
+import { WorkbenchService } from '@/service/WorkbenchService';
+import { API_BASE_TYPE, ApiBaseService } from '@/service/base/ApiBaseService';
+import { CurdProService } from '@/service/curd/CurdProService';
+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';
 
 const QUERY_AS_LIST = ['condition', 'data'];

package/src/controller/gateway/CrudStdGatewayController.ts

@@ -1,10 +1,10 @@
 import { Controller, Inject, Post } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
-import { CrudStdService, SPECIAL_SETTING_KEY } from '../../service/crudstd/CrudStdService';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { IRequestModel } from '../../libs/crud-pro/interfaces';
-import { CommonResult } from '../../libs/utils/common-dto';
+import { CrudStdService, SPECIAL_SETTING_KEY } from '@/service/crudstd/CrudStdService';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { IRequestModel } from '@/libs/crud-pro/interfaces';
+import { CommonResult } from '@/libs/utils/common-dto';
 
 interface ICrudStdActionParams {
   appCode: string;

package/src/controller/gateway/DocGatewayController.ts

@@ -1,11 +1,11 @@
-import {Get, Controller, Inject, Query} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {BaseApiController} from '../base/BaseApiController';
-import { SystemTables} from '../../models/SystemTables';
+import { Get, Controller, Inject, Query } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { BaseApiController } from '../base/BaseApiController';
+import { SystemTables } from '@/models/SystemTables';
 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 { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { WorkbenchService } from '@/service/WorkbenchService';
+import { CommonResult } from '@/libs/utils/common-dto';
 
 function checkIsNumber(value: string, name: string) {
   if (!value) {
@@ -28,21 +28,21 @@ export class DocGatewayController extends BaseApiController {
   @Inject()
   protected workbenchService: WorkbenchService;
 
-
   private async updateDocPV(docId: string, docLibId: string, pv: number) {
     const ip = this.ctx.headers['x-real-ip'];
     const lockKey = `doc_ip_pv_${docId}_${ip}`;
     const EXPIRE_TIME = 5 * 60 * 1000; // 在五分钟内，同一个IP地址重复刷新同一篇文章，认为是一个PV
-    const nxRes = await this.redisService.set(lockKey, 1, 'EX', EXPIRE_TIME, 'NX')
+    const nxRes = await this.redisService.set(lockKey, 1, 'EX', EXPIRE_TIME, 'NX');
     if (nxRes !== 'OK') {
       return;
     }
 
-    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
-    await this.curdMixService.executeCrudByCfg({
+    await this.curdMixService.executeCrudByCfg(
+      {
         data: {
-          pv: pv + 1
+          pv: pv + 1,
         },
         condition: {
           id: parseInt(docId),
@@ -54,10 +54,10 @@ export class DocGatewayController extends BaseApiController {
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
         sqlDatabase: SystemDbName,
         sqlDbType: SystemDbType,
-      });
+      }
+    );
   }
 
-
   /**
    * @param docId
    * @param docLibId 文档库
@@ -72,7 +72,7 @@ export class DocGatewayController extends BaseApiController {
       return docLibInfoRes;
     }
 
-    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const res = await this.curdMixService.executeCrudByCfg(
       {
@@ -111,7 +111,7 @@ export class DocGatewayController extends BaseApiController {
       return docLibInfoRes;
     }
 
-    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     return this.curdMixService.executeCrudByCfg(
       {
@@ -141,7 +141,7 @@ export class DocGatewayController extends BaseApiController {
   async getDocLibInfo(@Query('docLibId') docLibId: string) {
     checkIsNumber(docLibId, 'docLibId');
 
-    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const s = await this.curdMixService.executeCrudByCfg(
       {

package/src/controller/gateway/FileController.ts

@@ -2,18 +2,17 @@ import { Get, Post, Inject, Controller, Files, Fields, Param, Query } from '@mid
 import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
 import { BaseApiController } from '../base/BaseApiController';
-import { BizException } from '../../models/devops';
-import {AccessType, FILE_GET_TYPES} from '../../models/bizmodels';
-import { FileCenterService, PATH_PREFIX, toDownloadPaths, isImageFile } from '../../service/FileCenterService';
-import { checkPermission } from '../../middleware/permission.middleware';
-import { CommonResult } from '../../libs/utils/common-dto';
-import {SystemFuncCode} from "../../models/SystemPerm";
+import { BizException } from '@/models/devops';
+import { AccessType, FILE_GET_TYPES } from '@/models/bizmodels';
+import { FileCenterService, PATH_PREFIX, toDownloadPaths, isImageFile } from '@/service/FileCenterService';
+import { checkPermission } from '@/middleware/permission.middleware';
+import { CommonResult } from '@/libs/utils/common-dto';
+import { SystemFuncCode } from '@/models/SystemPerm';
 
 function isTrue(obj: any) {
   return obj === true || obj === 'true';
 }
 
-
 /**
  * 文件上传下载服务
  */
@@ -31,7 +30,7 @@ export class FileController extends BaseApiController {
    * @param fields
    * @param queryData
    */
-  @Post('/uploadFile',  { middleware: [checkPermission([SystemFuncCode.DocMangeWrite, SystemFuncCode.FileMangeWrite, SystemFuncCode.UserAccountMangeWrite])] } )
+  @Post('/uploadFile', { middleware: [checkPermission([SystemFuncCode.DocMangeWrite, SystemFuncCode.FileMangeWrite, SystemFuncCode.UserAccountMangeWrite])] })
   async uploadFile(@Files() files, @Fields() fields, @Query() queryData): Promise<CommonResult> {
     const accessType = queryData?.accessType || fields?.accessType || AccessType.open;
     const referer = this.ctx.req.headers.referer;
@@ -64,7 +63,7 @@ export class FileController extends BaseApiController {
    * @param streaming 是否直接返回流，默认返回 302 跳转
    */
   @Get('/get/:byMethod/:fileKey*')
-  async downloadFile(@Param('byMethod') byMethod: string ,@Param('fileKey') fileKey: string) {
+  async downloadFile(@Param('byMethod') byMethod: string, @Param('fileKey') fileKey: string) {
     if (!fileKey) {
       throw new BizException('fileKey不能为空');
     }

package/src/controller/gateway/ProxyApiGatewayController.ts

@@ -1,10 +1,10 @@
 import { All, Controller, Inject, Query } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
-import { ProxyApiService } from '../../service/proxyapi/ProxyApiService';
-import { WorkbenchService } from '../../service/WorkbenchService';
-import { CommonResult } from '../../libs/utils/common-dto';
-import { ProxyApiLoadService } from '../../service/proxyapi/ProxyApiLoadService';
+import { ProxyApiService } from '@/service/proxyapi/ProxyApiService';
+import { WorkbenchService } from '@/service/WorkbenchService';
+import { CommonResult } from '@/libs/utils/common-dto';
+import { ProxyApiLoadService } from '@/service/proxyapi/ProxyApiLoadService';
 
 /**
  * 只支持前缀匹配

package/src/controller/gateway/PublicApiController.ts

@@ -1,14 +1,14 @@
-import {Controller, Get, Inject, Post} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
+import { Controller, Get, Inject, Post } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
-import {BaseApiController} from '../base/BaseApiController';
-import {SystemTables} from '../../models/SystemTables';
-import {EnumInfoService} from '../../service/EnumInfoService';
-import {CommonResult} from '../../libs/utils/common-dto';
-import {parseJsonObject} from '../../libs/utils/functions';
-import {WorkbenchService} from '../../service/WorkbenchService';
-import {SystemRoleCode} from "../../models/SystemPerm";
-import {KeysOfAuthType} from "../../libs/crud-pro/models/keys";
+import { BaseApiController } from '../base/BaseApiController';
+import { SystemTables } from '@/models/SystemTables';
+import { EnumInfoService } from '@/service/EnumInfoService';
+import { CommonResult } from '@/libs/utils/common-dto';
+import { parseJsonObject } from '@/libs/utils/functions';
+import { WorkbenchService } from '@/service/WorkbenchService';
+import { SystemRoleCode } from '@/models/SystemPerm';
+import { KeysOfAuthType } from '@/libs/crud-pro/models/keys';
 
 /**
  * 公开的API，无需鉴权，所有人可以直接访问
@@ -52,12 +52,12 @@ export class PublicApiController extends BaseApiController {
       return CommonResult.errorRes('param workbenchMenuCode is null');
     }
 
-    const workbenchMenuCodeStr = "" + workbenchMenuCode;
-    const workbenchMenuCodeArray =  workbenchMenuCodeStr.split(',');
+    const workbenchMenuCodeStr = '' + workbenchMenuCode;
+    const workbenchMenuCodeArray = workbenchMenuCodeStr.split(',');
 
     const condition = {
       menu_code: {
-        "$in": workbenchMenuCodeArray
+        $in: workbenchMenuCodeArray,
       },
     };
     const rows = await this.sysDBUtil.getList({ condition }, SystemTables.sys_menus);
@@ -72,22 +72,19 @@ export class PublicApiController extends BaseApiController {
       const view_auth_config = rowElement.view_auth_config;
       const view_auth_type = rowElement.view_auth_type;
 
-      const hasPermission  = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config)
+      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 = parseJsonObject(menu_config_content) || [];
-      map[menu_code] = { ...rowElement, menu_list, hasPermission }
+      map[menu_code] = { ...rowElement, menu_list, hasPermission };
     }
 
-
     // 特殊的devops菜单
     map['devops'] = {
       menu_list: [], // 这个特殊的菜单在前端写死。
-      hasPermission: this.ctx.userSession.isAuthPass(KeysOfAuthType.byRoleCode, [
-        SystemRoleCode.DevOpsWriter,SystemRoleCode.DevOpsViewer, SystemRoleCode.SuperAdmin
-      ])
-    }
+      hasPermission: this.ctx.userSession.isAuthPass(KeysOfAuthType.byRoleCode, [SystemRoleCode.DevOpsWriter, SystemRoleCode.DevOpsViewer, SystemRoleCode.SuperAdmin]),
+    };
 
     return CommonResult.successRes(map);
   }
@@ -108,7 +105,7 @@ export class PublicApiController extends BaseApiController {
         if (oneData && oneData['app_schema']) {
           oneData['app_schema'] = parseJsonObject(oneData['app_schema']);
         }
-        resultData[key] = oneData
+        resultData[key] = oneData;
       }
     };
 
@@ -126,7 +123,7 @@ export class PublicApiController extends BaseApiController {
     const body = this.ctx.request.body as any;
     const query = this.ctx.query || {};
     let codeList = _.get(body, 'codeList');
-    let refreshCache = `${_.get(body, 'refreshCache')}` === 'true' || query.refreshCache === 'true';
+    const refreshCache = `${_.get(body, 'refreshCache')}` === 'true' || query.refreshCache === 'true';
 
     if (query.codeList) {
       //codeList=dict@@SexEnum,sysCfgEnum@@EntityStatusEnum