From 63f0a371fd43742f3368cca2c5758be509eb854b Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Tue, 9 Jan 2018 11:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E7=B2=BE?= =?UTF-8?q?=E7=A1=AE=E6=A0=A1=E9=AA=8C,=E7=BB=9F=E4=B8=80=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=BB=91=E5=AE=9A=E5=BC=82=E5=B8=B8,=E5=B0=86?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=80=9A=E7=9F=A5=E5=A4=84=E7=90=86=E7=B1=BB?= =?UTF-8?q?=E7=A7=BB=E5=85=A5ssm=E5=9F=BA=E7=A1=80=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../micro/fast/common/CommonApplication.java | 2 +- .../handler/ExceptionHandlerController.java | 21 ++++++++++++++++--- .../micro/fast/common/response/BaseConst.java | 5 +++++ .../common/util/ExceptionHandlerUtil.java | 12 ----------- .../com/micro/fast/upms/pojo/UpmsUser.java | 18 ++++++++++------ 5 files changed, 36 insertions(+), 22 deletions(-) rename {ms/upms/src/main/java/com/micro/fast/upms/controller => boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception}/handler/ExceptionHandlerController.java (67%) delete mode 100644 boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/ExceptionHandlerUtil.java diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java index 4a0429d..3990c24 100644 --- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java +++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration; * @since 1.0 */ @Configuration -@ComponentScan(basePackages = {"com.micro.fast.common.config"}) +@ComponentScan(basePackages = {"com.micro.fast.common"}) public class CommonApplication { // public static void main(String[] args) { // SpringApplication.run(CommonApplication.class, args); diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/handler/ExceptionHandlerController.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/handler/ExceptionHandlerController.java similarity index 67% rename from ms/upms/src/main/java/com/micro/fast/upms/controller/handler/ExceptionHandlerController.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/handler/ExceptionHandlerController.java index 897ef6f..97997d5 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/handler/ExceptionHandlerController.java +++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/handler/ExceptionHandlerController.java @@ -1,9 +1,10 @@ -package com.micro.fast.upms.controller.handler; +package com.micro.fast.common.exception.handler; import com.micro.fast.common.exception.SystemException; import com.micro.fast.common.exception.UserException; import com.micro.fast.util.ExceptionUtil; import org.springframework.http.HttpStatus; +import org.springframework.validation.BindException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -26,7 +27,7 @@ public class ExceptionHandlerController { @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) public Map handlerSystemException(SystemException se) { String[] strings = ExceptionUtil.splitCodeMsg(se.getMessage()); - Map map = new HashMap<>(); + Map map = new HashMap<>(1); map.put(strings[0],strings[1]); return map; } @@ -40,7 +41,21 @@ public class ExceptionHandlerController { @ResponseStatus(HttpStatus.BAD_REQUEST) public Map handlerUserException(UserException se) { String[] strings = ExceptionUtil.splitCodeMsg(se.getMessage()); - Map map = new HashMap<>(); + Map map = new HashMap<>(1); + map.put(strings[0],strings[1]); + return map; + } + + /** + * 用于统一处理参数校验异常 + * @param be + * @return + */ + @ExceptionHandler(BindException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public Map handlerBingException(BindException be){ + String[] strings = ExceptionUtil.splitCodeMsg(be.getMessage()); + Map map = new HashMap<>(1); map.put(strings[0],strings[1]); return map; } diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/BaseConst.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/BaseConst.java index 98a4299..d468839 100644 --- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/BaseConst.java +++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/BaseConst.java @@ -1,5 +1,7 @@ package com.micro.fast.common.response; +import com.micro.fast.util.ExceptionUtil; + /** * 数据字典 * @@ -10,6 +12,9 @@ package com.micro.fast.common.response; public class BaseConst { public static final String DEFAULT_VALIDATE_CODE = "888888"; + + public static final String BASEMSG_PREFIX = DEFAULT_VALIDATE_CODE+ ExceptionUtil.split; + /** * 服务器响应数据字典 */ diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/ExceptionHandlerUtil.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/ExceptionHandlerUtil.java deleted file mode 100644 index 8af95e5..0000000 --- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/ExceptionHandlerUtil.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.micro.fast.common.util; - -import com.micro.fast.util.ExceptionUtil; - -/** - * 对于基础异常工具类进行封装 - * @author lsy - */ -public class ExceptionHandlerUtil { - - -} diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java index 26e41bb..d5fe1d8 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java @@ -1,18 +1,24 @@ package com.micro.fast.upms.pojo; import com.micro.fast.common.response.BaseConst; -import com.micro.fast.util.ExceptionUtil; -import org.hibernate.validator.constraints.NotBlank; +import org.hibernate.validator.constraints.Email; +import javax.validation.constraints.Pattern; import java.io.Serializable; public class UpmsUser implements Serializable { - private Integer id; - @NotBlank(message = BaseConst.DEFAULT_VALIDATE_CODE+ExceptionUtil.split+"请按提示输入用户名") + private Integer id; + /** + * 用户名必须为6-16位字母或数字的组合 + */ + @Pattern(regexp = "^[a-z,A-Z,0-9]{6,16}$",message = BaseConst.BASEMSG_PREFIX+"请按要求输入用户名") private String username; - @NotBlank(message = BaseConst.DEFAULT_VALIDATE_CODE+ExceptionUtil.split+"请按提示输入密码") + /** + * 密码必须为6-16位字母或数字的组合 + */ + @Pattern(regexp = "^[a-z,A-Z,0-9]{6,16}$",message = BaseConst.BASEMSG_PREFIX+"请按要求输入密码") private String password; private String salt; @@ -23,7 +29,7 @@ public class UpmsUser implements Serializable { private String phone; - @NotBlank(message = BaseConst.DEFAULT_VALIDATE_CODE+ExceptionUtil.split+"请按照提示输入邮箱") + @Email(message = BaseConst.BASEMSG_PREFIX+"邮箱格式不正确") private String email; private Byte sex;