From a1b250e782972033ac0fbac077b8da757ada0ebd Mon Sep 17 00:00:00 2001
From: 18326186802 <862709625@qq.com>
Date: Tue, 27 Jul 2021 14:47:25 +0800
Subject: [PATCH] =?UTF-8?q?excel=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BAbug(po?=
 =?UTF-8?q?i=E7=89=88=E6=9C=AC=E5=86=B2=E7=AA=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bps-kettle/pom.xml                            | 46 ++++++++++---------
 .../src/test/java/com/kone/Testsetset.java    | 15 ------
 pom.xml                                       | 12 ++++-
 3 files changed, 35 insertions(+), 38 deletions(-)
 delete mode 100644 bps-kettle/src/test/java/com/kone/Testsetset.java

diff --git a/bps-kettle/pom.xml b/bps-kettle/pom.xml
index d99135432..657b1ad91 100644
--- a/bps-kettle/pom.xml
+++ b/bps-kettle/pom.xml
@@ -31,18 +31,6 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-quartz</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20160810</version>
-        </dependency>
-        <!--丝袜哥-->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.21</version>
-            <scope>compile</scope>
-        </dependency>
 
         <!-- kettle核心依赖 -->
         <dependency>
@@ -54,6 +42,20 @@
             <groupId>pentaho-kettle</groupId>
             <artifactId>kettle-engine</artifactId>
             <version>${kettle-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>pentaho-kettle</groupId>
@@ -113,7 +115,7 @@
             <artifactId>jtds</artifactId>
             <version>1.2.4</version>
         </dependency>
-
+<!--
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
@@ -128,16 +130,16 @@
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>3.17</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-<!--        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
         </dependency>-->
+        <!--        <dependency>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                    <scope>test</scope>
+                </dependency>-->
+        <!--        <dependency>
+                    <groupId>org.projectlombok</groupId>
+                    <artifactId>lombok</artifactId>
+                </dependency>-->
     </dependencies>
     <repositories>
         <repository>
diff --git a/bps-kettle/src/test/java/com/kone/Testsetset.java b/bps-kettle/src/test/java/com/kone/Testsetset.java
deleted file mode 100644
index 9ebe25fd3..000000000
--- a/bps-kettle/src/test/java/com/kone/Testsetset.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.kone;
-
-import com.ruoyi.kettle.tools.KettleUtil;
-import org.junit.Test;
-
-public class Testsetset {
-
-
-    @Test
-    public void test1() throws Exception {
-        KettleUtil.KettleEnv.init();
-        KettleUtil util=new KettleUtil();
-        util.callTrans("/","text",null,null);
-    }
-}
diff --git a/pom.xml b/pom.xml
index 81de1e84b..388a59e28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,8 +161,18 @@
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml</artifactId>
                 <version>${poi.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.xmlbeans</groupId>
+                        <artifactId>xmlbeans</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>3.1.0</version>
             </dependency>
-
             <!-- velocity代码生成使用模板 -->
             <dependency>
                 <groupId>org.apache.velocity</groupId>