Commit 26e95dd4 by manxiaoqiang

sendemail

parent acda0052
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
<dmp.password>reyun123</dmp.password> <dmp.password>reyun123</dmp.password>
<mail.host>smtp.exmail.qq.com</mail.host> <mail.host>smtp.exmail.qq.com</mail.host>
<mail.username>service1@reyun.com</mail.username> <mail.username>manxiaoqiang@reyun.com</mail.username>
<mail.password>XSW29ijn</mail.password> <mail.password>Mxq123</mail.password>
<mail.content_type>text/plain;charset\=GBK</mail.content_type> <mail.content_type>text/plain;charset\=GBK</mail.content_type>
<mail.list>zhangliang</mail.list> <mail.list>zhangliang</mail.list>
<!-- 单位是分钟--> <!-- 单位是分钟-->
......
...@@ -18,6 +18,6 @@ public interface ReminderRepository extends JpaRepository<Reminder, Long> { ...@@ -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) @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); 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); List<Reminder> findAllDistinctFalse(String platform);
} }
...@@ -14,6 +14,7 @@ import util.StringUtil; ...@@ -14,6 +14,7 @@ import util.StringUtil;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Enumeration;
public class AuthorizationInterceptor extends HandlerInterceptorAdapter { public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
private static final Logger logger = LoggerFactory.getLogger(AuthorizationInterceptor.class); private static final Logger logger = LoggerFactory.getLogger(AuthorizationInterceptor.class);
......
...@@ -7,6 +7,7 @@ import tkio.repository.SalesManLeaderRepository; ...@@ -7,6 +7,7 @@ import tkio.repository.SalesManLeaderRepository;
import tkio.service.SalesManService; import tkio.service.SalesManService;
import tkio.service.SendEmailService; import tkio.service.SendEmailService;
import util.MailUtils; import util.MailUtils;
import util.ValidateUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -20,12 +21,19 @@ public class SendEmailServiceImpl implements SendEmailService { ...@@ -20,12 +21,19 @@ public class SendEmailServiceImpl implements SendEmailService {
@Override @Override
public void send(String email, List<String> content) { public void send(String email, List<String> content) {
String contentStr = String.join(",", content); String contentStr = String.join(",", content);
StringBuffer sb = new StringBuffer();
if(ValidateUtil.isValid(content)){
for(String e : content){
sb.append(e).append("\r\n");
}
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add(email); list.add(email);
try { try {
MailUtils.sendSimpleEmail("账号过期提醒", "以下账号过期了,请及时处理 : " + contentStr,list); MailUtils.sendSimpleEmail("账号过期提醒", "以下账号过期了,请及时处理 : " + sb.toString(),list);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
}
} }
...@@ -108,11 +108,11 @@ public class SendEmailTask { ...@@ -108,11 +108,11 @@ public class SendEmailTask {
if (reMap.containsKey(em)){ if (reMap.containsKey(em)){
if(reMap.get(em)){ if(reMap.get(em)){
newList.add(em); newList.add(em);
}
}else{ }else{
newList.add(em); newList.add(em);
} }
} }
}
//sendEmail //sendEmail
sendEmailService.send(user.getEmail(), newList); sendEmailService.send(user.getEmail(), newList);
} else if(saleMap.containsKey(user.getId())){ } else if(saleMap.containsKey(user.getId())){
...@@ -125,13 +125,13 @@ public class SendEmailTask { ...@@ -125,13 +125,13 @@ public class SendEmailTask {
if (reMap.containsKey(em)){ if (reMap.containsKey(em)){
if(reMap.get(em)){ if(reMap.get(em)){
newList.add(em); newList.add(em);
}
}else{ }else{
newList.add(em); newList.add(em);
} }
} }
} }
} }
}
//sendEmail //sendEmail
sendEmailService.send(user.getEmail(), newList); sendEmailService.send(user.getEmail(), newList);
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<bean id="emailTask" class="tkio.task.SendEmailTask"></bean> <bean id="emailTask" class="tkio.task.SendEmailTask"></bean>
<task:scheduled-tasks> <task:scheduled-tasks>
<task:scheduled ref="emailTask" method="task" cron="* * * */2 * ?"/> <task:scheduled ref="emailTask" method="task" cron="0 7 19 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
<bean id="trackAccountTask" class="track.task.AccountTask"></bean> <bean id="trackAccountTask" class="track.task.AccountTask"></bean>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment