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 36a0d0fdd..3a98ec153 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 @@ -120,7 +120,7 @@ public class AuthController { } AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties); String authorizeUrl = authRequest.authorize(AuthStateUtils.createState()); - return R.ok("操作成功", authorizeUrl); + return R.data(authorizeUrl); } /** 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 53c5f7737..23488cc5c 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 @@ -59,6 +59,17 @@ public class R implements Serializable { return restResult(data, SUCCESS, "操作成功"); } + /** + * 构建成功响应结果(明确指定业务数据) + * + * @param data 业务数据 + * @param 响应数据的泛型类型 + * @return 成功响应结果对象 + */ + public static R data(T data) { + return restResult(data, SUCCESS, "操作成功"); + } + /** * 构建成功响应结果(自定义提示信息) * 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 2335da4cd..4e57c05a8 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 @@ -1,10 +1,10 @@ package org.dromara.demo.controller; import cn.hutool.core.thread.ThreadUtil; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.domain.R; import org.dromara.common.redis.utils.RedisUtils; -import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; @@ -43,7 +43,7 @@ public class RedisCacheController { @Cacheable(cacheNames = "demo:cache#60s#10m#20#1", key = "#key", condition = "#key != null") @GetMapping("/test1") public R test1(String key, String value) { - return R.ok("操作成功", value); + return R.data(value); } /** @@ -57,7 +57,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.data(value); } /** @@ -71,7 +71,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.data(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 237b6ee2d..183ef36b7 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 @@ -5,8 +5,8 @@ import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; -import org.dromara.common.core.domain.R; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -37,7 +37,7 @@ public class RedisLockController { System.out.println("start:" + key + ",time:" + LocalTime.now()); ThreadUtil.sleep(10000); System.out.println("end :" + key + ",time:" + LocalTime.now()); - return R.ok("操作成功", value); + return R.data(value); } /** @@ -58,7 +58,7 @@ public class RedisLockController { lockTemplate.releaseLock(lockInfo); } //结束 - return R.ok("操作成功", value); + return R.data(value); } } 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 71cf3b618..ed3a11d5e 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 @@ -1,9 +1,9 @@ package org.dromara.demo.controller; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.redis.annotation.RateLimiter; import org.dromara.common.redis.enums.LimitType; -import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -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.data(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.data(value); } /** @@ -46,19 +46,19 @@ public class RedisRateLimiterController { @RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER) @GetMapping("/testcluster") public R testcluster(String value) { - return R.ok("操作成功", value); + return R.data(value); } /** * 测试请求IP限流(key基于参数获取) * 同一IP请求受影响 - * + *

* 简单变量获取 #变量 复杂表达式 #{#变量 != 1 ? 1 : 0} */ @RateLimiter(count = 2, time = 10, limitType = LimitType.IP, key = "#value") @GetMapping("/testObj") public R testObj(String value) { - return R.ok("操作成功", value); + return R.data(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..91f09c6d4 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.data(file.getOriginalFilename()); } } 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 12d2a7e09..b3f2cf1a0 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 @@ -36,7 +36,7 @@ public class SysConfigController extends BaseController { /** * 分页查询参数配置列表。 * - * @param config 查询条件 + * @param config 查询条件 * @param pageQuery 分页参数 * @return 参数配置分页结果 */ @@ -49,7 +49,7 @@ public class SysConfigController extends BaseController { /** * 导出参数配置列表。 * - * @param config 查询条件 + * @param config 查询条件 * @param response HTTP 响应 */ @Log(title = "参数管理", businessType = BusinessType.EXPORT) @@ -80,7 +80,7 @@ public class SysConfigController extends BaseController { */ @GetMapping(value = "/configKey/{configKey}") public R getConfigKey(@PathVariable String configKey) { - return R.ok("操作成功", configService.selectConfigByKey(configKey)); + return R.data(configService.selectConfigByKey(configKey)); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 1d7c31bf6..cf41a1ad0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -201,10 +201,9 @@ public class FlwDefinitionController extends BaseController { @GetMapping("/xmlString/{id}") @SaCheckPermission("workflow:definition:query") public R xmlString(@PathVariable Long id) { - return R.ok("操作成功", defService.exportJson(id)); + return R.data(defService.exportJson(id)); } - /** /** * 激活或挂起流程定义。 * diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index 537ab0786..3f9d167cd 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -27,7 +27,6 @@ import org.dromara.warm.flow.orm.entity.FlowNode; import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowNodeMapper; -import org.dromara.warm.flow.orm.mapper.FlowSkipMapper; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.dromara.workflow.mapper.FlwCategoryMapper; @@ -59,7 +58,6 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { private final FlowDefinitionMapper flowDefinitionMapper; private final FlowHisTaskMapper flowHisTaskMapper; private final FlowNodeMapper flowNodeMapper; - private final FlowSkipMapper flowSkipMapper; private final FlwCategoryMapper flwCategoryMapper; private final IFlwCommonService flwCommonService;