fix 修复 workflow 路由策略与其他服务不一致导致的问题

dromara · Nov 9, 2024 · ab828a2 · ab828a2
1 parent 0892121
commit ab828a2
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 22 deletions.
diff --git a/config/nacos/ruoyi-gateway.yml b/config/nacos/ruoyi-gateway.yml
@@ -60,6 +60,8 @@ spring:
           uri: lb://ruoyi-workflow
           predicates:
             - Path=/workflow/**
+          filters:
+            - StripPrefix=1
         # 演示服务
         - id: ruoyi-demo
           uri: lb://ruoyi-demo

diff --git a/...ules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/...ules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
@@ -34,7 +34,7 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/model")
+@RequestMapping("/model")
 public class ActModelController extends BaseController {
 
     @Autowired(required = false)

diff --git a/...orkflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/...orkflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
@@ -32,7 +32,7 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/processDefinition")
+@RequestMapping("/processDefinition")
 public class ActProcessDefinitionController extends BaseController {
 
     private final IActProcessDefinitionService actProcessDefinitionService;

diff --git a/...-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java b/...-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java
@@ -32,7 +32,7 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/processInstance")
+@RequestMapping("/processInstance")
 public class ActProcessInstanceController extends BaseController {
 
     private final IActProcessInstanceService actProcessInstanceService;

diff --git a/...dules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/...dules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
@@ -36,7 +36,7 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/task")
+@RequestMapping("/task")
 public class ActTaskController extends BaseController {
 
     @Autowired(required = false)

diff --git a/...les/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/...les/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
@@ -32,7 +32,7 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/leave")
+@RequestMapping("/leave")
 public class TestLeaveController extends BaseController {
 
     private final ITestLeaveService testLeaveService;

diff --git a/...es/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java b/...es/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java
@@ -30,7 +30,7 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/category")
+@RequestMapping("/category")
 public class WfCategoryController extends BaseController {
 
     private final IWfCategoryService wfCategoryService;

diff --git a/...-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java b/...-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
@@ -25,7 +25,7 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/definitionConfig")
+@RequestMapping("/definitionConfig")
 public class WfDefinitionConfigController extends BaseController {
 
     private final IWfDefinitionConfigService wfDefinitionConfigService;

diff --git a/.../ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java b/.../ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java
@@ -1,26 +1,27 @@
 package org.dromara.workflow.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.workflow.domain.vo.WfFormManageVo;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.workflow.domain.bo.WfFormManageBo;
+import org.dromara.workflow.domain.vo.WfFormManageVo;
 import org.dromara.workflow.service.IWfFormManageService;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 表单管理
@@ -31,7 +32,7 @@
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/formManage")
+@RequestMapping("/formManage")
 public class WfFormManageController extends BaseController {
 
     private final IWfFormManageService wfFormManageService;