Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了activiti的版本

Browse Source
This commit is contained in:
wanggeng 2021-09-01 22:18:38 +08:00
parent 65ca91116d
commit f94288675d
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module-activiti/pom.xml
View File

@ -21,7 +21,7 @@
<!-- activiti start --> <!-- activiti start -->
<dependency> <dependency>
<groupId>org.activiti</groupId> <groupId>org.activiti</groupId>
<artifactId>activiti-spring-boot-starter</artifactId> <artifactId>activiti-spring-boot-starter-basic</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.activiti</groupId> <groupId>org.activiti</groupId>

4
module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiModelServiceImpl.java
View File

@ -111,8 +111,8 @@ public class ActivitiModelServiceImpl extends DefaultBaseService implements IAct
} }
BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId()); BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId());
DefaultProcessDiagramGenerator defaultProcessDiagramGenerator = new DefaultProcessDiagramGenerator(); DefaultProcessDiagramGenerator defaultProcessDiagramGenerator = new DefaultProcessDiagramGenerator();
response.setContentType("text/xml"); response.setContentType("image/png");
try (InputStream inputStream = defaultProcessDiagramGenerator.generateDiagram(bpmnModel, new ArrayList<>(), new ArrayList<>(), "宋体", "宋体", "宋体"); try (InputStream inputStream = defaultProcessDiagramGenerator.generateDiagram(bpmnModel, "png", new ArrayList<>(), new ArrayList<>(), 1.0D);
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream = response.getOutputStream();
) { ) {
byte[] buf = new byte[1024]; byte[] buf = new byte[1024];

1
module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java
View File

@ -92,6 +92,7 @@ public class ActivitiServiceImpl extends DefaultBaseService implements IActiviti
BpmnModel bpmnModel = new BpmnJsonConverter().convertToBpmnModel(modelNode); BpmnModel bpmnModel = new BpmnJsonConverter().convertToBpmnModel(modelNode);
Deployment deployment = repositoryService.createDeployment() Deployment deployment = repositoryService.createDeployment()
.name(model.getName()) .name(model.getName())
.key(model.getKey())
.addBpmnModel(model.getKey() + ".bpmn20.xml", bpmnModel) .addBpmnModel(model.getKey() + ".bpmn20.xml", bpmnModel)
.deploy(); .deploy();
model.setDeploymentId(deployment.getId()); model.setDeploymentId(deployment.getId());

2
module-activiti/src/main/resources/templates/activiti/list.html
View File

@ -99,7 +99,7 @@
return rowData; return rowData;
} }
}, },
{field:'deploymentId', width:300, title: '部署ID', align:'center', {field:'deploymentId', width:120, title: '部署ID', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {

4
pom.xml
View File

@ -83,7 +83,7 @@
<tomcat-embed.version>9.0.14</tomcat-embed.version> <tomcat-embed.version>9.0.14</tomcat-embed.version>
<lombok.version>1.18.16</lombok.version> <lombok.version>1.18.16</lombok.version>
<slf4j.version>1.7.30</slf4j.version> <slf4j.version>1.7.30</slf4j.version>
<activiti.version>7.1.0.M6</activiti.version> <activiti.version>6.0.0</activiti.version>
<xmlgraphics.version>1.10</xmlgraphics.version> <xmlgraphics.version>1.10</xmlgraphics.version>
</properties> </properties>
@ -454,7 +454,7 @@
<!-- activiti start --> <!-- activiti start -->
<dependency> <dependency>
<groupId>org.activiti</groupId> <groupId>org.activiti</groupId>
<artifactId>activiti-spring-boot-starter</artifactId> <artifactId>activiti-spring-boot-starter-basic</artifactId>
<version>${activiti.version}</version> <version>${activiti.version}</version>
</dependency> </dependency>
<dependency> <dependency>