小书童优化

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.com.jdkj</groupId>
     <artifactId>little-scholar</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
 
     <packaging>jar</packaging>
     <description>小书童</description>

src/main/java/cn/com/jdkj/customer/controller/CustomerController.java

@@ -9,6 +9,7 @@ import cn.com.jdkj.entity.ResultBean;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -24,26 +25,26 @@ public class CustomerController {
     @GetMapping("/login")
     @ApiOperation("登入")
     @CheckSign
-    public ResultBean login(LoginDto dto){
+    public ResultBean login(@Validated LoginDto dto){
         return customerService.login(dto);
     }
 
     @GetMapping("/register")
     @ApiOperation("注册")
     @CheckSign
-    public ResultBean register(RegisterDto dto){
+    public ResultBean register(@Validated RegisterDto dto){
         return customerService.register(dto);
     }
     @PostMapping("/question")
     @ApiOperation("访问问题(返回文本")
     @CheckSign
-    public ResultBean question(@RequestBody QuestionDto dto){
+    public ResultBean question(@Validated @RequestBody QuestionDto dto){
         return customerService.question(dto);
     }
     @GetMapping("/questionToAudio")
     @ApiOperation("访问问题(返回音频流")
     @CheckSign
-    public void questionToAudio(QuestionDto dto, HttpServletResponse response){
+    public void questionToAudio(@Validated QuestionDto dto, HttpServletResponse response){
         customerService.questionToAudio(dto, response);
     }
 }

src/main/java/cn/com/jdkj/customer/dto/LoginDto.java

@@ -5,10 +5,14 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class LoginDto {
+    @NotNull(message = "用户名不可为空")
     String username;
+    @NotNull(message = "密码不可为空")
     String password;
 }

src/main/java/cn/com/jdkj/customer/dto/QuestionDto.java

@@ -5,10 +5,13 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class QuestionDto {
+    @NotNull(message = "请输入问题")
     String qs;
     String UUID;
 }

src/main/java/cn/com/jdkj/customer/dto/RegisterDto.java

@@ -4,11 +4,16 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class RegisterDto {
+    @NotNull(message = "用户名不可为空")
     String username;
+    @NotNull(message = "密码不可为空")
     String password;
+
     String code;
 }

src/main/java/cn/com/jdkj/enums/ReturnCode.java

@@ -8,6 +8,7 @@ import lombok.Getter;
 public enum ReturnCode {
 
     SUCCESS(200,"成功"),
+    PARAM_ERROR(501,"参数错误"),
     USER_NOT_ACTIVE(400,"账号登录失败，账号未激活。"),
     PASSWORD_ERROR(301,"密码错误，或账号错误。"),
     USER_NOT_EXSIT(302,"账号不存在请注册。"),

src/main/java/cn/com/jdkj/exception/GlobalExceptionHandler.java

@@ -1,7 +1,7 @@
 package cn.com.jdkj.exception;
 
-import cn.com.jdkj.constant.ReturnCode;
 import cn.com.jdkj.entity.ResultBean;
+import cn.com.jdkj.enums.ReturnCode;
 import cn.dev33.satoken.exception.NotLoginException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.multipart.support.MissingServletRequestPartException;
 
 import javax.validation.ConstraintViolationException;
+import javax.validation.ValidationException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -33,4 +34,8 @@ public class GlobalExceptionHandler {
     public ResultBean<?> customException(CustomException e) {
         return ResultBean.error(e.getCode(),e.getMessage());
     }
+    @ExceptionHandler({ValidationException.class})
+    public ResultBean<?> ValidationExceptionException(ValidationException e) {
+        return ResultBean.error(ReturnCode.PARAM_ERROR.getCode(),e.getMessage());
+    }
 }