From 68e57803f3386ab4f5211dd30e4d8ade9d24f0a4 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:04:08 +0800 Subject: [PATCH] update 适配 springboot-admin 改为最新 spring-security 写法 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 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 f568882..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,7 +19,6 @@ * @author Lion Li */ @Validated -@Api(value = "娴嬭瘯鍥介檯鍖栨帶鍒跺櫒", tags = {"娴嬭瘯鍥介檯鍖栫鐞�"}) @RestController @RequestMapping("/demo/i18n") public class TestI18nController { @@ -32,11 +28,12 @@ * code涓� messages.properties 涓殑 key * <p> * 娴嬭瘯浣跨敤 user.register.success + * + * @param code 鍥介檯鍖朿ode */ - @ApiOperation("閫氳繃code鑾峰彇鍥介檯鍖栧唴瀹�") @GetMapping() - public AjaxResult<Void> get(@ApiParam("鍥介檯鍖朿ode") String code) { - return AjaxResult.success(MessageUtils.message(code)); + public R<Void> get(String code) { + return R.ok(MessageUtils.message(code)); } /** @@ -45,10 +42,9 @@ * <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); } /** @@ -57,10 +53,9 @@ * <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