Просмотр исходного кода

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

疯狂的狮子Li 1 год назад
Родитель
Сommit
1eaf28e985

+ 2 - 0
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

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java

@@ -34,7 +34,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/model")
+@RequestMapping("/model")
 public class ActModelController extends BaseController {
 
     @Autowired(required = false)

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java

@@ -32,7 +32,7 @@ import java.util.Map;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/processDefinition")
+@RequestMapping("/processDefinition")
 public class ActProcessDefinitionController extends BaseController {
 
     private final IActProcessDefinitionService actProcessDefinitionService;

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java

@@ -32,7 +32,7 @@ import java.util.Map;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/processInstance")
+@RequestMapping("/processInstance")
 public class ActProcessInstanceController extends BaseController {
 
     private final IActProcessInstanceService actProcessInstanceService;

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java

@@ -36,7 +36,7 @@ import java.util.Map;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/task")
+@RequestMapping("/task")
 public class ActTaskController extends BaseController {
 
     @Autowired(required = false)

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java

@@ -32,7 +32,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/leave")
+@RequestMapping("/leave")
 public class TestLeaveController extends BaseController {
 
     private final ITestLeaveService testLeaveService;

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java

@@ -30,7 +30,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/category")
+@RequestMapping("/category")
 public class WfCategoryController extends BaseController {
 
     private final IWfCategoryService wfCategoryService;

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java

@@ -25,7 +25,7 @@ import org.dromara.workflow.service.IWfDefinitionConfigService;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/definitionConfig")
+@RequestMapping("/definitionConfig")
 public class WfDefinitionConfigController extends BaseController {
 
     private final IWfDefinitionConfigService wfDefinitionConfigService;

+ 16 - 15
ruoyi-modules/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 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/workflow/formManage")
+@RequestMapping("/formManage")
 public class WfFormManageController extends BaseController {
 
     private final IWfFormManageService wfFormManageService;