From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 八月 2024 11:43:59 +0800
Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev

---
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
index f03173e..217538e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
@@ -10,6 +10,7 @@
 import com.alibaba.excel.util.StringUtils;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.image.PNGTranscoder;
@@ -38,6 +39,7 @@
 import org.flowable.engine.repository.ModelQuery;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.validation.ValidationError;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -59,13 +61,15 @@
  *
  * @author may
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class ActModelServiceImpl implements IActModelService {
 
-    private final RepositoryService repositoryService;
-    private final IWfNodeConfigService iWfNodeConfigService;
-    private final IWfDefinitionConfigService iWfDefinitionConfigService;
+    @Autowired(required = false)
+    private RepositoryService repositoryService;
+    private final IWfNodeConfigService wfNodeConfigService;
+    private final IWfDefinitionConfigService wfDefinitionConfigService;
 
     /**
      * 鍒嗛〉鏌ヨ妯″瀷
@@ -131,7 +135,7 @@
             repositoryService.addModelEditorSource(model.getId(), StrUtil.utf8Bytes(xml));
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             throw new ServiceException(e.getMessage());
         }
     }
@@ -157,6 +161,7 @@
                 modelVo.setDescription(model.getMetaInfo());
                 return modelVo;
             } catch (Exception e) {
+                log.error(e.getMessage(), e);
                 throw new ServiceException(e.getMessage());
             }
         }
@@ -181,6 +186,7 @@
             model.setMetaInfo(modelBo.getDescription());
             repositoryService.saveModel(model);
         } catch (Exception e) {
+            log.error(e.getMessage(), e);
             throw new ServiceException(e.getMessage());
         }
         return true;
@@ -230,7 +236,7 @@
             repositoryService.addModelEditorSourceExtra(model.getId(), result);
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             throw new ServiceException(e.getMessage());
         }
     }
@@ -291,16 +297,16 @@
             repositoryService.setProcessDefinitionCategory(definition.getId(), model.getCategory());
             //鏇存柊娴佺▼瀹氫箟閰嶇疆
             if (processDefinition != null) {
-                WfDefinitionConfigVo definitionVo = iWfDefinitionConfigService.getByDefId(processDefinition.getId());
+                WfDefinitionConfigVo definitionVo = wfDefinitionConfigService.getByDefId(processDefinition.getId());
                 if (definitionVo != null) {
-                    iWfDefinitionConfigService.deleteByDefIds(Collections.singletonList(processDefinition.getId()));
+                    wfDefinitionConfigService.deleteByDefIds(Collections.singletonList(processDefinition.getId()));
                     WfDefinitionConfigBo wfFormDefinition = new WfDefinitionConfigBo();
                     wfFormDefinition.setDefinitionId(definition.getId());
                     wfFormDefinition.setProcessKey(definition.getKey());
                     wfFormDefinition.setTableName(definitionVo.getTableName());
                     wfFormDefinition.setVersion(definition.getVersion());
                     wfFormDefinition.setRemark(definitionVo.getRemark());
-                    iWfDefinitionConfigService.saveOrUpdate(wfFormDefinition);
+                    wfDefinitionConfigService.saveOrUpdate(wfFormDefinition);
                 }
             }
             //鏇存柊娴佺▼鑺傜偣閰嶇疆琛ㄥ崟
@@ -321,11 +327,11 @@
                 }
             }
             if (CollUtil.isNotEmpty(wfNodeConfigList)) {
-                iWfNodeConfigService.saveOrUpdate(wfNodeConfigList);
+                wfNodeConfigService.saveOrUpdate(wfNodeConfigList);
             }
             return true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             throw new ServiceException(e.getMessage());
         }
     }
@@ -370,7 +376,7 @@
             // 鍒峰嚭鍝嶅簲娴�
             response.flushBuffer();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 
@@ -417,6 +423,7 @@
                 }
             }
         } catch (Exception e) {
+            log.error(e.getMessage(), e);
             throw new ServiceException(e.getMessage());
         }
         return true;

--
Gitblit v1.9.3