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

This commit is contained in:
疯狂的狮子Li
2024-11-10 00:08:22 +08:00
parent 0892121cf7
commit ab828a2579
9 changed files with 26 additions and 23 deletions

View File

@@ -60,6 +60,8 @@ spring:
uri: lb://ruoyi-workflow
predicates:
- Path=/workflow/**
filters:
- StripPrefix=1
# 演示服务
- id: ruoyi-demo
uri: lb://ruoyi-demo

View File

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

View File

@@ -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;

View File

@@ -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;

View File

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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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.workflow.domain.bo.WfFormManageBo;
import org.dromara.workflow.service.IWfFormManageService;
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.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;