From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 09:59:19 +0800
Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java | 43 +++++++++++++++++++------------------------
1 files changed, 19 insertions(+), 24 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 40b031b..0cc529a 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
@@ -1,10 +1,7 @@
package com.ruoyi.demo.controller;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
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;
@@ -22,45 +19,43 @@
* @author Lion Li
*/
@Validated
-@Api(value = "娴嬭瘯鍥介檯鍖栨帶鍒跺櫒", tags = {"娴嬭瘯鍥介檯鍖栫鐞�"})
@RestController
@RequestMapping("/demo/i18n")
public class TestI18nController {
- /**
- * 閫氳繃code鑾峰彇鍥介檯鍖栧唴瀹�
- * code涓� messages.properties 涓殑 key
- *
- * 娴嬭瘯浣跨敤 user.register.success
- */
- @ApiOperation("閫氳繃code鑾峰彇鍥介檯鍖栧唴瀹�")
- @GetMapping()
- public AjaxResult<Void> get(@ApiParam("鍥介檯鍖朿ode") String code) {
- return AjaxResult.success(MessageUtils.message(code));
- }
+ /**
+ * 閫氳繃code鑾峰彇鍥介檯鍖栧唴瀹�
+ * code涓� messages.properties 涓殑 key
+ * <p>
+ * 娴嬭瘯浣跨敤 user.register.success
+ *
+ * @param code 鍥介檯鍖朿ode
+ */
+ @GetMapping()
+ public R<Void> get(String code) {
+ return R.ok(MessageUtils.message(code));
+ }
/**
* Validator 鏍￠獙鍥介檯鍖�
* 涓嶄紶鍊� 鍒嗗埆鏌ョ湅寮傚父杩斿洖
- *
+ * <p>
* 娴嬭瘯浣跨敤 not.null
*/
- @ApiOperation("Validator 鏍￠獙鍥介檯鍖�")
@GetMapping("/test1")
- public AjaxResult<Void> test1(@NotBlank(message = "{not.null}") String str) {
- return AjaxResult.success(str);
+ public R<Void> test1(@NotBlank(message = "{not.null}") String str) {
+ return R.ok(str);
}
/**
* Bean 鏍￠獙鍥介檯鍖�
* 涓嶄紶鍊� 鍒嗗埆鏌ョ湅寮傚父杩斿洖
- *
+ * <p>
* 娴嬭瘯浣跨敤 not.null
*/
- @ApiOperation("Bean 鏍￠獙鍥介檯鍖�")
@GetMapping("/test2")
- public AjaxResult<TestI18nBo> test2(@Validated TestI18nBo bo) {
- return AjaxResult.success(bo);
+ public R<TestI18nBo> test2(@Validated TestI18nBo bo) {
+ return R.ok(bo);
}
@Data
--
Gitblit v1.9.3