diff --git a/mail-worker/src/service/s3-service.js b/mail-worker/src/service/s3-service.js index 93d502f..873ae73 100644 --- a/mail-worker/src/service/s3-service.js +++ b/mail-worker/src/service/s3-service.js @@ -1,6 +1,7 @@ import { S3Client, PutObjectCommand, DeleteObjectsCommand } from "@aws-sdk/client-s3"; import settingService from './setting-service'; import domainUtils from '../utils/domain-uitls'; +import { settingConst } from '../const/entity-const'; const s3Service = { async putObj(c, key, content, metadata) { @@ -76,10 +77,11 @@ const s3Service = { async client(c) { - const { region, endpoint, s3AccessKey, s3SecretKey } = await settingService.query(c); + const { region, endpoint, s3AccessKey, s3SecretKey, forcePathStyle } = await settingService.query(c); return new S3Client({ region: region || 'auto', endpoint: domainUtils.toOssDomain(endpoint), + forcePathStyle: forcePathStyle === settingConst.forcePathStyle.OPEN, credentials: { accessKeyId: s3AccessKey, secretAccessKey: s3SecretKey, diff --git a/mail-worker/src/template/email-html.js b/mail-worker/src/template/email-html.js index 941b955..3f3f696 100644 --- a/mail-worker/src/template/email-html.js +++ b/mail-worker/src/template/email-html.js @@ -5,7 +5,7 @@ export default function emailHtmlTemplate(html, domain) { const { document } = parseHTML(html); document.querySelectorAll('script').forEach(script => script.remove()); - html = document.documentElement.outerHTML; + html = document.toString(); html = html.replace(/{{domain}}/g, domainUtils.toOssDomain(domain) + '/'); return `