Merge branch 'v2-dev' into v2-dev-buy

packages/ui/certd-server/src/controller/basic/code-controller.ts

@@ -16,6 +16,9 @@ export class SmsCodeReq {
 
   @Rule(RuleType.string().required().max(4))
   imgCode: string;
+
+  @Rule(RuleType.string())
+  verificationType: string;
 }
 
 export class EmailCodeReq {
@@ -32,6 +35,9 @@ export class EmailCodeReq {
   verificationType: string;
 }
 
+// 找回密码的验证码有效期
+const FORGOT_PASSWORD_CODE_DURATION = 3
+
 /**
  */
 @Provide()
@@ -48,8 +54,18 @@ export class BasicController extends BaseController {
     @Body(ALL)
     body: SmsCodeReq
   ) {
+    const opts = {
+      verificationType: body.verificationType,
+      verificationCodeLength: undefined,
+      duration: undefined,
+    };
+    if(body?.verificationType === 'forgotPassword') {
+      opts.duration = FORGOT_PASSWORD_CODE_DURATION;
+      // opts.verificationCodeLength = 6; //部分厂商这里会设置参数长度这里就不改了
+    }
+
     await this.codeService.checkCaptcha(body.randomStr, body.imgCode);
-    await this.codeService.sendSmsCode(body.phoneCode, body.mobile, body.randomStr);
+    await this.codeService.sendSmsCode(body.phoneCode, body.mobile, body.randomStr, opts);
     return this.ok(null);
   }
 
@@ -60,6 +76,7 @@ export class BasicController extends BaseController {
   ) {
     const opts = {
       verificationType: body.verificationType,
+      verificationCodeLength: undefined,
       title: undefined,
       content: undefined,
       duration: undefined,
@@ -67,7 +84,8 @@ export class BasicController extends BaseController {
     if(body?.verificationType === 'forgotPassword') {
       opts.title = '找回密码';
       opts.content = '验证码：${code}。您正在找回密码，请输入验证码并完成操作。如非本人操作请忽略';
-      opts.duration = 3;
+      opts.duration = FORGOT_PASSWORD_CODE_DURATION;
+      opts.verificationCodeLength = 6;
     }
 
     await this.codeService.checkCaptcha(body.randomStr, body.imgCode);

packages/ui/certd-server/src/controller/user/login/forgot-password-controller.ts

@@ -28,6 +28,8 @@ export class LoginController extends BaseController {
     if(!sysSettings.selfServicePasswordRetrievalEnabled) {
       throw new CommonException('暂未开启自助找回');
     }
+    // 找回密码的验证码允许错误次数
+    const errorNum = 5;
 
     if(body.type === 'email') {
       this.codeService.checkEmailCode({
@@ -35,6 +37,7 @@ export class LoginController extends BaseController {
         email: body.input,
         randomStr: body.randomStr,
         validateCode: body.validateCode,
+        errorNum,
         throwError: true,
       });
     } else if(body.type === 'mobile') {
@@ -44,6 +47,7 @@ export class LoginController extends BaseController {
         randomStr: body.randomStr,
         phoneCode: body.phoneCode,
         smsCode: body.validateCode,
+        errorNum,
         throwError: true,
       });
     } else {