reghao преди 6 месеца
родител
ревизия
3044385e2b

+ 0 - 6
mgr/pom.xml

@@ -152,12 +152,6 @@
             <version>0.1.55</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

+ 0 - 11
mgr/src/main/java/cn/reghao/devops/mgr/admin/service/NotifyService.java

@@ -3,7 +3,6 @@ package cn.reghao.devops.mgr.admin.service;
 import cn.reghao.devops.mgr.admin.db.repository.WebhookRepository;
 import cn.reghao.devops.mgr.admin.service.notifier.ding.DingMsg;
 import cn.reghao.devops.mgr.admin.service.notifier.ding.DingNotify;
-import cn.reghao.devops.mgr.admin.service.notifier.email.EmailMsg;
 import cn.reghao.devops.mgr.admin.model.vo.NotifyType;
 import cn.reghao.devops.mgr.admin.model.po.Webhook;
 import cn.reghao.devops.mgr.admin.service.notifier.Notify;
@@ -42,13 +41,6 @@ public class NotifyService {
                 DingMsg dingMsg = (DingMsg) msg;
                 threadPool.execute(new NotifyTask<>(sysMessageService, dingNotify, receiver, dingMsg));
             }
-        } else if (msg instanceof EmailMsg) {
-            /*Webhook notifyReceiver = webhookRepository.findByTypeAndSetdefaultIsTrue(NotifyType.email.getName());
-            if (notifyReceiver != null) {
-                receiver = notifyReceiver.getUrl();
-                EmailMsg emailMsg = (EmailMsg) msg;
-                threadPool.execute(new NotifyTask<>(sysMessageService, emailNotify, receiver, emailMsg));
-            }*/
         }
     }
 
@@ -56,9 +48,6 @@ public class NotifyService {
         if (msg instanceof DingMsg) {
             DingMsg dingMsg = (DingMsg) msg;
             threadPool.execute(new NotifyTask<>(sysMessageService, dingNotify, receiver, dingMsg));
-        } else if (msg instanceof EmailMsg) {
-            /*EmailMsg emailMsg = (EmailMsg) msg;
-            threadPool.execute(new NotifyTask<>(sysMessageService, emailNotify, receiver, emailMsg));*/
         }
     }
     /**

+ 0 - 17
mgr/src/main/java/cn/reghao/devops/mgr/admin/service/notifier/email/EmailMsg.java

@@ -1,17 +0,0 @@
-package cn.reghao.devops.mgr.admin.service.notifier.email;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * email 消息格式
- *
- * @author reghao
- * @date 2021-02-25 19:37:00
- */
-@AllArgsConstructor
-@Data
-public class EmailMsg {
-    private String subject;
-    private String content;
-}

+ 0 - 67
mgr/src/main/java/cn/reghao/devops/mgr/admin/service/notifier/email/EmailNotify.java

@@ -1,67 +0,0 @@
-package cn.reghao.devops.mgr.admin.service.notifier.email;
-
-import cn.reghao.devops.mgr.admin.service.notifier.Notify;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.mail.Address;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.util.Properties;
-
-/**
- * 邮件通知
- *
- * @author reghao
- * @date 2021-02-25 19:23:16
- */
-@Slf4j
-public class EmailNotify implements Notify<EmailMsg> {
-    @Override
-    public void send(String receiver, EmailMsg msg) throws Exception {
-        String myEmail = "";
-        String password = "";
-        String personal = "";
-        String smtp = "";
-
-        Properties props = new Properties();
-        props.setProperty("mail.transport.protocol", "smtp");
-        props.setProperty("mail.smtp.host", smtp);
-        props.setProperty("mail.smtp.auth", "true");
-        Session session = Session.getInstance(props);
-
-        InternetAddress from = new InternetAddress(myEmail, personal, "UTF-8");
-        InternetAddress[] dest = getDestinations(receiver);
-        MimeMessage message = getMessage(session, from, dest, msg);
-
-        Transport transport = session.getTransport();
-        transport.connect(myEmail, password);
-        transport.sendMessage(message, message.getAllRecipients());
-        transport.close();
-    }
-
-    private InternetAddress[] getDestinations(String receiver) throws UnsupportedEncodingException {
-        String[] strs = receiver.split(",");
-        int len = strs.length;
-        InternetAddress[] addresses = new InternetAddress[len];
-        for (int i = 0; i < len; i++) {
-            addresses[i] = new InternetAddress(strs[i], "", "UTF-8");
-        }
-        return addresses;
-    }
-
-    private MimeMessage getMessage(Session session, Address from, InternetAddress[] dest, EmailMsg msg)
-            throws MessagingException {
-        MimeMessage message = new MimeMessage(session);
-        message.setFrom(from);
-        message.setRecipients(MimeMessage.RecipientType.TO, dest);
-        message.setSubject(msg.getSubject(), "UTF-8");
-        message.setContent(msg.getContent(), "text/html;charset=UTF-8");
-        message.setSentDate(new Date());
-        return message;
-    }
-}