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

packages/libs/lib-server/src/system/basic/service/plus-service.ts

@@ -3,7 +3,7 @@ import { AppKey, PlusRequestService } from '@certd/plus-core';
 import { cache, http, HttpRequestConfig, logger } from '@certd/basic';
 import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js';
 import { merge } from 'lodash-es';
-
+import fs from 'fs';
 @Provide("plusService")
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class PlusService {
@@ -85,12 +85,31 @@ export class PlusService {
 
   async sendEmail(email: any) {
     const plusRequestService = await this.getPlusRequestService();
+
+    let attachments = email.attachments || [];
+    if (attachments.length > 0) {
+      const newAttachments: any[] = [];
+      attachments.forEach((item: any) => {
+        const name = item.filename || item.path.split('/').pop();
+        const body = item.content || fs.readFileSync(item.path);
+        const bodyBase64 = Buffer.from(body).toString('base64');
+        item = {
+          name,
+          body: bodyBase64,
+        };
+        newAttachments.push(item);
+      });
+      attachments = newAttachments;
+    }
+
     await plusRequestService.request({
       url: '/activation/emailSend',
       data: {
         subject: email.subject,
-        text: email.content,
         to: email.receivers,
+        text: email.content,
+        html: email.html,
+        attachments,
       },
     });
   }

packages/libs/lib-server/src/system/settings/service/models.ts

@@ -37,6 +37,15 @@ export class SysPublicSettings extends BaseSettings {
   //验证码类型
   captchaType?: string;
   captchaAddonId?:number;
+
+
+
+  //流水线是否启用有效期
+  pipelineValidTimeEnabled?: boolean = false;
+
+  //证书域名添加到监控
+  certDomainAddToMonitorEnabled?: boolean = false;
+
 }
 
 export class SysPrivateSettings extends BaseSettings {
@@ -51,6 +60,8 @@ export class SysPrivateSettings extends BaseSettings {
   dnsResultOrder? = '';
   commonCnameEnabled?: boolean = true;
 
+  httpRequestTimeout?: number = 30;
+
   sms?: {
     type?: string;
     config?: any;
@@ -214,3 +225,4 @@ export class SysSafeSetting extends BaseSettings {
   };
 }
 
+