midway-fatcms 0.0.1-beta.6 → 0.0.1-beta.60

package/src/controller/gateway/DocGatewayController.ts

@@ -1,165 +1,173 @@
-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';
-
-function checkIsNumber(value: string, name: string) {
-  if (!value) {
-    throw `${name}参数不存在`;
-  }
-  if (!parseInt(value)) {
-    throw `${name}参数不是一个整数`;
-  }
-}
-
-/**
- * C端用户接口。
- * 对外开发接口。
- */
-@Controller('/ns/gw/doc')
-export class DocGatewayController extends BaseApiController {
-  @Inject()
-  protected ctx: Context;
-
-  @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')
-    if (nxRes !== 'OK') {
-      return;
-    }
-
-    await this.curdMixService.executeCrudByCfg({
-        data: {
-          pv: pv + 1
-        },
-        condition: {
-          id: parseInt(docId),
-          doc_lib_id: parseInt(docLibId),
-        },
-      },
-      {
-        sqlTable: SystemTables.sys_doc,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      });
-  }
-
-
-  /**
-   * @param docId
-   * @param docLibId 文档库
-   */
-  @Get('/getDocInfo')
-  async getDocInfo(@Query('docId') docId: string, @Query('docLibId') docLibId: string) {
-    checkIsNumber(docId, 'docId');
-    checkIsNumber(docLibId, 'docLibId');
-
-    const docLibInfoRes = await this.getDocLibInfo(docLibId);
-    if (!docLibInfoRes.success) {
-      return docLibInfoRes;
-    }
-
-
-    const res = await this.curdMixService.executeCrudByCfg(
-      {
-        condition: {
-          id: parseInt(docId),
-          doc_lib_id: parseInt(docLibId),
-        },
-      },
-      {
-        sqlTable: SystemTables.sys_doc,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-
-    // 更新PV数据
-    const docObj = res.getOneObj();
-    if (docObj) {
-      const pv: number = parseInt(docObj.pv) || 0;
-      await this.updateDocPV(docId, docLibId, pv);
-    }
-
-    return res;
-  }
-
-  /**
-   * @param docLibId
-   */
-  @Get('/getDocList')
-  async getDocList(@Query('docLibId') docLibId: string) {
-    checkIsNumber(docLibId, 'docLibId');
-
-    const docLibInfoRes = await this.getDocLibInfo(docLibId);
-    if (!docLibInfoRes.success) {
-      return docLibInfoRes;
-    }
-
-    return this.curdMixService.executeCrudByCfg(
-      {
-        columns: 'id,title,doc_category_code,sort_index',
-        orderBy: 'sort_index+,id-',
-        condition: {
-          doc_lib_id: parseInt(docLibId),
-          doc_category_code: {
-            $notNull: '',
-          },
-        },
-      },
-      {
-        sqlTable: SystemTables.sys_doc,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-  }
-
-  /**
-   * TODO 权限控制
-   * @param docLibId
-   */
-  @Get('/getDocLibInfo')
-  async getDocLibInfo(@Query('docLibId') docLibId: string) {
-    checkIsNumber(docLibId, 'docLibId');
-
-    const s = await this.curdMixService.executeCrudByCfg(
-      {
-        condition: {
-          id: parseInt(docLibId),
-        },
-      },
-      {
-        sqlTable: SystemTables.sys_doc_lib,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-    const docLibInfo = s.getOneObj();
-
-    if (!docLibInfo) {
-      throw '此文档库查询失败';
-    }
-
-    const workbench_code_array = docLibInfo.workbench_code_array;
-    const isSupportCurrentWorkbench = await this.workbenchService.isSupportCurrentWorkbench(workbench_code_array);
-    if (!isSupportCurrentWorkbench) {
-      throw '此文档库不支持在当前站点打开';
-    }
-
-    return CommonResult.successRes(docLibInfo);
-  }
-}
+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) {
+    throw `${name}参数不存在`;
+  }
+  if (!parseInt(value)) {
+    throw `${name}参数不是一个整数`;
+  }
+}
+
+/**
+ * C端用户接口。
+ * 对外开发接口。
+ */
+@Controller('/ns/gw/doc')
+export class DocGatewayController extends BaseApiController {
+  @Inject()
+  protected ctx: Context;
+
+  @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');
+    if (nxRes !== 'OK') {
+      return;
+    }
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    await this.curdMixService.executeCrudByCfg(
+      {
+        data: {
+          pv: pv + 1,
+        },
+        condition: {
+          id: parseInt(docId),
+          doc_lib_id: parseInt(docLibId),
+        },
+      },
+      {
+        sqlTable: SystemTables.sys_doc,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+  }
+
+  /**
+   * @param docId
+   * @param docLibId 文档库
+   */
+  @Get('/getDocInfo')
+  async getDocInfo(@Query('docId') docId: string, @Query('docLibId') docLibId: string) {
+    checkIsNumber(docId, 'docId');
+    checkIsNumber(docLibId, 'docLibId');
+
+    const docLibInfoRes = await this.getDocLibInfo(docLibId);
+    if (!docLibInfoRes.success) {
+      return docLibInfoRes;
+    }
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const res = await this.curdMixService.executeCrudByCfg(
+      {
+        condition: {
+          id: parseInt(docId),
+          doc_lib_id: parseInt(docLibId),
+        },
+      },
+      {
+        sqlTable: SystemTables.sys_doc,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+
+    // 更新PV数据
+    const docObj = res.getOneObj();
+    if (docObj) {
+      const pv: number = parseInt(docObj.pv) || 0;
+      await this.updateDocPV(docId, docLibId, pv);
+    }
+
+    return res;
+  }
+
+  /**
+   * @param docLibId
+   */
+  @Get('/getDocList')
+  async getDocList(@Query('docLibId') docLibId: string) {
+    checkIsNumber(docLibId, 'docLibId');
+
+    const docLibInfoRes = await this.getDocLibInfo(docLibId);
+    if (!docLibInfoRes.success) {
+      return docLibInfoRes;
+    }
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    return this.curdMixService.executeCrudByCfg(
+      {
+        columns: 'id,title,doc_category_code,sort_index',
+        orderBy: 'sort_index+,id-',
+        condition: {
+          doc_lib_id: parseInt(docLibId),
+          doc_category_code: {
+            $notNull: '',
+          },
+        },
+      },
+      {
+        sqlTable: SystemTables.sys_doc,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+  }
+
+  /**
+   * TODO 权限控制
+   * @param docLibId
+   */
+  @Get('/getDocLibInfo')
+  async getDocLibInfo(@Query('docLibId') docLibId: string) {
+    checkIsNumber(docLibId, 'docLibId');
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const s = await this.curdMixService.executeCrudByCfg(
+      {
+        condition: {
+          id: parseInt(docLibId),
+        },
+      },
+      {
+        sqlTable: SystemTables.sys_doc_lib,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    const docLibInfo = s.getOneObj();
+
+    if (!docLibInfo) {
+      throw '此文档库查询失败';
+    }
+
+    const workbench_code_array = docLibInfo.workbench_code_array;
+    const isSupportCurrentWorkbench = await this.workbenchService.isSupportCurrentWorkbench(workbench_code_array);
+    if (!isSupportCurrentWorkbench) {
+      throw '此文档库不支持在当前站点打开';
+    }
+
+    return CommonResult.successRes(docLibInfo);
+  }
+}

package/src/controller/gateway/FileController.ts

@@ -1,110 +1,109 @@
-import { Get, Post, Inject, Controller, Files, Fields, Param, Query } from '@midwayjs/core';
-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";
-
-function isTrue(obj: any) {
-  return obj === true || obj === 'true';
-}
-
-
-/**
- * 文件上传下载服务
- */
-@Controller(PATH_PREFIX)
-export class FileController extends BaseApiController {
-  @Inject()
-  ctx: Context;
-
-  @Inject()
-  private fileCenterService: FileCenterService;
-
-  /**
-   * 上传普通文件。必须是登录用户才能上传。
-   * @param files
-   * @param fields
-   * @param queryData
-   */
-  @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;
-
-    if (!Object.keys(AccessType).includes(accessType)) {
-      throw new BizException(`仅支持 ${Object.keys(AccessType).join('、')} 上传模式`);
-    }
-
-    const { fileKey, filename, storageUrl } = await this.fileCenterService.uploadFileToOSS(files, accessType, referer);
-
-    const origin = this.ctx.request.origin;
-
-    const downloadUrls = toDownloadPaths(origin, fileKey);
-
-    const data = {
-      fileKey,
-      filename,
-      storageUrl,
-      ...downloadUrls,
-    };
-    return CommonResult.successRes(data);
-  }
-
-  // http://localhost:5173/ns/gw/file/get/download/6114718c6e2cb192bf6e99c3ede2b6d41743401594182.png&process=doc/preview
-  /**
-   * 文件下载或预览
-   * @param byMethod
-   * @param fileKey
-   * @param process 图片处理：https://help.aliyun.com/document_detail/44688.html
-   * @param streaming 是否直接返回流，默认返回 302 跳转
-   */
-  @Get('/get/:byMethod/:fileKey*')
-  async downloadFile(@Param('byMethod') byMethod: string ,@Param('fileKey') fileKey: string) {
-    if (!fileKey) {
-      throw new BizException('fileKey不能为空');
-    }
-
-    const byMethodSet = new Set<string>(FILE_GET_TYPES);
-    if (!byMethodSet.has(byMethod)) {
-      throw new BizException('byMethod不正确');
-    }
-
-    // eslint-disable-next-line prefer-const
-    let { process, preview, streaming } = (this.ctx.query || {}) as any;
-
-    const isThumbnail = this.ctx.path.startsWith(`${PATH_PREFIX}/get/thumbnail/`);
-    const isPreview = this.ctx.path.startsWith(`${PATH_PREFIX}/get/preview/`) || isTrue(preview);
-    const isStreaming = isTrue(streaming);
-
-    if (isThumbnail && isImageFile(fileKey) && !process) {
-      // x-oss-process=image/resize,w_200,p_10/quality,q_60
-      process = 'image/resize,w_200'; //图片缩略图(小图片)
-    }
-
-    const isOutByStreaming = isStreaming || isPreview || isThumbnail;
-
-    const result = await this.fileCenterService.downloadFile(fileKey, isOutByStreaming, process);
-
-    if (isOutByStreaming) {
-      // 移除这些属性
-      const headers: any = _.omitBy(result.res.headers, (_v, key) => {
-        if (key === 'content-length') {
-          return true;
-        }
-        if ((isPreview || isThumbnail) && key.toLowerCase() === 'content-disposition') {
-          return true;
-        }
-        return key.startsWith('x-oss-meta-');
-      });
-      this.ctx.set(headers);
-      this.ctx.body = result.stream;
-    } else {
-      this.ctx.redirect(result.downloadURL);
-    }
-  }
-}
+import { Get, Post, Inject, Controller, Files, Fields, Param, Query } from '@midwayjs/core';
+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';
+
+function isTrue(obj: any) {
+  return obj === true || obj === 'true';
+}
+
+/**
+ * 文件上传下载服务
+ */
+@Controller(PATH_PREFIX)
+export class FileController extends BaseApiController {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  protected fileCenterService: FileCenterService;
+
+  /**
+   * 上传普通文件。必须是登录用户才能上传。
+   * @param files
+   * @param fields
+   * @param queryData
+   */
+  @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;
+
+    if (!Object.keys(AccessType).includes(accessType)) {
+      throw new BizException(`仅支持 ${Object.keys(AccessType).join('、')} 上传模式`);
+    }
+
+    const { fileKey, filename, storageUrl } = await this.fileCenterService.uploadFileToOSS(files, accessType, referer);
+
+    const origin = this.ctx.request.origin;
+
+    const downloadUrls = toDownloadPaths(origin, fileKey);
+
+    const data = {
+      fileKey,
+      filename,
+      storageUrl,
+      ...downloadUrls,
+    };
+    return CommonResult.successRes(data);
+  }
+
+  // http://localhost:5173/ns/gw/file/get/download/6114718c6e2cb192bf6e99c3ede2b6d41743401594182.png&process=doc/preview
+  /**
+   * 文件下载或预览
+   * @param byMethod
+   * @param fileKey
+   * @param process 图片处理：https://help.aliyun.com/document_detail/44688.html
+   * @param streaming 是否直接返回流，默认返回 302 跳转
+   */
+  @Get('/get/:byMethod/:fileKey*')
+  async downloadFile(@Param('byMethod') byMethod: string, @Param('fileKey') fileKey: string) {
+    if (!fileKey) {
+      throw new BizException('fileKey不能为空');
+    }
+
+    const byMethodSet = new Set<string>(FILE_GET_TYPES);
+    if (!byMethodSet.has(byMethod)) {
+      throw new BizException('byMethod不正确');
+    }
+
+    // eslint-disable-next-line prefer-const
+    let { process, preview, streaming } = (this.ctx.query || {}) as any;
+
+    const isThumbnail = this.ctx.path.startsWith(`${PATH_PREFIX}/get/thumbnail/`);
+    const isPreview = this.ctx.path.startsWith(`${PATH_PREFIX}/get/preview/`) || isTrue(preview);
+    const isStreaming = isTrue(streaming);
+
+    if (isThumbnail && isImageFile(fileKey) && !process) {
+      // x-oss-process=image/resize,w_200,p_10/quality,q_60
+      process = 'image/resize,w_200'; //图片缩略图(小图片)
+    }
+
+    const isOutByStreaming = isStreaming || isPreview || isThumbnail;
+
+    const result = await this.fileCenterService.downloadFile(fileKey, isOutByStreaming, process);
+
+    if (isOutByStreaming) {
+      // 移除这些属性
+      const headers: any = _.omitBy(result.res.headers, (_v, key) => {
+        if (key === 'content-length') {
+          return true;
+        }
+        if ((isPreview || isThumbnail) && key.toLowerCase() === 'content-disposition') {
+          return true;
+        }
+        return key.startsWith('x-oss-meta-');
+      });
+      this.ctx.set(headers);
+      this.ctx.body = result.stream;
+    } else {
+      this.ctx.redirect(result.downloadURL);
+    }
+  }
+}

package/src/controller/gateway/ProxyApiGatewayController.ts

@@ -1,47 +1,47 @@
-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';
-
-/**
- * 只支持前缀匹配
- * 【/ns/gw/proxy/[upstreamName]/】api/userinfo ==> http://127.0.0.1:3000/api/userinfo
- * FaaS方式配置的接口
- */
-@Controller('/ns/gw/proxy')
-export class ProxyApiGatewayController extends BaseApiController {
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  private proxyApiService: ProxyApiService;
-
-  @Inject()
-  private workbenchService: WorkbenchService;
-
-  @Inject()
-  private proxyApiLoadService: ProxyApiLoadService;
-  /**
-   * 执行配置出来的接口的接口。此接口本身不需要鉴权。鉴权信息在配置中由curdPro底层进行鉴权
-   */
-  @All('/*')
-  async executeProxyApi() {
-    const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
-    if (!workbenchInfo) {
-      return CommonResult.errorRes('域名站点不存在');
-    }
-    const workbench_code = workbenchInfo.workbench_code;
-    // const path_prefix2 = '/' + entity.upstream_code + entity.path_prefix;
-    // 路由树的结构是 /${entity.upstream_code}${entity.path_prefix}
-    const path2 = this.ctx.path.replace(/^\/ns\/gw\/proxy/, '');
-    return this.proxyApiService.handleProxyRequest(workbench_code, path2);
-  }
-
-  @All('/buildRouteTrie')
-  async buildRouteTrie(@Query('workbench_code') workbench_code: string) {
-    return this.proxyApiLoadService.buildRouteTrie(workbench_code);
-  }
-}
+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';
+
+/**
+ * 只支持前缀匹配
+ * 【/ns/gw/proxy/[upstreamName]/】api/userinfo ==> http://127.0.0.1:3000/api/userinfo
+ * FaaS方式配置的接口
+ */
+@Controller('/ns/gw/proxy')
+export class ProxyApiGatewayController extends BaseApiController {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  private proxyApiService: ProxyApiService;
+
+  @Inject()
+  private workbenchService: WorkbenchService;
+
+  @Inject()
+  private proxyApiLoadService: ProxyApiLoadService;
+  /**
+   * 执行配置出来的接口的接口。此接口本身不需要鉴权。鉴权信息在配置中由curdPro底层进行鉴权
+   */
+  @All('/*')
+  async executeProxyApi() {
+    const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
+    if (!workbenchInfo) {
+      return CommonResult.errorRes('域名站点不存在');
+    }
+    const workbench_code = workbenchInfo.workbench_code;
+    // const path_prefix2 = '/' + entity.upstream_code + entity.path_prefix;
+    // 路由树的结构是 /${entity.upstream_code}${entity.path_prefix}
+    const path2 = this.ctx.path.replace(/^\/ns\/gw\/proxy/, '');
+    return this.proxyApiService.handleProxyRequest(workbench_code, path2);
+  }
+
+  @All('/buildRouteTrie')
+  async buildRouteTrie(@Query('workbench_code') workbench_code: string) {
+    return this.proxyApiLoadService.buildRouteTrie(workbench_code);
+  }
+}