github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace ServiceException with EmailException in MailService

pull/146/head
johnniang 2019-04-23 20:05:34 +08:00
parent a5b016ef19
commit 3a15fb307c
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/run/halo/app/exception/EmailException.java Normal file
View File

@ -0,0 +1,18 @@
package run.halo.app.exception;
/**
* Email exception.
*
* @author johnniang
* @date 19-4-23
*/
public class EmailException extends ServiceException {
public EmailException(String message) {
super(message);
}
public EmailException(String message, Throwable cause) {
super(message, cause);
}
}

15
src/main/java/run/halo/app/service/impl/MailServiceImpl.java
View File

@ -1,9 +1,5 @@
package run.halo.app.service.impl; package run.halo.app.service.impl;
import run.halo.app.exception.ServiceException;
import run.halo.app.model.properties.EmailProperties;
import run.halo.app.service.MailService;
import run.halo.app.service.OptionService;
import cn.hutool.core.text.StrBuilder; import cn.hutool.core.text.StrBuilder;
import freemarker.template.Template; import freemarker.template.Template;
import io.github.biezhi.ome.OhMyEmail; import io.github.biezhi.ome.OhMyEmail;
@ -11,7 +7,10 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.ui.freemarker.FreeMarkerTemplateUtils; import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer; import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
import run.halo.app.exception.ServiceException; import run.halo.app.exception.EmailException;
import run.halo.app.model.properties.EmailProperties;
import run.halo.app.service.MailService;
import run.halo.app.service.OptionService;
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;
@ -74,7 +73,7 @@ public class MailServiceImpl implements MailService {
} catch (Exception e) { } catch (Exception e) {
log.debug("Email properties: to username: [{}], from username: [{}], subject: [{}], content: [{}]", log.debug("Email properties: to username: [{}], from username: [{}], subject: [{}], content: [{}]",
to, fromUsername, subject, content); to, fromUsername, subject, content);
throw new ServiceException("Failed to send email to " + to, e); throw new EmailException("Failed to send email to " + to, e);
} }
} }
@ -104,7 +103,7 @@ public class MailServiceImpl implements MailService {
} catch (Exception e) { } catch (Exception e) {
log.debug("Email properties: to username: [{}], from username: [{}], subject: [{}], template name: [{}], content: [{}]", log.debug("Email properties: to username: [{}], from username: [{}], subject: [{}], template name: [{}], content: [{}]",
to, fromUsername, subject, templateName, content); to, fromUsername, subject, templateName, content);
throw new ServiceException("Failed to send template email to " + to, e).setErrorData(templateName); throw new EmailException("Failed to send template email to " + to, e).setErrorData(templateName);
} }
} }
@ -135,7 +134,7 @@ public class MailServiceImpl implements MailService {
} catch (Exception e) { } catch (Exception e) {
log.debug("Email properties: to username: [{}], from username: [{}], subject: [{}], template name: [{}], attachment: [{}], content: [{}]", log.debug("Email properties: to username: [{}], from username: [{}], subject: [{}], template name: [{}], attachment: [{}], content: [{}]",
to, fromUsername, subject, templateName, attachFilename, content); to, fromUsername, subject, templateName, attachFilename, content);
throw new ServiceException("Failed to send attachment email to " + to, e); throw new EmailException("Failed to send attachment email to " + to, e);
} }
} }