From 1860c2f41b2c81101e9016a6a7b2b30122bc2d9b Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 8 Apr 2025 17:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electrmangnetic/pom.xml                       | 66 +++++++++----------
 .../service/serviceimpl/ChatService.java      |  6 +-
 electromagnetic-common/pom.xml                |  6 +-
 3 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/electrmangnetic/pom.xml b/electrmangnetic/pom.xml
index fc10988..9025132 100644
--- a/electrmangnetic/pom.xml
+++ b/electrmangnetic/pom.xml
@@ -29,6 +29,35 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-elasticsearch-store-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-pdf-document-reader</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>co.elastic.clients</groupId>
+            <artifactId>elasticsearch-java</artifactId>
+            <version>8.13.4</version>
+        </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
@@ -39,16 +68,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.31</version>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.7.0</version>
-        </dependency>
         <dependency>
             <groupId>com.electromagnetic.data</groupId>
             <artifactId>electromagnetic-common</artifactId>
@@ -71,10 +90,7 @@
             <artifactId>druid</artifactId>
             <version>1.1.10</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-processor</artifactId>
@@ -90,27 +106,7 @@
             <artifactId>aspectjweaver</artifactId>
             <version>1.9.7</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-elasticsearch-store-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>co.elastic.clients</groupId>
-            <artifactId>elasticsearch-java</artifactId>
-            <version>8.13.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-pdf-document-reader</artifactId>
-        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java
index 72b5011..d908d39 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java
@@ -111,7 +111,7 @@ public class ChatService {
                 Path tempFile = saveUploadedFileToTemp(file);
                 DocumentReader documentReader = new TextReader(String.valueOf(tempFile.toUri().toURL()));
                 documents = new TokenTextSplitter().apply(documentReader.get());
-                Files.deleteIfExists(tempFile);
+                FileUtil.del(tempFile);
             }
             case "xls", "xlsx" -> {
                 String filePath = elePropertyConfig.getEleTmpPath() + File.separator + fileMd5 + "." + fileType;
@@ -145,14 +145,14 @@ public class ChatService {
                     Document doc = new Document(Objects.requireNonNull(document.getText()), metaData);
                     documents.add(doc);
                 }
-                Files.deleteIfExists(path);
+                FileUtil.del(pdfPath);
                 FileUtil.del(srcPath);
             }
             case "pdf" -> {
                 Path tempFile = saveUploadedFileToTemp(file);
                 PagePdfDocumentReader reader = new PagePdfDocumentReader(String.valueOf(tempFile.toUri().toURL()));
                 documents = reader.get();
-                Files.deleteIfExists(tempFile);
+                FileUtil.del(tempFile);
             }
             default -> {
                 return ElectromagneticResultUtil.fail("-1", StrFormatter.format("当前格式 {} 不支持", fileType));
diff --git a/electromagnetic-common/pom.xml b/electromagnetic-common/pom.xml
index cee461c..b47683c 100644
--- a/electromagnetic-common/pom.xml
+++ b/electromagnetic-common/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.34</version>
+            <version>1.18.36</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -42,12 +42,12 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.5.16</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.2.3</version>
+            <version>1.5.16</version>
         </dependency>
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>