From af1d0637093624dcffd0864a7834768812f7229a Mon Sep 17 00:00:00 2001
From: fanxb <fanxb.tl@gmail.com>
Date: Thu, 1 Aug 2019 18:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix:=20[=E5=90=8E=E5=8F=B0]:?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E8=83=BD=E9=80=9A=E8=BF=87=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/bookmark/service/BookmarkService.java    |  4 ++--
 .../bookmark/business/user/service/UserService.java   | 11 +++++------
 .../web/src/main/resources/application.yml            |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java
index c2ff064..b09f0f2 100644
--- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java
+++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java
@@ -6,7 +6,7 @@ import com.fanxb.bookmark.business.bookmark.entity.MoveNodeBody;
 import com.fanxb.bookmark.common.constant.EsConstant;
 import com.fanxb.bookmark.common.entity.Bookmark;
 import com.fanxb.bookmark.common.entity.EsEntity;
-import com.fanxb.bookmark.common.exception.CustomException;
+import com.fanxb.bookmark.common.exception.FormDataException;
 import com.fanxb.bookmark.common.util.EsUtil;
 import com.fanxb.bookmark.common.util.UserContextHolder;
 import lombok.extern.slf4j.Slf4j;
@@ -203,7 +203,7 @@ public class BookmarkService {
         try {
             bookmarkDao.insertOne(bookmark);
         } catch (DuplicateKeyException e) {
-            throw new CustomException("同级目录下不能存在相同名称的数据");
+            throw new FormDataException("同级目录下不能存在相同名称的数据");
         }
         //如果是书签，插入到es中
         if (bookmark.getType() == 0) {
diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/UserService.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/UserService.java
index 315522f..be84311 100644
--- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/UserService.java
+++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/UserService.java
@@ -7,7 +7,6 @@ import com.fanxb.bookmark.business.user.entity.RegisterBody;
 import com.fanxb.bookmark.common.constant.Constant;
 import com.fanxb.bookmark.common.entity.MailInfo;
 import com.fanxb.bookmark.common.entity.User;
-import com.fanxb.bookmark.common.exception.CustomException;
 import com.fanxb.bookmark.common.exception.FormDataException;
 import com.fanxb.bookmark.common.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,8 +70,8 @@ public class UserService {
     public void register(RegisterBody body) {
         String codeKey = Constant.authCodeKey(body.getEmail());
         String realCode = RedisUtil.get(codeKey, String.class);
-        if ((!StringUtil.isEmpty(realCode)) && (!realCode.equals(body.getAuthCode()))) {
-            throw new CustomException("验证码错误");
+        if (StringUtil.isEmpty(realCode) || (!realCode.equals(body.getAuthCode()))) {
+            throw new FormDataException("验证码错误");
         }
         RedisUtil.delete(codeKey);
         User user = userDao.selectByUsernameOrEmail(body.getUsername(), body.getEmail());
@@ -148,12 +147,12 @@ public class UserService {
     /**
      * Description: 根据userId获取用户信息
      *
-     * @author fanxb
-     * @date 2019/7/30 15:57
      * @param userId userId
      * @return com.fanxb.bookmark.common.entity.User
+     * @author fanxb
+     * @date 2019/7/30 15:57
      */
-    public User getUserInfo(int userId){
+    public User getUserInfo(int userId) {
         return userDao.selectByUserId(userId);
     }
 }
diff --git a/bookMarkService/web/src/main/resources/application.yml b/bookMarkService/web/src/main/resources/application.yml
index 9f0773d..f06adb3 100644
--- a/bookMarkService/web/src/main/resources/application.yml
+++ b/bookMarkService/web/src/main/resources/application.yml
@@ -29,7 +29,7 @@ spring:
     lettuce:
       pool:
         max-active: 20
-        max-wait: 1000ms
+        max-wait: 500ms
         max-idle: 20
         min-idle: 2
   datasource: