From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:22:30 +0800 Subject: [PATCH] update 适配 新序列化注解 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java | 47 +++++++++++++++++++++-------------------------- 1 files changed, 21 insertions(+), 26 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..c6fa799 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; @@ -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