fix(邮件通知): 优化获取邮件附件，过大时的抛错国际化 (#568)

* fix(邮件通知): 优化获取邮件附件，过大时的抛错国际化 * fix(邮件通知): 优化使用通用的国际化信息 * fix(邮件通知): 代码优化 --------- Co-authored-by: fighter-wang <[email protected]>
jetlinks · Sep 3, 2024 · bf7e19c · bf7e19c
1 parent 3ce520e
commit bf7e19c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/...mail/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java b/...mail/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
@@ -154,7 +154,14 @@ protected Mono<Void> doSend(ParsedEmailTemplate template) {
 
                 return Flux
                     .fromIterable(template.getAttachments().entrySet())
-                    .flatMap(entry -> Mono.zip(Mono.just(entry.getKey()), convertResource(entry.getValue())))
+                    .flatMap(entry -> Mono
+                        .zip(Mono.just(entry.getKey()), convertResource(entry.getValue()))
+                        .onErrorResume(err -> Mono
+                            .error(() -> new BusinessException.NoStackTrace("error.load_attachment_failed",
+                                                                            500,
+                                                                            entry.getKey(),
+                                                                            err.getMessage())))
+                    )
                     .flatMap(tp2 -> Mono
                         .fromCallable(() -> {
                             //添加附件

diff --git a/...s-components/notify-component/notify-email/src/main/resources/i18n/messages_en.properties b/...s-components/notify-component/notify-email/src/main/resources/i18n/messages_en.properties
@@ -0,0 +1 @@
+error.load_attachment_failed=load attachment [{0}] failed:{1}
diff --git a/...s-components/notify-component/notify-email/src/main/resources/i18n/messages_zh.properties b/...s-components/notify-component/notify-email/src/main/resources/i18n/messages_zh.properties
@@ -0,0 +1 @@
+error.load_attachment_failed=\u52A0\u8F7D\u9644\u4EF6[{0}]\u5931\u8D25\uFF1A{1}