lbqms.git - Gitblit

			@@ -5,20 +5,22 @@
			import cn.hutool.core.map.MapUtil;
			import cn.hutool.core.util.CharUtil;
			import cn.hutool.core.util.StrUtil;
			import org.dromara.common.core.utils.SpringUtils;
			import org.dromara.common.core.utils.StringUtils;
			import lombok.AccessLevel;
			import lombok.NoArgsConstructor;

			import cn.hutool.extra.mail.JakartaMail;
			import cn.hutool.extra.mail.JakartaUserPassAuthenticator;
			import cn.hutool.extra.mail.MailAccount;
			import jakarta.mail.Authenticator;
			import jakarta.mail.Session;
			import lombok.AccessLevel;
			import lombok.NoArgsConstructor;
			import org.dromara.common.core.utils.SpringUtils;
			import org.dromara.common.core.utils.StringUtils;

			import java.io.File;
			import java.io.InputStream;
			import java.util.Collection;
			import java.util.List;
			import java.util.Map;

			import java.util.Map.Entry;

			/**
			* 邮件工具类
			@@ -386,7 +388,7 @@
			public static Session getSession(MailAccount mailAccount, boolean isSingleton) {
			Authenticator authenticator = null;
			if (mailAccount.isAuth()) {
			authenticator = new UserPassAuthenticator(mailAccount.getUser(), mailAccount.getPass());
			authenticator = new JakartaUserPassAuthenticator(mailAccount.getUser(), mailAccount.getPass());
			}

			return isSingleton ? Session.getDefaultInstance(mailAccount.getSmtpProps(), authenticator) //
			@@ -413,7 +415,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 JakartaMail mail = JakartaMail.create(mailAccount).setUseGlobalSession(useGlobalSession);

			// 可选抄送人
			if (CollUtil.isNotEmpty(ccs)) {
			@@ -432,7 +434,7 @@

			// 图片
			if (MapUtil.isNotEmpty(imageMap)) {
			for (Map.Entry<String, InputStream> entry : imageMap.entrySet()) {
			for (Entry<String, InputStream> entry : imageMap.entrySet()) {
			mail.addImage(entry.getKey(), entry.getValue());
			// 关闭流
			IoUtil.close(entry.getValue());
			@@ -464,5 +466,4 @@
			return result;
			}
			// ------------------------------------------------------------------------------------------------------------------------ Private method end

			}