From 19fba9ef80d6dec0c5e5005ae49b14d48c1a3280 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Sat, 7 Oct 2023 15:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/zhengjie/service/mapstruct/LogErrorMapperImpl.java | 2 +- .../me/zhengjie/service/mapstruct/LogSmallMapperImpl.java | 2 +- .../dmpMonitor/service/impl/StatisticsDmpServiceImpl.java | 2 +- eladmin-system/src/test/java/me/zhengjie/SimpleTest.java | 6 ++++-- .../java/me/zhengjie/service/impl/EmailServiceImpl.java | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) 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 6a3538b..29c1da9 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,7 +9,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-08-09T18:29:07+0800", + date = "2023-09-27T14:06:43+0800", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)" ) @Component 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 4f19cfb..87db716 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,7 +9,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-08-09T18:29:07+0800", + date = "2023-09-27T14:06:43+0800", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)" ) @Component diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/dmpMonitor/service/impl/StatisticsDmpServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/dmpMonitor/service/impl/StatisticsDmpServiceImpl.java index 967a9bc..4157bed 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/dmpMonitor/service/impl/StatisticsDmpServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/dmpMonitor/service/impl/StatisticsDmpServiceImpl.java @@ -86,8 +86,8 @@ public class StatisticsDmpServiceImpl implements StatisticsDmpService { List list = new ArrayList<>(); list.add(conditionDto.getMail()); emailVo.setTos(list); - emailVo.setSubject("一次性短链"); emailVo.setContent(link); + emailVo.setSubject("一次性短链".concat(StrUtil.DASHED).concat((conditionDto.getQueryType() == 1 ? "方式一" : "方式二"))); emailService.outlookMail(emailVo, emailService.find()); } diff --git a/eladmin-system/src/test/java/me/zhengjie/SimpleTest.java b/eladmin-system/src/test/java/me/zhengjie/SimpleTest.java index f6f62da..0a74935 100644 --- a/eladmin-system/src/test/java/me/zhengjie/SimpleTest.java +++ b/eladmin-system/src/test/java/me/zhengjie/SimpleTest.java @@ -182,12 +182,14 @@ public class SimpleTest { public static void main(String[] args) { - List strings = ToolExcelUtils.excelParseListByUrl("F:\\新建文件夹\\电销名单\\123456\\123123\\chenlei1\\萧山\\恒园公寓（萧山经济开发区）1266 (1).xlsx"); + int length = "5a8913474914b8878c9b035d7e540be0".length(); + System.out.println(length); + /* List strings = ToolExcelUtils.excelParseListByUrl("F:\\新建文件夹\\电销名单\\123456\\123123\\chenlei1\\萧山\\恒园公寓（萧山经济开发区）1266 (1).xlsx"); for (String string : strings) { System.out.println(string); } - +*/ } diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java index 9b3e38a..f213266 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java @@ -116,7 +116,7 @@ public class EmailServiceImpl implements EmailService { while (count < 3) { boolean result = MailUtil.sendEmail(emailConfig.getFromUser(), EncryptUtils.desDecrypt(emailConfig.getPass()), - emailConfig.getHost(), emailConfig.getPort(), toAddress, "一次性短链", emailVo.getContent()); + emailConfig.getHost(), emailConfig.getPort(), toAddress, emailVo.getSubject(), emailVo.getContent()); log.info("===================== send mail result as {} =====================", result); if (result) { break;