sendemail

pom.xml

@@ -58,8 +58,8 @@
         <dmp.password>reyun123</dmp.password>
 
         <mail.host>smtp.exmail.qq.com</mail.host>
-        <mail.username>service1@reyun.com</mail.username>
-        <mail.password>XSW29ijn</mail.password>
+        <mail.username>manxiaoqiang@reyun.com</mail.username>
+        <mail.password>Mxq123</mail.password>
         <mail.content_type>text/plain;charset\=GBK</mail.content_type>
         <mail.list>zhangliang</mail.list>
         <!-- 单位是分钟-->

src/main/java/common/repository/ReminderRepository.java

@@ -18,6 +18,6 @@ public interface ReminderRepository extends JpaRepository<Reminder, Long> {
     @Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id )", nativeQuery = true)
     List<Reminder> findAllDistinct(String platform);
 
-    @Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id ) and status = false", nativeQuery = true)
+    @Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id ) and remind_status = false", nativeQuery = true)
     List<Reminder> findAllDistinctFalse(String platform);
 }

src/main/java/security/interceptor/AuthorizationInterceptor.java

@@ -14,6 +14,7 @@ import util.StringUtil;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Enumeration;
 
 public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
     private static final Logger logger = LoggerFactory.getLogger(AuthorizationInterceptor.class);

src/main/java/tkio/service/impl/SendEmailServiceImpl.java

@@ -7,6 +7,7 @@ import tkio.repository.SalesManLeaderRepository;
 import tkio.service.SalesManService;
 import tkio.service.SendEmailService;
 import util.MailUtils;
+import util.ValidateUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,12 +21,19 @@ public class SendEmailServiceImpl implements SendEmailService {
     @Override
     public void send(String email, List<String> content) {
         String contentStr = String.join(",", content);
-        List<String> list = new ArrayList<>();
-        list.add(email);
-        try {
-            MailUtils.sendSimpleEmail("账号过期提醒", "以下账号过期了,请及时处理  : " + contentStr,list);
-        } catch (Exception e) {
-            e.printStackTrace();
+        StringBuffer sb = new StringBuffer();
+        if(ValidateUtil.isValid(content)){
+            for(String e : content){
+                sb.append(e).append("\r\n");
+            }
+            List<String> list = new ArrayList<>();
+            list.add(email);
+            try {
+                MailUtils.sendSimpleEmail("账号过期提醒", "以下账号过期了,请及时处理  : " + sb.toString(),list);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
+
     }
 }

src/main/java/tkio/task/SendEmailTask.java

@@ -108,9 +108,9 @@ public class SendEmailTask {
                         if (reMap.containsKey(em)){
                             if(reMap.get(em)){
                                 newList.add(em);
-                            }else{
-                                newList.add(em);
                             }
+                        }else{
+                            newList.add(em);
                         }
                     }
                     //sendEmail
@@ -125,9 +125,9 @@ public class SendEmailTask {
                                 if (reMap.containsKey(em)){
                                     if(reMap.get(em)){
                                         newList.add(em);
-                                    }else{
-                                        newList.add(em);
                                     }
+                                }else{
+                                    newList.add(em);
                                 }
                             }
                         }

src/main/resources/spring/applicationContext-schedule.xml

@@ -22,7 +22,7 @@
 
     <bean id="emailTask" class="tkio.task.SendEmailTask"></bean>
     <task:scheduled-tasks>
-        <task:scheduled ref="emailTask" method="task" cron="* * * */2 * ?"/>
+        <task:scheduled ref="emailTask" method="task" cron="0 7 19 * * ?"/>
     </task:scheduled-tasks>
 
     <bean id="trackAccountTask" class="track.task.AccountTask"></bean>