更换已弃用方法，更新依赖

LinkTechTips · LinkTechTips · commit 12e01510df0a · 2022-11-18T03:57:39.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -47,20 +47,17 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
+        <!--slf4j日志门面-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.10</version>
+            <version>1.7.25</version>
         </dependency>
+        <!--logback日志实现 logback-classic涵盖了logback-core依赖,不需要重复导入-->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.4.4</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.er1c</groupId>
-            <artifactId>scala-stringutils_2.13</artifactId>
-            <version>0.1.0</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -73,50 +70,6 @@
             <version>23.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jdbc</artifactId>
-            <version>2.7.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>2.7.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
-            <version>2.7.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.7.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.30</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>3.0.6</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.7.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource</groupId>
-            <artifactId>sigar</artifactId>
-            <version>1.6.4</version>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -129,6 +82,7 @@
         </dependency>
     </dependencies>
     <build>
+        <defaultGoal>compile</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -1,8 +1,9 @@
 module BetterFSD.Java {
+    uses org.LinkTechTips.plugins.IPluginService;
     requires org.apache.commons.lang3;
-    requires org.jetbrains.annotations;
     requires java.management;
     requires org.apache.commons.io;
     requires jdk.httpserver;
+    requires org.jetbrains.annotations;
     requires slf4j.api;
 }
diff --git a/src/main/java/org/LinkTechTips/Main.java b/src/main/java/org/LinkTechTips/Main.java
@@ -12,7 +12,7 @@
 import org.LinkTechTips.model.Client;
 import org.LinkTechTips.model.Flightplan;
 import org.LinkTechTips.model.Server;
-import org.LinkTechTips.plugins.PluginService;
+import org.LinkTechTips.plugins.IPluginService;
 import org.LinkTechTips.plugins.PluginLoader;
 import org.LinkTechTips.process.PMan;
 import org.LinkTechTips.process.config.ConfigEntry;
@@ -27,7 +27,6 @@
 import org.apache.commons.lang3.math.NumberUtils;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -44,8 +43,11 @@
 import java.util.List;
 import java.util.Scanner;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
+
 public class Main {
-    private final static Logger LOGGER = LoggerFactory.getLogger(Main.class);
+    private final static Logger LOGGER = getLogger(Main.class);
     public static ConfigManager configManager;
     public static ServerInterface serverInterface;
     public static SystemInterface systemInterface;
@@ -91,8 +93,8 @@ public Main(String configFile) {
         makeConnections();
         LOGGER.info("[Plugins]: Start loading plugins");
         try {
-            List<PluginService> services = PluginLoader.loadPlugins();
-            for (PluginService service : services) {
+            List<IPluginService> services = PluginLoader.loadPlugins();
+            for (IPluginService service : services) {
                 LOGGER.info(String.format("[Plugins]: %s %s loaded successfully", service.PluginName(),
                         service.PlugunVersion()));
                 service.PluginService();
diff --git a/src/main/java/org/LinkTechTips/MainLauncher.java b/src/main/java/org/LinkTechTips/MainLauncher.java
@@ -16,10 +16,10 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
-import java.util.Scanner;
 
 public class MainLauncher {
     private static String[] args;
+
     public static void main(String[] args) {
         System.setProperty("java.net.preferIPv4Stack", "true");
         System.setProperty("server.name", "BetterFSD");
diff --git a/src/main/java/org/LinkTechTips/httpapi/ReadWhazzupController.java b/src/main/java/org/LinkTechTips/httpapi/ReadWhazzupController.java
@@ -21,7 +21,7 @@ public class ReadWhazzupController implements HttpHandler {
     public void handle(HttpExchange httpExchange) {
         try {
             StringBuilder responseText = new StringBuilder();
-            String whazzup = FileUtils.readFileToString(new File(whazzupFile));
+            String whazzup = FileUtils.readFileToString(new File(whazzupFile),StandardCharsets.UTF_8);
             responseText.append(whazzup);
             handleResponse(httpExchange, responseText.toString());
         } catch (NullPointerException e) {
@@ -33,8 +33,7 @@ public void handle(HttpExchange httpExchange) {
     }
     private void handleResponse(HttpExchange httpExchange, String responsetext) throws Exception {
         //生成html
-        String responseContentStr = responsetext;
-        byte[] responseContentByte = responseContentStr.getBytes(StandardCharsets.UTF_8);
+        byte[] responseContentByte = responsetext.getBytes(StandardCharsets.UTF_8);
 
         //设置响应头，必须在sendResponseHeaders方法之前设置！
         httpExchange.getResponseHeaders().add("Content-Type:", "text/plain;charset=utf-8");
diff --git a/src/main/java/org/LinkTechTips/httpapi/ReadWhazzupJsonController.java b/src/main/java/org/LinkTechTips/httpapi/ReadWhazzupJsonController.java
@@ -22,7 +22,7 @@ public class ReadWhazzupJsonController implements HttpHandler {
     public void handle(HttpExchange httpExchange) {
         try {
             StringBuilder responseText = new StringBuilder();
-            String whazzup = FileUtils.readFileToString(new File(whazzupJsonFile));
+            String whazzup = FileUtils.readFileToString(new File(whazzupJsonFile),StandardCharsets.UTF_8);
             responseText.append(whazzup);
             handleResponse(httpExchange, responseText.toString());
         } catch (NullPointerException e) {
@@ -34,8 +34,7 @@ public void handle(HttpExchange httpExchange) {
     }
     private void handleResponse(HttpExchange httpExchange, String responsetext) throws Exception {
         //生成html
-        String responseContentStr = responsetext;
-        byte[] responseContentByte = responseContentStr.getBytes(StandardCharsets.UTF_8);
+        byte[] responseContentByte = responsetext.getBytes(StandardCharsets.UTF_8);
 
         //设置响应头，必须在sendResponseHeaders方法之前设置！
         httpExchange.getResponseHeaders().add("Content-Type:", "application/json;charset=utf-8");
diff --git a/src/main/java/org/LinkTechTips/plugins/IPluginService.java b/src/main/java/org/LinkTechTips/plugins/IPluginService.java
@@ -4,7 +4,7 @@
 
 package org.LinkTechTips.plugins;
 
-public interface PluginService {
+public interface IPluginService {
     // 插件功能主入口方法
     void PluginService();
     // 插件名称
diff --git a/src/main/java/org/LinkTechTips/plugins/PluginLoader.java b/src/main/java/org/LinkTechTips/plugins/PluginLoader.java
@@ -9,13 +9,12 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class PluginLoader {
     public static final String PLUGIN_PATH = "plugins";
 
-    public static List<PluginService> loadPlugins() throws MalformedURLException {
-        List<PluginService> plugins = new ArrayList<>();
+    public static List<IPluginService> loadPlugins() throws MalformedURLException {
+        List<IPluginService> plugins = new ArrayList<>();
 
         File parentDir = new File(PLUGIN_PATH);
         File[] files = parentDir.listFiles();
@@ -25,8 +24,7 @@ public static List<PluginService> loadPlugins() throws MalformedURLException {
 
         // 从目录下筛选出所有jar文件
         List<File> jarFiles = Arrays.stream(files)
-                .filter(file -> file.getName().endsWith(".jar"))
-                .collect(Collectors.toList());
+                .filter(file -> file.getName().endsWith(".jar")).toList();
 
         URL[] urls = new URL[jarFiles.size()];
         for (int i = 0; i < jarFiles.size(); i++) {
@@ -36,9 +34,9 @@ public static List<PluginService> loadPlugins() throws MalformedURLException {
 
         URLClassLoader urlClassLoader = new URLClassLoader(urls);
         // 使用 ServiceLoader 以SPI的方式加载插件包中的 PluginService 实现类
-        ServiceLoader<PluginService> serviceLoader = ServiceLoader.load(PluginService.class, urlClassLoader);
-        for (PluginService pluginService : serviceLoader) {
-            plugins.add(pluginService);
+        ServiceLoader<IPluginService> serviceLoader = ServiceLoader.load(IPluginService.class, urlClassLoader);
+        for (IPluginService IPluginService : serviceLoader) {
+            plugins.add(IPluginService);
         }
         return plugins;
     }
