From f94288675d9d5442d4ff3d220f9ffafd2a4823ab Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Wed, 1 Sep 2021 22:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86activiti=E7=9A=84?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module-activiti/pom.xml                                       | 2 +-
 .../service/activiti/impl/ActivitiModelServiceImpl.java       | 4 ++--
 .../activiti/service/activiti/impl/ActivitiServiceImpl.java   | 1 +
 .../src/main/resources/templates/activiti/list.html           | 2 +-
 pom.xml                                                       | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

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 @@
         <!-- activiti start -->
         <dependency>
             <groupId>org.activiti</groupId>
-            <artifactId>activiti-spring-boot-starter</artifactId>
+            <artifactId>activiti-spring-boot-starter-basic</artifactId>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
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 @@
         <tomcat-embed.version>9.0.14</tomcat-embed.version>
         <lombok.version>1.18.16</lombok.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>
     </properties>
 
@@ -454,7 +454,7 @@
             <!-- activiti start -->
             <dependency>
                 <groupId>org.activiti</groupId>
-                <artifactId>activiti-spring-boot-starter</artifactId>
+                <artifactId>activiti-spring-boot-starter-basic</artifactId>
                 <version>${activiti.version}</version>
             </dependency>
             <dependency>