feat: 修改验证码

Author: kuangshp

src/api/login/dto/login.dto.ts

@@ -12,4 +12,7 @@ export class LoginDto {
 
   @IsNotEmpty({ message: '验证码不能空' })
   readonly captcha!: string;
+
+  @IsNotEmpty({ message: '验证码不能为空' })
+  readonly codeText!: string;
 }

src/api/login/login.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Post, Query, Res, Session } from '@nestjs/common';
+import { Body, Controller, Get, Post, Query } from '@nestjs/common';
 import { LoginDto } from './dto/login.dto';
 import { LoginService } from './login.service';
 import { LoginVo } from './vo/login.vo';
@@ -10,9 +10,8 @@ export class LoginController {
   constructor(private readonly loginService: LoginService) {}
 
   @Post('login')
-  async loginApi(@Body() req: LoginDto, @Session() session: any): Promise<LoginVo> {
-    const storedCaptcha = session.code;
-    if (req.captcha && storedCaptcha && req.captcha.toLowerCase() === storedCaptcha.toLowerCase()) {
+  async loginApi(@Body() req: LoginDto): Promise<LoginVo> {
+    if (req.captcha.toLowerCase() === req.codeText.toLowerCase()) {
       return await this.loginService.loginApi(req);
     } else {
       throw new HttpException('验证码错误', HttpStatus.OK);
@@ -25,16 +24,17 @@ export class LoginController {
   }
 
   @Get('captcha')
-  getCaptchaApi(@Res() res: any, @Session() session: any) {
+  getCaptchaApi() {
     const captcha = svgCaptcha.create({
       size: 4, //生成几个验证码
       fontSize: 50, //文字大小
       width: 100, //宽度
       height: 34, //高度
       background: '#fff', //背景颜色
     });
-    session['code'] = captcha['text']; //存储验证码记录到session
-    res.set('Content-Type', 'image/svg+xml');
-    res.send(captcha['data']);
+    // session['code'] = captcha['text']; //存储验证码记录到session
+    // res.set('Content-Type', 'image/svg+xml');
+    // res.send(captcha['data']);
+    return captcha;
   }
 }

src/api/login/login.service.ts

@@ -64,7 +64,7 @@ export class LoginService {
       return await this.generateToken(redisDataObj.userInfo);
     } else {
       throw new HttpException(
-        JSON.stringify({ code: 10024, message: '你还没登录,请先登录' }),
+        JSON.stringify({ code: 10025, message: '你还没登录,请先登录' }),
         HttpStatus.OK
       );
     }