From e20b3016a6eac73ad378bbf433898647b92ff53c Mon Sep 17 00:00:00 2001 From: tony <846249920@qq.com> Date: Wed, 7 Jul 2021 14:41:53 +0800 Subject: [PATCH] fix: 1.https://gitee.com/tony2y/RuoYi-flowable/issues/I3VN42 2.https://gitee.com/tony2y/RuoYi-flowable/issues/I3TUB2 --- .../com/ruoyi/flowable/controller/FlowInstanceController.java | 2 +- .../ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowInstanceController.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowInstanceController.java index d56b818..b48f7f8 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowInstanceController.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowInstanceController.java @@ -31,7 +31,7 @@ public class FlowInstanceController { @ApiOperation(value = "根据流程定义id启动流程实例") @PostMapping("/startBy/{procDefId}") public AjaxResult startById(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, - @ApiParam(value = "变量集合,json对象") @RequestBody @RequestParam(required = false) Map variables) { + @ApiParam(value = "变量集合,json对象") @RequestBody Map variables) { return flowInstanceService.startProcessInstanceById(procDefId, variables); } diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java index a7f9889..154ec34 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java @@ -127,7 +127,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl public AjaxResult readXml(String deployId) throws IOException { ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployId).singleResult(); InputStream inputStream = repositoryService.getResourceAsStream(definition.getDeploymentId(), definition.getResourceName()); - String result = IOUtils.toString(inputStream, StandardCharsets.UTF_8); + String result = IOUtils.toString(inputStream, StandardCharsets.UTF_8.name()); return AjaxResult.success("", result); }