chore:

.github/workflows/build-image.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches: ['v2-dev']
     paths:
-      - "trigger/build.trigger"
+      - "trigger/build1.trigger"
 
 #  schedule:
 #    - # 国际时间 19:17 执行，北京时间3:17  ↙↙↙ 改成你想要每天自动执行的时间

packages/core/basic/src/utils/index.ts

@@ -22,12 +22,14 @@ import { sp } from "./util.sp.js";
 import { hashUtils } from "./util.hash.js";
 import { promises } from "./util.promise.js";
 import { fileUtils } from "./util.file.js";
-import * as _ from "lodash-es";
 import { cache } from "./util.cache.js";
 import dayjs from "dayjs";
 import { domainUtils } from "./util.domain.js";
+export * from "./util.domain.js";
 import { optionsUtils } from "./util.options.js";
+export * from "./util.options.js";
 import { amountUtils } from "./util.amount.js";
+export * from "./util.amount.js";
 import { nanoid } from "nanoid";
 import * as id from "./util.id.js";
 import { locker } from "./util.lock.js";
@@ -43,7 +45,6 @@ export const utils = {
   hash: hashUtils,
   promises,
   file: fileUtils,
-  _,
   mergeUtils,
   cache,
   nanoid,

packages/libs/lib-server/src/user/addon/service/addon-service.ts

@@ -1,11 +1,9 @@
-import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { Provide, Scope, ScopeEnum } from "@midwayjs/core";
 import { InjectEntityModel } from "@midwayjs/typeorm";
 import { In, Repository } from "typeorm";
-import { AddonDefine, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
-import { addonRegistry, newAddon } from "../api/index.js";
+import { AddonDefine, BaseService, PageReq, ValidateException } from "../../../index.js";
+import { addonRegistry } from "../api/index.js";
 import { AddonEntity } from "../entity/addon.js";
-import { http, logger, utils } from "@certd/basic";
-import { TaskServiceBuilder } from "@certd/ui-server";
 
 /**
  * Addon
@@ -16,9 +14,6 @@ export class AddonService extends BaseService<AddonEntity> {
   @InjectEntityModel(AddonEntity)
   repository: Repository<AddonEntity>;
 
-  @Inject()
-  private taskServiceBuilder: TaskServiceBuilder;
-
   //@ts-ignore
   getRepository() {
     return this.repository;
@@ -37,18 +32,18 @@ export class AddonService extends BaseService<AddonEntity> {
     if (param._copyFrom) {
       oldEntity = await this.info(param._copyFrom);
       if (oldEntity == null) {
-        throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+        throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
       }
       if (oldEntity.userId !== param.userId) {
-        throw new ValidateException('您无权查看该Addon配置');
+        throw new ValidateException("您无权查看该Addon配置");
       }
     }
     if (!param.userId) {
-      param.isSystem = true
+      param.isSystem = true;
     } else {
-      param.isSystem = false
+      param.isSystem = false;
     }
-    delete param._copyFrom
+    delete param._copyFrom;
     return await super.add(param);
   }
 
@@ -60,7 +55,7 @@ export class AddonService extends BaseService<AddonEntity> {
   async update(param) {
     const oldEntity = await this.info(param.id);
     if (oldEntity == null) {
-      throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+      throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
     }
     return await super.update(param);
   }
@@ -68,57 +63,17 @@ export class AddonService extends BaseService<AddonEntity> {
   async getSimpleInfo(id: number) {
     const entity = await this.info(id);
     if (entity == null) {
-      throw new ValidateException('该Addon配置不存在,请确认是否已被删除');
+      throw new ValidateException("该Addon配置不存在,请确认是否已被删除");
     }
     return {
       id: entity.id,
       name: entity.name,
       userId: entity.userId,
       addonType: entity.addonType,
-      type: entity.type,
+      type: entity.type
     };
   }
 
-  async getAddonById(id: any, checkUserId: boolean, userId?: number): Promise<any> {
-    const serviceGetter = this.taskServiceBuilder.create({userId:userId??0})
-    const ctx = {
-      http: http,
-      logger: logger,
-      utils: utils,
-      serviceGetter
-    };
-
-    if (!id){
-      //使用图片验证码
-      return await newAddon("captcha", "image", {},ctx);
-    }
-    const entity = await this.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);
-  }
-
 
   getDefineList(addonType: string) {
     return addonRegistry.getDefineList();
@@ -139,7 +94,7 @@ export class AddonService extends BaseService<AddonEntity> {
     return await this.repository.find({
       where: {
         id: In(ids),
-        userId,
+        userId
       },
       select: {
         id: true,
@@ -147,14 +102,13 @@ export class AddonService extends BaseService<AddonEntity> {
         addonType: true,
         type: true,
         userId: true,
-        isSystem: true,
-      },
+        isSystem: true
+      }
     });
 
   }
 
 
-
   async getDefault(userId: number, addonType: string): Promise<any> {
     const res = await this.repository.findOne({
       where: {
@@ -162,8 +116,8 @@ export class AddonService extends BaseService<AddonEntity> {
         addonType
       },
       order: {
-        isDefault: 'DESC',
-      },
+        isDefault: "DESC"
+      }
     });
     if (!res) {
       return null;
@@ -179,16 +133,16 @@ export class AddonService extends BaseService<AddonEntity> {
       type: res.type,
       name: res.name,
       userId: res.userId,
-      setting,
+      setting
     };
   }
 
   async setDefault(id: number, userId: number, addonType: string) {
     if (!id) {
-      throw new ValidateException('id不能为空');
+      throw new ValidateException("id不能为空");
     }
     if (!userId) {
-      throw new ValidateException('userId不能为空');
+      throw new ValidateException("userId不能为空");
     }
     await this.repository.update(
       {
@@ -196,7 +150,7 @@ export class AddonService extends BaseService<AddonEntity> {
         addonType
       },
       {
-        isDefault: false,
+        isDefault: false
       }
     );
     await this.repository.update(
@@ -206,7 +160,7 @@ export class AddonService extends BaseService<AddonEntity> {
         addonType
       },
       {
-        isDefault: true,
+        isDefault: true
       }
     );
   }
@@ -214,14 +168,14 @@ export class AddonService extends BaseService<AddonEntity> {
   async getOrCreateDefault(opts: { addonType: string, type: string, inputs: any, userId: any }) {
     const { addonType, type, inputs, userId } = opts;
 
-   const addonDefine =  this.getDefineByType( type,addonType)
+    const addonDefine = this.getDefineByType(type, addonType);
 
     const defaultConfig = await this.getDefault(userId, addonType);
     if (defaultConfig) {
       return defaultConfig;
     }
     const setting = {
-      ...inputs,
+      ...inputs
     };
     const res = await this.repository.save({
       userId,
@@ -229,7 +183,7 @@ export class AddonService extends BaseService<AddonEntity> {
       type: type,
       name: addonDefine.title,
       setting: JSON.stringify(setting),
-      isDefault: true,
+      isDefault: true
     });
     return this.buildAddonInstanceConfig(res);
   }

packages/plugins/plugin-cert/src/dns-provider/index.ts

@@ -2,3 +2,4 @@ export * from "./api.js";
 export * from "./registry.js";
 export * from "./decorator.js";
 export * from "./base.js";
+export * from "./domain-parser.js";

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);
+  }
+
+}