diff --git a/UPDATE.md b/UPDATE.md index 1ea6af37..382db90f 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -1,3 +1,3 @@ -优化通知测试 +修复了server酱3的问题 @Jisxu -通知webhook支持更多参数 \ No newline at end of file +邮箱通知也支持发送图片了 \ No newline at end of file diff --git a/pom.xml b/pom.xml index ea9a19f5..bb5227f5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ ani.rss ani-rss - 1.1.155 + 1.1.156 11 diff --git a/src/main/java/ani/rss/entity/Config.java b/src/main/java/ani/rss/entity/Config.java index 4e31b011..a9e76447 100644 --- a/src/main/java/ani/rss/entity/Config.java +++ b/src/main/java/ani/rss/entity/Config.java @@ -193,6 +193,11 @@ public class Config implements Serializable { */ private String mailAddressee; + /** + * mail 发送图片 + */ + private Boolean mailImage; + /** * 登录信息 */ diff --git a/src/main/java/ani/rss/msg/Mail.java b/src/main/java/ani/rss/msg/Mail.java index c43a8281..51d95483 100644 --- a/src/main/java/ani/rss/msg/Mail.java +++ b/src/main/java/ani/rss/msg/Mail.java @@ -46,13 +46,16 @@ public Boolean send(Config config, Ani ani, String text, MessageEnum messageEnum messageBody = messageBody.replace("\n", "
"); - String image = "https://docs.wushuo.top/image/null.png"; + Boolean mailImage = config.getMailImage(); + if (mailImage) { + String image = "https://docs.wushuo.top/image/null.png"; - if (Objects.nonNull(ani)) { - image = ani.getImage(); - } + if (Objects.nonNull(ani)) { + image = ani.getImage(); + } - messageBody += StrFormatter.format("
", image); + messageBody += StrFormatter.format("
", image); + } try { MailUtil.send(mailAccount, List.of(mailAddressee), text, messageBody, true); diff --git a/src/main/java/ani/rss/util/ConfigUtil.java b/src/main/java/ani/rss/util/ConfigUtil.java index 74757756..19a3f353 100644 --- a/src/main/java/ani/rss/util/ConfigUtil.java +++ b/src/main/java/ani/rss/util/ConfigUtil.java @@ -4,6 +4,7 @@ import ani.rss.entity.Login; import ani.rss.entity.MyMailAccount; import ani.rss.enums.MessageEnum; +import ani.rss.enums.ServerChanTypeEnum; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.io.FileUtil; @@ -65,6 +66,7 @@ public class ConfigUtil { .setDownloadCount(0) .setMail(false) .setMailAddressee("") + .setMailImage(true) .setMailAccount( new MyMailAccount() .setHost("") @@ -113,7 +115,7 @@ public class ConfigUtil { )) .setVerifyLoginIp(true) .setServerChan(false) - .setServerChanType("") + .setServerChanType(ServerChanTypeEnum.SERVER_CHAN.getType()) .setServerChanSendKey("") .setServerChan3ApiUrl("") .setSystemMsg(false) diff --git a/ui/src/config/Message.vue b/ui/src/config/Message.vue index 54d11f74..a2bd235c 100644 --- a/ui/src/config/Message.vue +++ b/ui/src/config/Message.vue @@ -102,6 +102,9 @@ + + +
@@ -127,11 +130,10 @@ - + - - +
diff --git a/ui/src/home/Config.vue b/ui/src/home/Config.vue index 44b719d2..ab91bd43 100644 --- a/ui/src/home/Config.vue +++ b/ui/src/home/Config.vue @@ -101,6 +101,7 @@ const config = ref({ 'pass': '', 'sslEnable': false }, + 'mailImage': true, 'login': { 'username': '', 'password': ''