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

dev
疯狂的狮子Li 1 year ago
parent 4675399919
commit 1eaf28e985

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

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

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

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

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

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

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

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

@ -1,26 +1,27 @@
package org.dromara.workflow.controller; 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 cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.validation.annotation.Validated; import jakarta.validation.constraints.NotEmpty;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import jakarta.validation.constraints.NotNull;
import org.dromara.common.log.annotation.Log; import lombok.RequiredArgsConstructor;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.workflow.domain.vo.WfFormManageVo; import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.workflow.domain.bo.WfFormManageBo; import org.dromara.common.log.annotation.Log;
import org.dromara.workflow.service.IWfFormManageService; 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.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 @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/workflow/formManage") @RequestMapping("/formManage")
public class WfFormManageController extends BaseController { public class WfFormManageController extends BaseController {
private final IWfFormManageService wfFormManageService; private final IWfFormManageService wfFormManageService;

Loading…
Cancel
Save