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

package/src/controller/base/BaseApiController.ts

@@ -178,26 +178,25 @@ export class BaseApiController extends BaseService {
 
 
   protected async decodeBodyBySession<T>(body: any): Promise<any> {
-    const sessionInfo = this.getUserSessionInfo();
-    const sessionId = sessionInfo?.sessionId;
-    if (!sessionId) {
-      throw new Error('[decodeBodyBySessionId] sessionId is null');
+    if (!this.ctx.userSession?.isLogin()) {
+      throw new Error('[decodeBodyBySessionId] 用户必须登录');
     }
 
+    const sessionInfo = this.getUserSessionInfo();
     const secretBody = body as ISecretBody;
 
     if (!secretBody.secretPayload || !secretBody.secretKey) {
       return body;
     }
 
-    const { privateKey } = sessionInfo;
+    const { privateKey, publicKey } = sessionInfo;
 
     const secretPayload: string = secretBody.secretPayload;
-    const secretKey: string = secretBody.secretKey; // 使用RSA加密的AES密钥  
+    const secretKey: string = secretBody.secretKey; // 使用RSA加密的AES密钥
     const aesKey = await AsymmetricCrypto.decrypt(privateKey, secretKey); // 解密AES密钥
 
     const createAes128 = () => {
-      const iv = md5(aesKey + sessionId);
+      const iv = md5(aesKey + publicKey);
       return new Aes128CBC(aesKey, iv);
     }
     const aes128 = createAes128();

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/controller/manage/DataDictManageApi.ts

@@ -4,12 +4,17 @@ import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
 import { BaseApiController } from '../base/BaseApiController';
 import { checkPermission } from '@/middleware/permission.middleware';
 import { SystemFuncCode } from '@/models/SystemPerm';
+import {SysDictDataService} from "@/service/SysDictDataService";
+import {CommonResult} from "@/libs/utils/common-dto";
 
 @Controller('/ns/api/manage/dataDict', { middleware: [checkPermission(SystemFuncCode.DataDictMangeRead)] })
 export class DataDictManageApi extends BaseApiController {
   @Inject()
   protected ctx: Context;
 
+  @Inject()
+  private sysDictDataService: SysDictDataService;
+
   @Post('/getDataDictList')
   async getDataDictList() {
     return this.executeSysSimpleSQL('sys_data_dict', KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
@@ -40,6 +45,14 @@ export class DataDictManageApi extends BaseApiController {
 
   @Post('/deleteDataDict', { middleware: [checkPermission(SystemFuncCode.DataDictMangeWrite)] })
   async deleteDataDict() {
+
+    const body = this.ctx.request.body as any;
+    const dict_code = body?.condition?.dict_code;
+    if (!dict_code) {
+      return CommonResult.errorRes('condition.dict_code不能为空');
+    }
+    await this.sysDictDataService.removeCacheByDictCode(dict_code);
+
     return this.executeSysSimpleSQL('sys_data_dict', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
         'condition.dict_code': [KeysOfValidators.REQUIRED],
@@ -59,16 +72,44 @@ export class DataDictManageApi extends BaseApiController {
 
   @Post('/createDataDictItem', { middleware: [checkPermission(SystemFuncCode.DataDictMangeWrite)] })
   async createDataDictItem() {
+
+
+    const body = this.ctx.request.body as any;
+    const dict_code = body?.data?.dict_code;
+    if (!dict_code) {
+      return CommonResult.errorRes('data.dict_code不能为空');
+    }
+    await this.sysDictDataService.removeCacheByDictCode(dict_code);
+
+
     return this.executeSysSimpleSQL('sys_data_dict_item', KeysOfSimpleSQL.SIMPLE_INSERT);
   }
 
   @Post('/updateDataDictItem', { middleware: [checkPermission(SystemFuncCode.DataDictMangeWrite)] })
   async updateDataDictItem() {
+
+    const body = this.ctx.request.body as any;
+    const itemId = body.condition.id;
+    if (!itemId) {
+      return CommonResult.errorRes('condition.id不能为空');
+    }
+    await this.sysDictDataService.removeCacheByDictItemId(itemId);
+
+
     return this.executeSysSimpleSQL('sys_data_dict_item', KeysOfSimpleSQL.SIMPLE_UPDATE);
   }
 
   @Post('/deleteDataDictItem', { middleware: [checkPermission(SystemFuncCode.DataDictMangeWrite)] })
   async deleteDataDictItem() {
+
+    const body = this.ctx.request.body as any;
+    const itemId = body.condition.id;
+    if (!itemId) {
+      return CommonResult.errorRes('condition.id不能为空');
+    }
+    await this.sysDictDataService.removeCacheByDictItemId(itemId);
+
+
     return this.executeSysSimpleSQL('sys_data_dict_item', KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
         'condition.dict_code': [KeysOfValidators.REQUIRED],

package/src/controller/myinfo/AuthController.ts

@@ -9,6 +9,12 @@ import { assertCsrfToken } from '@/libs/utils/fatcms-request';
 import { WorkbenchService } from '@/service/WorkbenchService';
 import { CommonException } from '@/libs/crud-pro/exceptions';
 
+function removePrivateField(sessionInfo: ISessionInfo): ISessionInfo {
+  const userInfoClone: ISessionInfo = { ...sessionInfo };
+  delete userInfoClone.privateKey;
+  return userInfoClone;
+}
+
 /**
  * 支持使用明文密码和Hash后密码登录。
  * 1. 明文密码登录，所需字段：loginName， plainPwd，
@@ -53,12 +59,11 @@ export class AuthController extends BaseApiController {
     }
 
     const userSessionInfo = await this.authService.createUserSession(loginName, workbench.workbench_code);
-
     this.ctx.cookies.set(SESSION_ID_KEY, userSessionInfo.sessionId, sessionCookieCfg);
-
-    return CommonResult.successMsg('登录成功', userSessionInfo);
+    return CommonResult.successMsg('登录成功', removePrivateField(userSessionInfo));
   }
 
+
   /**
    * 退出
    */
@@ -78,9 +83,23 @@ export class AuthController extends BaseApiController {
     const sessionInfo: ISessionInfo = this.ctx.userSession.getSessionInfo();
     const newSessionInfo: ISessionInfo = await this.authService.refreshSession(sessionInfo);
     this.ctx.cookies.set(SESSION_ID_KEY, newSessionInfo.sessionId, sessionCookieCfg);
-    return CommonResult.successRes(newSessionInfo);
+    return CommonResult.successRes(removePrivateField(newSessionInfo));
+  }
+
+
+  /**
+   * 避免Session过期，前端需要定时调用此接口刷新
+   */
+  @Post('/updateSessionBizExt', { middleware: [checkLogin()] })
+  async updateSessionBizExt(): Promise<CommonResult> {
+    let { bizExt } = this.ctx.request.body as any;
+    const sessionInfo: ISessionInfo = this.ctx.userSession.getSessionInfo();
+    const newSessionInfo: ISessionInfo = await this.authService.updateSessionBizExt(sessionInfo, bizExt);
+    this.ctx.cookies.set(SESSION_ID_KEY, newSessionInfo.sessionId, sessionCookieCfg);
+    return CommonResult.successRes(removePrivateField(newSessionInfo));
   }
 
+
   /**
    * 修改我自己的密码
    */

package/src/index.ts

@@ -47,6 +47,7 @@ export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
 export * from './service/SysConfigService';
 export * from './service/SysAppService';
+export * from './service/SysDictDataService';
 export * from './service/UserAccountService';
 export * from './service/UserSessionService';
 export * from './service/VisitStatService';

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 };