fengji

添加日志

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -383,7 +383,6 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 
-
 	@Override
 	@Async
 	public void batchPushMessage(MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
@@ -480,21 +479,31 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			mode = MessageSendMode.PUSH;
 		} else if (messageSender.getSendMode().equals("EMAIL")) {
 			mode = MessageSendMode.EMAIL;
+			LOGGER.info("发送邮件 {} ");
 		}
 		Map<Integer, String> receivers = new HashMap<Integer, String>();
 		receivers.put(userId, receiver);
+		LOGGER.info("添加消息 {} ", title);
 		addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType);
 	}
 
 	private void loadEmailInfo(Integer userId) {
 		SysUser user = sysUserFeignService.queryUserById(userId);
-		SysEmail email1 = sysEmailService.getOne(new WrapperUtil<SysEmail>().hasEq("tenant_id_", user.getTenantId()).queryWrapper());
-		messageSenderPluginContext.sysEmail.setHostName(email1.getHostName());
-		messageSenderPluginContext.sysEmail.setSmtpPort(email1.getSmtpPort());
-		messageSenderPluginContext.sysEmail.setUserName(email1.getUserName());
-		messageSenderPluginContext.sysEmail.setPassword(email1.getPassword());
-		messageSenderPluginContext.sysEmail.setFromName(email1.getFromName());
-		messageSenderPluginContext.sysEmail.setFrom(email1.getFrom());
+		if (user == null) {
+			LOGGER.error("用户Id {} 找不到用户", userId);
+			return;
+		}
+		try {
+			SysEmail email1 = sysEmailService.getOne(new WrapperUtil<SysEmail>().hasEq("tenant_id_", user.getTenantId()).queryWrapper());
+			messageSenderPluginContext.sysEmail.setHostName(email1.getHostName());
+			messageSenderPluginContext.sysEmail.setSmtpPort(email1.getSmtpPort());
+			messageSenderPluginContext.sysEmail.setUserName(email1.getUserName());
+			messageSenderPluginContext.sysEmail.setPassword(email1.getPassword());
+			messageSenderPluginContext.sysEmail.setFromName(email1.getFromName());
+			messageSenderPluginContext.sysEmail.setFrom(email1.getFrom());
+		} catch (Exception e) {
+		    LOGGER.error("设置邮件配置错误: {} " + e);
+		}
 	}
 
 	@Override

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/CommEmailPlugin.java

@@ -5,6 +5,8 @@ import org.apache.commons.mail.DefaultAuthenticator;
 import org.apache.commons.mail.Email;
 import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.SimpleEmail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
@@ -13,6 +15,8 @@ import com.ym.mec.thirdparty.message.MessageSenderPlugin;
 @Service
 public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 
+	private final static Logger log = LoggerFactory.getLogger(CommEmailPlugin.class);
+
 	private String hostName;
 
 	private int smtpPort;
@@ -88,6 +92,10 @@ public class CommEmailPlugin implements MessageSenderPlugin, InitializingBean {
 
 	@Override
 	public boolean send(String subject, String content, String receiver, String url, String jpushType, String sound, String channelId) throws Exception {
+		if (hostName == null || hostName.equals("")) {
+			log.error("邮件配置未能加载");
+			return false;
+		}
 		this.checkProperties();
 		Email email = new SimpleEmail();
 		email.setHostName(hostName);