diff --git a/src/main/java/com/loafle/overflow/central/commons/utils/EmailSender.java b/src/main/java/com/loafle/overflow/central/commons/utils/EmailSender.java index 896919a..29c865b 100644 --- a/src/main/java/com/loafle/overflow/central/commons/utils/EmailSender.java +++ b/src/main/java/com/loafle/overflow/central/commons/utils/EmailSender.java @@ -1,13 +1,13 @@ package com.loafle.overflow.central.commons.utils; import org.apache.commons.codec.binary.Base64; -import org.apache.velocity.Template; import org.apache.velocity.app.VelocityEngine; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ClassPathResource; import org.springframework.mail.MailException; -import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; +import org.springframework.mail.javamail.MimeMessagePreparator; import org.springframework.stereotype.Service; import org.springframework.ui.velocity.VelocityEngineUtils; @@ -37,27 +37,18 @@ public class EmailSender { private String initVector = "loafleInitVector"; - public void sendSimpleEmail(Mail mail) throws MailException { + public void sendSimpleEmail(final Mail mail) throws MailException { -// SimpleMailMessage message1 = new SimpleMailMessage(); -// message1.setTo(mail.getMailTo()); -// message1.setSubject(mail.getMailSubject()); -// message1.setText(getContentFromTemplate(mail.getModel(), mail)); -// message1.setFrom("geek@loafle.com"); -// mailSender.send(message1); - - MimeMessage msg = this.mailSender.createMimeMessage(); - - try { - MimeMessageHelper helper = new MimeMessageHelper(msg, false); + MimeMessagePreparator preparator = mimeMessage -> { + MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "UTF-8"); helper.setTo(mail.getMailTo()); helper.setFrom("geek@loafle.com"); helper.setSubject(mail.getMailSubject()); helper.setText(getContentFromTemplate(mail.getModel(), mail), true); - this.mailSender.send(msg); - } catch (MessagingException e) { - e.printStackTrace(); - } + helper.addInline("company-logo", new ClassPathResource("/vmtemplates/overFlow_logo.png")); + }; + + this.mailSender.send(preparator); } public void sendMailWithAttachment(Mail mail) throws MessagingException { @@ -129,3 +120,26 @@ public class EmailSender { } } + + +// SimpleMailMessage message1 = new SimpleMailMessage(); +// message1.setTo(mail.getMailTo()); +// message1.setSubject(mail.getMailSubject()); +// message1.setText(getContentFromTemplate(mail.getModel(), mail)); +// message1.setFrom("geek@loafle.com"); +// mailSender.send(message1); + + +// MimeMessage msg = this.mailSender.createMimeMessage(); +// +// try { +// MimeMessageHelper helper = new MimeMessageHelper(msg, false); +// helper.setTo(mail.getMailTo()); +// helper.setFrom("geek@loafle.com"); +// helper.setSubject(mail.getMailSubject()); +// helper.setText(getContentFromTemplate(mail.getModel(), mail), true); +// helper.addInline("company-logo", new ClassPathResource("/vmtemplates/overFlow_logo.png")); +// this.mailSender.send(msg); +// } catch (MessagingException e) { +// e.printStackTrace(); +// } \ No newline at end of file diff --git a/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java b/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java index 91c7578..55ac110 100644 --- a/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java +++ b/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java @@ -17,11 +17,9 @@ import com.loafle.overflow.model.member.Member; import com.loafle.overflow.model.meta.MetaEmailStatus; import com.loafle.overflow.model.meta.MetaMemberStatus; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mail.MailException; import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.net.URLEncoder; import java.util.*; diff --git a/src/main/resources/local/vmtemplates/overFlow_logo.png b/src/main/resources/local/vmtemplates/overFlow_logo.png new file mode 100644 index 0000000..b95826f Binary files /dev/null and b/src/main/resources/local/vmtemplates/overFlow_logo.png differ diff --git a/src/main/resources/local/vmtemplates/password_reset.vm b/src/main/resources/local/vmtemplates/password_reset.vm index 98aacb1..1792fc3 100644 --- a/src/main/resources/local/vmtemplates/password_reset.vm +++ b/src/main/resources/local/vmtemplates/password_reset.vm @@ -1,13 +1,72 @@ - + + + - + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
+ Resset Your Password +
- -

Dear ${firstName} ${lastName},

-

Sending Email ${content}

-

Thanks

-

${signature}

-

${location}

- +

Dear ${firstName} ${lastName},

- \ No newline at end of file +

Sending Email ${content}

+ + + + + + + + + +
+ RESSET PASSWORD NOW +
+ +

Thanks

+ +
+

${signature}

+ +

${location}

+ +

Copyright ⓒ 2017 LOAFLE. All Rights Reserved.

+

Help Center · + Privacy Policy · + Terms & Conditions

+

Unsubscribe from this email

+
+
+
+ + + diff --git a/src/main/resources/local/vmtemplates/signup.vm b/src/main/resources/local/vmtemplates/signup.vm index 98aacb1..2b5ead3 100644 --- a/src/main/resources/local/vmtemplates/signup.vm +++ b/src/main/resources/local/vmtemplates/signup.vm @@ -1,3 +1,77 @@ + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
+ Welcome to overFlow. Please Confirm your Email +
+ +

Dear ${firstName} ${lastName},

+ +

Sending Email ${content}

+ + + + + + + + + +
+ Register Now +
+ +

Thanks

+ +
+

${signature}

+ +

${location}

+ +

Copyright ⓒ 2017 LOAFLE. All Rights Reserved.

+

Help Center · + Privacy Policy · + Terms & Conditions

+

Unsubscribe from this email

+
+
+
+ + + + +