diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a468a999..8e5bc7c0 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,5 +16,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="com.e-iceblue" />
+      <option name="name" value="e-iceblue" />
+      <option name="url" value="https://repo.e-iceblue.cn/repository/maven-public/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/aspose_words_24_10_jdk17.xml b/.idea/libraries/aspose_words_24_10_jdk17.xml
deleted file mode 100644
index e3602cd5..00000000
--- a/.idea/libraries/aspose_words_24_10_jdk17.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="aspose-words-24.10-jdk17">
-    <CLASSES>
-      <root url="jar://C:/aspose-words-24.10-jdk17.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/Spire.Doc for Java 5.2.0/spire.doc.free-5.2.0.jar b/Spire.Doc for Java 5.2.0/spire.doc.free-5.2.0.jar
new file mode 100644
index 00000000..a0c4d895
Binary files /dev/null and b/Spire.Doc for Java 5.2.0/spire.doc.free-5.2.0.jar differ
diff --git a/pom.xml b/pom.xml
index 011aa19a..b8f79b80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,6 @@
             <artifactId>jfinal</artifactId>
             <version>${jfinal.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal-undertow</artifactId>
@@ -73,7 +72,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql.version}</version>
         </dependency>
-
         <!-- https://mvnrepository.com/artifact/io.minio/minio -->
         <dependency>
             <groupId>io.minio</groupId>
@@ -266,7 +264,6 @@
             <artifactId>druid</artifactId>
             <version>1.2.23</version>
         </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
         <dependency>
             <groupId>org.yaml</groupId>
diff --git a/src/main/java/com/dsideal/base/Global/Controller/GlobalController.java b/src/main/java/com/dsideal/base/Global/Controller/GlobalController.java
index 6d58d148..44048a06 100644
--- a/src/main/java/com/dsideal/base/Global/Controller/GlobalController.java
+++ b/src/main/java/com/dsideal/base/Global/Controller/GlobalController.java
@@ -13,7 +13,6 @@ import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.upload.UploadFile;
 import org.apache.commons.lang.StringUtils;
 import org.bouncycastle.util.encoders.Base64;
-import org.checkerframework.checker.units.qual.A;
 
 import java.io.File;
 import java.util.List;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
index b4d1e295..46e442e8 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
@@ -7,19 +7,13 @@ import com.dsideal.base.Tools.Util.ReadDocxUtil;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xwpf.usermodel.XWPFChart;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.checkerframework.checker.units.qual.N;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Test/TestSingle.java b/src/main/java/com/dsideal/base/Tools/FillData/Test/TestSingle.java
index 73dc416e..89e3fd40 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Test/TestSingle.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Test/TestSingle.java
@@ -1,42 +1,44 @@
 package com.dsideal.base.Tools.FillData.Test;
 
-import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xwpf.usermodel.XWPFChart;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import org.apache.poi.xwpf.usermodel.*;
+import org.docx4j.Docx4J;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDrawing;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr;
+
+import javax.xml.bind.SchemaOutputResolver;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
 
 public class TestSingle {
 
-    public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException {
 
-        //处理这个目录
-        //判断file是不是目录，是目录的需要跳过
-        //城市名称
-        File file = new File("c:/1.docx");
-        String fileName = file.getAbsolutePath();
+    public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, Docx4JException {
 
+        String sourceWord = "c:/1.docx";
 
-        InputStream is = new FileInputStream(fileName);
+        InputStream is = new FileInputStream(sourceWord);
         ZipSecureFile.setMinInflateRatio(-1.0d);
         XWPFDocument doc = new XWPFDocument(is);
-        //排序后的图表
-        List<XWPFChart> charts = ExcelKit.getSortListForXWPFChart(doc.getCharts());
-
-        System.out.println("图表个数=" + charts.size());
-        //第34个图表读取不出来
-        XSSFWorkbook workbook = charts.get(33).getWorkbook();
-        System.out.println("正在读取第34个图表数据...");
-        List<List<String>> data = ExcelKit.readSheet(workbook, 2);
-        System.out.println("数据条数=" + data.size());
+        List<XWPFChart> charts = new ArrayList<>();
+        for (IBodyElement element : doc.getBodyElements()) {
+            if (element instanceof XWPFChart) {
+                charts.add((XWPFChart) element);
+            }
+            if (element instanceof XWPFParagraph sourcePara) {
+                System.out.println(sourcePara.getDocument().getCharts().size());
+            }
+        }
+        //System.out.println("图表个数=" + charts.size());
         is.close();
-        ExcelKit.printTable(data);
     }
 }