From 908ef7ae34befa61c2da39dc47b45fca25d8bbc1 Mon Sep 17 00:00:00 2001 From: geek Date: Tue, 29 May 2018 19:55:18 +0900 Subject: [PATCH] email token duplication check --- .../central/commons/utils/EmailSender.java | 50 +++++++---- .../email/service/EmailAuthService.java | 2 - .../local/vmtemplates/overFlow_logo.png | Bin 0 -> 2304 bytes .../local/vmtemplates/password_reset.vm | 79 +++++++++++++++--- .../resources/local/vmtemplates/signup.vm | 74 ++++++++++++++++ 5 files changed, 175 insertions(+), 30 deletions(-) create mode 100644 src/main/resources/local/vmtemplates/overFlow_logo.png 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 0000000000000000000000000000000000000000..b95826f258eed5cd1103fef1e2b7793cab564ed9 GIT binary patch literal 2304 zcmbVOX;f2Z8jfN>BxprMmY|meWl^$|Oolw$Y2H33T8mGNN__(5k<$bV=pSs{P6V0+-RW z9TgWGg^SX%WGM=MrcM@-s#ey`Sdmx z1-ye8lyua4r{bfc0hUH51A;N+APJsC04N{^PsV`+(kg&}!&9(03KmZc!r^H+GK~lV zA1)MRO(#vJt!HyT*n(DcREoi%rD3r~qY+~yVl+BA77v0T7DvDm2tg1cNS~oLh)h9h zJ$gogEz?VM3avq*Q3KP8BC#gjKu1BIz7IjAjf(mxtk!=>6qGWoNuTbxP(9D(pWl~$e_{1YBZ@c6%d`G zF=+HD8ZE$zAp`z#3bj;Y)CWu-&--ZEGM!?pOv=@1RKUCZ(iESt4>Ac%2AM=5bExd; zxETy4l|^Q4_xX0lQS&j40gIW{-;=Gwx9}}o_;KSXz{UmWNN5mbWm$- zdv06;gTZm(Y(}hU@KNG;+MzJSEz>nvoH=H89CTxLlxIh1*W#8}xWFOa132EK}IO)sdsX^9iI z#Q=|eqlHID{8Mrh4I6$4ysmW(VHYEX&efy-(o$|Q*O}+j!4U5M=1_@`$VN&>4{^!G z=c)NjeU0YZ@>g`FEwR6LA#dU*Ae*yyL2&gwd`-ioIZG1i+f>=7w?{PYSYQ*(*BiaD zz(7v-=#Hc@?c4fa{gSDl^$t&^9_uV>1a(ha3k#FzSKRwsRt{Eph27x_;=rlmIjxme zlTwNy{{t;qUNLTWXX*T}g)@`mDJ6-Y!_N4H^>McoQ8iYmqcY%**tCJvB z-r}%#1nJF31dtp34^Jgg8+Qz?BNVz=k~1C${_a){s~YvVI)rpDL+7CnXj&ZXip+%i zAIsh%9(u1=o`MT|$n>?R`xr zFUdQJtl(KIwFzdd|Ml z9&g0>A9B=Jxrv)ugy|c?L;5= z%{%7F>O7ZiVe^q{-HJ?jxzDj=BwXlJ_b@H24wGOP;aATVjeq6VUR8}={6+td{JAA` zSK56io@OQ2G)Q3mdvznlImFd*w(aEthP8Lat=)U>{tNHG^PSAkK9Qvu@htCZc(%9e zPBwP8EV5I=FwuKS zp|vp{Owz5;&&bI zsD2=9VD;TB^NT&psb~b56YYQNtP8T|je(_wBQ<%85dvYZ*FkXTCw8>!Z>f$6x|}o1 z)Kq<1?j=1cdDg)&s{I({isinVY6Wv@4^h*O9tq=^yToCuNVH2@=AjZX#!^#YTO;l5 zcgs`TqlbHLIyH&mQKdhNIQ@IpDpl4RLab~`#l;JbBd(et&! zrOo#Zzl%vP&R5uIZ+-~pqZrF>By7p{8FXZyu1=>CFPKda+_5@@% z{36|E95|Kguz!2e_hqk&ON~DIzht@fo_sV=dyn=XoCA;QjauG5mq)A_GLtW!@NO1% zV0oQ)5$2|CE>{A_ds38^Cy)EDBPSL{9i6A?@sM*$UK#y1nr|BHu>!8au8d4bo36gS6n&s%^d!s<_OQXeGr#`Xtm%J}aE^do I&rCA^0b_=jKL7v# literal 0 HcmV?d00001 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

+
+
+
+ + + + +