From dd68585799f0c6cb0d071c7074c83fc718eabd74 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 16 Jun 2022 10:31:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86=EF=BC=8C=E6=89=93=E5=8D=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BB=A3=E7=A0=81=E4=BD=8D=E7=BD=AE=202.=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=203.=E6=9F=A5=E8=AF=A2=E5=8C=BB=E7=96=97=E5=99=A8=E6=A2=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AFSQL=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E6=9C=AA=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=8C=87=E5=AE=9A=E5=AD=97=E6=AE=B5=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/controller/auth/RegisterController.java | 6 +++++- .../admin/controller/thrsys/ThrProductsAddController.java | 2 +- .../com/glxp/sale/admin/handler/GlobalExceptionHandler.java | 3 ++- .../resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index 86e69b0..a44d252 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -198,7 +198,11 @@ public class RegisterController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - JSONObject userCode = JSONObject.parseObject(String.valueOf(redisUtil.get(Constant.CAPTCHAS + userRegisterEntity.getMobile()))); + String codeStr = String.valueOf(redisUtil.get(Constant.CAPTCHAS + userRegisterEntity.getMobile())); + if (StrUtil.isBlank(codeStr) || "null".equals(codeStr)) { + return ResultVOUtils.error(500, "验证码已过期，请重新获取"); + } + JSONObject userCode = JSONObject.parseObject(codeStr); if (userCode == null) { return ResultVOUtils.error(500, "验证码已失效，请重新获取"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index 88114e5..a957675 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -84,7 +84,7 @@ public class ThrProductsAddController { BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity); thrProductsService.insertThrProducts(thrProductsEntity); } - return ResultVOUtils.success("删除成功"); + return ResultVOUtils.success(ResultEnum.SUCCESS); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/handler/GlobalExceptionHandler.java b/api-admin/src/main/java/com/glxp/sale/admin/handler/GlobalExceptionHandler.java index 509328c..679b0c5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/handler/GlobalExceptionHandler.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/handler/GlobalExceptionHandler.java @@ -19,13 +19,14 @@ public class GlobalExceptionHandler { @ExceptionHandler(value = JsonException.class) public BaseResponse handlerJsonException(JsonException e) { // 返回对应的错误信息 + log.error(e.getMessage(), e); return ResultVOUtils.error(e.getCode(), e.getMessage()); } // 拦截API异常 @ExceptionHandler(value = RuntimeException.class) public BaseResponse handlerRuntimeException(RuntimeException e) { - log.error(e.getMessage()); + log.error(e.getMessage(), e); // 返回对应的错误信息 return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml index a463f02..f37c74f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml @@ -9,7 +9,7 @@ left join basic_corp on thr_products_add.customerId = basic_corp.erpId - AND name LIKE concat('%',#{name},'%') + AND thr_products_add.name LIKE concat('%',#{name},'%') AND code LIKE concat('%',#{code},'%')