新增发送邮件功能

pom.xml

@@ -77,6 +77,11 @@
             <version>1.18.6</version>
         </dependency>
         <!-- 封装实体依赖 -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.11.0</version>
+        </dependency>
 
     </dependencies>
     <build>

src/main/java/com/foc/DbSoundsMonitorTask.java

@@ -2,7 +2,9 @@ package com.foc;
 
 import com.alibaba.fastjson.JSON;
 import com.foc.entity.AccessInfo;
+import com.foc.entity.EmailResult;
 import com.foc.entity.SmsResult;
+import com.foc.service.Email;
 import com.foc.service.Sms;
 import com.foc.service.SoundMonitorService;
 import com.foc.util.PropertiesUtils;
@@ -52,12 +54,22 @@ public class DbSoundsMonitorTask {
             AccessInfo accessInfo = new AccessInfo();
             accessInfo.setAicc(aicc);
             accessInfo.setAicp(aicp);
+            //发送短信
             String result = Sms.sendSms(accessInfo, properties.getProperty("mobile"), "预警：智能首航录音记录显示异常，请处理。");
+            //发送邮件
+            String emailResult = Email.sendEmail("预警","智能首航录音记录显示异常，请处理。");
+            EmailResult emailResult1 = JSON.parseObject(emailResult,EmailResult.class);
+            if (emailResult1.getResult().getResultCode().equals(resultCode)){
+                log.info("邮件发送成功,Time："+ new Date() +"result："+result);
+            }else {
+                log.info("邮件发送失败,Time："+ new Date() +"result："+result);
+            }
+
             SmsResult rootEntity = JSON.parseObject(result, SmsResult.class);
             if (rootEntity.getResult().getResultCode().equals(resultCode)){
-                log.info("发送成功,Time："+ new Date() +"result："+result);
+                log.info("短信发送成功,Time："+ new Date() +"result："+result);
             }else {
-                log.info("发送失败,Time："+ new Date() +"result："+result);
+                log.info("短信发送失败,Time："+ new Date() +"result："+result);
             }
         }else {
             log.info("没有异常！" );

src/main/java/com/foc/entity/EmailDate.java

+package com.foc.entity;
+
+import lombok.Data;
+
+/**
+ * @author zangtao
+ * @create 2019 - 05 -08 17:11
+ */
+@Data
+public class EmailDate {
+
+    private String data;
+}

src/main/java/com/foc/entity/EmailMsg.java

+package com.foc.entity;
+
+import lombok.Data;
+
+/**
+ * @author zangtao
+ * @create 2019 - 05 -08 17:10
+ */
+@Data
+public class EmailMsg {
+
+    private String message;
+
+    private String viewMessage;
+
+    private String resultCode;
+}

src/main/java/com/foc/entity/EmailResult.java

+package com.foc.entity;
+
+import lombok.Data;
+
+/**
+ * 发送邮件返回信息
+ *
+ * @author zangtao
+ * @create 2019 - 05 -08 17:09
+ */
+@Data
+public class EmailResult {
+
+    private EmailMsg result;
+
+    private EmailDate date;
+}

src/main/java/com/foc/service/Email.java

 package com.foc.service;
 
+import com.foc.util.HttpClientUtils;
 import com.foc.util.PropertiesUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.log4j.Log4j2;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.Properties;
 
 /**
@@ -16,19 +14,17 @@ import java.util.Properties;
  * @author zangtao
  * @create 2019 - 04 -11 16:25
  */
+@Log4j2
 public class Email {
 
-    private static final Logger logger = LoggerFactory.getLogger(Email.class);
-
     /**
      * 发送邮件
      *
-     * @param toEmail 收件人邮箱
      * @param subject 主题
      * @param body 正文
      * @return
      */
-    public static String sendEmail(String toEmail , String subject , String body ){
+    public static String sendEmail(String subject , String body ){
 
         //读取配置文件
         Properties properties = PropertiesUtils.getProperties();
@@ -40,35 +36,31 @@ public class Email {
         String fromEmail = properties.getProperty("fromEmail");
 
         //发件人的内网账号
-        String UserName = properties.getProperty("UserName");
+        String fromName = properties.getProperty("fromName");
 
         //发件人的密码
-        String UserPwd = properties.getProperty("UserPwd");
+        String fromPasswd = properties.getProperty("fromPasswd");
 
-        HttpClient httpClient = HttpClients.createDefault();
+        //收件人
+        String toEmail = properties.getProperty("toEmail");
 
-        try {
-            HttpPost httpPost = new HttpPost("https://dsp.jdair.net/flightinterface/uss/json/email/sendEmail.json" + "?ai.cc=5&ai.cc=1&ai.cp=10.68.26.52"
-                    + "&fromEmail=" + fromEmail + "&fromPasswd=" + UserPwd
-            + "&toEmail=" + toEmail + "&subject=" + subject
-                    + "&fromName=sdhkyxglzx" + "&content=" + body);
-            HttpResponse response = httpClient.execute(httpPost);
-            logger.info(response.toString());
-            return response.getEntity().toString();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
+        String aict = properties.getProperty("aict");
 
-        return null;
-
-    }
+        String aicc = properties.getProperty("aicc");
 
-    public static void main(String[] args) {
+        String aicp = properties.getProperty("aicp");
 
-        System.out.println(sendEmail("906577196@qq.com","测试测试","你好啊啊啊啊啊"));
+        String result = null;
+        try {
+             result = HttpClientUtils.doPost(emailUrl + "?ai.cc="+ aicc + "&ai.ct=" + aict + "&ai.cp="+ aicp
+                    + "&fromEmail=" + fromEmail + "&fromPasswd=" + fromPasswd
+                    + "&toEmail=" + toEmail + "&subject=" + URLEncoder.encode(subject,"UTF-8")
+                    + "&fromName="+ fromName + "&content=" + URLEncoder.encode(body,"UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
 
+        return result;
     }
 
-
-
 }

src/main/java/com/foc/service/Sms.java

 package com.foc.service;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.foc.entity.AccessInfo;
-import com.foc.entity.SmsResult;
 import com.foc.util.HttpClientUtils;
 import com.foc.util.PropertiesUtils;
-import lombok.extern.log4j.Log4j;
 
-import java.util.Date;
 import java.util.Properties;
 
 
@@ -18,7 +13,6 @@ import java.util.Properties;
  * @author zangtao
  * @create 2019 - 04 -11 15:35
  */
-@Log4j
 public class Sms {
 
     /**
@@ -33,11 +27,8 @@ public class Sms {
         //读取配置文件
         Properties properties = PropertiesUtils.getProperties();
         String smsUrl = properties.getProperty("smsUrl");
-        String result;
-
-        result = HttpClientUtils.doGet(smsUrl + "?ai.cp=" + accessInfo.getAicp() + "&ai.cc=" + accessInfo.getAicc()
+        return HttpClientUtils.doGet(smsUrl + "?ai.cp=" + accessInfo.getAicp() + "&ai.cc=" + accessInfo.getAicc()
                     + "&mobile=" + mobile + "&msg=" + msg );
-        return result;
     }
 
 }

src/main/resources/global.properties

@@ -3,11 +3,11 @@ smsUrl=http://user.jdair.net/ussinterface/uss/json/mobile/messSend.json
 #\u90AE\u4EF6\u5730\u5740
 emailUrl=https://dsp.jdair.net/flightinterface/uss/json/email/sendEmail.json
 #\u90AE\u4EF6\u53D1\u4EF6\u90AE\u7BB1
-fromEmail=sdhkyxglzx@hnair.com
+fromEmail=sdhkxxaq@hnair.com
 #\u7528\u6237
 UserName=sdhkyxglzx
 #\u5BC6\u7801
-UserPwd=075.wxp
+fromPasswd=xxaq1@jdair.net
 #\u624B\u673A
 mobile=13222650486
 #\u9996\u822A\u7535\u8BDD
@@ -15,4 +15,10 @@ mobile=13222650486
 interval=20
 aicc=5
 aicp=10.68.26.52
-resultCode=1000
+resultCode=1000
\ No newline at end of file
+#\u90AE\u4EF6
+aict=1
+#\u6536\u4EF6\u4EBA
+#toEmail=
+toEmail=zangtao@bbdtek.com
+fromName=sdhkxxaq
\ No newline at end of file

src/main/resources/log4j2.xml

@@ -15,7 +15,7 @@
     <loggers>
         <root level="DEBUG">
             <appender-ref ref="Console"/>
-            <!--<appender-ref ref="RollingFile"/>-->
+            <appender-ref ref="RollingFile"/>
         </root>
     </loggers>
 </configuration>
\ No newline at end of file