From 44a796ed57e87a386cf212d6e750343faf9affdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 14 四月 2023 14:20:57 +0800
Subject: [PATCH] update 优化 邮件工具代码格式
---
ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/InternalMailUtil.java | 165 +++++++++++++++++++++++++++---------------------------
1 files changed, 83 insertions(+), 82 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/InternalMailUtil.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/InternalMailUtil.java
index ca1a498..b755e73 100644
--- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/InternalMailUtil.java
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/InternalMailUtil.java
@@ -13,95 +13,96 @@
/**
* 閭欢鍐呴儴宸ュ叿绫�
+ *
* @author looly
* @since 3.2.3
*/
public class InternalMailUtil {
- /**
- * 灏嗗涓瓧绗︿覆閭欢鍦板潃杞负{@link InternetAddress}鍒楄〃<br>
- * 鍗曚釜瀛楃涓插湴鍧�鍙互鏄涓湴鍧�鍚堝苟鐨勫瓧绗︿覆
- *
- * @param addrStrs 鍦板潃鏁扮粍
- * @param charset 缂栫爜锛堜富瑕佺敤浜庝腑鏂囩敤鎴峰悕鐨勭紪鐮侊級
- * @return 鍦板潃鏁扮粍
- * @since 4.0.3
- */
- public static InternetAddress[] parseAddressFromStrs(String[] addrStrs, Charset charset) {
- final List<InternetAddress> resultList = new ArrayList<>(addrStrs.length);
- InternetAddress[] addrs;
- for (String addrStr : addrStrs) {
- addrs = parseAddress(addrStr, charset);
- if (ArrayUtil.isNotEmpty(addrs)) {
- Collections.addAll(resultList, addrs);
- }
- }
- return resultList.toArray(new InternetAddress[0]);
- }
+ /**
+ * 灏嗗涓瓧绗︿覆閭欢鍦板潃杞负{@link InternetAddress}鍒楄〃<br>
+ * 鍗曚釜瀛楃涓插湴鍧�鍙互鏄涓湴鍧�鍚堝苟鐨勫瓧绗︿覆
+ *
+ * @param addrStrs 鍦板潃鏁扮粍
+ * @param charset 缂栫爜锛堜富瑕佺敤浜庝腑鏂囩敤鎴峰悕鐨勭紪鐮侊級
+ * @return 鍦板潃鏁扮粍
+ * @since 4.0.3
+ */
+ public static InternetAddress[] parseAddressFromStrs(String[] addrStrs, Charset charset) {
+ final List<InternetAddress> resultList = new ArrayList<>(addrStrs.length);
+ InternetAddress[] addrs;
+ for (String addrStr : addrStrs) {
+ addrs = parseAddress(addrStr, charset);
+ if (ArrayUtil.isNotEmpty(addrs)) {
+ Collections.addAll(resultList, addrs);
+ }
+ }
+ return resultList.toArray(new InternetAddress[0]);
+ }
- /**
- * 瑙ｆ瀽绗竴涓湴鍧�
- *
- * @param address 鍦板潃瀛楃涓�
- * @param charset 缂栫爜锛寋@code null}琛ㄧず浣跨敤绯荤粺灞炴�у畾涔夌殑缂栫爜鎴栫郴缁熺紪鐮�
- * @return 鍦板潃鍒楄〃
- */
- public static InternetAddress parseFirstAddress(String address, Charset charset) {
- final InternetAddress[] internetAddresses = parseAddress(address, charset);
- if (ArrayUtil.isEmpty(internetAddresses)) {
- try {
- return new InternetAddress(address);
- } catch (AddressException e) {
- throw new MailException(e);
- }
- }
- return internetAddresses[0];
- }
+ /**
+ * 瑙ｆ瀽绗竴涓湴鍧�
+ *
+ * @param address 鍦板潃瀛楃涓�
+ * @param charset 缂栫爜锛寋@code null}琛ㄧず浣跨敤绯荤粺灞炴�у畾涔夌殑缂栫爜鎴栫郴缁熺紪鐮�
+ * @return 鍦板潃鍒楄〃
+ */
+ public static InternetAddress parseFirstAddress(String address, Charset charset) {
+ final InternetAddress[] internetAddresses = parseAddress(address, charset);
+ if (ArrayUtil.isEmpty(internetAddresses)) {
+ try {
+ return new InternetAddress(address);
+ } catch (AddressException e) {
+ throw new MailException(e);
+ }
+ }
+ return internetAddresses[0];
+ }
- /**
- * 灏嗕竴涓湴鍧�瀛楃涓茶В鏋愪负澶氫釜鍦板潃<br>
- * 鍦板潃闂翠娇鐢�" "銆�","銆�";"鍒嗛殧
- *
- * @param address 鍦板潃瀛楃涓�
- * @param charset 缂栫爜锛寋@code null}琛ㄧず浣跨敤绯荤粺灞炴�у畾涔夌殑缂栫爜鎴栫郴缁熺紪鐮�
- * @return 鍦板潃鍒楄〃
- */
- public static InternetAddress[] parseAddress(String address, Charset charset) {
- InternetAddress[] addresses;
- try {
- addresses = InternetAddress.parse(address);
- } catch (AddressException e) {
- throw new MailException(e);
- }
- //缂栫爜鐢ㄦ埛鍚�
- if (ArrayUtil.isNotEmpty(addresses)) {
- final String charsetStr = null == charset ? null : charset.name();
- for (InternetAddress internetAddress : addresses) {
- try {
- internetAddress.setPersonal(internetAddress.getPersonal(), charsetStr);
- } catch (UnsupportedEncodingException e) {
- throw new MailException(e);
- }
- }
- }
+ /**
+ * 灏嗕竴涓湴鍧�瀛楃涓茶В鏋愪负澶氫釜鍦板潃<br>
+ * 鍦板潃闂翠娇鐢�" "銆�","銆�";"鍒嗛殧
+ *
+ * @param address 鍦板潃瀛楃涓�
+ * @param charset 缂栫爜锛寋@code null}琛ㄧず浣跨敤绯荤粺灞炴�у畾涔夌殑缂栫爜鎴栫郴缁熺紪鐮�
+ * @return 鍦板潃鍒楄〃
+ */
+ public static InternetAddress[] parseAddress(String address, Charset charset) {
+ InternetAddress[] addresses;
+ try {
+ addresses = InternetAddress.parse(address);
+ } catch (AddressException e) {
+ throw new MailException(e);
+ }
+ //缂栫爜鐢ㄦ埛鍚�
+ if (ArrayUtil.isNotEmpty(addresses)) {
+ final String charsetStr = null == charset ? null : charset.name();
+ for (InternetAddress internetAddress : addresses) {
+ try {
+ internetAddress.setPersonal(internetAddress.getPersonal(), charsetStr);
+ } catch (UnsupportedEncodingException e) {
+ throw new MailException(e);
+ }
+ }
+ }
- return addresses;
- }
+ return addresses;
+ }
- /**
- * 缂栫爜涓枃瀛楃<br>
- * 缂栫爜澶辫触杩斿洖鍘熷瓧绗︿覆
- *
- * @param text 琚紪鐮佺殑鏂囨湰
- * @param charset 缂栫爜
- * @return 缂栫爜鍚庣殑缁撴灉
- */
- public static String encodeText(String text, Charset charset) {
- try {
- return MimeUtility.encodeText(text, charset.name(), null);
- } catch (UnsupportedEncodingException e) {
- // ignore
- }
- return text;
- }
+ /**
+ * 缂栫爜涓枃瀛楃<br>
+ * 缂栫爜澶辫触杩斿洖鍘熷瓧绗︿覆
+ *
+ * @param text 琚紪鐮佺殑鏂囨湰
+ * @param charset 缂栫爜
+ * @return 缂栫爜鍚庣殑缁撴灉
+ */
+ public static String encodeText(String text, Charset charset) {
+ try {
+ return MimeUtility.encodeText(text, charset.name(), null);
+ } catch (UnsupportedEncodingException e) {
+ // ignore
+ }
+ return text;
+ }
}
--
Gitblit v1.9.3