瀏覽代碼

导出工作流文件修复

zdd 3 年之前
父節點
當前提交
b3eed7701c

+ 3 - 2
src/main/java/com/activiti6/controller/ModelerController.java

@@ -201,10 +201,11 @@ public class ModelerController extends BaseController {
             }
             String filename = modelData.getKey() + ".bpmn";
             // 封装输出流
-            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
             response.setHeader("Content-Disposition",
                     "attachment; filename=" + URLEncoder.encode(filename, "UTF-8"));
-            IOUtils.copy(in, response.getOutputStream());
+            // 封装输出流
+            bos = new BufferedOutputStream(response.getOutputStream());
+            bos.write(bpmnBytes);// 写入流
             response.setContentType("application/x-msdownload;");
             response.flushBuffer();
         } catch (Exception e) {

+ 2 - 1
src/main/java/com/activiti6/controller/editor/ModelSaveRestResource.java

@@ -3,6 +3,7 @@ package com.activiti6.controller.editor;
 import java.io.*;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.Process;
@@ -63,7 +64,7 @@ public class ModelSaveRestResource implements ModelDataJsonConstants {
     try {
       
       Model model = repositoryService.getModel(modelId);
-      
+      JSONObject jsonObject = JSON.parseObject(json_xml);
       ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
       
       modelJson.put(MODEL_NAME, name);