From 1bc238d428cf72a7a1d6a90695b9022fab537902 Mon Sep 17 00:00:00 2001 From: David Wei Date: Wed, 4 Oct 2023 20:12:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E4=BF=A1=E6=81=AF=E4=B8=BB=E4=BD=93=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=20string=20=E7=B1=BB=E5=9E=8B=E7=9A=84=20data=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E5=88=B0=20msg=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/web/controller/AuthController.java | 4 ++-- .../src/main/java/org/dromara/common/core/domain/R.java | 6 +----- .../org/dromara/demo/controller/RedisCacheController.java | 6 +++--- .../org/dromara/demo/controller/RedisLockController.java | 4 ++-- .../dromara/demo/controller/RedisPubSubController.java | 4 ++-- .../demo/controller/RedisRateLimiterController.java | 8 ++++---- .../dromara/demo/controller/Swagger3DemoController.java | 2 +- .../org/dromara/demo/controller/WeSocketController.java | 2 +- .../demo/controller/queue/BoundedQueueController.java | 6 +++--- .../demo/controller/queue/DelayedQueueController.java | 8 ++++---- .../demo/controller/queue/PriorityQueueController.java | 6 +++--- .../system/controller/system/SysConfigController.java | 2 +- 12 files changed, 27 insertions(+), 31 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index 3c03e4248..835a23e86 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -99,7 +99,7 @@ public class AuthController { } AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties); String authorizeUrl = authRequest.authorize(AuthStateUtils.createState()); - return R.ok("操作成功", authorizeUrl); + return R.ok(authorizeUrl); } /** @@ -140,7 +140,7 @@ public class AuthController { @PostMapping("/logout") public R logout() { loginService.logout(); - return R.ok("退出成功"); + return R.ok(null, "退出成功"); } /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java index be858057e..48c3ccc6e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java @@ -43,11 +43,7 @@ public class R implements Serializable { return restResult(data, SUCCESS, "操作成功"); } - public static R ok(String msg) { - return restResult(null, SUCCESS, msg); - } - - public static R ok(String msg, T data) { + public static R ok(T data, String msg) { return restResult(data, SUCCESS, msg); } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java index 341880c5d..b566db1fe 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java @@ -42,7 +42,7 @@ public class RedisCacheController { @Cacheable(cacheNames = "demo:cache#60s#10m#20", key = "#key", condition = "#key != null") @GetMapping("/test1") public R test1(String key, String value) { - return R.ok("操作成功", value); + return R.ok(value); } /** @@ -56,7 +56,7 @@ public class RedisCacheController { @CachePut(cacheNames = CacheNames.DEMO_CACHE, key = "#key", condition = "#key != null") @GetMapping("/test2") public R test2(String key, String value) { - return R.ok("操作成功", value); + return R.ok(value); } /** @@ -70,7 +70,7 @@ public class RedisCacheController { @CacheEvict(cacheNames = CacheNames.DEMO_CACHE, key = "#key", condition = "#key != null") @GetMapping("/test3") public R test3(String key, String value) { - return R.ok("操作成功", value); + return R.ok(value); } /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java index b7e096266..89b35e2eb 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java @@ -40,7 +40,7 @@ public class RedisLockController { e.printStackTrace(); } System.out.println("end :" + key + ",time:" + LocalTime.now().toString()); - return R.ok("操作成功", value); + return R.ok(value); } /** @@ -65,7 +65,7 @@ public class RedisLockController { lockTemplate.releaseLock(lockInfo); } //结束 - return R.ok("操作成功", value); + return R.ok(value); } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java index bdbf0334a..e8b87dd9d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java @@ -28,7 +28,7 @@ public class RedisPubSubController { RedisUtils.publish(key, value, consumer -> { System.out.println("发布通道 => " + key + ", 发送值 => " + value); }); - return R.ok("操作成功"); + return R.ok(); } /** @@ -41,7 +41,7 @@ public class RedisPubSubController { RedisUtils.subscribe(key, String.class, msg -> { System.out.println("订阅通道 => " + key + ", 接收值 => " + msg); }); - return R.ok("操作成功"); + return R.ok(); } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java index f8adf7ded..be2941b0d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java @@ -26,7 +26,7 @@ public class RedisRateLimiterController { @RateLimiter(count = 2, time = 10) @GetMapping("/test") public R test(String value) { - return R.ok("操作成功", value); + return R.ok(value); } /** @@ -36,7 +36,7 @@ public class RedisRateLimiterController { @RateLimiter(count = 2, time = 10, limitType = LimitType.IP) @GetMapping("/testip") public R testip(String value) { - return R.ok("操作成功", value); + return R.ok(value); } /** @@ -46,7 +46,7 @@ public class RedisRateLimiterController { @RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER) @GetMapping("/testcluster") public R testcluster(String value) { - return R.ok("操作成功", value); + return R.ok(value); } /** @@ -58,7 +58,7 @@ public class RedisRateLimiterController { @RateLimiter(count = 2, time = 10, limitType = LimitType.IP, key = "#value") @GetMapping("/testObj") public R testObj(String value) { - return R.ok("操作成功", value); + return R.ok(value); } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java index bb02f98d5..1daab3511 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java @@ -25,7 +25,7 @@ public class Swagger3DemoController { */ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R upload(@RequestPart("file") MultipartFile file) { - return R.ok("操作成功", file.getOriginalFilename()); + return R.ok(file.getOriginalFilename()); } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java index 699a5e602..54a1fee00 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java @@ -28,6 +28,6 @@ public class WeSocketController { @GetMapping("/send") public R send(WebSocketMessageDto dto) throws InterruptedException { WebSocketUtils.publishMessage(dto); - return R.ok("操作成功"); + return R.ok(); } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java index 30ec27f7f..a41153a89 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java @@ -55,7 +55,7 @@ public class BoundedQueueController { log.info("通道: {} , 发送数据: {}", queueName, data); } } - return R.ok("操作成功"); + return R.ok(); } /** @@ -71,7 +71,7 @@ public class BoundedQueueController { } else { return R.fail("操作失败"); } - return R.ok("操作成功"); + return R.ok(); } /** @@ -86,7 +86,7 @@ public class BoundedQueueController { data = QueueUtils.getBoundedQueueObject(queueName); log.info("通道: {} , 获取数据: {}", queueName, data); } while (data != null); - return R.ok("操作成功"); + return R.ok(); } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java index f9b81c120..3a2d1fd28 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java @@ -41,7 +41,7 @@ public class DelayedQueueController { // 观察接收时间 log.info("通道: {}, 收到数据: {}", queueName, orderNum); }); - return R.ok("操作成功"); + return R.ok(); } /** @@ -56,7 +56,7 @@ public class DelayedQueueController { QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS); // 观察发送时间 log.info("通道: {} , 发送数据: {}", queueName, orderNum); - return R.ok("操作成功"); + return R.ok(); } /** @@ -72,7 +72,7 @@ public class DelayedQueueController { } else { return R.fail("操作失败"); } - return R.ok("操作成功"); + return R.ok(); } /** @@ -84,7 +84,7 @@ public class DelayedQueueController { public R destroy(String queueName) { // 用完了一定要销毁 否则会一直存在 QueueUtils.destroyDelayedQueue(queueName); - return R.ok("操作成功"); + return R.ok(); } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java index 02c739650..c643aba3a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java @@ -48,7 +48,7 @@ public class PriorityQueueController { log.info("通道: {} , 发送数据: {}, 发送失败", queueName, data); } } - return R.ok("操作成功"); + return R.ok(); } /** @@ -68,7 +68,7 @@ public class PriorityQueueController { } else { return R.fail("操作失败"); } - return R.ok("操作成功"); + return R.ok(); } /** @@ -83,7 +83,7 @@ public class PriorityQueueController { data = QueueUtils.getPriorityQueueObject(queueName); log.info("通道: {} , 获取数据: {}", queueName, data); } while (data != null); - return R.ok("操作成功"); + return R.ok(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java index 96a48bbca..eb41d8d47 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -68,7 +68,7 @@ public class SysConfigController extends BaseController { * @param configKey 参数Key */ @GetMapping(value = "/configKey/{configKey}") - public R getConfigKey(@PathVariable String configKey) { + public R getConfigKey(@PathVariable String configKey) { return R.ok(configService.selectConfigByKey(configKey)); } From 74c7d2c563f4ab9a3a696b8d5cba5e0e2f7d22d3 Mon Sep 17 00:00:00 2001 From: David Wei Date: Wed, 4 Oct 2023 21:09:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E4=BF=A1=E6=81=AF=E4=B8=BB=E4=BD=93=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=20string=20=E7=B1=BB=E5=9E=8B=E7=9A=84=20data=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E5=88=B0=20msg=20=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/demo/controller/TestDemoController.java | 2 +- .../java/org/dromara/demo/controller/TestI18nController.java | 4 ++-- .../dromara/system/controller/system/SysUserController.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java index f31c54074..6ea5fe092 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java @@ -73,7 +73,7 @@ public class TestDemoController extends BaseController { @Log(title = "测试单表", businessType = BusinessType.IMPORT) @SaCheckPermission("demo:demo:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R importData(@RequestPart("file") MultipartFile file) throws Exception { + public R importData(@RequestPart("file") MultipartFile file) throws Exception { ExcelResult excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true); List list = MapstructUtils.convert(excelResult.getList(), TestDemo.class); testDemoService.saveBatch(list); diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java index 40393c525..3c1328637 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java @@ -32,7 +32,7 @@ public class TestI18nController { * @param code 国际化code */ @GetMapping() - public R get(String code) { + public R get(String code) { return R.ok(MessageUtils.message(code)); } @@ -43,7 +43,7 @@ public class TestI18nController { * 测试使用 not.null */ @GetMapping("/test1") - public R test1(@NotBlank(message = "{not.null}") String str) { + public R test1(@NotBlank(message = "{not.null}") String str) { return R.ok(str); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index 628060ae1..86349e73d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -85,7 +85,7 @@ public class SysUserController extends BaseController { @Log(title = "用户管理", businessType = BusinessType.IMPORT) @SaCheckPermission("system:user:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { + public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport)); return R.ok(result.getAnalysis()); }