From f4a0f741420f684da008fb6c62b001426d8e68a0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 6 May 2020 17:48:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=BF=90=E8=90=A5=E7=AB=AF=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E8=B4=A6=E5=8F=B7=E5=81=9A=E7=99=BB=E5=BD=95=E5=BC=BA?= =?UTF-8?q?=E8=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/LoginServiceImpl.java | 3 ++- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../java/com/epmet/filter/CpAuthGatewayFilterFactory.java | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index f3cef61f98..ed7176c8d4 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import com.epmet.common.token.constant.LoginConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; @@ -248,7 +249,7 @@ public class LoginServiceImpl implements LoginService { //1、验证码是否正确 boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha()); if (!flag) { - return new Result().error(ErrorCode.CAPTCHA_ERROR); + return new Result().error(EpmetErrorCode.ERR10019.getCode()); } //2、账号是否存在 //获取用户信息 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index c9b876389c..2cb2859bde 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -9,6 +9,7 @@ public enum EpmetErrorCode { ERR10005(10005, "token不能为空"), ERR10006(10006, "登录超时，请重新登录"), ERR10007(10007, "当前帐号已在别处登录"), + ERR10019(10019, "验证码不正确"), ERR401(401, "未授权"), VALIDATE_ERROR(7000, "数据校验异常"), SERVER_ERROR(8000, "服务器开小差了..."), diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java index d3c7d60b6d..acb3d166b5 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java @@ -100,6 +100,10 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory Date: Wed, 6 May 2020 18:03:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E9=A6=96=E9=A1=B5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/HomeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java index 7c1b813838..1f697182b0 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java @@ -119,7 +119,7 @@ public class HomeServiceImpl implements HomeService { customerHomeDetailDao.deleteCustomerHomeDetailByHomeId(customerHomeEntity.getId()); List list = ConvertUtils.sourceToTarget(formDTO.getComponentList(), CustomerHomeDetailEntity.class); - + list.forEach(homeDetail -> homeDetail.setHomeId(customerHomeEntity.getId())); //将数据存入客户首页详情表 customerHomeDetailService.insertBatch(list);