更新 settings.gradle.kts

.gitea/workflows/build.yaml

@@ -14,8 +14,7 @@ jobs:
       - name: build-test
         run: |
           source gradle.properties
-          gradle
-          gradle build-jar
+          gradle -Dorg.gradle.java.home=/opt/jdk/21.0.7/ build-jar
 
       - name: Releases
         run: |

build.gradle.kts

@@ -1,4 +1,3 @@
-
 import java.security.MessageDigest
         import java.text.SimpleDateFormat
         import java.util.Date
@@ -38,10 +37,10 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     implementation("org.jetbrains:annotations:24.0.0")
     annotationProcessor("org.jetbrains:annotations:24.0.0")
-    implementation("com.mingliqiye:network-endpoint:1.0.2")
-    implementation("com.mingliqiye:string-utilts:1.0.4")
-    implementation("com.mingliqiye:socket-utilts:1.0.6")
-    implementation("org.apache.logging.log4j:log4j-core:2.12.4")
+    implementation("com.mingliqiye:network-endpoint:1.0.4")
+    implementation("com.mingliqiye:string-utils:1.0.4")
+    implementation("com.mingliqiye:socket-utils:1.0.7")
+    implementation("org.apache.logging.log4j:log4j-core:2.25.0")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.1")
 }
 

gradle.properties

@@ -1,5 +1,5 @@
 GROUPSID=com.mingliqiye
 ARTIFACTID=tcp-proxy
-VERSIONS=0.1
+VERSIONS=0.2
 MAINCLASS=com.mingliqiye.tcp.proxy.Main
 JDKVERSIONS=1.8

settings.gradle.kts

@@ -1 +1,2 @@
-rootProject.name = "tcp-proxy"
+val ARTIFACTID: String by settings.extra
+rootProject.name= ARTIFACTID

src/main/java/com/mingliqiye/tcp/proxy/Main.java

@@ -9,7 +9,9 @@ import org.apache.logging.log4j.Logger;
 
 public class Main {
 
-    private static final Logger log = LogManager.getLogger(Main.class);
+    private static final Logger log = LogManager.getLogger(
+        Main.class.getName()
+    );
 
     public static void main(String[] args) {
         log.info("启动中...");

src/main/java/com/mingliqiye/tcp/proxy/Proxy.java

@@ -7,7 +7,7 @@ import org.apache.logging.log4j.Logger;
 
 public class Proxy {
 
-    private static Logger log = LogManager.getLogger(Proxy.class);
+    private static Logger log = LogManager.getLogger(Proxy.class.getName());
     private final TcpSocketServer tcpSocketServer;
 
     Proxy(NetworkEndpoint endpoint, NetworkEndpoint remoteEndpoint) {

src/main/java/com/mingliqiye/tcp/proxy/ProxyClient.java

@@ -14,7 +14,9 @@ import org.apache.logging.log4j.Logger;
 
 public class ProxyClient extends Thread implements Closeable {
 
-    private static Logger log = LogManager.getLogger(ProxyClient.class);
+    private static Logger log = LogManager.getLogger(
+        ProxyClient.class.getName()
+    );
 
     private final String id;
 

src/main/java/com/mingliqiye/tcp/proxy/ServerEvent.java

@@ -20,7 +20,9 @@ public class ServerEvent extends TcpServerImplementation {
      */
     private final Map<String, ProxyClient> clientMap =
         new ConcurrentHashMap<>();
-    private static Logger log = LogManager.getLogger(Proxy.class);
+    private static Logger log = LogManager.getLogger(
+        ServerEvent.class.getName()
+    );
 
     public ServerEvent(
         NetworkEndpoint endpoint,

src/main/resources/log4j2.yaml

@@ -4,7 +4,7 @@ Appenders:
     name: CONSOLE #Appender命名
     target: SYSTEM_OUT
     PatternLayout:
-      pattern: "%style{%d{yyyy-MM-dd HH:mm:ss,SSS}}{bright,magenta} [%highlight{%p}{FATAL=white, ERROR=red, WARN=yellow, INFO=green, DEBUG=cyan, TRACE=blue}] [%style{%t}{bright,yellow}/%style{%c{1}}{bright,cyan}] -- %style{%m}{#EEDFCC}%n" #输出日志的格式
+      pattern: "%style{%d{yyyy-MM-dd HH:mm:ss,SSS}}{bright,magenta} [%highlight{%p}{FATAL=white, ERROR=red, WARN=yellow, INFO=green, DEBUG=cyan, TRACE=blue}] [%style{%t}{bright,yellow}/%style{%c{1}}{bright,cyan}] -- %style{%m}{#EEDFCC} %n" #输出日志的格式
       disableAnsi: "${env:DISABLECOLOR:-false}"
   RollingFile:
     - name: FILE