diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java index ad7795fb..aab5724c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java @@ -111,7 +111,7 @@ public class EmailServiceManager { log.info("{}邮件服务连接测试成功",email.getName()); flag = true; } catch (IOException e) { - log.error("{}邮件服务连接测试失败，请检查邮件服务属性配置是否正确或邮件服务未开启，原因{}",email.getName(),e.getMessage()); + log.error("{}邮件服务连接测试失败，请检查邮件服务属性配置是否正确或邮件服务未开启，原因: ",email.getName(),e); }finally { try { if(null != socket){ @@ -127,7 +127,7 @@ public class EmailServiceManager { /** * 接收邮件 */ - public Message[] receiveMail() throws MessagingException { + public Message[] receiveMail() throws Exception { String status = EmailLogManager.STATUS_SUCCESS; try{ //配置邮件服务属性 @@ -135,6 +135,8 @@ public class EmailServiceManager { properties.put("mail.store.protocol", "imap"); properties.put("mail.imap.host", email.getEmailServerAddress()); properties.put("mail.imap.port",email.getPort()); + properties.put("mail.imap.connectiontimeout", "3000"); + properties.put("mail.imap.timeout", "3000"); if (email.getIsQiye() == 1) { properties.put("mail.imap.ssl.enable", "true"); } else { @@ -177,6 +179,7 @@ public class EmailServiceManager { return o1.getReceivedDate().compareTo(o2.getReceivedDate()); } catch (MessagingException e) { e.printStackTrace(); + log.error(e.getMessage(), e); } return 0; }); @@ -186,7 +189,7 @@ public class EmailServiceManager { return Arrays.copyOfRange(messages,0,this.receiveNum-1); } } - } catch (MessagingException e){ + } catch (Exception e){ status = EmailLogManager.STATUS_ERROR; log.error("Email connection is abnormal, account is {}, service is {},the reason is {}.",email.getName(),email.getEmailServerAddress(),e.getMessage()); throw e; @@ -590,6 +593,7 @@ public class EmailServiceManager { throw new DownloadEmailException(errorMsg); }catch (Exception e) { log.error("",e); + throw new RuntimeException(e); }finally { EmailLogEvent event = new EmailLogEvent(batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,status,EmailLogManager.GETIDEML,subject,DateUtils.formatDate(receivedDate,"yyyy-MM-dd HH:mm:ss:SSS"), (Objects.isNull(emlFile)?" ":emlFile.getAbsolutePath())); @@ -725,9 +729,11 @@ public class EmailServiceManager { // log.info("EmailServiceManager: Remove Email:{},receiveTime:{}",message.getSubject(), DateUtils.formatDate(message.getReceivedDate(),"yyyy-MM-dd HH:mm:ss")); } catch (MessagingException | UnsupportedEncodingException e) { status = EmailLogManager.STATUS_ERROR; - log.error("Email deletion failed, the subject of the email is :{}, the reason is :{}.",subject,e.getMessage()); + log.error("Email deletion failed, the subject of the email is :{}, the reason is :",subject, e); e.printStackTrace(); - }finally { + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { EmailLogEvent removeEvent = new EmailLogEvent(batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,status,EmailLogManager.DELETEID,subject,DateUtils.formatDate(receivedDate,"yyyy-MM-dd HH:mm:ss:SSS")); EmailLogManager.getInstance().offer(Thread.currentThread().getId(),removeEvent); //这里删除和彻底删除一起写入日志，java和C++处理有差异，java是在连接关闭时彻底删除的 @@ -748,13 +754,13 @@ public class EmailServiceManager { if(null != store){ store.close(); } - log.info("EmailServiceManage资源关闭完成."); + log.info("{}: EmailServiceManage资源关闭完成.", Thread.currentThread().getName()); // for(String messageId : messageIds){ // String key = RedisConstant.EMAIL_MSG_ID+StringConstant.COLON+messageId; // redisUtil.del(key); // } } catch (MessagingException e) { - log.error("Email closure failed, email address is: {}, reason is: {}",email.getUsername(),e.getMessage()); + log.error("Email closure failed, email address is: {}, reason is: {}",email.getUsername(),e); e.printStackTrace(); } } diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java index a15e9258..5e642a2d 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; /** @@ -40,12 +41,12 @@ public class AutoProcessManager{ /** * 以邮件Id为key，邮件信息为value */ - private Map emailMap = new HashMap<>(); + private Map emailMap = new ConcurrentHashMap<>(); /** * 以邮件id为key，以邮件执行线程为value */ - private Map emailExecThreadMap = new HashMap<>(); + private Map emailExecThreadMap = new ConcurrentHashMap<>(); /** * 启动自动处理 @@ -82,34 +83,39 @@ public class AutoProcessManager{ public void run() { for(;;){ long start = System.currentTimeMillis(); - if(!CollectionUtils.isEmpty(emailMap)){ - synchronized (lock){ - Iterator iterator = emailMap.values().iterator(); - while(iterator.hasNext()){ - EmailProperties next = iterator.next(); - if (next.isResetFlag()) { - EmailParsingActuator actuator = emailExecThreadMap.get(next.getId()); - actuator.updateEmail(next); - next.setResetFlag(false); - } - if(next.isNewEmailFlag()){ - // 网络正常之后才允许创建新的实例 - final EmailServiceManager emailServiceManager = EmailServiceManager.getInstance(); - emailServiceManager.init(next); - boolean testFlag = emailServiceManager.testConnectEmailServer(); - if(testFlag){ - EmailParsingActuator emailParsingActuator = new EmailParsingActuator(); - emailParsingActuator.init(next,spectrumServiceQuotes,emailCounter,systemStartupTime); - emailParsingActuator.setName(next.getUsername()+"-email-monitor"); - emailParsingActuator.start(); - //把邮件监测执行线程加入管理队列 - emailExecThreadMap.put(next.getId(),emailParsingActuator); - //新邮件监测监测线程已启动则修改新邮件标记为false - next.setNewEmailFlag(false); + try { + if(!CollectionUtils.isEmpty(emailMap)){ + synchronized (lock){ + Iterator iterator = emailMap.values().iterator(); + while(iterator.hasNext()){ + EmailProperties next = iterator.next(); + if (next.isResetFlag()) { + EmailParsingActuator actuator = emailExecThreadMap.get(next.getId()); + actuator.updateEmail(next); + next.setResetFlag(false); + } + if(next.isNewEmailFlag()){ + // 网络正常之后才允许创建新的实例 + final EmailServiceManager emailServiceManager = EmailServiceManager.getInstance(); + emailServiceManager.init(next); + boolean testFlag = emailServiceManager.testConnectEmailServer(); + if(testFlag){ + EmailParsingActuator emailParsingActuator = new EmailParsingActuator(); + emailParsingActuator.init(next,spectrumServiceQuotes,emailCounter,systemStartupTime); + emailParsingActuator.setName(next.getUsername()+"-email-monitor"); + emailParsingActuator.start(); + //把邮件监测执行线程加入管理队列 + emailExecThreadMap.put(next.getId(),emailParsingActuator); + //新邮件监测监测线程已启动则修改新邮件标记为false + next.setNewEmailFlag(false); + } } } } } + } catch (Exception e) { + e.printStackTrace(); + log.error(e.getMessage(), e); } long end = System.currentTimeMillis(); long sleepTime = taskProperties.getMonitoringMailDataCycle() - (end-start); @@ -282,46 +288,52 @@ public class AutoProcessManager{ public void run() { for(;;){ long start = System.currentTimeMillis(); - if(!CollectionUtils.isEmpty(emailExecThreadMap)){ - //遍历邮箱执行线程，如果状态为已停止则删除 - final Iterator> checkStopThreads = emailExecThreadMap.entrySet().iterator(); - while (checkStopThreads.hasNext()){ - final Map.Entry next = checkStopThreads.next(); - if(next.getValue().getState() == State.TERMINATED){ - log.info("{}邮箱执行线程已停止，emailExecThreadMap删除此邮箱数据",next.getValue().getEmailProperties().getUsername()); - checkStopThreads.remove(); - emailMap.remove(next.getKey()); + try { + if(!CollectionUtils.isEmpty(emailExecThreadMap)){ + //遍历邮箱执行线程，如果状态为已停止则删除 + final Iterator> checkStopThreads = emailExecThreadMap.entrySet().iterator(); + while (checkStopThreads.hasNext()){ + final Map.Entry next = checkStopThreads.next(); + if(next.getValue().getState() == State.TERMINATED){ + log.info("{}邮箱执行线程已停止，emailExecThreadMap删除此邮箱数据",next.getValue().getEmailProperties().getUsername()); + checkStopThreads.remove(); + emailMap.remove(next.getKey()); + } } - } - //遍历邮箱执行线程，如果邮箱执行线程stop属性已被设置为true则关闭资源停止线程 - final Iterator> iterator = emailExecThreadMap.entrySet().iterator(); - emailExecThreadMap.forEach((emailId,emailExecThread)->{ - try{ - if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){ - final long nowTime = System.currentTimeMillis(); - final long setStoptime = emailExecThread.getStopTime().getTime(); - final long val = nowTime - setStoptime; - if(val >= taskProperties.getForceDeletedTime()){ - log.info("关闭{}邮箱线程内部线程池资源",emailExecThread.getEmailProperties().getUsername()); - emailExecThread.closeResource(); + //遍历邮箱执行线程，如果邮箱执行线程stop属性已被设置为true则关闭资源停止线程 + final Iterator> iterator = emailExecThreadMap.entrySet().iterator(); + emailExecThreadMap.forEach((emailId,emailExecThread)->{ + try{ + log.info("当前线程状态：{}", emailExecThread.getState()); + if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){ + final long nowTime = System.currentTimeMillis(); + final long setStoptime = emailExecThread.getStopTime().getTime(); + final long val = nowTime - setStoptime; + if(val >= taskProperties.getForceDeletedTime()){ + log.info("关闭{}邮箱线程内部线程池资源",emailExecThread.getEmailProperties().getUsername()); + emailExecThread.closeResource(); + } + } + }catch (Exception e){ + e.printStackTrace(); + log.error(e.getMessage(), e); + }finally { + if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){ + final long nowTime = System.currentTimeMillis(); + final long setStoptime = emailExecThread.getStopTime().getTime(); + final long val = nowTime - setStoptime; + if(val >= taskProperties.getForceDeletedTime()){ + log.info("强制停止{}邮箱线程",emailExecThread.getEmailProperties().getUsername()); + emailExecThread.stop(); + } } } - }catch (Exception e){ - e.printStackTrace(); - log.error(e.getMessage(), e); - }finally { - if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){ - final long nowTime = System.currentTimeMillis(); - final long setStoptime = emailExecThread.getStopTime().getTime(); - final long val = nowTime - setStoptime; - if(val >= taskProperties.getForceDeletedTime()){ - log.info("强制停止{}邮箱线程",emailExecThread.getEmailProperties().getUsername()); - emailExecThread.stop(); - } - } - } - }); + }); + } + } catch (Exception e) { + e.printStackTrace(); + log.error(e.getMessage(), e); } long end = System.currentTimeMillis(); long sleepTime = taskProperties.getDeletedMailThreadExecCycle() - (end-start); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java index 9957cda8..06c37e71 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java @@ -119,7 +119,7 @@ public class EmailParsingActuator extends Thread{ } } } catch (Exception e) { - log.error("EmailParsingActuator has exception: {}", e.getMessage()); + log.error("EmailParsingActuator has exception: ", e); log.info("Mail-Parsing线程池资源关闭..."); closeResource(); throw new RuntimeException(e); diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java index 5548ba1e..50e89ee1 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java @@ -152,13 +152,15 @@ public class SpectrumParsingActuator implements Runnable{ } } } catch (Exception e) { + //输出异常信息 + log.error("邮件处理异常{}，邮件主题:{}：", e, subject); + // todo 需要解决其他异常会进入if 删除邮件 // 如果不是下载导致的失败 并且 下载成功，则删除下载的邮件对象 if(!(e instanceof DownloadEmailException) && downloadFlag){ log.error("Catch Remove Email："+ subject + StringPool.UNDERSCORE + receiveDate + StringPool.UNDERSCORE); emailServiceManager.removeMail(message,batchesCounter); } - //输出异常信息 - log.error("邮件处理异常{}，邮件主题:{}：", e, subject); + }finally { try { EmailLogEvent expungeEvent = new EmailLogEvent(this.batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,EmailLogManager.DONE);