总队邮件优化

pom.xml

@@ -54,13 +54,13 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.shanghaigeography</groupId>
-            <artifactId>Infrastructure</artifactId>
-            <version>1.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/Infrastructure-1.1-SNAPSHOT.jar</systemPath>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.shanghaigeography</groupId>-->
+<!--            <artifactId>Infrastructure</artifactId>-->
+<!--            <version>1.1-SNAPSHOT</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${project.basedir}/libs/Infrastructure-1.1-SNAPSHOT.jar</systemPath>-->
+<!--        </dependency>-->
         <!--数据库连接驱动 连接配置修改时间-->
         <!--模板引擎-->
         <dependency>
@@ -83,13 +83,6 @@
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.4.0</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/libs/ojdbc6.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -181,8 +174,6 @@
             <groupId>com.dm</groupId>
             <artifactId>DmJdbcDriver17</artifactId>
             <version>1.7</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/DmJdbcDriver17.jar</systemPath>
         </dependency>
 
         <dependency>

src/main/java/com/shcd/controller/testActiveController.java

@@ -1,10 +1,16 @@
 package com.shcd.controller;
 
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+
 @RestController
 @CrossOrigin
 @RequestMapping("/supervision")
@@ -13,4 +19,20 @@ public class testActiveController {
     public String isAlive(){
         return "I'm alive, don't worry";
     }
+
+    @Value("${emailUrl}")
+    private String emailUrl;
+    @PostMapping("send")
+    public String send(){
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("subject","test");
+        map.put("text","test");
+        map.put("isHtml",true);
+        map.put("sender","港航中心");
+        map.put("mail","944927389@qq.com");
+        String[] strings = new String[]{"scg6238@china-gis.com"};
+        map.put("to",strings);
+        HttpResponse execute = HttpUtil.createPost(emailUrl).body(JSON.toJSONString(map)).execute();
+        return "success";
+    }
 }

src/main/java/com/shcd/service/impl/EmailSupervisionServiceImpl.java

@@ -1,10 +1,10 @@
 package com.shcd.service.impl;
 
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
 import com.shcd.conf.DMConfiguration;
 import com.shcd.mapper.EmailSupervisionMapper;
 import com.shcd.service.EmailSupervisionService;
-import com.shcd.util.EmailUtil;
 import com.shcd.vo.Result;
 import com.shcd.vo.Rule;
 import com.shcd.vo.RuleUser;
@@ -21,12 +21,11 @@ public class EmailSupervisionServiceImpl implements EmailSupervisionService {
     @Resource
     private EmailSupervisionMapper emailSupervisionMapper;
 
-    @Autowired
-    private EmailUtil emailUtil;
-
     @Autowired
     private DMConfiguration configuration;
 
+    @Value("${emailUrl}")
+    private String emailUrl;
     @Override
     public void sendEmail() {
         //获取所有的规则，用来判断是否发送邮件
@@ -57,7 +56,16 @@ public class EmailSupervisionServiceImpl implements EmailSupervisionService {
                 String s = ruleUser.getMessage().replaceAll(ruleResult.getKeyTime(), ruleResult.getTime());
                 String content = ruleUser.getUsername() + ": \n" + s;
                 //HttpUtil.createPost(url).form("to",ruleUser.getEmail()).form("subject",ruleUser.getSubject()).form("content",content).setReadTimeout(30000).execute();
-                emailUtil.sendMail(ruleUser.getEmail(),ruleUser.getSubject(),content);
+                //emailUtil.sendMail(ruleUser.getEmail(),ruleUser.getSubject(),content);
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("subject",ruleUser.getSubject());
+                map.put("text",content);
+                map.put("isHtml",false);
+                map.put("sender","港航中心");
+                map.put("mail","944927389@qq.com");
+                String[] strings = {ruleUser.getEmail()};
+                map.put("to",strings);
+                HttpUtil.createPost(emailUrl).body(JSON.toJSONString(map)).execute();
             }
         }
     }

src/main/java/com/shcd/util/EmailUtil.java

@@ -1,26 +1,26 @@
-package com.shcd.util;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.stereotype.Component;
-@Component
-@Slf4j
-public class EmailUtil {
-    @Value("${spring.mail.username}")
-    private  String userName;
-    @Value("${server.port}")
-    private String port;
-    @Autowired
-    private JavaMailSender javaMailSender;
-    public  void sendMail(String to,String subject,String content){
-        SimpleMailMessage simpleMailMessage = new SimpleMailMessage();
-        simpleMailMessage.setFrom(userName);
-        simpleMailMessage.setTo(to);
-        simpleMailMessage.setSubject(subject);
-        simpleMailMessage.setText(content);
-        javaMailSender.send(simpleMailMessage);
-    }
-}
+//package com.shcd.util;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.mail.SimpleMailMessage;
+//import org.springframework.mail.javamail.JavaMailSender;
+//import org.springframework.stereotype.Component;
+//@Component
+//@Slf4j
+//public class EmailUtil {
+//    @Value("${spring.mail.username}")
+//    private  String userName;
+//    @Value("${server.port}")
+//    private String port;
+//    @Autowired
+//    private JavaMailSender javaMailSender;
+//    public  void sendMail(String to,String subject,String content){
+//        SimpleMailMessage simpleMailMessage = new SimpleMailMessage();
+//        simpleMailMessage.setFrom(userName);
+//        simpleMailMessage.setTo(to);
+//        simpleMailMessage.setSubject(subject);
+//        simpleMailMessage.setText(content);
+//        javaMailSender.send(simpleMailMessage);
+//    }
+//}

src/main/resources/application.yaml

@@ -17,18 +17,19 @@ spring:
     username: SYSDBA
   jmx:
     enabled: false
-  mail:
-    host: 183.47.101.192
-    password:  ucxhwxszatqgdhgf
-    port: 465
-    username: 2500471547@qq.com
-    properties:
-      mail:
-        transport:
-          protocol: smtps
-        smtp:
-          ssl:
-            enable: true
-    protocol: smtps
+#  mail:
+#    host: 183.47.101.192
+#    password:  ucxhwxszatqgdhgf
+#    port: 465
+#    username: 2500471547@qq.com
+#    properties:
+#      mail:
+#        transport:
+#          protocol: smtps
+#        smtp:
+#          ssl:
+#            enable: true
+#    protocol: smtps
   mvc:
     static-path-pattern: file:/disk/
+emailUrl: http://10.83.68.109:8092/SpringMail/mailTo/SendSimpleMail