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

package/src/service/SysAppService.ts

@@ -0,0 +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
+    });
+  }
+}

package/src/service/SysConfigService.ts

@@ -1,38 +1,51 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from "../libs/crud-pro/models/keys";
-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';
-
-@Provide()
-export class SysConfigService extends BaseService {
-  @Inject()
-  ctx: Context;
-
-  @Inject()
-  private curdProService: CurdProService;
-
-  async getSysConfigOne(config_code: string): Promise<any> {
-    if (!config_code) {
-      throw new Error('[getSysConfigOne] config_code required');
-    }
-
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    const res1 = await this.curdProService.executeCrudByCfg(
-      {
-        condition: { config_code },
-      },
-      {
-        sqlTable: SystemTables.sys_configs,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-    return res1.getOneObj();
-  }
-
-}
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+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 { CacheNameEnum } from "@/models/bizmodels";
+import { CacheServiceFactory } from "@/service/base/cache/CacheServiceFactory";
+
+@Provide()
+export class SysConfigService extends BaseService {
+  @Inject()
+  ctx: Context;
+
+  @Inject()
+  private curdProService: CurdProService;
+
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
+  private get sysConfigsDao(){
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return this.curdProService.getBbUtil(SystemDbName, SystemDbType, SystemTables.sys_configs)
+  }
+
+  async getSysConfigOne(config_code: string): Promise<any> {
+    if (!config_code || typeof config_code !== 'string') {
+      throw new Error('[getSysAppOne] config_code required');
+    }
+    return await this.cacheServiceFactory.getJsonObjectCache({
+      cacheKey: config_code,
+      cacheName: CacheNameEnum.GetSysConfigOne,
+      getter: async () => {
+        return await this.sysConfigsDao.getUniqueOne({
+          condition: {config_code, deleted_at: 0}
+        });
+      },
+    });
+  }
+
+  async removeSysConfigOneCache(config_code: string) {
+    if (!config_code || typeof config_code !== 'string') {
+      throw new Error('[removeSysConfigOneCache] config_code required');
+    }
+
+    return await this.cacheServiceFactory.removeItemCache({
+      cacheKey: config_code,
+      cacheName: CacheNameEnum.GetSysConfigOne,
+    });
+  }
+}

package/src/service/UserAccountService.ts

@@ -1,110 +1,107 @@
-import * as md5 from 'md5';
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from '../libs/crud-pro/models/keys';
-import { CurdMixService } from './curd/CurdMixService';
-import { createUniqueId } from '../libs/utils/functions';
-import { CommonException, Exceptions } from '../libs/crud-pro/exceptions';
-import { IRequestCfgModel, IRequestModel } from '../libs/crud-pro/interfaces';
-import {SystemTables} from '../models/SystemTables';
-import { CommonResult } from '../libs/utils/common-dto';
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-
-@Provide()
-export class UserAccountService {
-  @Inject()
-  ctx: Context;
-  @Inject()
-  private curdMixService: CurdMixService;
-
-  /**
-   * 查询用户: 根据loginName查询
-   * @param loginName
-   */
-  public async queryUserAccountByLoginName(loginName: string) {
-
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    const query = await this.curdMixService.executeCrudByCfg(
-      {
-        condition: { login_name: loginName },
-      },
-      {
-        method: 'UserAccountService.queryUserAccountByLoginName',
-        sqlTable: SystemTables.sys_user_account,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-    const { row } = query.getResModel();
-    return row;
-  }
-
-  /**
-   * 查询基本信息：根据accountId数组
-   * @param accountIdList
-   * @param columns
-   */
-  public async queryAccountBasicInfoByIds(accountIdList: any[], columns: string[]): Promise<any[]> {
-    if (!accountIdList || accountIdList.length === 0) {
-      return [];
-    }
-
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-
-    const accountIds = accountIdList.map(userId => {
-      return `${userId}`;
-    });
-
-    const cfgModel: IRequestCfgModel = {
-      method: 'UserAccountService.queryAccountBasicInfoByIds',
-      sqlTable: SystemTables.sys_user_account,
-      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      sqlDatabase: SystemDbName,
-      sqlDdType: SystemDbType,
-    };
-
-    const reqJson: IRequestModel = {
-      columns: columns,
-      condition: {
-        account_id: {
-          $in: accountIds,
-        },
-      },
-    };
-
-    const res = await this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
-    return res.getResRows();
-  }
-
-  /**
-   * 修改密码
-   * @param loginName
-   * @param unsaltedPwd
-   */
-  public async chgUserPassword(loginName: any, unsaltedPwd: any) {
-    if (!loginName) {
-      throw new CommonException(Exceptions.OTHER_EXCEPTION, 'loginName不存在');
-    }
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    
-    const pwd_salt = createUniqueId();
-    const pwd_md5 = md5(unsaltedPwd + pwd_salt);
-    const res1 = await this.curdMixService.executeCrudByCfg(
-      {
-        data: { pwd_md5: pwd_md5, pwd_salt: pwd_salt },
-        condition: { login_name: loginName },
-      },
-      {
-        sqlTable: SystemTables.sys_user_account,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-    return CommonResult.successRes(res1.getResModel());
-  }
-}
+import * as md5 from 'md5';
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { CurdMixService } from './curd/CurdMixService';
+import { createUniqueId } from '@/libs/utils/functions';
+import { CommonException, Exceptions } from '@/libs/crud-pro/exceptions';
+import { IRequestCfgModel, IRequestModel } from '@/libs/crud-pro/interfaces';
+import { SystemTables } from '@/models/SystemTables';
+import { CommonResult } from '@/libs/utils/common-dto';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+
+@Provide()
+export class UserAccountService {
+  @Inject()
+  ctx: Context;
+  @Inject()
+  private curdMixService: CurdMixService;
+
+  /**
+   * 查询用户: 根据loginName查询
+   * @param loginName
+   */
+  public async queryUserAccountByLoginName(loginName: string) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const query = await this.curdMixService.executeCrudByCfg(
+      {
+        condition: { login_name: loginName },
+      },
+      {
+        method: 'UserAccountService.queryUserAccountByLoginName',
+        sqlTable: SystemTables.sys_user_account,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    const { row } = query.getResModel();
+    return row;
+  }
+
+  /**
+   * 查询基本信息：根据accountId数组
+   * @param accountIdList
+   * @param columns
+   */
+  public async queryAccountBasicInfoByIds(accountIdList: any[], columns: string[]): Promise<any[]> {
+    if (!accountIdList || accountIdList.length === 0) {
+      return [];
+    }
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const accountIds = accountIdList.map(userId => {
+      return `${userId}`;
+    });
+
+    const cfgModel: IRequestCfgModel = {
+      method: 'UserAccountService.queryAccountBasicInfoByIds',
+      sqlTable: SystemTables.sys_user_account,
+      sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+    };
+
+    const reqJson: IRequestModel = {
+      columns: columns,
+      condition: {
+        account_id: {
+          $in: accountIds,
+        },
+      },
+    };
+
+    const res = await this.curdMixService.executeCrudByCfg(reqJson, cfgModel);
+    return res.getResRows();
+  }
+
+  /**
+   * 修改密码
+   * @param loginName
+   * @param unsaltedPwd
+   */
+  public async chgUserPassword(loginName: any, unsaltedPwd: any) {
+    if (!loginName) {
+      throw new CommonException(Exceptions.OTHER_EXCEPTION, 'loginName不存在');
+    }
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const pwd_salt = createUniqueId();
+    const pwd_md5 = md5(unsaltedPwd + pwd_salt);
+    const res1 = await this.curdMixService.executeCrudByCfg(
+      {
+        data: { pwd_md5: pwd_md5, pwd_salt: pwd_salt },
+        condition: { login_name: loginName },
+      },
+      {
+        sqlTable: SystemTables.sys_user_account,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_UPDATE,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    return CommonResult.successRes(res1.getResModel());
+  }
+}

package/src/service/UserSessionService.ts

@@ -1,81 +1,163 @@
-import {Inject, Provide} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {parseJsonObject} from '../libs/utils/functions';
-import {ISessionInfo, SESSION_ID_KEY, sessionCookieCfg} from '../models/userSession';
-import {RedisCacheService} from "./base/RedisCacheService";
-
-
-function pickUserAvatar(avatar: any): string {
-  if (!avatar) {
-    return null;
-  }
-  if (typeof avatar === 'string') {
-    if (avatar.startsWith('http') || avatar.startsWith('/')) {
-      return avatar;
-    }
-    const obj = parseJsonObject(avatar);
-    if (!obj) {
-      return null;
-    }
-    if (Array.isArray(obj)) {
-      return pickUserAvatar(obj[0]);
-    }
-    return pickUserAvatar(obj);
-  }
-
-  if (avatar && avatar.imgURL) {
-    return avatar.imgURL;
-  }
-  if (avatar && avatar.downloadURL) {
-    return avatar.downloadURL;
-  }
-  return null;
-}
-
-
-const SESSION_KEEP_TIME_SECOND: number = 3600 * 24 * 30;
-
-const toCacheKey = (sessionId: string)=>{
-  return `UserSession@@${sessionId}`;
-}
-
-@Provide()
-export class UserSessionService {
-  @Inject()
-  private ctx: Context;
-
-  @Inject()
-  private redisCacheService: RedisCacheService
-
-
-  public async saveUserSession(sessionInfo: ISessionInfo) {
-    sessionInfo.avatar = pickUserAvatar(sessionInfo.avatar);
-    const sessionId = sessionInfo.sessionId;
-    await this.redisCacheService.setJsonObject(toCacheKey(sessionId), sessionInfo, SESSION_KEEP_TIME_SECOND)
-  }
-
-  /**
-   * 移除Session
-   * @param sessionId
-   */
-  public async removeUserSession(sessionId: string) {
-    return await this.redisCacheService.removeItem(toCacheKey(sessionId))
-  }
-
-  private async getCurrentUserSessionForMiddleware1(sessionId: string): Promise<ISessionInfo> {
-    if (!sessionId) {
-      return null;
-    }
-    return await this.redisCacheService.getJsonObject(toCacheKey(sessionId))
-  }
-
-  /**
-   * 专门给中间件点调用的
-   */
-  public async getCurrentUserSessionForMiddleware(): Promise<ISessionInfo> {
-    const cookies = this.ctx.cookies;
-    const sessionId = cookies.get(SESSION_ID_KEY, sessionCookieCfg);
-    return this.getCurrentUserSessionForMiddleware1(sessionId);
-  }
-
-}
+import {Config, Inject, Provide} from '@midwayjs/core';
+import {Context} from '@midwayjs/koa';
+import {parseJsonObject} from '@/libs/utils/functions';
+import {ISessionInfo, SESSION_ID_KEY, sessionCookieCfg} from '@/models/userSession';
+import {HEADER_KEY_RUN_BY_ASYNC_TASK_ID} from '@/models/AsyncTaskModel';
+import {CurdProService} from './curd/CurdProService';
+import {KeysOfSimpleSQL} from '@/libs/crud-pro/models/keys';
+import {SystemTables} from '@/models/SystemTables';
+import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
+import {CacheServiceFactory} from './base/cache/CacheServiceFactory';
+import {ICacheService , CacheNameEnum} from '@/models/bizmodels';
+
+function pickUserAvatar(avatar: any): string {
+  if (!avatar) {
+    return null;
+  }
+  if (typeof avatar === 'string') {
+    if (avatar.startsWith('http') || avatar.startsWith('/')) {
+      return avatar;
+    }
+    const obj = parseJsonObject(avatar);
+    if (!obj) {
+      return null;
+    }
+    if (Array.isArray(obj)) {
+      return pickUserAvatar(obj[0]);
+    }
+    return pickUserAvatar(obj);
+  }
+
+  if (avatar && avatar.imgURL) {
+    return avatar.imgURL;
+  }
+  if (avatar && avatar.downloadURL) {
+    return avatar.downloadURL;
+  }
+  return null;
+}
+
+const SESSION_KEEP_TIME_SECOND: number = 3600 * 24 * 7;
+
+@Provide()
+export class UserSessionService {
+  @Inject()
+  private ctx: Context;
+
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
+  @Inject()
+  private curdProService: CurdProService;
+
+  @Config('fatcmsUserSessionKeepTimeSecond')
+  private fatcmsUserSessionKeepTimeSecond: number;
+
+  /**
+   * 获取用户会话保持时间: 单位秒
+   * @returns
+   */
+  private getSessionKeepTimeSecond(): number {
+    if (typeof this.fatcmsUserSessionKeepTimeSecond === 'number' && this.fatcmsUserSessionKeepTimeSecond > 0) {
+      return this.fatcmsUserSessionKeepTimeSecond;
+    }
+    return SESSION_KEEP_TIME_SECOND;
+  }
+
+
+  /**
+   * 获取用户会话缓存服务
+   * @returns
+   */
+  private getUserSessionCacheService(): ICacheService {
+    return this.cacheServiceFactory.getCacheServiceByName(CacheNameEnum.UserSessionBySessionId);
+  }
+
+  /**
+   * 保存用户会话信息。
+   * 用户登录后，在业务的项目中，可以调用此函数，更新bizExt字段
+   * @param sessionInfo
+   */
+  public async saveUserSession(sessionInfo: ISessionInfo) {
+    sessionInfo.avatar = pickUserAvatar(sessionInfo.avatar);
+    const sessionId = sessionInfo.sessionId;
+    const keepTime = this.getSessionKeepTimeSecond();
+    const userSessionCache = this.getUserSessionCacheService();
+    await userSessionCache.setJsonObject(sessionId, sessionInfo, keepTime);
+  }
+
+  /**
+   * 移除Session
+   * @param sessionId
+   */
+  public async removeUserSession(sessionId: string) {
+    const userSessionCache = this.getUserSessionCacheService();
+    return await userSessionCache.removeItem(sessionId);
+  }
+
+  /**
+   * 获取用户会话信息
+   * @param sessionId
+   * @returns
+   */
+  private async getCurrentUserSessionForMiddleware1(sessionId: string): Promise<ISessionInfo> {
+    if (!sessionId) {
+      return null;
+    }
+    const userSessionCache = this.getUserSessionCacheService();
+    return await userSessionCache.getJsonObject(sessionId);
+  }
+
+  /**
+   * 从异步任务队列中获取当时用户的Session信息
+   * @param asyncTaskId
+   */
+  private async getCurrentUserSessionByAsyncTaskId(asyncTaskId: string): Promise<ISessionInfo> {
+    const taskSessionCacheKey = `${asyncTaskId}`;
+
+    const loadSessionInfo = async (): Promise<ISessionInfo> => {
+      const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+      const asyncTaskRes = await this.curdProService.executeCrudByCfg(
+        {
+          columns: ['id', 'created_user_session'],
+          condition: {
+            id: asyncTaskId,
+          },
+        },
+        {
+          sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+          sqlTable: SystemTables.sys_async_tasks,
+          sqlDatabase: SystemDbName,
+          sqlDbType: SystemDbType,
+        }
+      );
+      const asyncTaskObj = asyncTaskRes.getOneObj();
+      if (!asyncTaskObj) {
+        return null;
+      }
+      return parseJsonObject(asyncTaskObj.created_user_session);
+    };
+
+    return await this.cacheServiceFactory.getJsonObjectCache({
+      cacheName: CacheNameEnum.UserSessionByAsyncTaskId,
+      cacheKey: taskSessionCacheKey,
+      getter: loadSessionInfo,
+    });
+  }
+
+  /**
+   * 专门给中间件点调用的
+   */
+  public async getCurrentUserSessionForMiddleware(): Promise<ISessionInfo> {
+    // 先从Header中获取：异步任务队列的任务ID
+    const asyncTaskId = this.ctx.headers[HEADER_KEY_RUN_BY_ASYNC_TASK_ID];
+    if (asyncTaskId && typeof asyncTaskId === 'string') {
+      return this.getCurrentUserSessionByAsyncTaskId(asyncTaskId);
+    }
+
+    const cookies = this.ctx.cookies;
+    const sessionId = cookies.get(SESSION_ID_KEY, sessionCookieCfg);
+    return this.getCurrentUserSessionForMiddleware1(sessionId);
+  }
+}