feat: 登录生成token的问题

Author: kuangshp

src/config/admin.config.ts

@@ -2,4 +2,6 @@ export default {
   adminPath: 'admin',
   defaultAccount: 'admin',
   defaultPassword: '123456',
+  /**token失效时间为1天 */
+  tokenExpire: 1,
 };

src/modules/admin/system/account/entities/account.token.entity.ts

@@ -1,3 +1,4 @@
+import { PlatformEnum } from '@src/enums';
 import { SharedEntity } from '@src/modules/shared/entities/shared.entity';
 import { Column, Entity } from 'typeorm';
 
@@ -34,20 +35,38 @@ export class AccountTokenEntity extends SharedEntity {
   @Column({
     type: 'varchar',
     nullable: true,
-    length: 110,
+    length: 11,
     name: 'mobile',
     comment: '手机号码',
   })
   mobile: string;
 
   @Column({
     type: 'varchar',
-    nullable: false,
-    length: 30,
+    nullable: true,
+    length: 50,
+    name: 'email',
+    comment: '邮箱',
+  })
+  email: string;
+
+  @Column({
+    type: 'tinyint',
+    nullable: true,
     name: 'platform',
-    comment: '平台',
+    default: 0,
+    comment: '平台:0表示普通用户(没权限),1表示为运营管理,2表示入住商家',
+  })
+  platform: PlatformEnum;
+
+  @Column({
+    type: 'tinyint',
+    nullable: false,
+    default: 0,
+    name: 'is_super',
+    comment: '是否为超级管理员1表示是,0表示不是',
   })
-  platform: string;
+  isSuper: number;
 
   @Column({
     type: 'timestamp',

src/modules/admin/system/account/services/login/login.service.ts

@@ -2,21 +2,35 @@ import { Injectable, HttpException, HttpStatus, Logger } from '@nestjs/common';
 import { LoginDto } from '../../controllers/login/dto/login.dto';
 import { AccountEntity } from '../../entities/account.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, getConnection } from 'typeorm';
+import { Repository, getConnection, SelectQueryBuilder } from 'typeorm';
 import { ToolsService } from '@src/modules/shared/services/tools/tools.service';
 import { isMobilePhone, isEmail } from 'class-validator';
 import { AccountLastLoginEntity } from '../../entities/account.last.login.entity';
 import { LoginVo } from '../../controllers/login/vo/login.vo';
+import { AccountTokenEntity } from '../../entities/account.token.entity';
+import { ConfigService, InjectConfig } from 'nestjs-config';
+import moment from 'moment';
+import { usernameReg } from '@src/constants';
 
+interface IAccount {
+  id: number;
+  username: string;
+  email: string;
+  mobile: string;
+  isSuper: number;
+  platform: number;
+}
 @Injectable()
 export class LoginService {
   private logger: Logger = new Logger(LoginService.name);
   constructor(
-    @InjectRepository(AccountEntity)
-    private readonly accountRepository: Repository<AccountEntity>,
     @InjectRepository(AccountLastLoginEntity)
     private readonly accountLastLoginRepository: Repository<AccountLastLoginEntity>,
+    @InjectRepository(AccountTokenEntity)
+    private readonly accountTokenRepository: Repository<AccountTokenEntity>,
     private readonly toolsService: ToolsService,
+    @InjectConfig()
+    private readonly configService: ConfigService,
   ) {}
 
   /**
@@ -31,44 +45,75 @@ export class LoginService {
   async adminLogin(loginDto: LoginDto, ipAddress: string): Promise<LoginVo> {
     try {
       const { username, password } = loginDto;
-      let sqlPassword: string | undefined;
-      let findAccount: AccountEntity | undefined;
+      type TypeAccountFindResult = Extract<AccountEntity, IAccount> | undefined;
+      let findAccount: TypeAccountFindResult;
+      const queryBuilder = this.queryLoginBuilder;
+      // 根据手机号码查询
       if (isMobilePhone(username, 'zh-CN')) {
-        const findResult: Pick<AccountEntity, 'password'> | undefined = await getConnection()
-          .createQueryBuilder(AccountEntity, 'account')
-          .select([])
-          .addSelect('account.password', 'password')
+        findAccount = await queryBuilder
           .where('(account.mobile = :mobile)', { mobile: username })
           .getRawOne();
-        sqlPassword = findResult?.password;
-        findAccount = await this.accountRepository.findOne({ where: { mobile: username } });
       } else if (isEmail(username)) {
-        const findResult: Pick<AccountEntity, 'password'> | undefined = await getConnection()
-          .createQueryBuilder(AccountEntity, 'account')
-          .select([])
-          .addSelect('account.password', 'password')
+        // 根据邮箱查询
+        findAccount = await queryBuilder
           .where('(account.email = :email)', { email: username })
           .getRawOne();
-        sqlPassword = findResult?.password;
-        findAccount = await this.accountRepository.findOne({ where: { email: username } });
       } else {
-        const findResult: Pick<AccountEntity, 'password'> | undefined = await getConnection()
-          .createQueryBuilder(AccountEntity, 'account')
-          .select([])
-          .addSelect('account.password', 'password')
+        // 用户名查询
+        findAccount = await queryBuilder
           .where('(account.username = :username)', { username })
           .getRawOne();
-        sqlPassword = findResult?.password;
-        findAccount = await this.accountRepository.findOne({ where: { username } });
       }
-      if (sqlPassword && this.toolsService.checkPassword(password, sqlPassword) && findAccount) {
+      if (
+        findAccount &&
+        findAccount.password &&
+        this.toolsService.checkPassword(password, findAccount.password)
+      ) {
+        // 记录最后登录时间和ip地址
         const lastLogin = this.accountLastLoginRepository.create({
           accountId: findAccount.id,
           lastLoginIp: ipAddress,
         });
         await this.accountLastLoginRepository.save(lastLogin);
         this.logger.log('当前用户', findAccount);
-        return Object.assign(findAccount, { token: this.toolsService.generateToken(findAccount) });
+        // 生成token存储到token表中并且返回给前端
+        const token = this.toolsService.uuidToken;
+        const { id, username, email, mobile, isSuper, platform } =
+          this.filterAccountField(findAccount);
+        const tokenExpire: number = this.configService.get('admin.tokenExpire');
+        const accountToken = {
+          userId: id,
+          username,
+          email,
+          mobile,
+          isSuper,
+          platform,
+          token,
+          // 设置token失效时间
+          expireTime: moment().add(tokenExpire, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        };
+        // 先判断之前是否有记录，有记录就更新，没记录就创建
+        const accountTokenResult: Pick<AccountTokenEntity, 'id'> | undefined =
+          await this.accountTokenRepository.findOne({
+            where: { userId: id },
+            select: ['id'],
+          });
+        if (accountTokenResult?.id) {
+          await this.accountTokenRepository.update({ id: accountTokenResult.id }, accountToken);
+        } else {
+          const accountTokenSave: AccountTokenEntity =
+            this.accountTokenRepository.create(accountToken);
+          await this.accountTokenRepository.save(accountTokenSave);
+        }
+        return {
+          token,
+          id,
+          username,
+          email,
+          mobile,
+          isSuper,
+          platform,
+        };
       } else {
         throw new HttpException('用户名或密码错误', HttpStatus.OK);
       }
@@ -77,4 +122,45 @@ export class LoginService {
       throw new HttpException('用户名或密码错误', HttpStatus.OK);
     }
   }
+
+  /**
+   * @Author: 水痕
+   * @Date: 2021-07-26 09:07:15
+   * @LastEditors: 水痕
+   * @Description: 公共的查询部分
+   * @param {*}
+   * @return {*}
+   */
+  private get queryLoginBuilder(): SelectQueryBuilder<AccountEntity> {
+    return getConnection()
+      .createQueryBuilder(AccountEntity, 'account')
+      .select('account.id', 'id')
+      .addSelect('account.username', 'username')
+      .addSelect('account.mobile', 'mobile')
+      .addSelect('account.email', 'email')
+      .addSelect('account.platform', 'platform')
+      .addSelect('account.isSuper', 'isSuper')
+      .addSelect('account.password', 'password');
+  }
+
+  /**
+   * @Author: 水痕
+   * @Date: 2021-07-26 10:15:17
+   * @LastEditors: 水痕
+   * @Description: 过来字段
+   * @param {IAccount} accountInfo
+   * @return {*}
+   */
+  private filterAccountField(accountInfo: IAccount): IAccount {
+    const { username, mobile, email } = accountInfo;
+    const _mobile = isMobilePhone(mobile, 'zh-CN') ? mobile : '';
+    const _email = isEmail(email) ? email : '';
+    const _username = usernameReg.test(username) ? username : '';
+    return {
+      ...accountInfo,
+      username: _username,
+      mobile: _mobile,
+      email: _email,
+    };
+  }
 }

src/utils/date.ts

@@ -9,14 +9,8 @@ import moment from 'moment';
  * @Date: 2019-07-31 15:27:39
  */
 export const formatDate = (dateNum: string | number, isDue = false): string => {
-  if (!dateNum) {
-    return '';
-  }
-  // if (!/^\d+$/.test(dateNum.toString())) {
-  //   throw new TypeError(`${dateNum}传递的数据格式化错误`);
-  // }
   if (isDue) {
-    return moment(dateNum).format('YYYY-MM-DD');
+    return moment(dateNum).format('YYYY-MM-DD HH:mm:ss');
   } else {
     return moment(dateNum).format('YYYY-MM-DD HH:mm:ss');
   }