From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
index bb0695f..40b031b 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
@@ -4,9 +4,16 @@
import com.ruoyi.common.utils.MessageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
/**
@@ -14,6 +21,7 @@
*
* @author Lion Li
*/
+@Validated
@Api(value = "娴嬭瘯鍥介檯鍖栨帶鍒跺櫒", tags = {"娴嬭瘯鍥介檯鍖栫鐞�"})
@RestController
@RequestMapping("/demo/i18n")
@@ -27,7 +35,42 @@
*/
@ApiOperation("閫氳繃code鑾峰彇鍥介檯鍖栧唴瀹�")
@GetMapping()
- public AjaxResult<Void> get(String code) {
+ public AjaxResult<Void> get(@ApiParam("鍥介檯鍖朿ode") String code) {
return AjaxResult.success(MessageUtils.message(code));
}
+
+ /**
+ * Validator 鏍￠獙鍥介檯鍖�
+ * 涓嶄紶鍊� 鍒嗗埆鏌ョ湅寮傚父杩斿洖
+ *
+ * 娴嬭瘯浣跨敤 not.null
+ */
+ @ApiOperation("Validator 鏍￠獙鍥介檯鍖�")
+ @GetMapping("/test1")
+ public AjaxResult<Void> test1(@NotBlank(message = "{not.null}") String str) {
+ return AjaxResult.success(str);
+ }
+
+ /**
+ * Bean 鏍￠獙鍥介檯鍖�
+ * 涓嶄紶鍊� 鍒嗗埆鏌ョ湅寮傚父杩斿洖
+ *
+ * 娴嬭瘯浣跨敤 not.null
+ */
+ @ApiOperation("Bean 鏍￠獙鍥介檯鍖�")
+ @GetMapping("/test2")
+ public AjaxResult<TestI18nBo> test2(@Validated TestI18nBo bo) {
+ return AjaxResult.success(bo);
+ }
+
+ @Data
+ public static class TestI18nBo {
+
+ @NotBlank(message = "{not.null}")
+ private String name;
+
+ @NotNull(message = "{not.null}")
+ @Range(min = 0, max = 100, message = "{length.not.valid}")
+ private Integer age;
+ }
}
--
Gitblit v1.9.3