midway-fatcms 0.0.1-beta.2 → 0.0.1-beta.20

package/src/config/config.default.ts

@@ -3,24 +3,25 @@ import { tmpdir } from 'os';
 import { join } from 'path';
 import { readFileSync } from 'fs';
 
-
-
 export default (appInfo: any) => {
   return {
-
     siteFile: {
       favicon: readFileSync(join(__dirname, '../views/static/favicon.ico')),
     },
 
-    encryptedFieldList: [
-
-    ],
+    encryptedFieldList: [],
 
     /**
      * 内置超级管理员用户
      * 可以使用这个工具生成：http://127.0.0.1:7002/ns/api/helpers/generateDatabasePassword?loginName=xxxx&pw0=xxxx
      */
-    superAdminList: [{ pwd_salt: 'c837f8c6de7261de228ec58b1b3ca9fa1htbvgm88', pwd_md5: 'e334410fca1fd49972f63bf91f3be1be', login_name: 'superadmin' }],
+    superAdminList: [
+      {
+        pwd_salt: 'c837f8c6de7261de228ec58b1b3ca9fa1htbvgm88',
+        pwd_md5: 'e334410fca1fd49972f63bf91f3be1be',
+        login_name: 'superadmin',
+      },
+    ],
 
     // use for cookie sign key, should change to your own and keep security
     keys: '1715169944707_323',
@@ -40,7 +41,11 @@ export default (appInfo: any) => {
       jsonLimit: '1mb',
       textLimit: '1mb',
       xmlLimit: '1mb',
-      ignore: ['/ns/gw/proxy/*', '/ns/gw/file/uploadFile', '/ns/api/manage/deploy/uploadAssets'], // 忽略代理路径的 body 解析
+      ignore: [
+        '/ns/gw/proxy/*',
+        '/ns/gw/file/uploadFile',
+        '/ns/api/manage/deploy/uploadAssets',
+      ], // 忽略代理路径的 body 解析
     },
 
     mysql2: {
@@ -57,7 +62,7 @@ export default (appInfo: any) => {
       },
     },
     postgres2: {
-      postgres_test1: {
+      postgres_test_fatcms_inner_demo_config: {
         user: 'postgres',
         host: '127.0.0.1',
         database: 'postgres',
@@ -66,12 +71,11 @@ export default (appInfo: any) => {
         max: 20, // 连接池最大连接数
         idleTimeoutMillis: 30000, // 空闲连接超时时间（毫秒）
         connectionTimeoutMillis: 2000, // 连接超时时间（毫秒）
-      }
+      },
     },
 
-
     sqlserver2: {
-      sqlserver_master: {
+      sqlserver_master_fatcms_inner_demo_config: {
         user: 'sa',
         password: '123456', // 你的SA密码
         server: '127.0.0.1',
@@ -79,20 +83,20 @@ export default (appInfo: any) => {
         database: 'master', // 默认数据库
         options: {
           encrypt: false, // Docker容器内通常不需要加密
-          trustServerCertificate: true // 信任自签名证书
+          trustServerCertificate: true, // 信任自签名证书
         },
         pool: {
-          max: 30,          // 最大连接数
-          min: 1,           // 最小连接数
-          idleTimeoutMillis: 30000  // 连接空闲超时时间（毫秒）
-        }
-      }
+          max: 30, // 最大连接数
+          min: 1, // 最小连接数
+          idleTimeoutMillis: 30000, // 连接空闲超时时间（毫秒）
+        },
+      },
     },
 
     redis: {
       client: {
         port: 6379, // Redis port
-        host: "127.0.0.1", // Redis host
+        host: '127.0.0.1', // Redis host
       },
     },
 
@@ -122,7 +126,34 @@ export default (appInfo: any) => {
       fileSize: '20mb',
       limit: '20mb',
       // whitelist: string[]，文件扩展名白名单
-      whitelist: ['.jpg', '.jpeg', '.png', '.gif', '.pdf', '.zip', '.xlsx', '.docx', '.pptx', '.txt', '.md', '.json', '.js', '.cjs', '.ejs', '.jsx', '.css', '.java', '.ts', '.tsx', '.less', '.scss', '.html', '.ttf', '.map', '.svg'],
+      whitelist: [
+        '.jpg',
+        '.jpeg',
+        '.png',
+        '.gif',
+        '.pdf',
+        '.zip',
+        '.xlsx',
+        '.docx',
+        '.pptx',
+        '.txt',
+        '.md',
+        '.json',
+        '.js',
+        '.cjs',
+        '.ejs',
+        '.jsx',
+        '.css',
+        '.java',
+        '.ts',
+        '.tsx',
+        '.less',
+        '.scss',
+        '.html',
+        '.ttf',
+        '.map',
+        '.svg',
+      ],
       // tmpdir: string，上传的文件临时存储路径
       tmpdir: join(tmpdir(), 'fatcms-upload-files'),
       // cleanTimeout: number，上传的文件在临时目录中多久之后自动删除，默认为 5 分钟
@@ -148,25 +179,25 @@ export default (appInfo: any) => {
     ejs: {},
 
     info: {
-      infoPath: `/_my_info_${Date.now()}_${Math.floor(Math.random() * 1000000)}`, // 实际上隐藏了info路径
+      infoPath: `/_my_info_${Date.now()}_${Math.floor(
+        Math.random() * 1000000
+      )}`, // 实际上隐藏了info路径
     },
 
     // 使用浏览器插件配置header信息：插件名：ModHeader - Modify HTTP headers
     // 默认值：配置key：fatcmsdebug, 配置value: headerSecret的值
     fatcmsDebug: {
-      headerKey: 'euhvfvv5sDt19dNoerVFamhNYlLJ8ZDDYcRZhMJWNRxALxtrxLPqJSks9sRZEpKY',
-      headerSecret: 'IlddQO1fO8X7KSwnF3KazNaNHK05Y0kYaD+1z3yGlfZpz0+aAF5hDzf7KQk2dyx0',
+      headerKey: 'fatcmsDebug',
+      headerSecret: '111',
     },
 
     // 是否开启SA账号。只有账号密码没有用，必须通过ModHeader插件设置如下字段
     fatcmsSAEnable: {
-      headerKey: 'WyuX2jf8hehgXAjV5Bf22hvbK/KTEiHCM8eiQeI0FETm/UFXkcLnn3GSTUfwVrrE',
-      headerSecret: 'lzt19Ef6HxSqg2rp6Q1M3YT+uMrTecmAm3cX1mwFZGqoXknwWdj5fTJil1Vr9AeHDIUFuOOxrU1kSSVa6h/Ppw==',
+      headerKey: 'fatcmsSAEnable',
+      headerSecret: '222',
     },
 
     // 是否启用内置的定时任务
     fatcmsScheduleService: true,
-
-
   } as MidwayConfig;
 };

package/src/configuration.ts

@@ -13,10 +13,11 @@ import { join } from 'path';
 // import { NotFoundFilter } from './filter/notfound.filter';
 import { GlobalMiddleware } from './middleware/global.middleware';
 import { ForbiddenMiddleware } from './middleware/forbidden.middleware';
-import { startSchedule } from './schedule';
+import { SCHEDULE_QUEUE , ANONYMOUS_CONTEXT, INNER_SCHEDULE_INTERVAL } from './schedule';
 import { privateAES } from './libs/utils/crypto-utils';
 
 @Configuration({
+  // namespace: 'fatcms',
   imports: [
     koa,
     validate,
@@ -62,16 +63,16 @@ export class ContainerLifeCycle {
   }
 
   async onReady() {
-    const logger = this.app.getLogger();
-    const config = this.app.getConfig();
 
-    if (config.fatcmsScheduleService) {
-      // 启动定时任务
-      const scheduleServiceList = ['proxyApiLoadService', 'workbenchService', 'visitStatService'];
-      await startSchedule(this.app, scheduleServiceList);
-      logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ' );
-    }
+    /**
+     * 让ANONYMOUS_CONTEXT获取app对象
+     */
+    ANONYMOUS_CONTEXT.setApp(this.app);
 
+    /**
+     * 启动定时任务
+     */
+    await this.startScheduleOnReady();
 
     // add middleware
     this.app.useMiddleware(ForbiddenMiddleware);
@@ -80,4 +81,36 @@ export class ContainerLifeCycle {
     // add filter
     // this.app.useFilter([NotFoundFilter, DefaultErrorFilter]);
   }
+
+  private async startScheduleOnReady() {
+    const logger = this.app.getLogger();
+    const config = this.app.getConfig();
+    const fatcmsScheduleService: boolean | any = config.fatcmsScheduleService;
+
+    // 关闭定时任务
+    if (fatcmsScheduleService === false || fatcmsScheduleService === null) {
+      return;
+    }
+
+    let scheduleIntervalCfg = INNER_SCHEDULE_INTERVAL;
+    if (typeof fatcmsScheduleService === "object") {
+      scheduleIntervalCfg = 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 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 {SystemDbName, SystemDbType} from '../../models/SystemTables';
-import { UserAccountService } from '../../service/UserAccountService';
-import { RelatedType } from '../../service/curd/CurdMixUtils';
-import { BaseService } from '../../service/base/BaseService';
+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';
 
 export interface IExecuteSimpleSqlParams {
   updateCfg?: Record<string, IFuncCfgModel>;
@@ -27,7 +27,6 @@ export class BaseApiController extends BaseService {
   @Inject()
   protected userAccountService: UserAccountService;
 
-
   protected getUserSessionInfo() {
     if (!this.ctx.userSession) {
       return null;
@@ -35,16 +34,15 @@ export class BaseApiController extends BaseService {
     return this.ctx.userSession.getSessionInfo();
   }
 
-  async executeSysSQL(executeSql:string, executeSqlArgs: any[]){
-    return await this.curdMixService.executeSQL(
-      {
-        executeSql: executeSql,
-        executeSqlArgs:executeSqlArgs,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-        crudType: KeyOfCrudTypes.SYS_QUERY,
-      }
-    );
+  async executeSysSQL(executeSql: string, executeSqlArgs: any[]) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return await this.curdMixService.executeSQL({
+      executeSql: executeSql,
+      executeSqlArgs: executeSqlArgs,
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+      crudType: KeyOfCrudTypes.SYS_QUERY,
+    });
   }
 
   /**
@@ -55,6 +53,7 @@ export class BaseApiController extends BaseService {
    * @protected
    */
   protected async executeSysSimpleSQL(sqlTable: string, sqlSimpleName: KeysOfSimpleSQL, params?: IExecuteSimpleSqlParams) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
     const body = this.ctx.request.body as any;
     const req = this.ctx.req;
     const cfgModel: IRequestCfgModel = {
@@ -62,7 +61,7 @@ export class BaseApiController extends BaseService {
       sqlTable,
       sqlSimpleName,
       sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
+      sqlDbType: SystemDbType,
       updateCfg: {},
     };
 
@@ -80,6 +79,7 @@ export class BaseApiController extends BaseService {
   }
 
   protected get sysDBUtil() {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
     return this.curdMixService.getBbUtil(SystemDbName, SystemDbType);
   }
 

package/src/controller/gateway/AnyApiGatewayController.ts

@@ -2,7 +2,7 @@ import { All, Controller, Inject, Param } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
 import * as _ from 'lodash';
-import { AnyApiService } from '../../service/anyapi/AnyApiService';
+import { AnyApiService } from '@/service/anyapi/AnyApiService';
 
 /**
  * FaaS方式配置的接口

package/src/controller/gateway/AsyncTaskController.ts

@@ -0,0 +1,83 @@
+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('参数不正确');
+  }
+  body.condition.created_by = ctx.userSession.getSessionInfo().accountId;
+}
+
+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;
+
+  // fix data
+  const dataObj: SysAsyncTaskEntity = (body.data || {}) as any;
+  dataObj.task_status = SysAsyncTaskStatus.CANCELLED;
+  body.data = dataObj;
+}
+
+function fixCreateBodyData(body: any, ctx: Context) {
+  if (!body.data) {
+    throw new CommonException('参数不正确');
+  }
+
+  const sessionInfo = ctx.userSession.getSessionInfo();
+  // fix data
+  const dataObj: SysAsyncTaskEntity = (body.data || {}) as any;
+  dataObj.task_status = SysAsyncTaskStatus.PENDING;
+  dataObj.created_by = sessionInfo.accountId;
+  dataObj.created_user_session = JSON.stringify(sessionInfo); // 创建人的session信息。用于执行时的鉴权。
+}
+
+/**
+ * 异步任务框架
+ */
+@Controller('/ns/gw/AsyncTask', { middleware: [checkLogin()] })
+export class AsyncTaskController extends BaseApiController {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  private asyncTaskService: AsyncTaskService;
+
+  // 获取任务列表
+  @Post('/getMyTasks')
+  async getMyTasks() {
+    fixMyTasksCondition(this.ctx.request.body, this.ctx);
+    return this.executeSysSimpleSQL(SystemTables.sys_async_tasks, KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
+  }
+
+  // 创建任务
+  @Post('/createTask')
+  async createTask() {
+    fixCreateBodyData(this.ctx.request.body, this.ctx);
+    const res = await this.executeSysSimpleSQL(SystemTables.sys_async_tasks, KeysOfSimpleSQL.SIMPLE_INSERT);
+    await this.asyncTaskService.startTask();
+    return res;
+  }
+
+  // 取消任务
+  @Post('/cancelTask')
+  async cancelTask(@Query('id') id: number) {
+    fixCancelBodyData(this.ctx.request.body, id);
+    await this.asyncTaskService.cancelTask(id);
+    await this.executeSysSimpleSQL(SystemTables.sys_async_tasks, KeysOfSimpleSQL.SIMPLE_UPDATE);
+    return { success: true };
+  }
+}

package/src/controller/gateway/CrudMtdGatewayController.ts

@@ -2,13 +2,14 @@ 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'];
 
@@ -20,11 +21,11 @@ function pickAsQuery(query_as_pick: string, query: any): any {
   return query;
 }
 
-// /ns/gw/api/crudMtd/getUser?__query_as_condition__=id&_query_as_data__=name&&id=1&name=22
+// /ns/gw/crudApi/getUser?__query_as_condition__=id&_query_as_data__=name&&id=1&name=22
 /**
- *    query形式1：GET: /ns/gw/api/crudMtd/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
- *    query形式2：GET: /ns/gw/api/crudMtd/getUser?__query_as__=condition&id=1&name=22
- *    query形式3：GET: /ns/gw/api/crudMtd/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
+ *    query形式1：GET: /ns/gw/crudApi/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
+ *    query形式2：GET: /ns/gw/crudApi/getUser?__query_as__=condition&id=1&name=22
+ *    query形式3：GET: /ns/gw/crudApi/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
  *
  * 执行单个配置的接口
  */
@@ -56,7 +57,7 @@ export class CrudMtdGatewayController extends ApiBaseService {
       return CommonResult.errorRes('接口不存在或已下线: ' + methodCode);
     }
 
-    this.logInfo("methodInfo=== ", methodInfo)
+    this.logInfo('methodInfo=== ', methodInfo);
 
     const workbench_code_array = methodInfo.workbench_code_array || methodInfo.workbenchCodeArray;
     const isSupport = await this.workbenchService.isSupportCurrentWorkbench(workbench_code_array);
@@ -100,7 +101,10 @@ export class CrudMtdGatewayController extends ApiBaseService {
     const cfgModel = methodInfo as IRequestCfgModel2;
     const { dbType, dbName } = parseDatabaseName(cfgModel.sqlDatabase);
     cfgModel.sqlDatabase = dbName;
-    cfgModel.sqlDdType = dbType;
+    cfgModel.sqlDbType = dbType;
+
+    // 业务系统自定义的修改cfgModel
+    await GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudMtd(reqJson, cfgModel, methodInfo, this.ctx);
 
     return this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
   }

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,10 +1,11 @@
-import {Get, Controller, Inject, Query} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {BaseApiController} from '../base/BaseApiController';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
-import {KeysOfSimpleSQL} from '../../libs/crud-pro/models/keys';
-import {WorkbenchService} from '../../service/WorkbenchService';
-import {CommonResult} from '../../libs/utils/common-dto';
+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';
 
 function checkIsNumber(value: string, name: string) {
   if (!value) {
@@ -27,19 +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;
     }
 
-    await this.curdMixService.executeCrudByCfg({
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    await this.curdMixService.executeCrudByCfg(
+      {
         data: {
-          pv: pv + 1
+          pv: pv + 1,
         },
         condition: {
           id: parseInt(docId),
@@ -50,11 +53,11 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      });
+        sqlDbType: SystemDbType,
+      }
+    );
   }
 
-
   /**
    * @param docId
    * @param docLibId 文档库
@@ -69,6 +72,7 @@ export class DocGatewayController extends BaseApiController {
       return docLibInfoRes;
     }
 
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
 
     const res = await this.curdMixService.executeCrudByCfg(
       {
@@ -81,7 +85,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
 
@@ -107,6 +111,8 @@ export class DocGatewayController extends BaseApiController {
       return docLibInfoRes;
     }
 
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     return this.curdMixService.executeCrudByCfg(
       {
         columns: 'id,title,doc_category_code,sort_index',
@@ -122,7 +128,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
   }
@@ -135,6 +141,8 @@ export class DocGatewayController extends BaseApiController {
   async getDocLibInfo(@Query('docLibId') docLibId: string) {
     checkIsNumber(docLibId, 'docLibId');
 
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const s = await this.curdMixService.executeCrudByCfg(
       {
         condition: {
@@ -145,7 +153,7 @@ export class DocGatewayController extends BaseApiController {
         sqlTable: SystemTables.sys_doc_lib,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
     const docLibInfo = s.getOneObj();

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';
 
 /**
  * 只支持前缀匹配