From 75d3d78caed63618a1fcd5ae16ccc741eef85193 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 23 Jul 2024 07:32:47 +0800
Subject: [PATCH] md

---
 .idea/libraries/Maven__cglib_cglib_3_1.xml      | 13 -------------
 ...l => Maven__com_alibaba_easyexcel_3_1_7.xml} |  8 ++++----
 ..._apache_commons_commons_collections4_4_1.xml | 13 -------------
 .../Maven__org_apache_poi_poi_3_17.xml          | 13 -------------
 ...n__org_apache_poi_poi_ooxml_schemas_3_17.xml | 13 -------------
 ...aven__org_apache_xmlbeans_xmlbeans_2_6_0.xml | 13 -------------
 .../Maven__org_ehcache_ehcache_3_9_9.xml        | 13 -------------
 .idea/libraries/Maven__org_ow2_asm_asm_4_2.xml  | 13 -------------
 emis-biz-web/emis-biz-web.iml                   | 15 +++++++--------
 emis-biz/emis-biz.iml                           | 17 ++++++++---------
 emis-biz/pom.xml                                |  9 ++-------
 11 files changed, 21 insertions(+), 119 deletions(-)
 delete mode 100644 .idea/libraries/Maven__cglib_cglib_3_1.xml
 rename .idea/libraries/{Maven__com_alibaba_easyexcel_2_2_7.xml => Maven__com_alibaba_easyexcel_3_1_7.xml} (64%)
 delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml
 delete mode 100644 .idea/libraries/Maven__org_apache_poi_poi_3_17.xml
 delete mode 100644 .idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
 delete mode 100644 .idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
 delete mode 100644 .idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml
 delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_4_2.xml

diff --git a/.idea/libraries/Maven__cglib_cglib_3_1.xml b/.idea/libraries/Maven__cglib_cglib_3_1.xml
deleted file mode 100644
index bd3cddd6b..000000000
--- a/.idea/libraries/Maven__cglib_cglib_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: cglib:cglib:3.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.1/cglib-3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.1/cglib-3.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib/3.1/cglib-3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml b/.idea/libraries/Maven__com_alibaba_easyexcel_3_1_7.xml
similarity index 64%
rename from .idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml
rename to .idea/libraries/Maven__com_alibaba_easyexcel_3_1_7.xml
index a74963b4c..3bcfa2aea 100644
--- a/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml
+++ b/.idea/libraries/Maven__com_alibaba_easyexcel_3_1_7.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.alibaba:easyexcel:2.2.7">
+  <library name="Maven: com.alibaba:easyexcel:3.1.7">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/2.2.7/easyexcel-2.2.7.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.1.7/easyexcel-3.1.7.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/2.2.7/easyexcel-2.2.7-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.1.7/easyexcel-3.1.7-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/2.2.7/easyexcel-2.2.7-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/easyexcel/3.1.7/easyexcel-3.1.7-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml
deleted file mode 100644
index 1e0b53d1f..000000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-collections4:4.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml
deleted file mode 100644
index 1a446fbf1..000000000
--- a/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.poi:poi:3.17">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.17/poi-3.17.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.17/poi-3.17-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.17/poi-3.17-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
deleted file mode 100644
index d214d8b81..000000000
--- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.poi:poi-ooxml-schemas:3.17">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
deleted file mode 100644
index cb0f76d6c..000000000
--- a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml b/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml
deleted file mode 100644
index 9ccdf70d9..000000000
--- a/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.ehcache:ehcache:3.9.9">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ehcache/ehcache/3.9.9/ehcache-3.9.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ehcache/ehcache/3.9.9/ehcache-3.9.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ehcache/ehcache/3.9.9/ehcache-3.9.9-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml b/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml
deleted file mode 100644
index b5e374897..000000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.ow2.asm:asm:4.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/4.2/asm-4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/4.2/asm-4.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/4.2/asm-4.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index fbd92cc4c..6c0a1b6ad 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -113,6 +113,12 @@
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
@@ -260,13 +266,6 @@
     <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:tea:1.1.14" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.7" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml
index 31792c29f..a85c1c023 100644
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@@ -66,6 +66,12 @@
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
@@ -79,6 +85,7 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
     <orderEntry type="library" name="Maven: org.redisson:redisson:3.10.0" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.74.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.74.Final" level="project" />
@@ -218,14 +225,6 @@
     <orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:tea:1.1.14" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.7" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index ba08b6c95..1eb1ab993 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -117,13 +117,8 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>2.2.7</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>poi-ooxml</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-            </exclusions>
+            <version>3.1.7</version>
+
         </dependency>
 
         <!-- poi -->