Skip to content

Commit 12e0151

Browse files
LinkTechTipsLinkTechTips
committed
更换已弃用方法，更新依赖
1 parent 8882f7d commit 12e0151

File tree

8 files changed

+26
-73
lines changed

8 files changed

+26
-73
lines changed

‎pom.xml‎

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,17 @@
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4848
</properties>
4949
<dependencies>
50+
<!--slf4j日志门面-->
5051
<dependency>
5152
<groupId>org.slf4j</groupId>
5253
<artifactId>slf4j-api</artifactId>
53-
<version>1.7.10</version>
54+
<version>1.7.25</version>
5455
</dependency>
56+
<!--logback日志实现 logback-classic涵盖了logback-core依赖,不需要重复导入-->
5557
<dependency>
5658
<groupId>ch.qos.logback</groupId>
5759
<artifactId>logback-classic</artifactId>
58-
<version>1.4.4</version>
59-
</dependency>
60-
<dependency>
61-
<groupId>io.github.er1c</groupId>
62-
<artifactId>scala-stringutils_2.13</artifactId>
63-
<version>0.1.0</version>
60+
<version>1.2.3</version>
6461
</dependency>
6562
<dependency>
6663
<groupId>org.apache.commons</groupId>
@@ -73,50 +70,6 @@
7370
<version>23.0.0</version>
7471
<scope>compile</scope>
7572
</dependency>
76-
<dependency>
77-
<groupId>org.springframework.boot</groupId>
78-
<artifactId>spring-boot-starter-data-jdbc</artifactId>
79-
<version>2.7.5</version>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.springframework.boot</groupId>
83-
<artifactId>spring-boot-starter-data-jpa</artifactId>
84-
<version>2.7.5</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.springframework.boot</groupId>
88-
<artifactId>spring-boot-starter-jdbc</artifactId>
89-
<version>2.7.5</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>org.springframework.boot</groupId>
93-
<artifactId>spring-boot-starter-web</artifactId>
94-
<version>2.7.5</version>
95-
</dependency>
96-
97-
<dependency>
98-
<groupId>mysql</groupId>
99-
<artifactId>mysql-connector-java</artifactId>
100-
<version>8.0.30</version>
101-
<scope>runtime</scope>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.mariadb.jdbc</groupId>
105-
<artifactId>mariadb-java-client</artifactId>
106-
<version>3.0.6</version>
107-
<scope>runtime</scope>
108-
</dependency>
109-
<dependency>
110-
<groupId>org.springframework.boot</groupId>
111-
<artifactId>spring-boot-starter-test</artifactId>
112-
<version>2.7.5</version>
113-
<scope>test</scope>
114-
</dependency>
115-
<dependency>
116-
<groupId>org.fusesource</groupId>
117-
<artifactId>sigar</artifactId>
118-
<version>1.6.4</version>
119-
</dependency>
12073
<dependency>
12174
<groupId>commons-io</groupId>
12275
<artifactId>commons-io</artifactId>
@@ -129,6 +82,7 @@
12982
</dependency>
13083
</dependencies>
13184
<build>
85+
<defaultGoal>compile</defaultGoal>
13286
<plugins>
13387
<plugin>
13488
<groupId>org.springframework.boot</groupId>

‎src/main/java/module-info.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
module BetterFSD.Java {
2+
uses org.LinkTechTips.plugins.IPluginService;
23
requires org.apache.commons.lang3;
3-
requires org.jetbrains.annotations;
44
requires java.management;
55
requires org.apache.commons.io;
66
requires jdk.httpserver;
7+
requires org.jetbrains.annotations;
78
requires slf4j.api;
89
}

‎src/main/java/org/LinkTechTips/Main.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.LinkTechTips.model.Client;
1313
import org.LinkTechTips.model.Flightplan;
1414
import org.LinkTechTips.model.Server;
15-
import org.LinkTechTips.plugins.PluginService;
15+
import org.LinkTechTips.plugins.IPluginService;
1616
import org.LinkTechTips.plugins.PluginLoader;
1717
import org.LinkTechTips.process.PMan;
1818
import org.LinkTechTips.process.config.ConfigEntry;
@@ -27,7 +27,6 @@
2727
import org.apache.commons.lang3.math.NumberUtils;
2828
import org.jetbrains.annotations.NotNull;
2929
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
3130

3231
import java.io.File;
3332
import java.io.FileOutputStream;
@@ -44,8 +43,11 @@
4443
import java.util.List;
4544
import java.util.Scanner;
4645

46+
import static org.slf4j.LoggerFactory.getLogger;
47+
48+
4749
public class Main {
48-
private final static Logger LOGGER = LoggerFactory.getLogger(Main.class);
50+
private final static Logger LOGGER = getLogger(Main.class);
4951
public static ConfigManager configManager;
5052
public static ServerInterface serverInterface;
5153
public static SystemInterface systemInterface;
@@ -91,8 +93,8 @@ public Main(String configFile) {
9193
makeConnections();
9294
LOGGER.info("[Plugins]: Start loading plugins");
9395
try {
94-
List<PluginService> services = PluginLoader.loadPlugins();
95-
for (PluginService service : services) {
96+
List<IPluginService> services = PluginLoader.loadPlugins();
97+
for (IPluginService service : services) {
9698
LOGGER.info(String.format("[Plugins]: %s %s loaded successfully", service.PluginName(),
9799
service.PlugunVersion()));
98100
service.PluginService();

‎src/main/java/org/LinkTechTips/MainLauncher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import java.nio.file.Path;
1717
import java.nio.file.Paths;
1818
import java.util.List;
19-
import java.util.Scanner;
2019

2120
public class MainLauncher {
2221
private static String[] args;
22+
2323
public static void main(String[] args) {
2424
System.setProperty("java.net.preferIPv4Stack", "true");
2525
System.setProperty("server.name", "BetterFSD");

‎src/main/java/org/LinkTechTips/httpapi/ReadWhazzupController.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class ReadWhazzupController implements HttpHandler {
2121
public void handle(HttpExchange httpExchange) {
2222
try {
2323
StringBuilder responseText = new StringBuilder();
24-
String whazzup = FileUtils.readFileToString(new File(whazzupFile));
24+
String whazzup = FileUtils.readFileToString(new File(whazzupFile),StandardCharsets.UTF_8);
2525
responseText.append(whazzup);
2626
handleResponse(httpExchange, responseText.toString());
2727
} catch (NullPointerException e) {
@@ -33,8 +33,7 @@ public void handle(HttpExchange httpExchange) {
3333
}
3434
private void handleResponse(HttpExchange httpExchange, String responsetext) throws Exception {
3535
//生成html
36-
String responseContentStr = responsetext;
37-
byte[] responseContentByte = responseContentStr.getBytes(StandardCharsets.UTF_8);
36+
byte[] responseContentByte = responsetext.getBytes(StandardCharsets.UTF_8);
3837

3938
//设置响应头，必须在sendResponseHeaders方法之前设置！
4039
httpExchange.getResponseHeaders().add("Content-Type:", "text/plain;charset=utf-8");

‎src/main/java/org/LinkTechTips/httpapi/ReadWhazzupJsonController.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ReadWhazzupJsonController implements HttpHandler {
2222
public void handle(HttpExchange httpExchange) {
2323
try {
2424
StringBuilder responseText = new StringBuilder();
25-
String whazzup = FileUtils.readFileToString(new File(whazzupJsonFile));
25+
String whazzup = FileUtils.readFileToString(new File(whazzupJsonFile),StandardCharsets.UTF_8);
2626
responseText.append(whazzup);
2727
handleResponse(httpExchange, responseText.toString());
2828
} catch (NullPointerException e) {
@@ -34,8 +34,7 @@ public void handle(HttpExchange httpExchange) {
3434
}
3535
private void handleResponse(HttpExchange httpExchange, String responsetext) throws Exception {
3636
//生成html
37-
String responseContentStr = responsetext;
38-
byte[] responseContentByte = responseContentStr.getBytes(StandardCharsets.UTF_8);
37+
byte[] responseContentByte = responsetext.getBytes(StandardCharsets.UTF_8);
3938

4039
//设置响应头，必须在sendResponseHeaders方法之前设置！
4140
httpExchange.getResponseHeaders().add("Content-Type:", "application/json;charset=utf-8");

src/main/java/org/LinkTechTips/plugins/PluginService.java renamed to src/main/java/org/LinkTechTips/plugins/IPluginService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package org.LinkTechTips.plugins;
66

7-
public interface PluginService {
7+
public interface IPluginService {
88
// 插件功能主入口方法
99
void PluginService();
1010
// 插件名称

‎src/main/java/org/LinkTechTips/plugins/PluginLoader.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
import java.net.URL;
1010
import java.net.URLClassLoader;
1111
import java.util.*;
12-
import java.util.stream.Collectors;
1312

1413
public class PluginLoader {
1514
public static final String PLUGIN_PATH = "plugins";
1615

17-
public static List<PluginService> loadPlugins() throws MalformedURLException {
18-
List<PluginService> plugins = new ArrayList<>();
16+
public static List<IPluginService> loadPlugins() throws MalformedURLException {
17+
List<IPluginService> plugins = new ArrayList<>();
1918

2019
File parentDir = new File(PLUGIN_PATH);
2120
File[] files = parentDir.listFiles();
@@ -25,8 +24,7 @@ public static List<PluginService> loadPlugins() throws MalformedURLException {
2524

2625
// 从目录下筛选出所有jar文件
2726
List<File> jarFiles = Arrays.stream(files)
28-
.filter(file -> file.getName().endsWith(".jar"))
29-
.collect(Collectors.toList());
27+
.filter(file -> file.getName().endsWith(".jar")).toList();
3028

3129
URL[] urls = new URL[jarFiles.size()];
3230
for (int i = 0; i < jarFiles.size(); i++) {
@@ -36,9 +34,9 @@ public static List<PluginService> loadPlugins() throws MalformedURLException {
3634

3735
URLClassLoader urlClassLoader = new URLClassLoader(urls);
3836
// 使用 ServiceLoader 以SPI的方式加载插件包中的 PluginService 实现类
39-
ServiceLoader<PluginService> serviceLoader = ServiceLoader.load(PluginService.class, urlClassLoader);
40-
for (PluginService pluginService : serviceLoader) {
41-
plugins.add(pluginService);
37+
ServiceLoader<IPluginService> serviceLoader = ServiceLoader.load(IPluginService.class, urlClassLoader);
38+
for (IPluginService IPluginService : serviceLoader) {
39+
plugins.add(IPluginService);
4240
}
4341
return plugins;
4442
}

0 commit comments

Comments
 (0)