midway-fatcms 0.0.1-beta.70 → 0.0.1-beta.71

package/dist/config/config.default.js

@@ -111,7 +111,7 @@ exports.default = (appInfo) => {
             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', '.rar', '.xlsx', '.docx', '.pptx', '.txt', '.md', '.json', '.js', '.cjs', '.ejs', '.jsx', '.css', '.java', '.ts', '.tsx', '.less', '.scss', '.html', '.ttf', '.map', '.svg'],
             // tmpdir: string，上传的文件临时存储路径
             tmpdir: (0, path_1.join)((0, os_1.tmpdir)(), 'fatcms-upload-files'),
             // cleanTimeout: number，上传的文件在临时目录中多久之后自动删除，默认为 5 分钟

package/dist/controller/gateway/FileController.d.ts

@@ -25,4 +25,8 @@ export declare class FileController extends BaseApiController {
      * @param streaming 是否直接返回流，默认返回 302 跳转
      */
     downloadFile(byMethod: string, fileKey: string): Promise<void>;
+    /**
+     * 获取用户本人上传的文件列表
+     */
+    getCurrentUserFiles(): Promise<CommonResult>;
 }

package/dist/controller/gateway/FileController.js

@@ -80,12 +80,13 @@ let FileController = class FileController extends BaseApiController_1.BaseApiCon
         const isThumbnail = this.ctx.path.startsWith(`${FileCenterService_1.PATH_PREFIX}/get/thumbnail/`);
         const isPreview = this.ctx.path.startsWith(`${FileCenterService_1.PATH_PREFIX}/get/preview/`) || isTrue(preview);
         const isStreaming = isTrue(streaming);
-        if (isThumbnail && (0, FileCenterService_1.isImageFile)(fileKey) && !process) {
+        const fileInfo = await this.fileCenterService.getFileInfo(fileKey);
+        if (isThumbnail && (0, FileCenterService_1.isImageFile)(fileKey, fileInfo.file_type) && !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);
+        const result = await this.fileCenterService.downloadFile(fileInfo, isOutByStreaming, process);
         if (isOutByStreaming) {
             // 移除这些属性
             const headers = _.omitBy(result.res.headers, (_v, key) => {
@@ -104,6 +105,14 @@ let FileController = class FileController extends BaseApiController_1.BaseApiCon
             this.ctx.redirect(result.downloadURL);
         }
     }
+    /**
+     * 获取用户本人上传的文件列表
+     */
+    async getCurrentUserFiles() {
+        let { file_category } = (this.ctx.query || {});
+        const res = await this.fileCenterService.getCurrentUserFiles(file_category);
+        return common_dto_1.CommonResult.successRes(res);
+    }
 };
 __decorate([
     (0, core_1.Inject)(),
@@ -139,6 +148,12 @@ __decorate([
     __metadata("design:paramtypes", [String, String]),
     __metadata("design:returntype", Promise)
 ], FileController.prototype, "downloadFile", null);
+__decorate([
+    (0, core_1.Get)('/getCurrentUserFiles', { middleware: [(0, permission_middleware_1.checkLogin)()] }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], FileController.prototype, "getCurrentUserFiles", null);
 FileController = __decorate([
     (0, core_1.Controller)(FileCenterService_1.PATH_PREFIX)
 ], FileController);

package/dist/libs/crud-pro/models/ExecuteContext.d.ts

@@ -4,7 +4,7 @@ import { SqlCfgModel } from './SqlCfgModel';
 import { Transaction } from './Transaction';
 import { ColumnRelation, ICrudProCfg, ILogger, IVisitor } from '../interfaces';
 import { IExecuteContextFunc } from './ExecuteContextFunc';
-import { ResModelFlexible } from './ResModel';
+import { ResModelFlexible, ResModelPageQuery } from './ResModel';
 declare class ExecuteContext {
     private transaction;
     private logger;
@@ -30,6 +30,7 @@ declare class ExecuteContext {
     getResRows(): any[];
     setResModelItem(resName: string, data: any): void;
     getResModelItem(resName: string): any;
+    getResModelForQueryPage(): ResModelPageQuery;
     getResModelItemLodash(resName: string): any;
     setCfgModel(cfgModel: RequestCfgModel): void;
     getCfgModel(): RequestCfgModel;

package/dist/libs/crud-pro/models/ExecuteContext.js

@@ -60,6 +60,14 @@ class ExecuteContext {
     getResModelItem(resName) {
         return this.resModel[resName];
     }
+    getResModelForQueryPage() {
+        const rows = this.resModel['rows'];
+        const total_count = this.resModel['total_count'];
+        return {
+            rows: rows || [],
+            total_count: total_count || 0
+        };
+    }
     getResModelItemLodash(resName) {
         return _.get(this.resModel, resName);
     }

package/dist/libs/crud-pro/models/ResModel.d.ts

@@ -10,7 +10,11 @@ interface ResModelStandard {
     insert_affected?: ResModelAffected;
     update_affected?: ResModelAffected;
 }
+interface ResModelPageQuery {
+    rows: any[];
+    total_count: number;
+}
 declare type ResModelFlexible = ResModelStandard & {
     [key: string]: any;
 };
-export { ResModelAffected, ResModelStandard, ResModelFlexible };
+export { ResModelAffected, ResModelStandard, ResModelFlexible, ResModelPageQuery };

package/dist/models/bizmodels.d.ts

@@ -50,6 +50,12 @@ export declare enum UploadCategoryType {
     file = "file",
     assets = "assets"
 }
+export declare enum FileCategoryType {
+    image = "image",
+    office = "office",
+    zip = "zip",
+    others = "others"
+}
 export declare class PermFunc {
     funcCode: string;
     funcName: string;

package/dist/models/bizmodels.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheNameEnum = exports.StdCrudExportInputParamsAppType = exports.FILE_GET_TYPES = exports.CTX_WORKBENCH_CODE = exports.CTX_VISITOR_ACCOUNT_TYPE = exports.CTX_VISITOR_NICKNAME = exports.CTX_VISITOR_AVATAR = exports.CTX_VISITOR_ID = exports.PermRole = exports.PermFunc = exports.UploadCategoryType = exports.AccessType = void 0;
+exports.CacheNameEnum = exports.StdCrudExportInputParamsAppType = exports.FILE_GET_TYPES = exports.CTX_WORKBENCH_CODE = exports.CTX_VISITOR_ACCOUNT_TYPE = exports.CTX_VISITOR_NICKNAME = exports.CTX_VISITOR_AVATAR = exports.CTX_VISITOR_ID = exports.PermRole = exports.PermFunc = exports.FileCategoryType = exports.UploadCategoryType = exports.AccessType = void 0;
 var AccessType;
 (function (AccessType) {
     AccessType["owner"] = "owner";
@@ -12,6 +12,13 @@ var UploadCategoryType;
     UploadCategoryType["file"] = "file";
     UploadCategoryType["assets"] = "assets";
 })(UploadCategoryType = exports.UploadCategoryType || (exports.UploadCategoryType = {}));
+var FileCategoryType;
+(function (FileCategoryType) {
+    FileCategoryType["image"] = "image";
+    FileCategoryType["office"] = "office";
+    FileCategoryType["zip"] = "zip";
+    FileCategoryType["others"] = "others";
+})(FileCategoryType = exports.FileCategoryType || (exports.FileCategoryType = {}));
 class PermFunc {
     constructor(funcCode, funcName) {
         this.funcName = funcName;

package/dist/service/FileCenterService.d.ts

@@ -1,7 +1,25 @@
 import { Context } from '@midwayjs/koa';
-import { AccessType, UploadCategoryType } from '../models/bizmodels';
+import { AccessType, FileCategoryType, IEntityCommonInfo, UploadCategoryType } from '../models/bizmodels';
 import { BaseService } from './base/BaseService';
-export declare function isImageFile(fileKey: string): boolean;
+import { ResModelPageQuery } from "../libs/crud-pro/models/ResModel";
+export declare function isImageFile(fileKey: string, mimeType: string): boolean;
+export declare function isOfficeFile(fileKey: string, mimeType: string): boolean;
+export declare function isZipFile(fileKey: string, mimeType: string): boolean;
+export declare function getFileCategory(fileKey: string, mimeType: string): FileCategoryType;
+interface IFileInfo extends IEntityCommonInfo {
+    file_key: string;
+    file_name: string;
+    file_size: number;
+    file_type: string;
+    file_suffix: string;
+    file_desc: string;
+    storage_path: string;
+    storage_url: string;
+    storage_engine: string;
+    access_type: string;
+    referer: string;
+    file_category: string;
+}
 interface IUploadFileToOSSOptions {
     uploadCategoryType: UploadCategoryType;
     uploadPath: string;
@@ -29,15 +47,18 @@ export declare class FileCenterService extends BaseService {
         mimeType: any;
         name: any;
         url: any;
+        file_category: FileCategoryType;
     }>;
     deleteFile(fileKey: string): Promise<import("../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
     private headFile;
-    downloadFile(fileKey: string, streaming: boolean, process: string): Promise<any>;
+    getFileInfo(fileKey: string): Promise<IFileInfo>;
+    downloadFile(fileInfo: IFileInfo, streaming: boolean, process: string): Promise<any>;
     /**
      * 检查用户下载权限
      * @param fileInfo
      * @private
      */
     private checkAuthUserDownloadFile;
+    getCurrentUserFiles(file_category: FileCategoryType): Promise<ResModelPageQuery>;
 }
 export {};

package/dist/service/FileCenterService.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileCenterService = exports.toDownloadPaths = exports.PATH_PREFIX = exports.isImageFile = void 0;
+exports.FileCenterService = exports.toDownloadPaths = exports.PATH_PREFIX = exports.getFileCategory = exports.isZipFile = exports.isOfficeFile = exports.isImageFile = void 0;
 const core_1 = require("@midwayjs/core");
 const mime = require("mime-types");
 const md5 = require("md5");
@@ -76,18 +76,45 @@ function getAssetsContentType(filename) {
     return 'application/octet-stream';
 }
 // JPG、PNG、BMP、GIF、WebP、TIFF
-function isImageFile(fileKey) {
-    const fileKey1 = fileKey.toLowerCase();
-    const suffix = ['.jpg', '.jpeg', '.png', '.bmp', '.gif', '.webp', '.tiff'];
-    for (let i = 0; i < suffix.length; i++) {
-        const suffix1 = suffix[i];
-        if (fileKey1.endsWith(suffix1)) {
-            return true;
-        }
-    }
-    return false;
+function isImageFile(fileKey, mimeType) {
+    if (typeof mimeType === 'string' && mimeType.startsWith('image/'))
+        return true;
+    const fileKey2 = fileKey.toLowerCase();
+    const suffixList = ['.jpg', '.jpeg', '.png', '.bmp', '.gif', '.webp', '.tiff'];
+    return suffixList.some(suffix => fileKey2.endsWith(suffix));
 }
 exports.isImageFile = isImageFile;
+function isOfficeFile(fileKey, mimeType) {
+    if (typeof mimeType === 'string' &&
+        (mimeType.startsWith('application/vnd.openxmlformats-officedocument') ||
+            mimeType.startsWith('application/msword') ||
+            mimeType.startsWith('application/vnd.ms-'))) {
+        return true;
+    }
+    const fileKey2 = fileKey.toLowerCase();
+    const suffixList = ['.docx', '.xlsx', '.pptx', '.doc', '.xls', '.ppt', '.pdf'];
+    return suffixList.some(suffix => fileKey2.endsWith(suffix));
+}
+exports.isOfficeFile = isOfficeFile;
+function isZipFile(fileKey, mimeType) {
+    const suffixList = ['.zip', '.7z', '.rar'];
+    const fileKey2 = fileKey.toLowerCase();
+    return suffixList.some(suffix => fileKey2.endsWith(suffix));
+}
+exports.isZipFile = isZipFile;
+function getFileCategory(fileKey, mimeType) {
+    if (isImageFile(fileKey, mimeType)) {
+        return bizmodels_1.FileCategoryType.image;
+    }
+    if (isOfficeFile(fileKey, mimeType)) {
+        return bizmodels_1.FileCategoryType.office;
+    }
+    if (isZipFile(fileKey, mimeType)) {
+        return bizmodels_1.FileCategoryType.zip;
+    }
+    return bizmodels_1.FileCategoryType.others;
+}
+exports.getFileCategory = getFileCategory;
 class FileDB {
     constructor(curdMixService) {
         this.curdMixService = curdMixService;
@@ -145,6 +172,17 @@ class FileDB {
         };
         return await this.curdMixService.executeCrudByCfg({ condition: { id } }, cfgModel);
     }
+    async getFilePage(reqModel) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const cfgModel = {
+            sqlTable: 'sys_file',
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        };
+        const res = await this.curdMixService.executeCrudByCfg(reqModel, cfgModel);
+        return res.getResModelForQueryPage();
+    }
 }
 exports.PATH_PREFIX = '/ns/gw/file';
 function toDownloadPaths(origin, fileKey) {
@@ -239,6 +277,7 @@ let FileCenterService = class FileCenterService extends BaseService_1.BaseServic
             access_type: accessType,
             referer: referer,
             upload_origin: uploadOrigin,
+            file_category: getFileCategory(fileKey, file.mimeType)
         };
         if (isAssets) {
             await this.fileBD.saveAssetsLog(saveInfo);
@@ -256,6 +295,7 @@ let FileCenterService = class FileCenterService extends BaseService_1.BaseServic
             mimeType: file.mimeType,
             name: result.name,
             url: result.url,
+            file_category: saveInfo.file_category,
         };
     }
     async deleteFile(fileKey) {
@@ -279,8 +319,10 @@ let FileCenterService = class FileCenterService extends BaseService_1.BaseServic
             return false;
         }
     }
-    async downloadFile(fileKey, streaming, process) {
-        const fileInfo = await this.fileBD.getFileInfo(fileKey);
+    async getFileInfo(fileKey) {
+        return await this.fileBD.getFileInfo(fileKey);
+    }
+    async downloadFile(fileInfo, streaming, process) {
         if (!fileInfo || fileInfo.status !== 1) {
             throw new devops_1.BizException('文件不存在');
         }
@@ -336,6 +378,35 @@ let FileCenterService = class FileCenterService extends BaseService_1.BaseServic
         }
         return 'OK';
     }
+    async getCurrentUserFiles(file_category) {
+        const userSession = this.ctx.userSession;
+        if (!userSession.isLogin()) {
+            throw new devops_1.BizException('您当前未登录，您没有访问此文件的权限');
+        }
+        const sessionInfo = this.ctx.userSession.getSessionInfo();
+        const condition = {
+            created_by: sessionInfo.accountId,
+            status: 1
+        };
+        if (file_category) {
+            condition.file_category = file_category;
+        }
+        return await this.fileBD.getFilePage({
+            condition: condition,
+            columns: [
+                'id',
+                'file_key',
+                'file_name',
+                'file_size',
+                'file_type',
+                'file_suffix',
+                'storage_path',
+                'storage_url',
+                'file_category',
+                'created_at'
+            ]
+        });
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

package/dist/service/curd/CrudProQuick.d.ts

@@ -2,7 +2,7 @@ import { SqlDbType } from '../../libs/crud-pro/models/keys';
 import { IRequestModel } from '../../libs/crud-pro/interfaces';
 import { IRequestCfgModel2 } from '../../models/bizmodels';
 import { CrudPro } from '../../libs/crud-pro/CrudPro';
-import { ResModelAffected, ResModelStandard } from '../../libs/crud-pro/models/ResModel';
+import { ResModelAffected, ResModelPageQuery, ResModelStandard } from '../../libs/crud-pro/models/ResModel';
 export declare class CrudProQuick {
     private readonly curdPro;
     private readonly sqlDbType;
@@ -34,7 +34,7 @@ export declare class CrudProQuick {
      * @returns 返回多条数据对象组成的数组
      */
     getList(reqJson: IRequestModel, sqlTable?: string): Promise<any[]>;
-    getListPage(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard>;
+    getListPage(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelPageQuery>;
     getTotalCount(reqJson: IRequestModel, sqlTable?: string): Promise<number>;
     insertObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;
     updateObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;

package/dist/service/curd/CrudProQuick.js

@@ -91,7 +91,7 @@ class CrudProQuick {
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
         };
         const res = await this.executeCrudByCfg(reqJson, cfgModel);
-        return res.getResModel(); // 因为它有2个返回值
+        return res.getResModelForQueryPage();
     }
     async getTotalCount(reqJson, sqlTable) {
         const cfgModel = {

package/package.json

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

package/src/config/config.default.ts

@@ -122,7 +122,7 @@ 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', '.rar', '.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 分钟

package/src/controller/gateway/FileController.ts

@@ -94,14 +94,16 @@ export class FileController extends BaseApiController {
     const isPreview = this.ctx.path.startsWith(`${PATH_PREFIX}/get/preview/`) || isTrue(preview);
     const isStreaming = isTrue(streaming);
 
-    if (isThumbnail && isImageFile(fileKey) && !process) {
+    const fileInfo = await this.fileCenterService.getFileInfo(fileKey);
+
+    if (isThumbnail && isImageFile(fileKey, fileInfo.file_type) && !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);
+    const result = await this.fileCenterService.downloadFile(fileInfo, isOutByStreaming, process);
 
     if (isOutByStreaming) {
       // 移除这些属性
@@ -120,4 +122,17 @@ export class FileController extends BaseApiController {
       this.ctx.redirect(result.downloadURL);
     }
   }
+
+
+  /**
+   * 获取用户本人上传的文件列表
+   */
+  @Get('/getCurrentUserFiles', { middleware: [checkLogin()] })
+  public async getCurrentUserFiles(): Promise<CommonResult> {
+    let { file_category } = (this.ctx.query || {}) as any;
+    const res = await this.fileCenterService.getCurrentUserFiles(file_category);
+    return CommonResult.successRes(res);
+  }
+
+
 }

package/src/libs/crud-pro/models/ExecuteContext.ts

@@ -7,7 +7,7 @@ import { Transaction } from './Transaction';
 import { ColumnRelation, ICrudProCfg, ILogger, IVisitor } from '../interfaces';
 import { IExecuteContextFunc } from './ExecuteContextFunc';
 import { defaultCrudProCfg } from '../defaultConfigs';
-import { ResModelFlexible } from './ResModel';
+import {ResModelFlexible, ResModelPageQuery} from './ResModel';
 
 class ExecuteContext {
   // 运行前设置的
@@ -82,6 +82,15 @@ class ExecuteContext {
     return this.resModel[resName];
   }
 
+  getResModelForQueryPage(): ResModelPageQuery {
+    const rows =  this.resModel['rows'];
+    const total_count =  this.resModel['total_count'];
+    return {
+      rows: rows || [],
+      total_count: total_count || 0
+    }
+  }
+
   getResModelItemLodash(resName: string): any {
     return _.get(this.resModel, resName);
   }

package/src/libs/crud-pro/models/ResModel.ts

@@ -12,8 +12,13 @@ interface ResModelStandard {
   update_affected?: ResModelAffected;
 }
 
+interface ResModelPageQuery {
+  rows: any[];
+  total_count: number;
+}
+
 type ResModelFlexible = ResModelStandard & {
   [key: string]: any;
 };
 
-export { ResModelAffected, ResModelStandard, ResModelFlexible };
+export { ResModelAffected, ResModelStandard, ResModelFlexible, ResModelPageQuery };

package/src/models/bizmodels.ts

@@ -59,6 +59,13 @@ export enum UploadCategoryType {
   assets = 'assets', // 前端资源文件
 }
 
+export enum FileCategoryType {
+  image='image',
+  office='office',
+  zip='zip',
+  others='others',
+}
+
 export class PermFunc {
   public funcCode: string;
   public funcName: string;

package/src/service/FileCenterService.ts

@@ -1,16 +1,17 @@
-import { Provide, Inject } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
+import {Inject, Provide} from '@midwayjs/core';
+import {Context} from '@midwayjs/koa';
 import * as mime from 'mime-types';
 import * as md5 from 'md5';
 import * as fs from 'fs';
 import * as util from 'util';
-import { BizException } from '@/models/devops';
-import { CurdMixService } from './curd/CurdMixService';
-import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
-import { AccessType, IEntityCommonInfo, UploadCategoryType } from '@/models/bizmodels';
-import { IRequestCfgModel } from '@/libs/crud-pro/interfaces';
-import { BaseService } from './base/BaseService';
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import {BizException} from '@/models/devops';
+import {CurdMixService} from './curd/CurdMixService';
+import {KeysOfSimpleSQL, KeysOfValidators} from '@/libs/crud-pro/models/keys';
+import {AccessType, FileCategoryType, IEntityCommonInfo, UploadCategoryType} from '@/models/bizmodels';
+import {IRequestCfgModel, IRequestModel} from '@/libs/crud-pro/interfaces';
+import {BaseService} from './base/BaseService';
+import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
+import {ResModelPageQuery} from "@/libs/crud-pro/models/ResModel";
 
 function getSuffix(s: string): string {
   if (s) {
@@ -72,18 +73,47 @@ function getAssetsContentType(filename: string): string {
 }
 
 // JPG、PNG、BMP、GIF、WebP、TIFF
-export function isImageFile(fileKey: string) {
-  const fileKey1 = fileKey.toLowerCase();
-  const suffix = ['.jpg', '.jpeg', '.png', '.bmp', '.gif', '.webp', '.tiff'];
-  for (let i = 0; i < suffix.length; i++) {
-    const suffix1 = suffix[i];
-    if (fileKey1.endsWith(suffix1)) {
-      return true;
-    }
+export function isImageFile(fileKey: string, mimeType: string) {
+  if (typeof mimeType === 'string' && mimeType.startsWith('image/')) return true;
+  const fileKey2= fileKey.toLowerCase();
+  const suffixList = ['.jpg', '.jpeg', '.png', '.bmp', '.gif', '.webp', '.tiff'];
+  return suffixList.some(suffix => fileKey2.endsWith(suffix));
+}
+
+export function isOfficeFile(fileKey: string, mimeType: string) {
+  if (typeof mimeType === 'string' &&
+    (mimeType.startsWith('application/vnd.openxmlformats-officedocument') ||
+      mimeType.startsWith('application/msword') ||
+      mimeType.startsWith('application/vnd.ms-'))) {
+    return true;
+  }
+  const fileKey2= fileKey.toLowerCase();
+  const suffixList = ['.docx', '.xlsx', '.pptx', '.doc', '.xls', '.ppt', '.pdf'];
+  return suffixList.some(suffix => fileKey2.endsWith(suffix));
+}
+
+export function isZipFile(fileKey: string, mimeType: string) {
+  const suffixList = ['.zip', '.7z', '.rar'];
+  const fileKey2= fileKey.toLowerCase();
+  return suffixList.some(suffix => fileKey2.endsWith(suffix));
+}
+
+
+
+export function getFileCategory(fileKey: string, mimeType: string):FileCategoryType{
+  if (isImageFile(fileKey, mimeType)){
+    return FileCategoryType.image;
   }
-  return false;
+  if (isOfficeFile(fileKey, mimeType)){
+    return FileCategoryType.office;
+  }
+  if (isZipFile(fileKey, mimeType)){
+    return FileCategoryType.zip;
+  }
+  return FileCategoryType.others;
 }
 
+
 interface IFileInfo extends IEntityCommonInfo {
   file_key: string;
   file_name: string;
@@ -96,6 +126,7 @@ interface IFileInfo extends IEntityCommonInfo {
   storage_engine: string;
   access_type: string;
   referer: string;
+  file_category: string;
 }
 
 class FileDB {
@@ -167,6 +198,21 @@ class FileDB {
     };
     return await this.curdMixService.executeCrudByCfg({ condition: { id } }, cfgModel);
   }
+
+
+  public async getFilePage(reqModel: IRequestModel): Promise<ResModelPageQuery> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const cfgModel: IRequestCfgModel = {
+      sqlTable: 'sys_file',
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+    };
+    const res = await this.curdMixService.executeCrudByCfg(reqModel, cfgModel);
+    return res.getResModelForQueryPage();
+  }
+
+
 }
 
 interface IUploadFileToOSSOptions {
@@ -284,6 +330,7 @@ export class FileCenterService extends BaseService {
       access_type: accessType,
       referer: referer,
       upload_origin: uploadOrigin,
+      file_category: getFileCategory(fileKey, file.mimeType)
     };
 
     if (isAssets) {
@@ -302,6 +349,7 @@ export class FileCenterService extends BaseService {
       mimeType: file.mimeType,
       name: result.name,
       url: result.url,
+      file_category: saveInfo.file_category,
     };
   }
 
@@ -328,8 +376,12 @@ export class FileCenterService extends BaseService {
     }
   }
 
-  public async downloadFile(fileKey: string, streaming: boolean, process: string): Promise<any> {
-    const fileInfo = await this.fileBD.getFileInfo(fileKey);
+  public async getFileInfo(fileKey: string): Promise<IFileInfo> {
+    return await this.fileBD.getFileInfo(fileKey);
+  }
+
+  public async downloadFile(fileInfo: IFileInfo, streaming: boolean, process: string): Promise<any> {
+
     if (!fileInfo || fileInfo.status !== 1) {
       throw new BizException('文件不存在');
     }
@@ -392,4 +444,40 @@ export class FileCenterService extends BaseService {
 
     return 'OK';
   }
+
+
+  public async getCurrentUserFiles(file_category: FileCategoryType): Promise<ResModelPageQuery> {
+    const userSession = this.ctx.userSession;
+    if (!userSession.isLogin()) {
+      throw new BizException('您当前未登录，您没有访问此文件的权限');
+    }
+    const sessionInfo = this.ctx.userSession.getSessionInfo();
+
+    const condition: any = {
+      created_by: sessionInfo.accountId,
+      status: 1
+    };
+
+    if (file_category) {
+      condition.file_category = file_category
+    }
+
+    return await this.fileBD.getFilePage({
+      condition: condition,
+      columns: [
+        'id',
+        'file_key',
+        'file_name',
+        'file_size',
+        'file_type',
+        'file_suffix',
+        'storage_path',
+        'storage_url',
+        'file_category',
+        'created_at'
+      ]
+    });
+  }
+
+
 }

package/src/service/curd/CrudProQuick.ts

@@ -2,7 +2,7 @@ import { KeysOfSimpleSQL, SqlDbType } from '@/libs/crud-pro/models/keys';
 import { IRequestCfgModel, IRequestModel, ISqlCfgModel } from '@/libs/crud-pro/interfaces';
 import { IRequestCfgModel2 } from '@/models/bizmodels';
 import { CrudPro } from '@/libs/crud-pro/CrudPro';
-import { ResModelAffected, ResModelStandard } from '@/libs/crud-pro/models/ResModel';
+import {ResModelAffected, ResModelPageQuery, ResModelStandard} from '@/libs/crud-pro/models/ResModel';
 
 const DEFAULT_MAX_LIMIT = 10 * 10000;
 
@@ -103,13 +103,13 @@ export class CrudProQuick {
     return res.getResRows();
   }
 
-  public async getListPage(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard> {
+  public async getListPage(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelPageQuery> {
     const cfgModel: IRequestCfgModel = {
       sqlTable,
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
     };
     const res = await this.executeCrudByCfg(reqJson, cfgModel);
-    return res.getResModel(); // 因为它有2个返回值
+    return res.getResModelForQueryPage();
   }
 
   public async getTotalCount(reqJson: IRequestModel, sqlTable?: string): Promise<number> {