From 8a555eb191593edcc6d7126c47ffcd3007da33ad Mon Sep 17 00:00:00 2001
From: bleachtred <bleachtred@163.com>
Date: 星期五, 14 四月 2023 14:11:28 +0800
Subject: [PATCH] update 优化 去除多余的引用前缀&&消除serialVersionUID警告
---
ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailAccount.java | 4 +++-
ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java | 2 +-
ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailException.java | 5 ++++-
ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/Mail.java | 18 ++++++++----------
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/Mail.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/Mail.java
index 1b01d28..17459d3 100644
--- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/Mail.java
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/Mail.java
@@ -18,10 +18,7 @@
import jakarta.mail.internet.MimeUtility;
import jakarta.mail.util.ByteArrayDataSource;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
+import java.io.*;
import java.nio.charset.Charset;
import java.util.Date;
@@ -32,7 +29,8 @@
* @since 3.2.0
*/
public class Mail implements Builder<MimeMessage> {
- private static final long serialVersionUID = 1L;
+ @Serial
+ private static final long serialVersionUID = 1L;
/**
* 閭甯愭埛淇℃伅浠ュ強涓�浜涘鎴风閰嶇疆淇℃伅
@@ -261,7 +259,7 @@
bodyPart.setDataHandler(new DataHandler(attachment));
nameEncoded = attachment.getName();
if (this.mailAccount.isEncodefilename()) {
- nameEncoded = org.dromara.common.mail.utils.InternalMailUtil.encodeText(nameEncoded, charset);
+ nameEncoded = InternalMailUtil.encodeText(nameEncoded, charset);
}
// 鏅�氶檮浠舵枃浠跺悕
bodyPart.setFileName(nameEncoded);
@@ -423,7 +421,7 @@
// 鐢ㄦ埛鏈彁渚涘彂閫佹柟锛屽垯浠嶴ession涓嚜鍔ㄨ幏鍙�
msg.setFrom();
} else {
- msg.setFrom(org.dromara.common.mail.utils.InternalMailUtil.parseFirstAddress(from, charset));
+ msg.setFrom(InternalMailUtil.parseFirstAddress(from, charset));
}
// 鏍囬
msg.setSubject(this.title, (null == charset) ? null : charset.name());
@@ -432,14 +430,14 @@
// 鍐呭鍜岄檮浠�
msg.setContent(buildContent(charset));
// 鏀朵欢浜�
- msg.setRecipients(MimeMessage.RecipientType.TO, org.dromara.common.mail.utils.InternalMailUtil.parseAddressFromStrs(this.tos, charset));
+ msg.setRecipients(MimeMessage.RecipientType.TO, InternalMailUtil.parseAddressFromStrs(this.tos, charset));
// 鎶勯�佷汉
if (ArrayUtil.isNotEmpty(this.ccs)) {
- msg.setRecipients(MimeMessage.RecipientType.CC, org.dromara.common.mail.utils.InternalMailUtil.parseAddressFromStrs(this.ccs, charset));
+ msg.setRecipients(MimeMessage.RecipientType.CC, InternalMailUtil.parseAddressFromStrs(this.ccs, charset));
}
// 瀵嗛�佷汉
if (ArrayUtil.isNotEmpty(this.bccs)) {
- msg.setRecipients(MimeMessage.RecipientType.BCC, org.dromara.common.mail.utils.InternalMailUtil.parseAddressFromStrs(this.bccs, charset));
+ msg.setRecipients(MimeMessage.RecipientType.BCC, InternalMailUtil.parseAddressFromStrs(this.bccs, charset));
}
// 鍥炲鍦板潃(reply-to)
if (ArrayUtil.isNotEmpty(this.reply)) {
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailAccount.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailAccount.java
index 5492bd2..d2b9e2c 100644
--- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailAccount.java
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailAccount.java
@@ -5,6 +5,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.setting.Setting;
+import java.io.Serial;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.util.HashMap;
@@ -17,7 +18,8 @@
* @author Luxiaolei
*/
public class MailAccount implements Serializable {
- private static final long serialVersionUID = -6937313421815719204L;
+ @Serial
+ private static final long serialVersionUID = -6937313421815719204L;
private static final String MAIL_PROTOCOL = "mail.transport.protocol";
private static final String SMTP_HOST = "mail.smtp.host";
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailException.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailException.java
index 82e6509..ced09a2 100644
--- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailException.java
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailException.java
@@ -3,12 +3,15 @@
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.StrUtil;
+import java.io.Serial;
+
/**
* 閭欢寮傚父
* @author xiaoleilu
*/
public class MailException extends RuntimeException{
- private static final long serialVersionUID = 8247610319171014183L;
+ @Serial
+ private static final long serialVersionUID = 8247610319171014183L;
public MailException(Throwable e) {
super(ExceptionUtil.getMessage(e), e);
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java
index 023be86..0400700 100644
--- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java
@@ -413,7 +413,7 @@
*/
private static String send(MailAccount mailAccount, boolean useGlobalSession, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content,
Map<String, InputStream> imageMap, boolean isHtml, File... files) {
- final org.dromara.common.mail.utils.Mail mail = Mail.create(mailAccount).setUseGlobalSession(useGlobalSession);
+ final Mail mail = Mail.create(mailAccount).setUseGlobalSession(useGlobalSession);
// 鍙�夋妱閫佷汉
if (CollUtil.isNotEmpty(ccs)) {
--
Gitblit v1.9.3