From 8a222df60e6fd99e740a640804b9354a7d2657e3 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期二, 07 六月 2022 11:04:00 +0800 Subject: [PATCH] update docker mysql 8.0.27 => 8.0.29 update docker nginx 1.21.3 => 1.21.6 update docker redis 6.2.6 => 6.2.7 update docker minio 2021-10-27 => 2022-05-26 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java index 77ee268..f877753 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java @@ -1,6 +1,6 @@ package com.ruoyi.demo.controller.queue; -import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.redis.QueueUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,45 +34,45 @@ @ApiOperation("璁㈤槄闃熷垪") @GetMapping("/subscribe") - public AjaxResult<Void> subscribe(@ApiParam("闃熷垪鍚�") String queueName) { + public R<Void> subscribe(@ApiParam("闃熷垪鍚�") String queueName) { log.info("閫氶亾: {} 鐩戝惉涓�......", queueName); // 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙� QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> { // 瑙傚療鎺ユ敹鏃堕棿 log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", queueName, orderNum); }); - return AjaxResult.success("鎿嶄綔鎴愬姛"); + return R.ok("鎿嶄綔鎴愬姛"); } @ApiOperation("娣诲姞闃熷垪鏁版嵁") @GetMapping("/add") - public AjaxResult<Void> add(@ApiParam("闃熷垪鍚�") String queueName, + public R<Void> add(@ApiParam("闃熷垪鍚�") String queueName, @ApiParam("璁㈠崟鍙�") String orderNum, @ApiParam("寤惰繜鏃堕棿(绉�)") Long time) { QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS); // 瑙傚療鍙戦�佹椂闂� log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, orderNum); - return AjaxResult.success("鎿嶄綔鎴愬姛"); + return R.ok("鎿嶄綔鎴愬姛"); } @ApiOperation("鍒犻櫎闃熷垪鏁版嵁") @GetMapping("/remove") - public AjaxResult<Void> remove(@ApiParam("闃熷垪鍚�") String queueName, + public R<Void> remove(@ApiParam("闃熷垪鍚�") String queueName, @ApiParam("璁㈠崟鍙�") String orderNum) { if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) { log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, orderNum); } else { - return AjaxResult.error("鎿嶄綔澶辫触"); + return R.fail("鎿嶄綔澶辫触"); } - return AjaxResult.success("鎿嶄綔鎴愬姛"); + return R.ok("鎿嶄綔鎴愬姛"); } @ApiOperation("閿�姣侀槦鍒�") @GetMapping("/destroy") - public AjaxResult<Void> destroy(@ApiParam("闃熷垪鍚�") String queueName) { + public R<Void> destroy(@ApiParam("闃熷垪鍚�") String queueName) { // 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦� QueueUtils.destroyDelayedQueue(queueName); - return AjaxResult.success("鎿嶄綔鎴愬姛"); + return R.ok("鎿嶄綔鎴愬姛"); } } -- Gitblit v1.9.3