perf: 登录注册、找回密码都支持极验验证码和图片验证码

2026-04-15 05:00:52 +08:00 · 2025-09-13 23:01:14 +08:00
parent 50f92f55e2
commit 7bdde68ece
29 changed files with 446 additions and 390 deletions
--- a/packages/ui/certd-server/src/controller/basic/code-controller.ts
+++ b/packages/ui/certd-server/src/controller/basic/code-controller.ts
@@ -1,8 +1,9 @@
-import { Rule, RuleType } from '@midwayjs/validate';
-import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { BaseController, Constants } from '@certd/lib-server';
-import { CodeService } from '../../modules/basic/service/code-service.js';
-import { EmailService } from '../../modules/basic/service/email-service.js';
+import { Rule, RuleType } from "@midwayjs/validate";
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { BaseController, Constants, SysSettingsService } from "@certd/lib-server";
+import { CodeService } from "../../modules/basic/service/code-service.js";
+import { EmailService } from "../../modules/basic/service/email-service.js";
+import { CaptchaService } from "../../modules/basic/service/captcha-service.js";

 export class SmsCodeReq {
  @Rule(RuleType.string().required())
@@ -11,11 +12,8 @@ export class SmsCodeReq {
  @Rule(RuleType.string().required())
  mobile: string;

-  @Rule(RuleType.string().required().max(10))
-  randomStr: string;
-
-  @Rule(RuleType.string().required().max(4))
-  imgCode: string;
+  @Rule(RuleType.required())
+  captcha: any;

  @Rule(RuleType.string())
  verificationType: string;
@@ -25,11 +23,8 @@ export class EmailCodeReq {
  @Rule(RuleType.string().required())
  email: string;

-  @Rule(RuleType.string().required().max(10))
-  randomStr: string;
-
-  @Rule(RuleType.string().required().max(4))
-  imgCode: string;
+  @Rule(RuleType.required())
+  captcha: any;

  @Rule(RuleType.string())
  verificationType: string;
@@ -48,6 +43,17 @@ export class BasicController extends BaseController {

  @Inject()
  emailService: EmailService;
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  @Inject()
+  captchaService: CaptchaService;
+
+  @Post('/captcha/get', { summary: Constants.per.guest })
+  async getCaptcha(@Query("captchaAddonId") captchaAddonId:number) {
+      const form = await this.captchaService.getCaptcha(captchaAddonId)
+      return this.ok(form);
+  }

  @Post('/sendSmsCode', { summary: Constants.per.guest })
  public async sendSmsCode(
@@ -64,8 +70,8 @@ export class BasicController extends BaseController {
      // opts.verificationCodeLength = 6; //部分厂商这里会设置参数长度这里就不改了
    }

-    await this.codeService.checkCaptcha(body.randomStr, body.imgCode);
-    await this.codeService.sendSmsCode(body.phoneCode, body.mobile, body.randomStr, opts);
+    await this.codeService.checkCaptcha(body.captcha);
+    await this.codeService.sendSmsCode(body.phoneCode, body.mobile, opts);
    return this.ok(null);
  }

@@ -88,16 +94,10 @@ export class BasicController extends BaseController {
      opts.verificationCodeLength = 6;
    }

-    await this.codeService.checkCaptcha(body.randomStr, body.imgCode);
-    await this.codeService.sendEmailCode(body.email, body.randomStr, opts);
+    await this.codeService.checkCaptcha(body.captcha);
+    await this.codeService.sendEmailCode(body.email, opts);
    // 设置缓存内容
    return this.ok(null);
  }

-  @Get('/captcha', { summary: Constants.per.guest })
-  public async getCaptcha(@Query('randomStr') randomStr: any) {
-    const captcha = await this.codeService.generateCaptcha(randomStr);
-    this.ctx.res.setHeader('Content-Type', 'image/svg+xml');
-    return captcha.data;
-  }
 }
--- a/packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts
@@ -1,4 +1,4 @@
-import {ALL, Body, Controller, Inject, Post, Provide, Query} from '@midwayjs/core';
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
 import {
  CrudController,
  SysPrivateSettings,
@@ -6,14 +6,14 @@ import {
  SysSafeSetting,
  SysSettingsEntity,
  SysSettingsService
-} from '@certd/lib-server';
-import {cloneDeep, merge} from 'lodash-es';
-import {PipelineService} from '../../../modules/pipeline/service/pipeline-service.js';
-import {UserSettingsService} from '../../../modules/mine/service/user-settings-service.js';
-import {getEmailSettings} from '../../../modules/sys/settings/fix.js';
-import {http, logger, simpleNanoId, utils} from '@certd/basic';
-import {CodeService} from '../../../modules/basic/service/code-service.js';
-import {SmsServiceFactory} from '../../../modules/basic/sms/factory.js';
+} from "@certd/lib-server";
+import { cloneDeep, merge } from "lodash-es";
+import { PipelineService } from "../../../modules/pipeline/service/pipeline-service.js";
+import { UserSettingsService } from "../../../modules/mine/service/user-settings-service.js";
+import { getEmailSettings } from "../../../modules/sys/settings/fix.js";
+import { http, logger, utils } from "@certd/basic";
+import { CodeService } from "../../../modules/basic/service/code-service.js";
+import { SmsServiceFactory } from "../../../modules/basic/sms/factory.js";


 /**
@@ -158,7 +158,7 @@ export class SysSettingsController extends CrudController<SysSettingsService> {

  @Post('/testSms', { summary: 'sys:settings:edit' })
  async testSms(@Body(ALL) body) {
-    await this.codeService.sendSmsCode(body.phoneCode, body.mobile, simpleNanoId());
+    await this.codeService.sendSmsCode(body.phoneCode, body.mobile );
    return this.ok({});
  }

--- a/packages/ui/certd-server/src/controller/user/login/forgot-password-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/login/forgot-password-controller.ts
@@ -29,25 +29,23 @@ export class LoginController extends BaseController {
      throw new CommonException('暂未开启自助找回');
    }
    // 找回密码的验证码允许错误次数
-    const errorNum = 5;
+    const maxErrorCount = 5;

    if(body.type === 'email') {
      this.codeService.checkEmailCode({
        verificationType: 'forgotPassword',
        email: body.input,
-        randomStr: body.randomStr,
        validateCode: body.validateCode,
-        errorNum,
+        maxErrorCount: maxErrorCount,
        throwError: true,
      });
    } else if(body.type === 'mobile') {
      await this.codeService.checkSmsCode({
        verificationType: 'forgotPassword',
        mobile: body.input,
-        randomStr: body.randomStr,
        phoneCode: body.phoneCode,
        smsCode: body.validateCode,
-        errorNum,
+        maxErrorCount: maxErrorCount,
        throwError: true,
      });
    } else {
--- a/packages/ui/certd-server/src/controller/user/login/login-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/login/login-controller.ts
@@ -3,8 +3,7 @@ import { LoginService } from "../../../modules/login/service/login-service.js";
 import { AddonService, BaseController, Constants, SysPublicSettings, SysSettingsService } from "@certd/lib-server";
 import { CodeService } from "../../../modules/basic/service/code-service.js";
 import { checkComm } from "@certd/plus-core";
-import { logger } from "@certd/basic";
-import { ICaptchaAddon } from "../../../plugins/plugin-captcha/api.js";
+import { CaptchaService } from "../../../modules/basic/service/captcha-service.js";

 /**
 */
@@ -21,12 +20,18 @@ export class LoginController extends BaseController {
  @Inject()
  addonService: AddonService;

+  @Inject()
+  captchaService: CaptchaService;
+
  @Post('/login', { summary: Constants.per.guest })
  public async login(
    @Body(ALL)
    body: any
  ) {
-    await this.loginService.doCaptchaValidate({form:body.captcha})
+   const settings = await this.sysSettingsService.getPublicSettings()
+    if (settings.captchaEnabled === true) {
+      await this.captchaService.doValidate({form:body.captcha,must:false,captchaAddonId:settings.captchaAddonId})
+    }
    const token = await this.loginService.loginByPassword(body);
    this.writeTokenCookie(token);
    return this.ok(token);
@@ -83,24 +88,4 @@ export class LoginController extends BaseController {
    });
    return this.ok();
  }
-
-  @Post('/captcha/getParams', { summary: Constants.per.guest })
-  async getCaptchaParams() {
-
-    const settings = await this.sysSettingsService.getPublicSettings()
-    if (settings.captchaEnabled) {
-      const addonId = settings.captchaAddonId;
-
-      const addon:ICaptchaAddon = await this.addonService.getAddonById(addonId,true,0)
-      if (!addon) {
-        logger.warn('验证码插件还未配置')
-        return this.ok({});
-      }
-
-      const params = await addon.getClientParams()
-      return this.ok(params);
-    }
-
-    return this.ok({});
-  }
 }
--- a/packages/ui/certd-server/src/controller/user/login/register-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/login/register-controller.ts
@@ -13,8 +13,7 @@ export type RegisterReq = {
  phoneCode?: string;

  validateCode: string;
-  imgCode: string;
-  randomStr: string;
+  captcha:any;
 };

 /**
@@ -52,7 +51,7 @@ export class RegisterController extends BaseController {
        throw new Error('用户名不能为空');
      }

-      await this.codeService.checkCaptcha(body.randomStr, body.imgCode);
+      await this.codeService.checkCaptcha(body.captcha);
      const newUser = await this.userService.register(body.type, {
        username: body.username,
        password: body.password,
@@ -68,7 +67,6 @@ export class RegisterController extends BaseController {
        mobile: body.mobile,
        phoneCode: body.phoneCode,
        smsCode: body.validateCode,
-        randomStr: body.randomStr,
        throwError: true,
      });
      const newUser = await this.userService.register(body.type, {
@@ -85,7 +83,6 @@ export class RegisterController extends BaseController {
      checkPlus();
      this.codeService.checkEmailCode({
        email: body.email,
-        randomStr: body.randomStr,
        validateCode: body.validateCode,
        throwError: true,
      });
--- a/packages/ui/certd-server/src/modules/basic/service/captcha-service.ts
+++ b/packages/ui/certd-server/src/modules/basic/service/captcha-service.ts
@@ -0,0 +1,54 @@
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { AddonService, SysSettingsService } from "@certd/lib-server";
+import { logger } from "@certd/basic";
+import { ICaptchaAddon } from "../../../plugins/plugin-captcha/api.js";
+
+@Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class CaptchaService {
+  @Inject()
+  sysSettingsService: SysSettingsService;
+  @Inject()
+  addonService: AddonService;
+
+
+  async getCaptcha(captchaAddonId?:number){
+    if (!captchaAddonId) {
+      const settings = await this.sysSettingsService.getPublicSettings()
+      captchaAddonId = settings.captchaAddonId ?? 0
+    }
+    const addon:ICaptchaAddon = await this.addonService.getAddonById(captchaAddonId,true,0)
+    if (!addon) {
+      throw new Error('验证码插件还未配置')
+    }
+    return  await addon.getCaptcha()
+  }
+
+
+  async doValidate(opts:{form:any,must?:boolean,captchaAddonId?:number}){
+    if (!opts.captchaAddonId) {
+      const settings = await this.sysSettingsService.getPublicSettings()
+      opts.captchaAddonId = settings.captchaAddonId ?? 0
+    }
+    const addon = await this.addonService.getById(opts.captchaAddonId,0)
+    if (!addon) {
+      if (opts.must) {
+        throw new Error('请先配置验证码插件');
+      }
+      logger.warn('验证码插件还未配置，忽略验证码校验')
+      return true
+    }
+
+    if (!opts.form) {
+      throw new Error('请输入验证码');
+    }
+    const res = await addon.onValidate(opts.form)
+    if (!res) {
+      throw new Error('验证码错误');
+    }
+
+    return true
+
+  }
+
+}
--- a/packages/ui/certd-server/src/modules/basic/service/code-service.ts
+++ b/packages/ui/certd-server/src/modules/basic/service/code-service.ts
@@ -8,6 +8,7 @@ import { EmailService } from './email-service.js';
 import { AccessService } from '@certd/lib-server';
 import { AccessSysGetter } from '@certd/lib-server';
 import { isComm } from '@certd/plus-core';
+import { CaptchaService } from "./captcha-service.js";

 // {data: '<svg.../svg>', text: 'abcd'}
 /**
@@ -23,44 +24,19 @@ export class CodeService {
  @Inject()
  accessService: AccessService;

-  /**
-   */
-  async generateCaptcha(randomStr) {
-    const svgCaptcha = await import('svg-captcha');
-    const c = svgCaptcha.create();
-    //{data: '<svg.../svg>', text: 'abcd'}
-    const imgCode = c.text; // = RandomUtil.randomStr(4, true);
-    cache.set('imgCode:' + randomStr, imgCode, {
-      ttl: 2 * 60 * 1000, //过期时间 2分钟
-    });
-    return c;
-  }
+  @Inject()
+  captchaService: CaptchaService;

-  async getCaptchaText(randomStr) {
-    return cache.get('imgCode:' + randomStr);
-  }

-  async removeCaptcha(randomStr) {
-    cache.delete('imgCode:' + randomStr);
-  }

-  async checkCaptcha(randomStr: string, userCaptcha: string) {
-    const code = await this.getCaptchaText(randomStr);
-    if (code == null) {
-      throw new Error('验证码已过期');
-    }
-    if (code.toLowerCase() !== userCaptcha.toLowerCase()) {
-      throw new Error('验证码不正确');
-    }
-    await this.removeCaptcha(randomStr);
-    return true;
+  async checkCaptcha(body:any) {
+    return await this.captchaService.doValidate({form:body})
  }
  /**
   */
  async sendSmsCode(
    phoneCode = '86',
    mobile: string,
-    randomStr: string,
    opts?: {
      duration?: number,
      verificationType?: string,
@@ -70,9 +46,6 @@ export class CodeService {
    if (!mobile) {
      throw new Error('手机号不能为空');
    }
-    if (!randomStr) {
-      throw new Error('randomStr不能为空');
-    }

    const verificationCodeLength =  Math.floor(Math.max(Math.min(opts?.verificationCodeLength || 4, 8), 4));
    const duration = Math.floor(Math.max(Math.min(opts?.duration || 5, 15), 1));
@@ -96,7 +69,7 @@ export class CodeService {
      phoneCode,
    });

-    const key = this.buildSmsCodeKey(phoneCode, mobile, randomStr, opts?.verificationType);
+    const key = this.buildSmsCodeKey(phoneCode, mobile,  opts?.verificationType);
    cache.set(key, smsCode, {
      ttl: duration * 60 * 1000, //5分钟
    });
@@ -106,12 +79,10 @@ export class CodeService {
  /**
   *
   * @param email 收件邮箱
-   * @param randomStr
   * @param opts title标题 content内容模版 duration有效时间单位分钟 verificationType验证类型
   */
  async sendEmailCode(
    email: string,
-    randomStr: string,
    opts?: {
      title?: string,
      content?: string,
@@ -123,9 +94,7 @@ export class CodeService {
    if (!email) {
      throw new Error('Email不能为空');
    }
-    if (!randomStr) {
-      throw new Error('randomStr不能为空');
-    }
+

    let siteTitle = 'Certd';
    if (isComm()) {
@@ -149,7 +118,7 @@ export class CodeService {
      receivers: [email],
    });

-    const key = this.buildEmailCodeKey(email, randomStr, opts?.verificationType);
+    const key = this.buildEmailCodeKey(email,opts?.verificationType);
    cache.set(key, code, {
      ttl: duration * 60 * 1000, //5分钟
    });
@@ -159,31 +128,32 @@ export class CodeService {
  /**
   * checkSms
   */
-  async checkSmsCode(opts: { mobile: string; phoneCode: string; smsCode: string; randomStr: string; verificationType?: string; throwError: boolean; errorNum?: number }) {
-    const key = this.buildSmsCodeKey(opts.phoneCode, opts.mobile, opts.randomStr, opts.verificationType);
-    if (isDev()) {
+  async checkSmsCode(opts: { mobile: string; phoneCode: string; smsCode: string;  verificationType?: string; throwError: boolean; maxErrorCount?: number }) {
+    const key = this.buildSmsCodeKey(opts.phoneCode, opts.mobile, opts.verificationType);
+    return this.checkValidateCode("sms",key, opts.smsCode, opts.throwError, opts.maxErrorCount);
+
+  }
+
+  buildSmsCodeKey(phoneCode: string, mobile: string, verificationType?: string) {
+    return ['sms', verificationType, phoneCode, mobile].filter(item => !!item).join(':');
+  }
+
+  buildEmailCodeKey(email: string, verificationType?: string) {
+    return ['email', verificationType, email].filter(item => !!item).join(':');
+  }
+  checkValidateCode(type:string,key: string, userCode: string, throwError = true, maxErrorCount = 3) {
+    // 记录异常次数key
+    if (isDev() && userCode==="1234567") {
      return true;
    }
-    return this.checkValidateCode(key, opts.smsCode, opts.throwError, opts.errorNum);
-  }
-
-  buildSmsCodeKey(phoneCode: string, mobile: string, randomStr: string, verificationType?: string) {
-    return ['sms', verificationType, phoneCode, mobile, randomStr].filter(item => !!item).join(':');
-  }
-
-  buildEmailCodeKey(email: string, randomStr: string, verificationType?: string) {
-    return ['email', verificationType, email, randomStr].filter(item => !!item).join(':');
-  }
-  checkValidateCode(key: string, userCode: string, throwError = true, errorNum = 3) {
-    // 记录异常次数key
    const err_num_key = key + ':err_num';
-    //验证图片验证码
+    //验证邮件验证码
    const code = cache.get(key);
    if (code == null || code !== userCode) {
      let maxRetryCount = false;
-      if (!!code && errorNum > 0) {
+      if (!!code && maxErrorCount > 0) {
        const err_num = cache.get(err_num_key) || 0
-        if(err_num >= errorNum - 1) {
+        if(err_num >= maxErrorCount - 1) {
          maxRetryCount = true;
          cache.delete(key);
          cache.delete(err_num_key);
@@ -194,7 +164,8 @@ export class CodeService {
        }
      }
      if (throwError) {
-        throw new CodeErrorException(!maxRetryCount ? '验证码错误': '验证码错误请获取新的验证码');
+        const label = type ==='sms' ? '手机' : '邮箱';
+        throw new CodeErrorException(!maxRetryCount ? `${label}验证码错误`: `${label}验证码错误请获取新的验证码`);
      }
      return false;
    }
@@ -203,9 +174,9 @@ export class CodeService {
    return true;
  }

-  checkEmailCode(opts: { randomStr: string; validateCode: string; email: string; verificationType?: string; throwError: boolean; errorNum?: number }) {
-    const key = this.buildEmailCodeKey(opts.email, opts.randomStr, opts.verificationType);
-    return this.checkValidateCode(key, opts.validateCode, opts.throwError, opts.errorNum);
+  checkEmailCode(opts: { validateCode: string; email: string; verificationType?: string; throwError: boolean; maxErrorCount?: number }) {
+    const key = this.buildEmailCodeKey(opts.email,  opts.verificationType);
+    return this.checkValidateCode('email',key, opts.validateCode, opts.throwError, opts.maxErrorCount);
  }

  compile(templateString: string) {
--- a/packages/ui/certd-server/src/modules/login/service/login-service.ts
+++ b/packages/ui/certd-server/src/modules/login/service/login-service.ts
@@ -1,17 +1,21 @@
-import {Config, Inject, Provide, Scope, ScopeEnum} from '@midwayjs/core';
-import {UserService} from '../../sys/authority/service/user-service.js';
-import jwt from 'jsonwebtoken';
-import {AuthException, CommonException, Need2FAException} from "@certd/lib-server";
-import {RoleService} from '../../sys/authority/service/role-service.js';
-import {UserEntity} from '../../sys/authority/entity/user.js';
-import {SysSettingsService} from '@certd/lib-server';
-import {SysPrivateSettings} from '@certd/lib-server';
-import { cache, logger, utils } from "@certd/basic";
-import {LoginErrorException} from '@certd/lib-server/dist/basic/exception/login-error-exception.js';
-import {CodeService} from '../../basic/service/code-service.js';
-import {TwoFactorService} from "../../mine/service/two-factor-service.js";
-import {UserSettingsService} from '../../mine/service/user-settings-service.js';
-import {isPlus} from "@certd/plus-core";
+import { Config, Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { UserService } from "../../sys/authority/service/user-service.js";
+import jwt from "jsonwebtoken";
+import {
+  AuthException,
+  CommonException,
+  Need2FAException,
+  SysPrivateSettings,
+  SysSettingsService
+} from "@certd/lib-server";
+import { RoleService } from "../../sys/authority/service/role-service.js";
+import { UserEntity } from "../../sys/authority/entity/user.js";
+import { cache, utils } from "@certd/basic";
+import { LoginErrorException } from "@certd/lib-server/dist/basic/exception/login-error-exception.js";
+import { CodeService } from "../../basic/service/code-service.js";
+import { TwoFactorService } from "../../mine/service/two-factor-service.js";
+import { UserSettingsService } from "../../mine/service/user-settings-service.js";
+import { isPlus } from "@certd/plus-core";
 import { AddonService } from "@certd/lib-server/dist/user/addon/service/addon-service.js";

 /**
@@ -100,33 +104,6 @@ export class LoginService {
    throw new LoginErrorException(errorMessage, leftTimes);
  }

-  async doCaptchaValidate(opts:{form:any}){
-
-    const pubSetting = await this.sysSettingsService.getPublicSettings()
-
-    if (pubSetting.captchaEnabled) {
-
-      const addon = await this.addonService.getById(pubSetting.captchaAddonId,0)
-      if (!addon) {
-        logger.warn('验证码插件还未配置，忽略验证码校验')
-        return true
-      }
-      if (addon.define.name !==  pubSetting.captchaType) {
-        logger.warn('验证码插件类型错误，忽略验证码校验')
-        return true
-      }
-
-      const res = await addon.onValidate(opts.form)
-      if (!res) {
-        throw new Error('验证码错误');
-      }
-    }
-
-    return true
-
-  }
-
-

  async loginBySmsCode(req: { mobile: string; phoneCode: string; smsCode: string; randomStr: string }) {

@@ -136,13 +113,12 @@ export class LoginService {
      mobile: req.mobile,
      phoneCode: req.phoneCode,
      smsCode: req.smsCode,
-      randomStr: req.randomStr,
      throwError: false,
    });

    const {mobile, phoneCode} = req;
    if (!smsChecked) {
-      this.addErrorTimes(mobile, '验证码错误');
+      this.addErrorTimes(mobile, '手机验证码错误');
    }
    let info = await this.userService.findOne({phoneCode, mobile: mobile});
    if (info == null) {
--- a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts
@@ -238,9 +238,12 @@ export class UserService extends BaseService<UserEntity> {

  async forgotPassword(
    data: {
-      type: ForgotPasswordType; input?: string, phoneCode?: string,
-      randomStr: string, imgCode:string, validateCode: string,
-      password: string, confirmPassword: string,
+      type: ForgotPasswordType;
+      input?: string,
+      phoneCode?: string,
+      validateCode: string,
+      password: string,
+      confirmPassword: string,
    }
  ) {
    if(!data.type) {
@@ -249,7 +252,13 @@ export class UserService extends BaseService<UserEntity> {
    if(data.password !== data.confirmPassword) {
      throw new CommonException('两次输入的密码不一致');
    }
-    const user = await this.findOne([{ [data.type]: data.input }]);
+    const where :any= {
+      [data.type]: data.input,
+    };
+    if (data.type === 'mobile' ) {
+      where.phoneCode = data.phoneCode ??  '86';
+    }
+    const user = await this.findOne({ [data.type]: data.input });
    console.log('user', user)
    if(!user) {
      throw new CommonException('用户不存在');
--- a/packages/ui/certd-server/src/plugins/plugin-captcha/api.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-captcha/api.ts
@@ -1,4 +1,4 @@
 export interface  ICaptchaAddon{
  onValidate(data?:any):Promise<any>;
-  getClientParams():Promise<any>;
+  getCaptcha():Promise<any>;
 }
--- a/packages/ui/certd-server/src/plugins/plugin-captcha/geetest/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-captcha/geetest/index.ts
@@ -1,6 +1,7 @@
 import { AddonInput, BaseAddon, IsAddon } from "@certd/lib-server";
-import crypto from 'crypto';
+import crypto from "crypto";
 import { ICaptchaAddon } from "../api.js";
+
@IsAddon({
  addonType:"captcha",
  name: 'geetest',
@@ -8,6 +9,7 @@ import { ICaptchaAddon } from "../api.js";
  desc: '',
 })
 export class GeeTestCaptcha extends BaseAddon implements ICaptchaAddon{
+
  @AddonInput({
    title: 'captchaId',
    component: {
@@ -28,7 +30,9 @@ export class GeeTestCaptcha extends BaseAddon implements ICaptchaAddon{


  async onValidate(data?:any) {
-
+    if (!data) {
+      return false
+    }
    // geetest 服务地址
 // geetest server url
    const API_SERVER = "http://gcaptcha4.geetest.com";
@@ -107,11 +111,10 @@ export class GeeTestCaptcha extends BaseAddon implements ICaptchaAddon{
    return result;
  }

- async  getClientParams(): Promise<any> {
+ async  getCaptcha(): Promise<any> {
    return {
      captchaId: this.captchaId,
    }
  }

-
 }
--- a/packages/ui/certd-server/src/plugins/plugin-captcha/image/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-captcha/image/index.ts
@@ -1,6 +1,8 @@
-import { AddonInput, BaseAddon, IsAddon } from "@certd/lib-server";
-import crypto from 'crypto';
+import { BaseAddon, IsAddon } from "@certd/lib-server";
 import { ICaptchaAddon } from "../api.js";
+import { cache } from "@certd/basic";
+import { nanoid } from "nanoid";
+
@IsAddon({
  addonType:"captcha",
  name: 'image',
@@ -9,42 +11,45 @@ import { ICaptchaAddon } from "../api.js";
 })
 export class ImageCaptcha extends BaseAddon implements ICaptchaAddon{

-
-
-
  async onValidate(data?:any) {
-
-
-  }
-
-  // 生成签名
-// Generate signature
-   hmac_sha256_encode(value, key){
-    var hash = crypto.createHmac("sha256", key)
-      .update(value, 'utf8')
-      .digest('hex');
-    return hash;
-  }
-
-
-// 发送post请求, 响应json数据如：{"result": "success", "reason": "", "captcha_args": {}}
-// Send a post request and respond to JSON data, such as: {result ":" success "," reason ":" "," captcha_args ": {}}
-  async  doRequest(datas, url){
-    var options = {
-      url: url,
-      method: "POST",
-      params: datas,
-      timeout: 5000
-    };
-    const result = await this.ctx.http.request(options);
-    return result;
-  }
-
- async  getClientParams(): Promise<any> {
-    return {
-      captchaId: this.captchaId,
+    if (!data) {
+      return false;
    }
+    return await this.checkCaptcha(data.randomStr, data.imageCode)
  }

+  async getCaptchaText(randomStr:string) {
+    return cache.get('imgCode:' + randomStr);
+  }

+  async removeCaptcha(randomStr:string) {
+    cache.delete('imgCode:' + randomStr);
+  }
+
+  async checkCaptcha(randomStr: string, userCaptcha: string) {
+    const code = await this.getCaptchaText(randomStr);
+    if (code == null) {
+      throw new Error('验证码已过期');
+    }
+    if (code.toLowerCase() !== userCaptcha?.toLowerCase()) {
+      throw new Error('验证码不正确');
+    }
+    await this.removeCaptcha(randomStr);
+    return true;
+  }
+
+ async  getCaptcha(): Promise<any> {
+   const svgCaptcha = await import('svg-captcha');
+   const c = svgCaptcha.create();
+   //{data: '<svg.../svg>', text: 'abcd'}
+   const imgCode = c.text; // = RandomUtil.randomStr(4, true);
+   const randomStr = nanoid(10)
+   cache.set('imgCode:' + randomStr, imgCode, {
+     ttl: 2 * 60 * 1000, //过期时间 2分钟
+   })
+   return {
+    randomStr: randomStr,
+    imageData: c.data,
+   }
+ }
 }
--- a/packages/ui/certd-server/src/plugins/plugin-captcha/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-captcha/index.ts
@@ -1 +1,2 @@
 export * from './geetest/index.js';
+export * from './image/index.js';