diff --git a/module-activiti/pom.xml b/module-activiti/pom.xml index 1d1b88bf..b5ee54c3 100644 --- a/module-activiti/pom.xml +++ b/module-activiti/pom.xml @@ -21,7 +21,7 @@ org.activiti - activiti-spring-boot-starter + activiti-spring-boot-starter-basic org.activiti diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiModelServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiModelServiceImpl.java index ac399b72..42d94459 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiModelServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiModelServiceImpl.java @@ -111,8 +111,8 @@ public class ActivitiModelServiceImpl extends DefaultBaseService implements IAct } BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId()); DefaultProcessDiagramGenerator defaultProcessDiagramGenerator = new DefaultProcessDiagramGenerator(); - response.setContentType("text/xml"); - try (InputStream inputStream = defaultProcessDiagramGenerator.generateDiagram(bpmnModel, new ArrayList<>(), new ArrayList<>(), "宋体", "宋体", "宋体"); + response.setContentType("image/png"); + try (InputStream inputStream = defaultProcessDiagramGenerator.generateDiagram(bpmnModel, "png", new ArrayList<>(), new ArrayList<>(), 1.0D); OutputStream outputStream = response.getOutputStream(); ) { byte[] buf = new byte[1024]; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java index 4ede1123..c0c1c02f 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java @@ -92,6 +92,7 @@ public class ActivitiServiceImpl extends DefaultBaseService implements IActiviti BpmnModel bpmnModel = new BpmnJsonConverter().convertToBpmnModel(modelNode); Deployment deployment = repositoryService.createDeployment() .name(model.getName()) + .key(model.getKey()) .addBpmnModel(model.getKey() + ".bpmn20.xml", bpmnModel) .deploy(); model.setDeploymentId(deployment.getId()); diff --git a/module-activiti/src/main/resources/templates/activiti/list.html b/module-activiti/src/main/resources/templates/activiti/list.html index 69560b0d..8369ff2a 100644 --- a/module-activiti/src/main/resources/templates/activiti/list.html +++ b/module-activiti/src/main/resources/templates/activiti/list.html @@ -99,7 +99,7 @@ return rowData; } }, - {field:'deploymentId', width:300, title: '部署ID', align:'center', + {field:'deploymentId', width:120, title: '部署ID', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { diff --git a/pom.xml b/pom.xml index 5dc396de..e1870e52 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 9.0.14 1.18.16 1.7.30 - 7.1.0.M6 + 6.0.0 1.10 @@ -454,7 +454,7 @@ org.activiti - activiti-spring-boot-starter + activiti-spring-boot-starter-basic ${activiti.version}