Merge remote-tracking branch 'origin/master'

pom.xml

@@ -14,7 +14,7 @@
     <name>ts_obj</name>
     <description>Demo project for Spring Boot</description>
     <properties>
-        <java.version>11</java.version>
+        <java.version>1.8</java.version>
     </properties>
 
     <repositories>

src/main/java/com/example/ts_obj/controller/TypesetController.java

@@ -415,13 +415,11 @@ public class TypesetController {
 //            FileDownloadUtil.writeFile(response, inputStream);
             XWPFDocument xdoc = new XWPFDocument(inputStream);
             List<XWPFParagraph> list = xdoc.getParagraphs();
-
-            String cache = "";
-            String cach = "";
             for (XWPFParagraph para:list) {
+                String cache = "";
                 List<XWPFRun> runs = para.getRuns();
                 for (XWPFRun r : runs) {
-                    System.out.println("run====>"+r);
+                    String cach = "";
                     if (r.getText(0) == null) {
                         continue;
                     }
@@ -436,14 +434,12 @@ public class TypesetController {
                     }
                     cache += cach;
                 }
+                al.add(cache);
             }
-            al.add(cache);
+
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-
-
         return new ReturnValue(ReturnCodeAndMsgEnum.Success, al);
     }