Commit b934edab authored by alex yao's avatar alex yao

fix: doc 文件加载

parent 102dceb9
...@@ -107,12 +107,6 @@ ...@@ -107,12 +107,6 @@
<version>8.0.28</version> <version>8.0.28</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.2</version>
</dependency>
<!-- ES --> <!-- ES -->
<dependency> <dependency>
<groupId>org.elasticsearch.client</groupId> <groupId>org.elasticsearch.client</groupId>
...@@ -245,11 +239,14 @@ ...@@ -245,11 +239,14 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<version>4.1.2</version> <version>4.1.2</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas -->
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId> <artifactId>poi-ooxml-schemas</artifactId>
...@@ -260,6 +257,13 @@ ...@@ -260,6 +257,13 @@
<artifactId>ooxml-schemas</artifactId> <artifactId>ooxml-schemas</artifactId>
<version>1.1</version> <version>1.1</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-scratchpad -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>4.1.2</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
...@@ -277,11 +281,6 @@ ...@@ -277,11 +281,6 @@
<version>3.6.0</version> <version>3.6.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/cn.hutool/hutool-http --> <!-- https://mvnrepository.com/artifact/cn.hutool/hutool-http -->
<dependency> <dependency>
......
...@@ -6,7 +6,7 @@ import org.apache.pdfbox.io.RandomAccessBufferedFileInputStream; ...@@ -6,7 +6,7 @@ import org.apache.pdfbox.io.RandomAccessBufferedFileInputStream;
import org.apache.pdfbox.pdfparser.PDFParser; import org.apache.pdfbox.pdfparser.PDFParser;
import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.PDFTextStripper;
//import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.extractor.WordExtractor;
import org.apache.poi.xwpf.extractor.XWPFWordExtractor; import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.util.Assert; import org.springframework.util.Assert;
...@@ -31,7 +31,7 @@ public class DocumentLoad { ...@@ -31,7 +31,7 @@ public class DocumentLoad {
case "docx": case "docx":
return loadWordDocx(file); return loadWordDocx(file);
case "doc": case "doc":
return loadWordDocx(file); return loadWordDoc(file);
case "md": case "md":
return loadMarkDown(file); return loadMarkDown(file);
case "pdf": case "pdf":
...@@ -62,12 +62,12 @@ public class DocumentLoad { ...@@ -62,12 +62,12 @@ public class DocumentLoad {
return xwpfWordExtractor.getText(); return xwpfWordExtractor.getText();
} }
// public static String loadWordDoc(File file) throws IOException { public static String loadWordDoc(File file) throws IOException {
// FileInputStream fis = new FileInputStream(file); FileInputStream fis = new FileInputStream(file);
// HWPFDocument doc = new HWPFDocument(fis); WordExtractor wordExtractor = new WordExtractor(fis);
// fis.close(); fis.close();
// return doc.getText().toString(); return wordExtractor.getText().toString();
// } }
public static String loadTxt(File file) throws IOException { public static String loadTxt(File file) throws IOException {
BufferedReader bufferedReader = new BufferedReader(new FileReader(file)); BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment