midway-fatcms 0.0.1-beta.24 → 0.0.1-beta.26

package/src/service/AuthService.ts

@@ -1,275 +1,272 @@
-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';
-
-@Provide()
-export class AuthService {
-  @Inject()
-  private ctx: Context;
-
-  @Config('superAdminList')
-  private superAdminList: any[];
-
-  @Inject()
-  private curdMixService: CurdMixService;
-
-  @Inject()
-  private userService: UserAccountService;
-
-  @Inject()
-  private userSessionService: UserSessionService;
-
-  /**
-   * 明文密码转unsaltedPwd密码
-   * @param plainPwd
-   * @param loginName
-   */
-  public toUnsaltedPwd(plainPwd: string, loginName: string) {
-    const pw2 = md5(md5(plainPwd) + '_' + loginName);
-    return pw2;
-  }
-
-  /**
-   * front: pw1 = md5(md5(input_pw) + "_" + loginName)
-   * db: pw2 = md5(pwd_salt + pw1)
-   * 检查用户名密码是否正确
-   * @param loginName
-   * @param unsaltedPwd
-   */
-  public async checkLoginPassword(loginName: string, unsaltedPwd: string): Promise<CommonResult> {
-    const message = '用户名或密码错误';
-    const errorCode = 'USERNAME_OR_PASSWORD_IS_INCORRECT';
-
-    if (!loginName) {
-      return CommonResult.errorRes(message, errorCode, '!loginName');
-    }
-
-    if (!unsaltedPwd) {
-      return CommonResult.errorRes(message, errorCode, '!unsaltedPwd');
-    }
-
-    const userAccount = await this.queryUserAccountByLoginName(loginName);
-    if (!userAccount) {
-      return CommonResult.errorRes(message, errorCode, '!userAccount');
-    }
-
-    if (userAccount.status !== 1) {
-      return CommonResult.errorRes(message, errorCode, 'userAccount.status !== 1');
-    }
-
-    if (!userAccount.pwd_md5) {
-      return CommonResult.errorRes(message, errorCode, '!userAccount.pwd_md5');
-    }
-
-    const pwd_salt = userAccount.pwd_salt;
-    const pwd_md5 = md5(unsaltedPwd + pwd_salt);
-
-    if (userAccount['pwd_md5'] !== pwd_md5) {
-      return CommonResult.errorRes(message, errorCode, "userAccount['pwd_md5'] !== pwd_md5");
-    }
-
-    return CommonResult.successRes();
-  }
-
-
-  /**
-   * 创建一个toC端的UserSession
-   * @param consumerUserInfo
-   */
-  public async createUserSessionForConsumer(consumerUserInfo: IConsumerUserInfo) {
-
-    const sessionId = createUniqueId();
-
-    const sessionInfo: ISessionInfo = {
-      nickName: consumerUserInfo.nickName,
-      avatar: consumerUserInfo.avatar,
-      roleCodes: [],
-      functionCodes: [],
-      loginName: consumerUserInfo.loginName,
-      sessionId,
-      accountId: consumerUserInfo.accountId,
-      workbenchCode: consumerUserInfo.workbenchCode,
-      accountType: consumerUserInfo.accountType,
-    };
-
-    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,
-    };
-  }
-
-  /**
-   * 创建一个Session
-   * @param loginName
-   * @param workbenchCode
-   */
-  public async createUserSession(loginName: string, workbenchCode: string) {
-    const userAccount = await this.queryUserAccountByLoginName(loginName);
-
-    if (!userAccount) {
-      throw new CommonException('USER_ACCOUNT_NOT_EXIST', '用户账号不存在');
-    }
-
-    const accountId = userAccount.account_id;
-    const sessionId = createUniqueId();
-    const roleCodes = await this.queryUserRoleCodeList(accountId);
-    const functionCodes = await this.queryFunctionCodeList(roleCodes);
-
-    const sessionInfo: ISessionInfo = {
-      nickName: userAccount.nick_name,
-      avatar: userAccount.avatar,
-      roleCodes,
-      functionCodes,
-      loginName,
-      sessionId,
-      accountId,
-      workbenchCode,
-      accountType: SYS_ACCOUNT_TYPE,
-    };
-
-    await this.userSessionService.saveUserSession(sessionInfo);
-
-    return {
-      sessionId,
-      loginName,
-      accountId,
-      nickName: userAccount.nick_name,
-      avatar: userAccount.avatar,
-      workbenchCode: sessionInfo.workbenchCode,
-      accountType: sessionInfo.accountType,
-    };
-  }
-
-  /**
-   * 获取用户
-   * @param loginName
-   * @private
-   */
-  private async queryUserAccountByLoginName(loginName: string) {
-    const superAdminList = this.superAdminList;
-    const findFromSuperAdmin = () => {
-
-      if (!isEnableSuperAdmin(this.ctx)) {
-        return null;
-      }
-
-      if (!Array.isArray(superAdminList)) {
-        return null;
-      }
-
-      for (let i = 0; i < superAdminList.length; i++) {
-        const element = superAdminList[i];
-        if (element && element.login_name === loginName) {
-          const nick_name = 'SA' + i;
-          return {
-            nick_name: element.nick_name || nick_name,
-            avatar: '',
-            account_id: nick_name,
-            status: 1,
-            login_name: element.login_name,
-            pwd_salt: element.pwd_salt,
-            pwd_md5: element.pwd_md5,
-          };
-        }
-      }
-    };
-    const superAdmin = findFromSuperAdmin();
-    if (superAdmin) {
-      return superAdmin;
-    }
-    return this.userService.queryUserAccountByLoginName(loginName);
-  }
-
-  /**
-   * 查询此accountId下关联的角色code列表
-   * @param accountId
-   * @private
-   */
-  private async queryUserRoleCodeList(accountId: string): Promise<string[]> {
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    const res = await this.curdMixService.executeCrudByCfg(
-      {
-        condition: { account_id: accountId },
-        limit: 10000,
-      },
-      {
-        sqlTable: SystemTables.sys_perm_user_role,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      }
-    );
-    const rows = res.getResModel().rows || [];
-    const roleCodes: string[] = rows.map(({ role_code }) => {
-      return role_code as string;
-    });
-    return [...new Set(roleCodes)];
-  }
-
-  /**
-   * 查询此roleCodeList下面关联的所有功能点列表
-   * @param roleCodeList
-   * @private
-   */
-  private async queryFunctionCodeList(roleCodeList: string[]): Promise<string[]> {
-    if (!roleCodeList || roleCodeList.length === 0) {
-      return [];
-    }
-
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    const res = await this.curdMixService.executeCrudByCfg(
-      {
-        condition: { role_code: { $in: roleCodeList } },
-        limit: 10000,
-      },
-      {
-        sqlTable: SystemTables.sys_perm_role_func,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      }
-    );
-    const rows = res.getResModel().rows || [];
-    const funcCodes: string[] = rows.map(({ func_code }) => {
-      return func_code;
-    });
-    return [...new Set(funcCodes)];
-  }
-
-  async removeUserSession(sessionId: string) {
-    return this.userSessionService.removeUserSession(sessionId);
-  }
-
-  async refreshSession(sessionInfo: ISessionInfo): Promise<ISessionInfo> {
-    const oldSessionId = sessionInfo.sessionId;
-
-    const sessionId = createUniqueId();
-    const newSessionInfo: ISessionInfo = { ...sessionInfo, sessionId };
-
-    await this.userSessionService.saveUserSession(newSessionInfo);
-
-    await this.removeUserSession(oldSessionId);
-
-    return newSessionInfo;
-  }
-}
+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';
+
+@Provide()
+export class AuthService {
+  @Inject()
+  private ctx: Context;
+
+  @Config('superAdminList')
+  private superAdminList: any[];
+
+  @Inject()
+  private curdMixService: CurdMixService;
+
+  @Inject()
+  private userService: UserAccountService;
+
+  @Inject()
+  private userSessionService: UserSessionService;
+
+  /**
+   * 明文密码转unsaltedPwd密码
+   * @param plainPwd
+   * @param loginName
+   */
+  public toUnsaltedPwd(plainPwd: string, loginName: string) {
+    const pw2 = md5(md5(plainPwd) + '_' + loginName);
+    return pw2;
+  }
+
+  /**
+   * front: pw1 = md5(md5(input_pw) + "_" + loginName)
+   * db: pw2 = md5(pwd_salt + pw1)
+   * 检查用户名密码是否正确
+   * @param loginName
+   * @param unsaltedPwd
+   */
+  public async checkLoginPassword(loginName: string, unsaltedPwd: string): Promise<CommonResult> {
+    const message = '用户名或密码错误';
+    const errorCode = 'USERNAME_OR_PASSWORD_IS_INCORRECT';
+
+    if (!loginName) {
+      return CommonResult.errorRes(message, errorCode, '!loginName');
+    }
+
+    if (!unsaltedPwd) {
+      return CommonResult.errorRes(message, errorCode, '!unsaltedPwd');
+    }
+
+    const userAccount = await this.queryUserAccountByLoginName(loginName);
+    if (!userAccount) {
+      return CommonResult.errorRes(message, errorCode, '!userAccount');
+    }
+
+    if (userAccount.status !== 1) {
+      return CommonResult.errorRes(message, errorCode, 'userAccount.status !== 1');
+    }
+
+    if (!userAccount.pwd_md5) {
+      return CommonResult.errorRes(message, errorCode, '!userAccount.pwd_md5');
+    }
+
+    const pwd_salt = userAccount.pwd_salt;
+    const pwd_md5 = md5(unsaltedPwd + pwd_salt);
+
+    if (userAccount['pwd_md5'] !== pwd_md5) {
+      return CommonResult.errorRes(message, errorCode, "userAccount['pwd_md5'] !== pwd_md5");
+    }
+
+    return CommonResult.successRes();
+  }
+
+  /**
+   * 创建一个toC端的UserSession
+   * @param consumerUserInfo
+   */
+  public async createUserSessionForConsumer(consumerUserInfo: IConsumerUserInfo) {
+    const sessionId = createUniqueId();
+
+    const sessionInfo: ISessionInfo = {
+      nickName: consumerUserInfo.nickName,
+      avatar: consumerUserInfo.avatar,
+      roleCodes: [],
+      functionCodes: [],
+      loginName: consumerUserInfo.loginName,
+      sessionId,
+      accountId: consumerUserInfo.accountId,
+      workbenchCode: consumerUserInfo.workbenchCode,
+      accountType: consumerUserInfo.accountType,
+    };
+
+    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,
+    };
+  }
+
+  /**
+   * 创建一个Session
+   * @param loginName
+   * @param workbenchCode
+   */
+  public async createUserSession(loginName: string, workbenchCode: string) {
+    const userAccount = await this.queryUserAccountByLoginName(loginName);
+
+    if (!userAccount) {
+      throw new CommonException('USER_ACCOUNT_NOT_EXIST', '用户账号不存在');
+    }
+
+    const accountId = userAccount.account_id;
+    const sessionId = createUniqueId();
+    const roleCodes = await this.queryUserRoleCodeList(accountId);
+    const functionCodes = await this.queryFunctionCodeList(roleCodes);
+
+    const sessionInfo: ISessionInfo = {
+      nickName: userAccount.nick_name,
+      avatar: userAccount.avatar,
+      roleCodes,
+      functionCodes,
+      loginName,
+      sessionId,
+      accountId,
+      workbenchCode,
+      accountType: SYS_ACCOUNT_TYPE,
+    };
+
+    await this.userSessionService.saveUserSession(sessionInfo);
+
+    return {
+      sessionId,
+      loginName,
+      accountId,
+      nickName: userAccount.nick_name,
+      avatar: userAccount.avatar,
+      workbenchCode: sessionInfo.workbenchCode,
+      accountType: sessionInfo.accountType,
+    };
+  }
+
+  /**
+   * 获取用户
+   * @param loginName
+   * @private
+   */
+  private async queryUserAccountByLoginName(loginName: string) {
+    const superAdminList = this.superAdminList;
+    const findFromSuperAdmin = () => {
+      if (!isEnableSuperAdmin(this.ctx)) {
+        return null;
+      }
+
+      if (!Array.isArray(superAdminList)) {
+        return null;
+      }
+
+      for (let i = 0; i < superAdminList.length; i++) {
+        const element = superAdminList[i];
+        if (element && element.login_name === loginName) {
+          const nick_name = 'SA' + i;
+          return {
+            nick_name: element.nick_name || nick_name,
+            avatar: '',
+            account_id: nick_name,
+            status: 1,
+            login_name: element.login_name,
+            pwd_salt: element.pwd_salt,
+            pwd_md5: element.pwd_md5,
+          };
+        }
+      }
+    };
+    const superAdmin = findFromSuperAdmin();
+    if (superAdmin) {
+      return superAdmin;
+    }
+    return this.userService.queryUserAccountByLoginName(loginName);
+  }
+
+  /**
+   * 查询此accountId下关联的角色code列表
+   * @param accountId
+   * @private
+   */
+  private async queryUserRoleCodeList(accountId: string): Promise<string[]> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const res = await this.curdMixService.executeCrudByCfg(
+      {
+        condition: { account_id: accountId },
+        limit: 10000,
+      },
+      {
+        sqlTable: SystemTables.sys_perm_user_role,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    const rows = res.getResModel().rows || [];
+    const roleCodes: string[] = rows.map(({ role_code }) => {
+      return role_code as string;
+    });
+    return [...new Set(roleCodes)];
+  }
+
+  /**
+   * 查询此roleCodeList下面关联的所有功能点列表
+   * @param roleCodeList
+   * @private
+   */
+  private async queryFunctionCodeList(roleCodeList: string[]): Promise<string[]> {
+    if (!roleCodeList || roleCodeList.length === 0) {
+      return [];
+    }
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const res = await this.curdMixService.executeCrudByCfg(
+      {
+        condition: { role_code: { $in: roleCodeList } },
+        limit: 10000,
+      },
+      {
+        sqlTable: SystemTables.sys_perm_role_func,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    const rows = res.getResModel().rows || [];
+    const funcCodes: string[] = rows.map(({ func_code }) => {
+      return func_code;
+    });
+    return [...new Set(funcCodes)];
+  }
+
+  async removeUserSession(sessionId: string) {
+    return this.userSessionService.removeUserSession(sessionId);
+  }
+
+  async refreshSession(sessionInfo: ISessionInfo): Promise<ISessionInfo> {
+    const oldSessionId = sessionInfo.sessionId;
+
+    const sessionId = createUniqueId();
+    const newSessionInfo: ISessionInfo = { ...sessionInfo, sessionId };
+
+    await this.userSessionService.saveUserSession(newSessionInfo);
+
+    await this.removeUserSession(oldSessionId);
+
+    return newSessionInfo;
+  }
+}

package/src/service/EnumInfoService.ts

@@ -1,13 +1,14 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from '../libs/crud-pro/models/keys';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 import { CurdProService } from './curd/CurdProService';
 import { RelatedType } from './curd/CurdMixUtils';
-import { SystemTables } from '../models/SystemTables';
-import { parseConfigContentToEnumInfo, IEnumInfo } from '../libs/utils/parseConfig';
+import { SystemTables } from '@/models/SystemTables';
+import { parseConfigContentToEnumInfo, IEnumInfo } from '@/libs/utils/parseConfig';
 import { RedisCacheService } from './base/RedisCacheService';
 import { CurdMixByLinkToCustomService } from './curd/CurdMixByLinkToCustomService';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { RedisKeys } from '@/models/RedisKeys';
 
 interface IQueryEnumInfo {
   type: RelatedType;
@@ -42,7 +43,7 @@ export class EnumInfoService {
     const result = [];
     for (let i = 0; i < codeList.length; i++) {
       const { code, type } = codeList[i];
-      const cacheKey = `enums@@${type}@@${code}`;
+      const cacheKey = `${RedisKeys.QUERY_ENUM_INFO_PREFIX}${type}@@${code}`;
       const emums = refreshCache ? null : await this.redisCacheService.getJsonObject(cacheKey);
       if (!Array.isArray(emums) || emums.length === 0) {
         let values;

package/src/service/FileCenterService.ts

@@ -4,11 +4,11 @@ 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 { 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 { 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';