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

package/src/service/AuthService.ts

@@ -1,18 +1,18 @@
-import { Inject, Provide, Config } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
-import { CurdMixService } from './curd/CurdMixService';
+import {Inject, Provide, Config} from '@midwayjs/core';
+import {Context} from '@midwayjs/koa';
+import {KeysOfSimpleSQL} from '@/libs/crud-pro/models/keys';
+import {CurdMixService} from './curd/CurdMixService';
 import * as md5 from 'md5';
-import { UserAccountService } from './UserAccountService';
-import { createUniqueId } from '@/libs/utils/functions';
-import { IConsumerUserInfo, ISessionInfo, SYS_ACCOUNT_TYPE } from '@/models/userSession';
-import { SystemTables } from '@/models/SystemTables';
-import { UserSessionService } from './UserSessionService';
-import { CommonResult } from '@/libs/utils/common-dto';
-import { isEnableSuperAdmin } from '@/libs/utils/fatcms-request';
-import { CommonException } from '@/libs/crud-pro/exceptions';
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-import { AsymmetricCrypto } from '@/libs/utils/AsymmetricCrypto';
+import {UserAccountService} from './UserAccountService';
+import {createUniqueId} from '@/libs/utils/functions';
+import {IConsumerUserInfo, ISessionInfo, SYS_ACCOUNT_TYPE} from '@/models/userSession';
+import {SystemTables} from '@/models/SystemTables';
+import {UserSessionService} from './UserSessionService';
+import {CommonResult} from '@/libs/utils/common-dto';
+import {isEnableSuperAdmin} from '@/libs/utils/fatcms-request';
+import {CommonException} from '@/libs/crud-pro/exceptions';
+import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
+import {AsymmetricCrypto} from '@/libs/utils/AsymmetricCrypto';
 
 @Provide()
 export class AuthService {
@@ -88,7 +88,7 @@ export class AuthService {
    * @param consumerUserInfo
    * @param loadRoleCodes
    */
-  public async createUserSessionForConsumer(consumerUserInfo: IConsumerUserInfo, loadRoleCodes?: boolean) {
+  public async createUserSessionForConsumer(consumerUserInfo: IConsumerUserInfo, loadRoleCodes?: boolean): Promise<ISessionInfo> {
     const sessionId = createUniqueId();
 
     const accountId = consumerUserInfo.accountId;
@@ -102,7 +102,7 @@ export class AuthService {
     }
 
 
-    const { publicKey, privateKey } = await AsymmetricCrypto.generateKeyPair();
+    const {publicKey, privateKey} = await AsymmetricCrypto.generateKeyPair();
 
 
     const sessionInfo: ISessionInfo = {
@@ -117,27 +117,21 @@ export class AuthService {
       accountType: consumerUserInfo.accountType,
       publicKey,
       privateKey,
+      sessionIdCreatedAt: Date.now(),
     };
 
     await this.userSessionService.saveUserSession(sessionInfo);
 
-    return {
-      sessionId,
-      loginName: sessionInfo.loginName,
-      accountId: sessionInfo.accountId,
-      nickName: sessionInfo.nickName,
-      avatar: sessionInfo.avatar,
-      workbenchCode: sessionInfo.workbenchCode,
-      accountType: sessionInfo.accountType,
-    };
+    return sessionInfo;
   }
 
   /**
    * 创建一个Session
    * @param loginName
    * @param workbenchCode
+   * @param bizExt
    */
-  public async createUserSession(loginName: string, workbenchCode: string, bizExt?: any) {
+  public async createUserSession(loginName: string, workbenchCode: string, bizExt?: any): Promise<ISessionInfo> {
     const userAccount = await this.queryUserAccountByLoginName(loginName);
 
     if (!userAccount) {
@@ -149,7 +143,7 @@ export class AuthService {
     const roleCodes = await this.queryUserRoleCodeList(accountId);
     const functionCodes = await this.queryFunctionCodeList(roleCodes);
 
-    const { publicKey, privateKey } = await AsymmetricCrypto.generateKeyPair();
+    const {publicKey, privateKey} = await AsymmetricCrypto.generateKeyPair();
 
     const sessionInfo: ISessionInfo = {
       nickName: userAccount.nick_name,
@@ -164,6 +158,7 @@ export class AuthService {
       bizExt: {},
       publicKey,
       privateKey,
+      sessionIdCreatedAt: Date.now(),
     };
 
     if (bizExt && typeof bizExt === 'object') {
@@ -172,15 +167,7 @@ export class AuthService {
 
     await this.userSessionService.saveUserSession(sessionInfo);
 
-    return {
-      sessionId,
-      loginName,
-      accountId,
-      nickName: userAccount.nick_name,
-      avatar: userAccount.avatar,
-      workbenchCode: sessionInfo.workbenchCode,
-      accountType: sessionInfo.accountType,
-    };
+    return sessionInfo;
   }
 
   /**
@@ -228,11 +215,11 @@ export class AuthService {
    * @private
    */
   private async queryUserRoleCodeList(accountId: string): Promise<string[]> {
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const {SystemDbName, SystemDbType} = GLOBAL_STATIC_CONFIG.getConfig();
 
     const res = await this.curdMixService.executeCrudByCfg(
       {
-        condition: { account_id: accountId },
+        condition: {account_id: accountId},
         limit: 10000,
       },
       {
@@ -243,7 +230,7 @@ export class AuthService {
       }
     );
     const rows = res.getResModel().rows || [];
-    const roleCodes: string[] = rows.map(({ role_code }) => {
+    const roleCodes: string[] = rows.map(({role_code}) => {
       return role_code as string;
     });
     return [...new Set(roleCodes)];
@@ -259,11 +246,11 @@ export class AuthService {
       return [];
     }
 
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const {SystemDbName, SystemDbType} = GLOBAL_STATIC_CONFIG.getConfig();
 
     const res = await this.curdMixService.executeCrudByCfg(
       {
-        condition: { role_code: { $in: roleCodeList } },
+        condition: {role_code: {$in: roleCodeList}},
         limit: 10000,
       },
       {
@@ -274,7 +261,7 @@ export class AuthService {
       }
     );
     const rows = res.getResModel().rows || [];
-    const funcCodes: string[] = rows.map(({ func_code }) => {
+    const funcCodes: string[] = rows.map(({func_code}) => {
       return func_code;
     });
     return [...new Set(funcCodes)];
@@ -284,16 +271,25 @@ export class AuthService {
     return this.userSessionService.removeUserSession(sessionId);
   }
 
-  async refreshSession(sessionInfo: ISessionInfo): Promise<ISessionInfo> {
-    const oldSessionId = sessionInfo.sessionId;
-
-    const sessionId = createUniqueId();
-    const newSessionInfo: ISessionInfo = { ...sessionInfo, sessionId };
 
+  async refreshSession(sessionInfo: ISessionInfo): Promise<ISessionInfo> {
+    const roleCodes = await this.queryUserRoleCodeList(sessionInfo.accountId);
+    const functionCodes = await this.queryFunctionCodeList(roleCodes);
+    const newSessionInfo: ISessionInfo = {...sessionInfo, roleCodes, functionCodes};
     await this.userSessionService.saveUserSession(newSessionInfo);
+    return newSessionInfo;
+  }
 
-    await this.removeUserSession(oldSessionId);
 
+  async updateSessionBizExt(sessionInfo: ISessionInfo, bizExt: any): Promise<ISessionInfo> {
+    const newSessionInfo: ISessionInfo = {...sessionInfo};
+    if (bizExt && typeof bizExt === 'object') {
+      const oldBizExt = typeof sessionInfo.bizExt === 'object' ? sessionInfo.bizExt : {};
+      newSessionInfo.bizExt = Object.assign({}, oldBizExt, bizExt);
+    }
+    await this.userSessionService.saveUserSession(newSessionInfo);
     return newSessionInfo;
   }
+
+
 }

package/src/service/EnumInfoService.ts

@@ -1,15 +1,10 @@
 import {Inject, Provide} from '@midwayjs/core';
 import {Context} from '@midwayjs/koa';
-import {KeysOfSimpleSQL} from '@/libs/crud-pro/models/keys';
-import {CurdProService} from './curd/CurdProService';
 import {RelatedType} from './curd/CurdMixUtils';
-import {SystemTables} from '@/models/SystemTables';
 import {IEnumInfo, parseConfigContentToEnumInfo} from '@/libs/utils/parseConfig';
 import {CurdMixByLinkToCustomService} from './curd/CurdMixByLinkToCustomService';
-import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
-import {CacheServiceFactory} from './base/cache/CacheServiceFactory';
-import { CacheNameEnum } from "@/models/bizmodels";
 import { SysConfigService } from "@/service/SysConfigService";
+import {SysDictDataService} from "@/service/SysDictDataService";
 
 interface IQueryEnumInfo {
   type: RelatedType;
@@ -29,18 +24,16 @@ function filterEmpty(e: IEnumInfo): boolean {
 @Provide()
 export class EnumInfoService {
   @Inject()
-  ctx: Context;
-  @Inject()
-  private curdProService: CurdProService;
+  protected ctx: Context;
 
   @Inject()
-  private curdMixByLinkToCustomService: CurdMixByLinkToCustomService;
+  private sysConfigService: SysConfigService
 
   @Inject()
-  private cacheServiceFactory: CacheServiceFactory;
+  private sysDictDataService: SysDictDataService;
 
   @Inject()
-  private sysConfigService: SysConfigService
+  private curdMixByLinkToCustomService: CurdMixByLinkToCustomService;
 
   async queryEnumInfo(codeList: IQueryEnumInfo[], refreshCache: boolean): Promise<IQueryEnumResult[]> {
 
@@ -51,19 +44,10 @@ export class EnumInfoService {
       if (type === RelatedType.sysCfgEnum) {
         return await this.queryEnumInfoBySysCfgEnum(code);
       }
-
-      const cacheKey = `${type}@@${code}`;
-      return await this.cacheServiceFactory.getJsonObjectCache({
-        cacheKey,
-        refreshCache,
-        cacheName: CacheNameEnum.GetEnumInfoByCode,
-        getter: async () => {
-          if (type === RelatedType.dict) {
-            return await this.queryEnumInfoItemByDict(code);
-          }
-          return [];
-        },
-      });
+      if (type === RelatedType.dict) {
+        return await this.queryEnumInfoItemByDict(code);
+      }
+      return []
     };
 
     const result = [];
@@ -98,27 +82,17 @@ export class EnumInfoService {
   private async queryEnumInfoBySysCfgEnum(code: string): Promise<IEnumInfo[]> {
     const obj = await this.sysConfigService.getSysConfigOne(code);
     const rows = parseConfigContentToEnumInfo(obj);
+    if (!rows) {
+      return [];
+    }
     return rows.map(e => ({ label: e.label, value: e.value, style: e.style, children: e.children })).filter(filterEmpty);
   }
 
   private async queryEnumInfoItemByDict(code: string): Promise<IEnumInfo[]> {
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    const res1 = await this.curdProService.executeCrudByCfg(
-      {
-        condition: { dict_code: code },
-      },
-      {
-        sqlTable: SystemTables.sys_data_dict_item,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      }
-    );
-    const obj = res1.getResRows();
-    if (!obj) {
-      return null;
+    const rows = await this.sysDictDataService.getDataDictItemsByDictCode(code);
+    if (!rows) {
+      return [];
     }
-    return obj.map(e => ({ label: e.label, value: e.value })).filter(filterEmpty);
+    return rows.map(e => ({ label: e.label, value: e.value })).filter(filterEmpty);
   }
 }

package/src/service/SysAppService.ts

@@ -1,88 +1,88 @@
-import {Inject, Provide} from '@midwayjs/core';
-import {SystemTables} from '@/models/SystemTables';
-import {BaseService} from './base/BaseService';
-import {CurdProService} from './curd/CurdProService';
-import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
-import {CacheServiceFactory} from "@/service/base/cache/CacheServiceFactory";
-import {CacheNameEnum} from "@/models/bizmodels";
-
-@Provide()
-export class SysAppService extends BaseService {
-
-  @Inject()
-  private curdProService: CurdProService;
-
-  @Inject()
-  private cacheServiceFactory: CacheServiceFactory;
-
-  private get sysAppDao(){
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_app)
-  }
-
-  private get sysAppPageDao(){
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_app_page)
-  }
-
-
-  async getSysAppPageOne({page_path,workbench_code}:{page_path: string,workbench_code: string}): Promise<any> {
-    if (!page_path || typeof page_path !== 'string') {
-      throw new Error('[getSysAppPageOne] page_path required');
-    }
-    if (!workbench_code || typeof workbench_code !== 'string') {
-      throw new Error('[getSysAppPageOne] workbench_code required');
-    }
-    return await this.cacheServiceFactory.getJsonObjectCache({
-      cacheKey: `${workbench_code}#${page_path}`,
-      cacheName: CacheNameEnum.GetSysAppPageOne,
-      getter: async () => {
-        return await this.sysAppPageDao.getUniqueOne({
-          condition: {page_path, workbench_code, deleted_at: 0}
-        });
-      },
-    });
-  }
-
-
-  async getSysAppOne(app_code: string): Promise<any> {
-    if (!app_code || typeof app_code !== 'string') {
-      throw new Error('[getSysAppOne] app_code required');
-    }
-    return await this.cacheServiceFactory.getJsonObjectCache({
-      cacheKey: app_code,
-      cacheName: CacheNameEnum.GetSysAppOne,
-      getter: async () => {
-        return await this.sysAppDao.getUniqueOne({
-          condition: {app_code, deleted_at: 0}
-        });
-      },
-    });
-  }
-
-  public deletePrivateField(parsedAppInfo: any){
-    if (!parsedAppInfo) {
-      return null;
-    }
-    const parsedAppInfo2: any = { ...parsedAppInfo };
-    delete parsedAppInfo2.created_at;
-    delete parsedAppInfo2.created_by;
-    delete parsedAppInfo2.workbench_code_array;
-    delete parsedAppInfo2.modified_at;
-    delete parsedAppInfo2.modified_by;
-    delete parsedAppInfo2.modified_desc;
-    delete parsedAppInfo2.std_crud_db;
-    delete parsedAppInfo2.std_crud_tbl;
-    return parsedAppInfo2;
-  }
-
-  async removeSysAppOneCache(app_code: string) {
-    if (!app_code || typeof app_code !== 'string') {
-      throw new Error('[removeSysAppOneCache] app_code required');
-    }
-    return await this.cacheServiceFactory.removeItemCache({
-      cacheKey: app_code,
-      cacheName: CacheNameEnum.GetSysAppOne
-    });
-  }
-}
+import {Inject, Provide} from '@midwayjs/core';
+import {SystemTables} from '@/models/SystemTables';
+import {BaseService} from './base/BaseService';
+import {CurdProService} from './curd/CurdProService';
+import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
+import {CacheServiceFactory} from "@/service/base/cache/CacheServiceFactory";
+import {CacheNameEnum} from "@/models/bizmodels";
+
+@Provide()
+export class SysAppService extends BaseService {
+
+  @Inject()
+  private curdProService: CurdProService;
+
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
+  private get sysAppDao(){
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_app)
+  }
+
+  private get sysAppPageDao(){
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_app_page)
+  }
+
+
+  async getSysAppPageOne({page_path,workbench_code}:{page_path: string,workbench_code: string}): Promise<any> {
+    if (!page_path || typeof page_path !== 'string') {
+      throw new Error('[getSysAppPageOne] page_path required');
+    }
+    if (!workbench_code || typeof workbench_code !== 'string') {
+      throw new Error('[getSysAppPageOne] workbench_code required');
+    }
+    return await this.cacheServiceFactory.getJsonObjectCache({
+      cacheKey: `${workbench_code}#${page_path}`,
+      cacheName: CacheNameEnum.GetSysAppPageOne,
+      getter: async () => {
+        return await this.sysAppPageDao.getUniqueOne({
+          condition: {page_path, workbench_code, deleted_at: 0}
+        });
+      },
+    });
+  }
+
+
+  async getSysAppOne(app_code: string): Promise<any> {
+    if (!app_code || typeof app_code !== 'string') {
+      throw new Error('[getSysAppOne] app_code required');
+    }
+    return await this.cacheServiceFactory.getJsonObjectCache({
+      cacheKey: app_code,
+      cacheName: CacheNameEnum.GetSysAppOne,
+      getter: async () => {
+        return await this.sysAppDao.getUniqueOne({
+          condition: {app_code, deleted_at: 0}
+        });
+      },
+    });
+  }
+
+  public deletePrivateField(parsedAppInfo: any){
+    if (!parsedAppInfo) {
+      return null;
+    }
+    const parsedAppInfo2: any = { ...parsedAppInfo };
+    delete parsedAppInfo2.created_at;
+    delete parsedAppInfo2.created_by;
+    delete parsedAppInfo2.workbench_code_array;
+    delete parsedAppInfo2.modified_at;
+    delete parsedAppInfo2.modified_by;
+    delete parsedAppInfo2.modified_desc;
+    delete parsedAppInfo2.std_crud_db;
+    delete parsedAppInfo2.std_crud_tbl;
+    return parsedAppInfo2;
+  }
+
+  async removeSysAppOneCache(app_code: string) {
+    if (!app_code || typeof app_code !== 'string') {
+      throw new Error('[removeSysAppOneCache] app_code required');
+    }
+    return await this.cacheServiceFactory.removeItemCache({
+      cacheKey: app_code,
+      cacheName: CacheNameEnum.GetSysAppOne
+    });
+  }
+}

package/src/service/SysDictDataService.ts

@@ -0,0 +1,63 @@
+import {Inject, Provide} from '@midwayjs/core';
+import {SystemTables} from '@/models/SystemTables';
+import {BaseService} from './base/BaseService';
+import {CurdProService} from './curd/CurdProService';
+import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
+import {CacheServiceFactory} from "@/service/base/cache/CacheServiceFactory";
+import {CacheNameEnum} from "@/models/bizmodels";
+
+@Provide()
+export class SysDictDataService extends BaseService {
+
+  @Inject()
+  private curdProService: CurdProService;
+
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
+  private get sys_data_dict_item(){
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_data_dict_item)
+  }
+
+  // private get sys_data_dict(){
+  //   const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+  //   return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_data_dict)
+  // }
+
+
+  public async getDataDictItemsByDictCode(dict_code: string): Promise<any[]> {
+    if (!dict_code || typeof dict_code !== 'string') {
+      throw new Error('[getDataDictItemsByDictCode] page_path required');
+    }
+    return await this.cacheServiceFactory.getJsonObjectCache({
+      cacheKey: dict_code,
+      cacheName: CacheNameEnum.GetDataDictItemsByDictCode,
+      getter: async () => {
+        return await this.sys_data_dict_item.getList({
+          condition: { dict_code, status:1, deleted_at: 0}
+        });
+      },
+    });
+  }
+
+  public async removeCacheByDictItemId(dict_item_id: string) {
+    const dictItemObj = await this.sys_data_dict_item.getUniqueOne({condition: {id: dict_item_id}});
+    return this.removeCacheByDictCode(dictItemObj['dict_code']);
+  }
+
+  // public async removeCacheByDictId(dict_id: string) {
+  //   const dictObj = await this.sys_data_dict.getUniqueOne({condition: {id: dict_id}});
+  //   return this.removeCacheByDictCode(dictObj['dict_code']);
+  // }
+
+  public async removeCacheByDictCode(dict_code: string) {
+    if (!dict_code || typeof dict_code !== 'string') {
+      throw new Error('[removeSysAppOneCache] app_code required');
+    }
+    return await this.cacheServiceFactory.removeItemCache({
+      cacheKey: dict_code,
+      cacheName: CacheNameEnum.GetDataDictItemsByDictCode
+    });
+  }
+}