修改模型部署导出校验

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java

@@ -1,7 +1,6 @@
 package org.dromara.workflow.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -11,7 +10,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -19,7 +20,6 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.workflow.domain.bo.ModelBo;
 import org.dromara.workflow.service.IActModelService;
 import org.dromara.workflow.utils.WorkflowUtils;
-import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.editor.constants.ModelDataJsonConstants;
 import org.flowable.editor.language.json.converter.BpmnJsonConverter;
@@ -31,9 +31,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.MultiValueMap;
 
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -168,10 +165,7 @@ public class ActModelServiceImpl implements IActModelService {
                 Integer version = model.getVersion();
                 if (version > 0) {
                     byte[] modelEditorSource = repositoryService.getModelEditorSource(model.getId());
-                    ByteArrayInputStream byteArrayInputStream = IoUtil.toStream(modelEditorSource);
+                    BpmnModel bpmnModel = WorkflowUtils.xmlToBpmnModel(modelEditorSource);
-                    XMLInputFactory xif = XMLInputFactory.newInstance();
-                    XMLStreamReader xtr = xif.createXMLStreamReader(byteArrayInputStream);
-                    BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
                     BpmnJsonConverter bpmnJsonConverter = new BpmnJsonConverter();
                     ObjectNode jsonNodes = bpmnJsonConverter.convertToJson(bpmnModel);
                     modelNode.set("model", jsonNodes);
@@ -245,10 +239,12 @@ public class ActModelServiceImpl implements IActModelService {
             if (ArrayUtil.isEmpty(xmlBytes)) {
                 throw new ServiceException("模型数据为空，请先设计流程定义模型，再进行部署！");
             }
-            byte[] toXmlBytes = WorkflowUtils.bpmnJsonToXmlBytes(xmlBytes);
+            if (JSONUtil.isTypeJSON(IOUtils.toString(xmlBytes, Constants.UTF8))) {
-            if (ArrayUtil.isEmpty(toXmlBytes)) {
+                byte[] bytes = WorkflowUtils.bpmnJsonToXmlBytes(xmlBytes);
+                if (ArrayUtil.isEmpty(bytes)) {
                     throw new ServiceException("模型不能为空，请至少设计一条主线流程！");
                 }
+            }
             // 查询模型的基本信息
             Model model = repositoryService.getModel(id);
             // xml资源的名称 ，对应act_ge_bytearray表中的name_字段
@@ -294,8 +290,8 @@ public class ActModelServiceImpl implements IActModelService {
             Model model = repositoryService.getModel(modelId);
             byte[] xmlBytes = repositoryService.getModelEditorSource(modelId);
             if (ObjectUtil.isNotNull(model)) {
-                byte[] toXmlBytes = WorkflowUtils.bpmnJsonToXmlBytes(xmlBytes);
+                byte[] bytes = WorkflowUtils.bpmnJsonToXmlBytes(xmlBytes);
-                if (ArrayUtil.isEmpty(toXmlBytes)) {
+                if (JSONUtil.isTypeJSON(IOUtils.toString(xmlBytes, Constants.UTF8)) && ArrayUtil.isEmpty(bytes)) {
                     zipName = "模型不能为空，请至少设计一条主线流程！";
                     zos.putNextEntry(new ZipEntry(zipName + ".txt"));
                     zos.write(zipName.getBytes(StandardCharsets.UTF_8));

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java

@@ -1,5 +1,7 @@
 package org.dromara.workflow.utils;
 
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.dromara.common.json.utils.JsonUtils;
@@ -7,7 +9,13 @@ import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.editor.language.json.converter.BpmnJsonConverter;
 
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.rmi.ServerException;
 
 /**
  * 工作流工具
@@ -39,4 +47,16 @@ public class WorkflowUtils {
         //2.将bpmnModel转为xml
         return new BpmnXMLConverter().convertToXML(bpmnModel);
     }
+
+    /**
+     * xml转为bpmnModel
+     *
+     * @param xmlBytes xml
+     */
+    public static BpmnModel xmlToBpmnModel(byte[] xmlBytes) throws XMLStreamException {
+        ByteArrayInputStream byteArrayInputStream = IoUtil.toStream(xmlBytes);
+        XMLInputFactory xif = XMLInputFactory.newInstance();
+        XMLStreamReader xtr = xif.createXMLStreamReader(byteArrayInputStream);
+        return new BpmnXMLConverter().convertToBpmnModel(xtr);
+    }
 }