diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java b/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java index 4f334aa..5e0e8ca 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java @@ -97,4 +97,5 @@ public class EncryptUtils { } return b2; } + } diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java b/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java index 7b8158b..e58d173 100644 --- a/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java +++ b/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java @@ -13,7 +13,8 @@ public class EncryptUtilsTest { public void testDesEncrypt() { try { - desEncrypt("baiye2022"); + System.out.println(desEncrypt("STfv4vubjusTJQBe")); + System.out.println(desDecrypt(desEncrypt("Bboy58456."))); assertEquals("7772841DC6099402", desEncrypt("123456")); } catch (Exception e) { e.printStackTrace(); diff --git a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java index aef0bcc..0085058 100644 --- a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java +++ b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-06-25T14:05:58+0800", - comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)" + date = "2024-09-29T16:51:33+0800", + comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_321 (Oracle Corporation)" ) @Component public class LogErrorMapperImpl implements LogErrorMapper { diff --git a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java index 3ace6c3..ed7cf82 100644 --- a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java +++ b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2024-06-25T14:05:58+0800", - comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)" + date = "2024-09-29T16:51:33+0800", + comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_321 (Oracle Corporation)" ) @Component public class LogSmallMapperImpl implements LogSmallMapper { diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/MailUtil.java b/eladmin-tools/src/main/java/me/zhengjie/utils/MailUtil.java index 81b90dc..ae5253b 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/utils/MailUtil.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/MailUtil.java @@ -61,7 +61,6 @@ public class MailUtil { } - /** * 创建一封复杂邮件(文本+图片+附件) */ @@ -191,7 +190,7 @@ public class MailUtil { Properties props = new Properties(); // 开启debug调试 - props.setProperty("mail.debug", "false"); + props.setProperty("mail.debug", "true"); // 发送服务器需要身份验证 props.setProperty("mail.smtp.auth", "true"); // 设置邮件服务器主机名 @@ -201,6 +200,7 @@ public class MailUtil { // 服务端口号 props.setProperty("mail.smtp.port", port); props.put("mail.smtp.starttls.enable", "true"); + props.put("mail.smtp.ssl.enable", "true"); // 设置环境信息 Session session = Session.getInstance(props); @@ -238,7 +238,7 @@ public class MailUtil { return true; } catch (Exception e) { - e.printStackTrace(); + log.error(e.getMessage()); return false; } }