fix: 修复阿里云esa超过免费配额之后无法部署证书的bug，改成删除最旧的那张证书

packages/core/pipeline/src/core/executor.ts

@@ -465,6 +465,8 @@ export class Executor {
 
     templateData.errors = errors;
     templateData.pipelineResult = pipelineResult;
+    templateData.title = subject;
+    templateData.content = content;
 
     for (const notification of this.pipeline.notifications) {
       if (!notification.when.includes(when)) {

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

@@ -77,6 +77,13 @@ export class EmailService implements IEmailService {
       }
     }
     let subject = email.subject;
+
+    if (!subject) {
+      logger.error(new Error('邮件标题不能为空'));
+      subject = `邮件标题为空，请联系管理员排查`;
+    }
+
+
     if (!subject.includes(`【${sysTitle}】`)) {
       subject = `【${sysTitle}】${subject}`;
     }
@@ -121,7 +128,7 @@ export class EmailService implements IEmailService {
       data: {
         title: '测试邮件,from certd',
         content: '测试邮件,from certd',
-        url:"https://certd.handfree.work",
+        url: "https://certd.handfree.work",
       },
       receivers: [receiver],
     });
@@ -150,32 +157,31 @@ export class EmailService implements IEmailService {
 
   async sendByTemplate(req: EmailSendByTemplateReq) {
     let content = null
-    if (isPlus()) {
-      const emailConf = await this.sysSettingsService.getSetting<SysEmailConf>(SysEmailConf);
-      const template = emailConf?.templates?.[req.type]
-      if (template && template.addonId) {
-        const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(template.addonId, true, 0)
+    const emailConf = await this.sysSettingsService.getSetting<SysEmailConf>(SysEmailConf);
+    const template = emailConf?.templates?.[req.type]
+    if (isPlus() && template &&  template.addonId) {
+      const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(template.addonId, true, 0)
+      if (addon) {
+        content = await addon.buildContent({ data: req.data })
+      }
+    }
+    if (isPlus() && !content ) {
+      //看看有没有通用模版
+      if (emailConf?.templates?.common && emailConf?.templates?.common.addonId) {
+        const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(emailConf.templates.common.addonId, true, 0)
         if (addon) {
           content = await addon.buildContent({ data: req.data })
         }
       }
-      if (!content) {
-        //看看有没有通用模版
-        if (emailConf?.templates?.common && emailConf?.templates?.common.addonId) {
-          const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getAddonById(emailConf.templates.common.addonId, true, 0)
-          if (addon) {
-            content = await addon.buildContent({ data: req.data })
-          }
-        }
-      }
-      // 没有找到模版，使用默认模版
-      if (!content) {
-        try {
-          const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getBlank("emailTemplate", req.type)
-          content = await addon.buildDefaultContent({ data: req.data })
-        } catch (e) {
-          // 对应的通知类型模版可能没有注册或者开发
-        }
+    }
+
+    // 没有找到模版，使用默认模版
+    if (!content) {
+      try {
+        const addon: ITemplateProvider<EmailContent> = await this.addonGetterService.getBlank("emailTemplate", req.type)
+        content = await addon.buildDefaultContent({ data: req.data })
+      } catch (e) {
+        // 对应的通知类型模版可能没有注册或者开发
       }
     }
 

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-esa/index.ts

@@ -7,6 +7,7 @@ import {
 import { AliyunAccess } from "../../../plugin-lib/aliyun/access/index.js";
 import { AliyunSslClient } from "../../../plugin-lib/aliyun/lib/ssl-client.js";
 import { AliyunClientV2 } from "../../../plugin-lib/aliyun/lib/aliyun-client-v2.js";
+import dayjs from "dayjs";
 
 @IsTaskPlugin({
   name: "AliyunDeployCertToESA",
@@ -89,6 +90,19 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
   )
   siteIds!: string[];
 
+  @TaskInput({
+    title: "是否免费版",
+    value: true,
+    component: {
+      name: "a-switch",
+      vModel: "value"
+    },
+    helper: "如果是免费站点，将检查证书数量限制，如果超限将删除最旧的那张证书",
+    required: true
+  })
+
+  isFree: boolean;
+
 
   async onInstance() {
   }
@@ -126,13 +140,9 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
     const { certId, certName } = await this.getAliyunCertId(access);
 
     for (const siteId of this.siteIds) {
-
-      try{
-        await this.clearSiteCert(client,siteId);
-      }catch (e) {
-        this.logger.error(`清理站点[${siteId}]证书失败`,e)
+      if (this.isFree) {
+          await this.clearSiteLimitCert(client, siteId);
       }
-
       try {
         const res = await client.doRequest({
           // 接口名称
@@ -140,12 +150,12 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
           // 接口版本
           version: "2024-09-10",
           data: {
-             body:{
-               SiteId: siteId,
-               CasId: certId,
-               Type: "cas",
-               Name: certName
-             }
+            body: {
+              SiteId: siteId,
+              CasId: certId,
+              Type: "cas",
+              Name: certName
+            }
           }
         });
         this.logger.info(`部署站点[${siteId}]证书成功：${JSON.stringify(res)}`);
@@ -153,14 +163,14 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
       } catch (e) {
         if (e.message.includes("Certificate.Duplicated")) {
           this.logger.info(`站点[${siteId}]证书已存在,无需重复部署`);
-        }else{
+        } else {
           throw e;
         }
-      }finally{
-        try{
-          await this.clearSiteCert(client,siteId);
-        }catch (e) {
-          this.logger.error(`清理站点[${siteId}]证书失败`,e)
+      } finally {
+        try {
+          await this.clearSiteExpiredCert(client, siteId);
+        } catch (e) {
+          this.logger.error(`清理站点[${siteId}]过期证书失败`, e)
         }
       }
     }
@@ -201,15 +211,16 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
     return this.ctx.utils.options.buildGroupOptions(options, this.certDomains);
   }
 
-  async clearSiteCert(client: AliyunClientV2, siteId: string) {
+  async clearSiteExpiredCert(client: AliyunClientV2, siteId: string) {
     this.logger.info(`开始清理站点[${siteId}]过期证书`);
     const certListRes = await client.doRequest({
       action: "ListCertificates",
       version: "2024-09-10",
       method: "GET",
-      data:{
+      data: {
         query: {
-          SiteId: siteId
+          SiteId: siteId,
+          PageSize: 100
         }
       }
     });
@@ -219,13 +230,13 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
       this.logger.info(`证书${item.Name}状态：${item.Status}`);
       if (item.Status === "Expired") {
         this.logger.info(`证书${item.Name}已过期，执行删除`);
-        try{
+        try {
           await client.doRequest({
             action: "DeleteCertificate",
             version: "2024-09-10",
             // 接口 HTTP 方法
             method: "GET",
-            data:{
+            data: {
               query: {
                 SiteId: siteId,
                 Id: item.id
@@ -233,13 +244,76 @@ export class AliyunDeployCertToESA extends AbstractTaskPlugin {
             }
           });
           this.logger.info(`证书${item.Name}已删除`);
-        }catch (e) {
-          this.logger.error(`过期证书${item.Name}删除失败：`,e.message)
+        } catch (e) {
+          this.logger.error(`过期证书${item.Name}删除失败：`, e.message)
         }
-
       }
     }
   }
+
+
+  async clearSiteLimitCert(client: AliyunClientV2, siteId: string) {
+    const res = await client.doRequest({
+      action: "GetCertificateQuota",
+      version: "2024-09-10",
+      method: "GET",
+      data: {
+        query: {
+          SiteId: siteId,
+          Type: "free"
+        }
+      }
+    });
+    this.logger.info(`站点[${siteId}]证书限制情况, 限制${res.Quota} ,已使用${res.QuotaUsage}`);
+
+    if (res.QuotaUsage < res.Quota) {
+      this.logger.info(`站点[${siteId}]证书未超限制, 无需删除`);
+      return;
+    }
+    //删除最旧的证书
+    this.logger.info(`站点[${siteId}]证书已超限制, 开始删除最旧的证书`);
+    const certListRes = await client.doRequest({
+      action: "ListCertificates",
+      version: "2024-09-10",
+      method: "GET",
+      data: {
+        query: {
+          SiteId: siteId,
+          PageSize: 100
+        }
+      }
+    });
+
+    const list = certListRes.Result;
+    if (!list || list.length === 0) {
+      this.logger.info(`站点[${siteId}]没有证书, 无需删除`);
+      return 
+    }
+    let  oldly:any = null;
+    for (const item of list) {
+      if (!oldly) {
+        oldly = item;
+        continue;
+      }
+      if (dayjs(item.CreateTime).valueOf() < (dayjs(oldly.CreateTime)).valueOf()){
+        oldly = item;
+      }
+    }
+    this.logger.info(`最旧的证书${oldly.Name}创建时间：${oldly.CreateTime}`);
+    await client.doRequest({
+      action: "DeleteCertificate",
+      version: "2024-09-10",
+      method: "GET",
+      data: {
+        query: {
+          SiteId: siteId,
+          Id: oldly.id
+        }
+      }
+    });
+    this.logger.info(`最旧证书${oldly.Name}已删除`);
+    
+  }
 }
 
 new AliyunDeployCertToESA();

packages/ui/certd-server/src/plugins/plugin-plus/lecdn/plugins/plugin-update-cert-v2.ts

@@ -136,7 +136,7 @@ export class LeCDNUpdateCertV2 extends AbstractTaskPlugin {
 
   private checkRes(res: any) {
     if (res.code !== 0 && res.code !== 200) {
-      throw new Error(res.message);
+      throw new Error(res.message || JSON.stringify(res));
     }
   }