Merge remote-tracking branch 'origin/v5' into v5

lib/EmergencyService/pom.xml

@@ -461,7 +461,11 @@
             <artifactId>drools-compiler</artifactId>
             <version>7.37.0.Final</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>3.0.4</version>
+        </dependency>
         <dependency>
             <groupId>com.github.liaochong</groupId>
             <artifactId>myexcel</artifactId>

lib/EmergencyService/zdxtEmergencyAuthService/pom.xml

@@ -33,11 +33,7 @@
         </dependency>
 
 
-        <dependency>
+
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <version>2.0.24</version>
-        </dependency>
         <dependency>
             <groupId>com.sfj</groupId>
             <artifactId>baseUCclient-1.4</artifactId>

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/NoticeServiceImpl.java

@@ -27,6 +27,7 @@ import com.zdxt.common.zdxtFile.FilePreviewUtilBean;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
 import com.zdxt.domain.auth.Dept;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.beans.BeanUtils;
@@ -381,7 +382,7 @@ public class NoticeServiceImpl implements INoticeService
         File file = new File(notice.getUrl());
         try {
             // 写入文件
-            PDDocument doc = PDDocument.load(file);
+            PDDocument doc = Loader.loadPDF(file);
             PDFRenderer renderer = new PDFRenderer(doc);
             int pageCount = doc.getNumberOfPages();
             for (int i = 0; i < pageCount; i++) {

lib/EmergencyService/zdxtLawEnforcementCodeService/pom.xml

@@ -52,11 +52,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <version>3.0.4</version>
-        </dependency>
     </dependencies>
 
 </project>