chore:

packages/ui/certd-server/src/modules/basic/service/captcha-service.ts

@@ -1,7 +1,8 @@
 import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
-import { AddonService, SysSettingsService } from "@certd/lib-server";
+import { SysSettingsService } from "@certd/lib-server";
 import { logger } from "@certd/basic";
 import { ICaptchaAddon } from "../../../plugins/plugin-captcha/api.js";
+import { AddonGetterService } from "../../pipeline/service/addon-getter-service.js";
 
 @Provide()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
@@ -9,7 +10,7 @@ export class CaptchaService {
   @Inject()
   sysSettingsService: SysSettingsService;
   @Inject()
-  addonService: AddonService;
+  addonGetterService: AddonGetterService;
 
 
   async getCaptcha(captchaAddonId?:number){
@@ -17,7 +18,7 @@ export class CaptchaService {
       const settings = await this.sysSettingsService.getPublicSettings()
       captchaAddonId = settings.captchaAddonId ?? 0
     }
-    const addon:ICaptchaAddon = await this.addonService.getAddonById(captchaAddonId,true,0)
+    const addon:ICaptchaAddon = await this.addonGetterService.getAddonById(captchaAddonId,true,0)
     if (!addon) {
       throw new Error('验证码插件还未配置')
     }
@@ -30,7 +31,7 @@ export class CaptchaService {
       const settings = await this.sysSettingsService.getPublicSettings()
       opts.captchaAddonId = settings.captchaAddonId ?? 0
     }
-    const addon = await this.addonService.getById(opts.captchaAddonId,0)
+    const addon = await this.addonGetterService.getById(opts.captchaAddonId,0)
     if (!addon) {
       if (opts.must) {
         throw new Error('请先配置验证码插件');

packages/ui/certd-server/src/modules/pipeline/service/addon-getter-service.ts

@@ -0,0 +1,61 @@
+import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { http, logger, utils } from "@certd/basic";
+import { TaskServiceBuilder } from "./getter/task-service-getter.js";
+import { AddonService, newAddon, PermissionException, ValidateException } from "@certd/lib-server";
+
+/**
+ * Addon
+ */
+@Provide()
+@Scope(ScopeEnum.Request, { allowDowngrade: true })
+export class AddonGetterService  {
+
+  @Inject()
+  taskServiceBuilder: TaskServiceBuilder;
+  @Inject()
+  addonService: AddonService;
+
+
+  async getAddonById(id: any, checkUserId: boolean, userId?: number): Promise<any> {
+    const serviceGetter = this.taskServiceBuilder.create({
+      userId
+    });
+    const ctx = {
+      http,
+      logger,
+      utils,
+      serviceGetter
+    }
+
+    if (!id) {
+      //使用图片验证码
+      return await newAddon("captcha", "image", {}, ctx);
+    }
+    const entity = await this.addonService.info(id);
+    if (entity == null) {
+      //使用图片验证码
+      return await newAddon("captcha", "image", {}, ctx);
+    }
+    if (checkUserId) {
+      if (userId == null) {
+        throw new ValidateException("userId不能为空");
+      }
+      if (userId !== entity.userId) {
+        throw new PermissionException("您对该Addon无访问权限");
+      }
+    }
+
+    const setting = JSON.parse(entity.setting ?? "{}");
+    const input = {
+      id: entity.id,
+      ...setting
+    };
+
+    return await newAddon(entity.addonType, entity.type, input, ctx);
+  }
+
+  async getById(id: any, userId: number): Promise<any> {
+    return await this.getAddonById(id, true, userId);
+  }
+
+}