From 95329a56036fc96db9678f5935824a83c9068338 Mon Sep 17 00:00:00 2001
From: chuzhongzai <njy1822574439@outlook.com>
Date: Sat, 8 Jun 2024 03:11:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=97=A5=E5=BF=97=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6;=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96;?=
 =?UTF-8?q?=E5=B0=86=E9=A1=B9=E7=9B=AEJDK=E8=AE=BE=E7=BD=AE=E4=B8=BA21;?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=97=A5=E5=BF=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  3 +-
 pom.xml                                       |  6 ++-
 .../java/lion/MultiThreadedHTTPServer.java    | 20 ++++++----
 .../lion/Service/DownloadCheckService.java    | 37 +++++++++++--------
 src/main/java/lion/storageNode.java           | 15 ++------
 src/main/resources/simplelogger.properties    |  9 +++++
 6 files changed, 50 insertions(+), 40 deletions(-)
 create mode 100644 src/main/resources/simplelogger.properties

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 64d19fc..dddff60 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,13 +7,12 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
-    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="PWA">
     <option name="enabled" value="true" />
     <option name="wasEnabledAtLeastOnce" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a524885..840afc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,13 +50,13 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.20</version>
+            <version>5.8.26</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.21</version>
+            <version>1.25.0</version>
         </dependency>
     </dependencies>
 
@@ -96,6 +96,8 @@
                         <arg>-H:+ReportExceptionStackTraces</arg>
                         <arg>--gc=G1</arg>
                         <arg>--enable-url-protocols=https</arg>
+                        <arg>-H:IncludeResources="simplelogger.properties"</arg>
+                        <arg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger,org.slf4j.simple.SimpleLoggerFactory</arg>
                         <arg>-H:ReflectionConfigurationFiles=src/main/resources/reflect-config.json</arg>
                     </buildArgs>
                     <metadataRepository>
diff --git a/src/main/java/lion/MultiThreadedHTTPServer.java b/src/main/java/lion/MultiThreadedHTTPServer.java
index 0c57fd5..c8ca647 100644
--- a/src/main/java/lion/MultiThreadedHTTPServer.java
+++ b/src/main/java/lion/MultiThreadedHTTPServer.java
@@ -1,5 +1,7 @@
 package lion;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.io.*;
 import java.net.*;
 import java.nio.charset.StandardCharsets;
@@ -8,7 +10,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
+@Slf4j
 public class MultiThreadedHTTPServer {
     private static final int PORT = 8888;
     private static final int BUFFER_SIZE = 1024;
@@ -22,26 +24,27 @@ public class MultiThreadedHTTPServer {
             real_ip = "207.60.50.74";
         }
         try(ServerSocket serverSocket = new ServerSocket(PORT)) {
-            System.out.println("Server listening on port " + PORT);
+            log.info("Server listening on port {}", PORT);
             while (true) {
                 Socket clientSocket = serverSocket.accept();
                 String ip = clientSocket.getInetAddress().getHostAddress();
                 if(ip.equals(real_ip)){
-                    System.out.println("Client connected");
+                    log.info("Client connected");
                     // 线程池处理下载请求
                     threadPool.submit(() -> handleClientRequest(clientSocket));
                 }else{
-                    System.out.println("unknown ip: " + ip);
+                    log.info("unknown ip: " + ip);
                     clientSocket.close();
                 }
 
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("处理http请求时出错,IP:{},ERROR:{}", real_ip, e.getMessage());
         }
     }
 
     private static void handleClientRequest(Socket clientSocket) {
+        String fileName = "";
         try {
             BufferedReader requestReader = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
             String requestLine = requestReader.readLine();
@@ -50,7 +53,7 @@ public class MultiThreadedHTTPServer {
             String[] requestParts = requestLine.split(" ");
             String method = requestParts[0];
             Map<String, String> paramMap = parseRequestLine(requestParts[1]);//path
-            System.out.println(Arrays.toString(requestParts));
+            log.info(Arrays.toString(requestParts));
 
             // Only handle GET requests
             if (method.equals("GET")) {
@@ -97,7 +100,8 @@ public class MultiThreadedHTTPServer {
                     sendErrorResponse(clientSocket, "403 Forbidden");
                     return;
                 }
-                System.out.println(file.getAbsolutePath());
+                fileName = file.getName();
+                log.info(file.getAbsolutePath());
                 // Check if the file exists and is readable
                 if (file.exists() && file.isFile() && file.canRead()) {
                     // Get the file length
@@ -154,7 +158,7 @@ public class MultiThreadedHTTPServer {
             requestReader.close();
             clientSocket.close();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("处理文件下载时出错,IP:{}, 文件:{}, ERROR:{}", clientSocket.getInetAddress().getHostAddress(), fileName, e.getMessage());
         }
     }
 
diff --git a/src/main/java/lion/Service/DownloadCheckService.java b/src/main/java/lion/Service/DownloadCheckService.java
index 41c69d6..14a4920 100644
--- a/src/main/java/lion/Service/DownloadCheckService.java
+++ b/src/main/java/lion/Service/DownloadCheckService.java
@@ -116,22 +116,27 @@ public class DownloadCheckService {
         ArrayList<GalleryTask> galleryTasks = new ArrayList<>(compress_queue);
         compress_queue.clear();
         reentrantLock.unlock();
-        for (GalleryTask galleryTask : galleryTasks) {
-            //创建文件夹
-            File file = new File(storagePath + galleryTask.getName());
-            if (file.isDirectory() || file.mkdirs()) {
-                log.info(galleryTask.getName() + "文件夹创建成功");
-            } else {
-                log.error(galleryTask.getName() + "文件夹创建失败");
-                continue;
+            for (GalleryTask galleryTask : galleryTasks) {
+                try {
+                    log.info("开始压缩:{}", galleryTask.getName());
+                    //创建文件夹
+                    File file = new File(storagePath + galleryTask.getName());
+                    if (file.isDirectory() || file.mkdirs()) {
+                        log.info("{}文件夹创建成功", galleryTask.getName());
+                    } else {
+                        log.error("{}文件夹创建失败", galleryTask.getName());
+                        continue;
+                    }
+
+                    //生成压缩包
+                    ZipUtil.zip(galleryTask.getPath(), storagePath + galleryTask.getName() + "/" + galleryTask.getName() + ".zip");
+                    log.info("{}压缩完成", galleryTask.getName());
+
+                    FileUtil.del(galleryTask.getPath());
+                    galleryTask.setStatus(GalleryTask.COMPRESS_COMPLETE);
+                } catch (Exception e){
+                    log.error("{}压缩失败:{}", galleryTask, e.getMessage());
+                }
             }
-
-            //生成压缩包
-            ZipUtil.zip(galleryTask.getPath(), storagePath + galleryTask.getName() + "/" + galleryTask.getName() + ".zip");
-            log.info(galleryTask.getName()  + "压缩完成" );
-
-            FileUtil.del(galleryTask.getPath());
-            galleryTask.setStatus(GalleryTask.COMPRESS_COMPLETE);
-        }
     }
 }
diff --git a/src/main/java/lion/storageNode.java b/src/main/java/lion/storageNode.java
index 0e2fc78..77f0efd 100644
--- a/src/main/java/lion/storageNode.java
+++ b/src/main/java/lion/storageNode.java
@@ -15,8 +15,6 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 import lombok.extern.slf4j.Slf4j;
 
 
-import java.io.FileOutputStream;
-import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -115,14 +113,7 @@ public class storageNode {
             queue.removeIf(GalleryTask::is_compress_complete);
             lock.unlock();
         }catch (Exception e){
-            e.printStackTrace();
-            try (OutputStream outputStream = new FileOutputStream("/root/gallery/storageNode/err.txt")){
-                outputStream.write(e.getMessage().getBytes());
-                channelFuture.channel().close().sync();
-                System.exit(-1);
-            }catch (Exception ex){
-                ex.printStackTrace();
-            }
+            log.error("发送任务状态时发生异常:{}", e.getMessage());
         }
     }
 
@@ -135,7 +126,7 @@ public class storageNode {
 
         @Override
         public void channelRead(ChannelHandlerContext ctx, Object msg) {
-            System.out.println(msg);
+            log.info(String.valueOf(msg));
             AbstractMessage abstractMessage = (AbstractMessage) msg;
 
             switch (abstractMessage.messageType){
@@ -154,7 +145,7 @@ public class storageNode {
                     DownloadPostMessage dpm = (DownloadPostMessage) abstractMessage;
                     lock.lock();
                     queue.add(dpm.getGalleryTask());
-                    System.out.println(queue);
+                    log.info(String.valueOf(queue));
                     lock.unlock();
                     ctx.writeAndFlush(new ResponseMessage(dpm.messageId, (byte) 0));
                 }
diff --git a/src/main/resources/simplelogger.properties b/src/main/resources/simplelogger.properties
new file mode 100644
index 0000000..53cffde
--- /dev/null
+++ b/src/main/resources/simplelogger.properties
@@ -0,0 +1,9 @@
+
+org.slf4j.simpleLogger.defaultLogLevel=info
+
+org.slf4j.simpleLogger.showDateTime=true
+
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss
+
+org.slf4j.simpleLogger.logFile=run.out
+