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

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