From 18f4e9eb0d37bca19df5b8180c270a58ffec2a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com> Date: Tue, 9 Jul 2019 14:20:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 114b05e..74be025 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ server.port=9999 -spring.profiles.active= pro +spring.profiles.active= local server.servlet.context-path= / spring.aop.proxy-target-class=true spring.jackson.time-zone= GMT+8 -- Gitee From 1931543921ef244c17a529ca3fe7875917776c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com> Date: Wed, 10 Jul 2019 08:24:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=BC=9A=E6=BF=80=E6=B4=BB=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fstack/service/impl/UserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/fstack/service/impl/UserServiceImpl.java b/src/main/java/com/fstack/service/impl/UserServiceImpl.java index 3b096f6..04a2c06 100644 --- a/src/main/java/com/fstack/service/impl/UserServiceImpl.java +++ b/src/main/java/com/fstack/service/impl/UserServiceImpl.java @@ -212,6 +212,7 @@ public class UserServiceImpl implements UserService { VerificationToken byUserId = this.verificationTokenMapper.findByUserId(user.getId().toString()); if (null != byUserId && byUserId.getToken().equalsIgnoreCase(userPwdDto.getToken())) { user.setPassword(this.passwordEncoder.encode(userPwdDto.getPassword())); + if (user.getActivated() == 0L) user.activated(true); int update = this.userMapper.update(user); if (update > 0) attributes.put("updateUserPwdResult", "success"); else attributes.put("updateUserPwdResult", "failure"); -- Gitee From a8510c6cfffa9541f957b02295dee4846d16afb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com> Date: Wed, 10 Jul 2019 08:26:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=BC=9A=E6=BF=80=E6=B4=BB=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fstack/service/impl/UserServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fstack/service/impl/UserServiceImpl.java b/src/main/java/com/fstack/service/impl/UserServiceImpl.java index 04a2c06..ee93ca7 100644 --- a/src/main/java/com/fstack/service/impl/UserServiceImpl.java +++ b/src/main/java/com/fstack/service/impl/UserServiceImpl.java @@ -213,9 +213,8 @@ public class UserServiceImpl implements UserService { if (null != byUserId && byUserId.getToken().equalsIgnoreCase(userPwdDto.getToken())) { user.setPassword(this.passwordEncoder.encode(userPwdDto.getPassword())); if (user.getActivated() == 0L) user.activated(true); - int update = this.userMapper.update(user); - if (update > 0) attributes.put("updateUserPwdResult", "success"); - else attributes.put("updateUserPwdResult", "failure"); + this.userMapper.update(user); + attributes.put("updateUserPwdResult", "success"); } else { attributes.put("updateUserPwdResult", "failure"); } -- Gitee From 54af335c1ed63c4b28370777544dad5542073607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com> Date: Wed, 10 Jul 2019 08:37:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fstack/event/RegistrationListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fstack/event/RegistrationListener.java b/src/main/java/com/fstack/event/RegistrationListener.java index b21b80f..89843dd 100644 --- a/src/main/java/com/fstack/event/RegistrationListener.java +++ b/src/main/java/com/fstack/event/RegistrationListener.java @@ -23,7 +23,7 @@ public class RegistrationListener implements ApplicationListener> " + confirmationLink); email.setFrom(VERIFICATION_EMAIL_FROM_ADDR); email.setSubject(VERIFICATION_EMAIL_SUBJECT); - email.setText("请及时激活您的账号，该链接24小时内有效===> " + confirmationLink); + email.setText("请及时激活您的账号，该链接24小时内有效===> " + confirmationLink + " (友情提示：请不要删除这个邮件哦，可能以后你还会用到的~)"); email.setTo(user.getEmail()); this.emailService.sendEmail(email); } -- Gitee From 9d63774d8f90011029975815992952f6dcb24874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E?= <672943942@qq.com> Date: Wed, 10 Jul 2019 08:37:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fstack/event/RegistrationListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/fstack/event/RegistrationListener.java b/src/main/java/com/fstack/event/RegistrationListener.java index 89843dd..c09e3f7 100644 --- a/src/main/java/com/fstack/event/RegistrationListener.java +++ b/src/main/java/com/fstack/event/RegistrationListener.java @@ -66,7 +66,7 @@ public class RegistrationListener implements ApplicationListener> " + confirmationLink); email.setFrom(VERIFICATION_EMAIL_FROM_ADDR); email.setSubject(VERIFICATION_EMAIL_SUBJECT); - email.setText("请及时激活您的账号，该链接24小时内有效===> " + confirmationLink + " (友情提示：请不要删除这个邮件哦，可能以后你还会用到的~)"); + email.setText("请及时激活您的账号，该链接24小时内有效===> " + confirmationLink + " (友情提示：请不要删除这个邮件哦，可能以后还会用到的~)"); email.setTo(user.getEmail()); this.emailService.sendEmail(email); } -- Gitee