ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Looly 2019-11-22 07:58:48 +08:00
parent c4740a2c6b
commit de80af155c
4 changed files with 194 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -8,9 +8,11 @@
### 新特性 ### 新特性
* 【core 】 解决NumberUtil导致的ambiguous问题（issue#630@Github） * 【core 】 解决NumberUtil导致的ambiguous问题（issue#630@Github）
* 【core 】 BeanUtil.isEmpty()忽略字段支持，增加isNotEmpty（issue#629@Github） * 【core 】 BeanUtil.isEmpty()忽略字段支持，增加isNotEmpty（issue#629@Github）
* 【extra 】 邮件发送后获取message-id（issue#I15FKR@Gitee）
### Bug修复 ### Bug修复
* 【extra】 修复SFTP.upload上传失败的问题 * 【extra】 修复SFTP.upload上传失败的问题
* 【db】 修复findLike匹配错误问题
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

13
hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java
View File

@ -349,10 +349,10 @@ public class Mail {
/** /**
* 发送 * 发送
* *
* @return this * @return message-id
* @throws MailException 邮件发送异常 * @throws MailException 邮件发送异常
*/ */
public Mail send() throws MailException { public String send() throws MailException {
try { try {
return doSend(); return doSend();
} catch (MessagingException e) { } catch (MessagingException e) {
@ -365,12 +365,13 @@ public class Mail {
/** /**
* 执行发送 * 执行发送
* *
* @return this * @return message-id
* @throws MessagingException 发送异常 * @throws MessagingException 发送异常
*/ */
private Mail doSend() throws MessagingException { private String doSend() throws MessagingException {
Transport.send(buildMsg()); final MimeMessage mimeMessage = buildMsg();
return this; Transport.send(mimeMessage);
return mimeMessage.getMessageID();
} }
/** /**

112
hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java
View File

@ -27,10 +27,11 @@ public class MailUtil {
* @param subject 标题 * @param subject 标题
* @param content 正文 * @param content 正文
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 3.2.0 * @since 3.2.0
*/ */
public static void sendText(String to, String subject, String content, File... files) { public static String sendText(String to, String subject, String content, File... files) {
send(to, subject, content, false, files); return send(to, subject, content, false, files);
} }
/** /**
@ -41,10 +42,11 @@ public class MailUtil {
* @param subject 标题 * @param subject 标题
* @param content 正文 * @param content 正文
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 3.2.0 * @since 3.2.0
*/ */
public static void sendHtml(String to, String subject, String content, File... files) { public static String sendHtml(String to, String subject, String content, File... files) {
send(to, subject, content, true, files); return send(to, subject, content, true, files);
} }
/** /**
@ -56,9 +58,10 @@ public class MailUtil {
* @param content 正文 * @param content 正文
* @param isHtml 是否为HTML * @param isHtml 是否为HTML
* @param files 附件列表 * @param files 附件列表
* @return message-id
*/ */
public static void send(String to, String subject, String content, boolean isHtml, File... files) { public static String send(String to, String subject, String content, boolean isHtml, File... files) {
send(splitAddress(to), subject, content, isHtml, files); return send(splitAddress(to), subject, content, isHtml, files);
} }
/** /**
@ -72,10 +75,11 @@ public class MailUtil {
* @param content 正文 * @param content 正文
* @param isHtml 是否为HTML * @param isHtml 是否为HTML
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 4.0.3 * @since 4.0.3
*/ */
public static void send(String to, String cc, String bcc, String subject, String content, boolean isHtml, File... files) { public static String send(String to, String cc, String bcc, String subject, String content, boolean isHtml, File... files) {
send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, isHtml, files); return send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, isHtml, files);
} }
/** /**
@ -85,9 +89,10 @@ public class MailUtil {
* @param subject 标题 * @param subject 标题
* @param content 正文 * @param content 正文
* @param files 附件列表 * @param files 附件列表
* @return message-id
*/ */
public static void sendText(Collection<String> tos, String subject, String content, File... files) { public static String sendText(Collection<String> tos, String subject, String content, File... files) {
send(tos, subject, content, false, files); return send(tos, subject, content, false, files);
} }
/** /**
@ -97,10 +102,11 @@ public class MailUtil {
* @param subject 标题 * @param subject 标题
* @param content 正文 * @param content 正文
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 3.2.0 * @since 3.2.0
*/ */
public static void sendHtml(Collection<String> tos, String subject, String content, File... files) { public static String sendHtml(Collection<String> tos, String subject, String content, File... files) {
send(tos, subject, content, true, files); return send(tos, subject, content, true, files);
} }
/** /**
@ -111,9 +117,10 @@ public class MailUtil {
* @param content 正文 * @param content 正文
* @param isHtml 是否为HTML * @param isHtml 是否为HTML
* @param files 附件列表 * @param files 附件列表
* @return message-id
*/ */
public static void send(Collection<String> tos, String subject, String content, boolean isHtml, File... files) { public static String send(Collection<String> tos, String subject, String content, boolean isHtml, File... files) {
send(tos, null, null, subject, content, isHtml, files); return send(tos, null, null, subject, content, isHtml, files);
} }
/** /**
@ -126,13 +133,15 @@ public class MailUtil {
* @param content 正文 * @param content 正文
* @param isHtml 是否为HTML * @param isHtml 是否为HTML
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 4.0.3 * @since 4.0.3
*/ */
public static void send(Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, boolean isHtml, File... files) { public static String send(Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, boolean isHtml, File... files) {
send(GlobalMailAccount.INSTANCE.getAccount(), true, tos, ccs, bccs, subject, content, null, isHtml, files); return send(GlobalMailAccount.INSTANCE.getAccount(), true, tos, ccs, bccs, subject, content, null, isHtml, files);
} }
// ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount // ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount
/** /**
* 发送邮件给多人 * 发送邮件给多人
* *
@ -142,10 +151,11 @@ public class MailUtil {
* @param content 正文 * @param content 正文
* @param isHtml 是否为HTML格式 * @param isHtml 是否为HTML格式
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 3.2.0 * @since 3.2.0
*/ */
public static void send(MailAccount mailAccount, String to, String subject, String content, boolean isHtml, File... files) { public static String send(MailAccount mailAccount, String to, String subject, String content, boolean isHtml, File... files) {
send(mailAccount, splitAddress(to), subject, content, isHtml, files); return send(mailAccount, splitAddress(to), subject, content, isHtml, files);
} }
/** /**
@ -157,9 +167,10 @@ public class MailUtil {
* @param content 正文 * @param content 正文
* @param isHtml 是否为HTML格式 * @param isHtml 是否为HTML格式
* @param files 附件列表 * @param files 附件列表
* @return message-id
*/ */
public static void send(MailAccount mailAccount, Collection<String> tos, String subject, String content, boolean isHtml, File... files) { public static String send(MailAccount mailAccount, Collection<String> tos, String subject, String content, boolean isHtml, File... files) {
send(mailAccount, tos, null, null, subject, content, isHtml, files); return send(mailAccount, tos, null, null, subject, content, isHtml, files);
} }
/** /**
@ -173,10 +184,11 @@ public class MailUtil {
* @param content 正文 * @param content 正文
* @param isHtml 是否为HTML格式 * @param isHtml 是否为HTML格式
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 4.0.3 * @since 4.0.3
*/ */
public static void send(MailAccount mailAccount, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, boolean isHtml, File... files) { public static String send(MailAccount mailAccount, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, boolean isHtml, File... files) {
send(mailAccount, false, tos, ccs, bccs, subject, content, null, isHtml, files); return send(mailAccount, false, tos, ccs, bccs, subject, content, null, isHtml, files);
} }
/** /**
@ -186,12 +198,13 @@ public class MailUtil {
* @param to 收件人 * @param to 收件人
* @param subject 标题 * @param subject 标题
* @param content 正文 * @param content 正文
* @param files 附件列表
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param files 附件列表
* @return message-id
* @since 3.2.0 * @since 3.2.0
*/ */
public static void sendHtml(String to, String subject, String content, Map<String, InputStream> imageMap, File... files) { public static String sendHtml(String to, String subject, String content, Map<String, InputStream> imageMap, File... files) {
send(to, subject, content, imageMap, true, files); return send(to, subject, content, imageMap, true, files);
} }
/** /**
@ -204,9 +217,10 @@ public class MailUtil {
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param isHtml 是否为HTML * @param isHtml 是否为HTML
* @param files 附件列表 * @param files 附件列表
* @return message-id
*/ */
public static void send(String to, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) { public static String send(String to, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
send(splitAddress(to), subject, content, imageMap, isHtml, files); return send(splitAddress(to), subject, content, imageMap, isHtml, files);
} }
/** /**
@ -221,10 +235,11 @@ public class MailUtil {
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param isHtml 是否为HTML * @param isHtml 是否为HTML
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 4.0.3 * @since 4.0.3
*/ */
public static void send(String to, String cc, String bcc, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) { public static String send(String to, String cc, String bcc, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, imageMap, isHtml, files); return send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, imageMap, isHtml, files);
} }
/** /**
@ -235,10 +250,11 @@ public class MailUtil {
* @param content 正文 * @param content 正文
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 3.2.0 * @since 3.2.0
*/ */
public static void sendHtml(Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, File... files) { public static String sendHtml(Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, File... files) {
send(tos, subject, content, imageMap, true, files); return send(tos, subject, content, imageMap, true, files);
} }
/** /**
@ -250,9 +266,10 @@ public class MailUtil {
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param isHtml 是否为HTML * @param isHtml 是否为HTML
* @param files 附件列表 * @param files 附件列表
* @return message-id
*/ */
public static void send(Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) { public static String send(Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
send(tos, null, null, subject, content, imageMap, isHtml, files); return send(tos, null, null, subject, content, imageMap, isHtml, files);
} }
/** /**
@ -266,13 +283,15 @@ public class MailUtil {
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param isHtml 是否为HTML * @param isHtml 是否为HTML
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 4.0.3 * @since 4.0.3
*/ */
public static void send(Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) { public static String send(Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
send(GlobalMailAccount.INSTANCE.getAccount(), true, tos, ccs, bccs, subject, content, imageMap, isHtml, files); return send(GlobalMailAccount.INSTANCE.getAccount(), true, tos, ccs, bccs, subject, content, imageMap, isHtml, files);
} }
// ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount // ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount
/** /**
* 发送邮件给多人 * 发送邮件给多人
* *
@ -283,10 +302,11 @@ public class MailUtil {
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param isHtml 是否为HTML格式 * @param isHtml 是否为HTML格式
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 3.2.0 * @since 3.2.0
*/ */
public static void send(MailAccount mailAccount, String to, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) { public static String send(MailAccount mailAccount, String to, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
send(mailAccount, splitAddress(to), subject, content, imageMap, isHtml, files); return send(mailAccount, splitAddress(to), subject, content, imageMap, isHtml, files);
} }
/** /**
@ -299,10 +319,11 @@ public class MailUtil {
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param isHtml 是否为HTML格式 * @param isHtml 是否为HTML格式
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 4.6.3 * @since 4.6.3
*/ */
public static void send(MailAccount mailAccount, Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) { public static String send(MailAccount mailAccount, Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
send(mailAccount, tos, null, null, subject, content, imageMap, isHtml, files); return send(mailAccount, tos, null, null, subject, content, imageMap, isHtml, files);
} }
/** /**
@ -317,14 +338,16 @@ public class MailUtil {
* @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
* @param isHtml 是否为HTML格式 * @param isHtml 是否为HTML格式
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 4.6.3 * @since 4.6.3
*/ */
public static void send(MailAccount mailAccount, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, Map<String, InputStream> imageMap, public static String send(MailAccount mailAccount, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, Map<String, InputStream> imageMap,
boolean isHtml, File... files) { boolean isHtml, File... files) {
send(mailAccount, false, tos, ccs, bccs, subject, content, imageMap, isHtml, files); return send(mailAccount, false, tos, ccs, bccs, subject, content, imageMap, isHtml, files);
} }
// ------------------------------------------------------------------------------------------------------------------------ Private method start // ------------------------------------------------------------------------------------------------------------------------ Private method start
/** /**
* 发送邮件给多人 * 发送邮件给多人
* *
@ -338,9 +361,10 @@ public class MailUtil {
* @param imageMap 图片与占位符，占位符格式为cid:${cid} * @param imageMap 图片与占位符，占位符格式为cid:${cid}
* @param isHtml 是否为HTML格式 * @param isHtml 是否为HTML格式
* @param files 附件列表 * @param files 附件列表
* @return message-id
* @since 4.6.3 * @since 4.6.3
*/ */
private static void send(MailAccount mailAccount, boolean useGlobalSession, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, 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) { Map<String, InputStream> imageMap, boolean isHtml, File... files) {
final Mail mail = Mail.create(mailAccount).setUseGlobalSession(useGlobalSession); final Mail mail = Mail.create(mailAccount).setUseGlobalSession(useGlobalSession);
@ -360,7 +384,7 @@ public class MailUtil {
mail.setFiles(files); mail.setFiles(files);
// 图片 // 图片
if(MapUtil.isNotEmpty(imageMap)) { if (MapUtil.isNotEmpty(imageMap)) {
for (Entry<String, InputStream> entry : imageMap.entrySet()) { for (Entry<String, InputStream> entry : imageMap.entrySet()) {
mail.addImage(entry.getKey(), entry.getValue()); mail.addImage(entry.getKey(), entry.getValue());
// 关闭流 // 关闭流
@ -368,7 +392,7 @@ public class MailUtil {
} }
} }
mail.send(); return mail.send();
} }
/** /**

2
hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java
View File

@ -40,7 +40,7 @@ public class MailTest {
} }
@Test @Test
@Ignore // @Ignore
public void sendHtmlTest() { public void sendHtmlTest() {
MailUtil.send("hutool@foxmail.com", "测试", "<h1>邮件来自Hutool测试</h1>", true); MailUtil.send("hutool@foxmail.com", "测试", "<h1>邮件来自Hutool测试</h1>", true);
} }