From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 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..5cc6a2e 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.utils.MessageUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.MessageUtils;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import org.springframework.validation.annotation.Validated;
@@ -12,8 +9,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
/**
@@ -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