From de25eb9011525870f5b55ed7bab840a720bd6095 Mon Sep 17 00:00:00 2001 From: 3944Realms Date: Tue, 23 Sep 2025 20:00:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=AF=B9=E6=93=8D=E4=BD=9C=E7=B1=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF=E5=8F=82=E6=95=B0):=20?= =?UTF-8?q?=E5=AF=B9=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=A2=9E=E5=8A=A0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 添加操作Operation类的Error方法错误的参数，同时移除无参方法 BREAKING CHANGE: 移除了Operation错误方法的无参实现 --- .../websocket/AbstractWebSocketClient.java | 20 +++++++------- .../websocket/AbstractWebSocketServer.java | 26 ++++++++++--------- .../dg_lab/websocket/PowerBoxWSClient.java | 8 +++--- .../dg_lab/websocket/PowerBoxWSServer.java | 9 ++++--- .../client/DefaultClientOperation.java | 8 +++--- .../server/DefaultServerOperation.java | 9 ++++--- .../dg_lab/api/operation/ClientOperation.java | 8 +++--- .../dg_lab/api/operation/ServerOperation.java | 6 +++-- gradle.properties | 2 +- versionlog.txt | 5 ++++ 10 files changed, 57 insertions(+), 44 deletions(-) diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java index 1e9101e..a00e162 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketClient.java @@ -297,7 +297,7 @@ public abstract class AbstractWebSocketClient { ClientChannel = channelFuture.sync().channel(); ClientChannel.closeFuture().sync(); } catch (Exception e) { - startingError(); + startingError("Catch Exception: " + e.getMessage()); ClientStatus = Status.ERROR; logger.error(e.getMessage()); } finally { @@ -320,15 +320,15 @@ public abstract class AbstractWebSocketClient { starting(); switch (ClientStatus) { case STARTING -> { - startingError(); + startingError("Client is already starting"); logger.info("Client is already starting."); } case RUNNING -> { - startingError(); + startingError("Client is already running."); logger.info("Client is already running."); } case STOPPING -> { - startingError(); + startingError("Client is stopping"); logger.info("Client is stopping"); } case STOPPED, WAITING_FOR_INIT -> { @@ -356,7 +356,7 @@ public abstract class AbstractWebSocketClient { /** * Starting error. */ - protected abstract void startingError(); + protected abstract void startingError(String msg); /** * Started. @@ -371,7 +371,7 @@ public abstract class AbstractWebSocketClient { /** * Stopping error. */ - protected abstract void stoppingError(); + protected abstract void stoppingError(String msg); /** * Stopped. @@ -385,11 +385,11 @@ public abstract class AbstractWebSocketClient { stopping(); switch (ClientStatus) { case WAITING_FOR_INIT -> { - stoppingError(); + stoppingError("Client is not initialized."); logger.warn("Not Init. (It shouldn't be happened)"); } case STARTING -> { - stoppingError(); + stoppingError("Client is already starting."); logger.info("Client is starting, please waiting."); } case RUNNING, ERROR -> { @@ -424,11 +424,11 @@ public abstract class AbstractWebSocketClient { }); } case STOPPING -> { - stoppingError(); + stoppingError("Client is already stopping."); logger.info("Client is already stopping"); } case STOPPED -> { - stoppingError(); + stoppingError("Client has been stopped."); logger.info("Client has stopped"); } } diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java index be7f004..c53e49e 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/AbstractWebSocketServer.java @@ -17,6 +17,7 @@ package com.r3944realms.dg_lab.websocket; +import com.google.gson.annotations.Since; import com.r3944realms.dg_lab.DgLab; import com.r3944realms.dg_lab.api.manager.Status; import com.r3944realms.dg_lab.utils.stringUtils.UrlValidator; @@ -248,7 +249,7 @@ public abstract class AbstractWebSocketServer { channelFuture.channel().closeFuture().sync(); } catch (Exception e) { ServerStatus = Status.ERROR; - stoppingError(); + stoppingError("Catch Exception:" + e.getMessage()); logger.error(e.getMessage()); } finally { if(ServerStatus == Status.ERROR || ServerStatus == Status.RUNNING) stop(); @@ -262,10 +263,12 @@ public abstract class AbstractWebSocketServer { */ protected abstract void starting(); + + /** - * Starting error. + * Starting error(With error result). */ - protected abstract void startingError(); + protected abstract void startingError(String error); /** * Started. @@ -280,8 +283,7 @@ public abstract class AbstractWebSocketServer { /** * Stopping error. */ - protected abstract void stoppingError(); - + protected abstract void stoppingError(String error); /** * Stopped. */ @@ -301,15 +303,15 @@ public abstract class AbstractWebSocketServer { starting(); switch (ServerStatus) { case STARTING -> { - startingError(); + startingError("Server is already starting."); logger.info("Server is already starting."); } case RUNNING -> { - startingError(); + startingError("Server is already running."); logger.info("Server is already running."); } case STOPPING -> { - startingError(); + startingError("Server is stopping"); logger.info("Server is stopping"); } case STOPPED, WAITING_FOR_INIT -> { @@ -336,11 +338,11 @@ public abstract class AbstractWebSocketServer { stopping(); switch (ServerStatus) { case WAITING_FOR_INIT -> { - stoppingError(); + stoppingError("Not Init. (It shouldn't be happened)"); logger.warn("Not Init. (It shouldn't be happened)"); } case STARTING -> { - stoppingError(); + stoppingError("Server is starting, please waiting."); logger.info("Server is starting, please waiting."); } case RUNNING -> { @@ -392,11 +394,11 @@ public abstract class AbstractWebSocketServer { } case STOPPING -> { - stoppingError(); + stoppingError("Server is already stopping"); logger.info("Server is already stopping"); } case STOPPED -> { - stoppingError(); + stoppingError("Server has stopped"); logger.info("Server has stopped"); } } diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java index 9e0803f..34d5584 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSClient.java @@ -183,8 +183,8 @@ public class PowerBoxWSClient extends AbstractWebSocketClient { } @Override - protected void startingError() { - operation.ClientStartingErrorHandler(); + protected void startingError(String msg) { + operation.ClientStartingErrorHandler(msg); } @Override @@ -198,8 +198,8 @@ public class PowerBoxWSClient extends AbstractWebSocketClient { } @Override - protected void stoppingError() { - operation.ClientStoppingErrorHandler(); + protected void stoppingError(String msg) { + operation.ClientStoppingErrorHandler(msg); } @Override diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java index c92387c..06b2cfa 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/PowerBoxWSServer.java @@ -118,9 +118,10 @@ public class PowerBoxWSServer extends AbstractWebSocketServer { operation.ServerStartingHandler(); } + @Override - protected void startingError() { - operation.ServerStartingErrorHandler(); + protected void startingError(String error) { + operation.ServerStartingErrorHandler(error); } @Override @@ -134,8 +135,8 @@ public class PowerBoxWSServer extends AbstractWebSocketServer { } @Override - protected void stoppingError() { - operation.ServerStoppingErrorHandler(); + protected void stoppingError(String error) { + operation.ServerStoppingErrorHandler(error); } @Override diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/DefaultClientOperation.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/DefaultClientOperation.java index 0fad7eb..1a1603f 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/DefaultClientOperation.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/DefaultClientOperation.java @@ -34,8 +34,8 @@ public class DefaultClientOperation implements ClientOperation { } @Override - public void ClientStartingErrorHandler() { - //NOOP + public void ClientStartingErrorHandler(String errorMsg) { + } @Override @@ -43,11 +43,13 @@ public class DefaultClientOperation implements ClientOperation { //NOOP } + @Override - public void ClientStoppingErrorHandler() { + public void ClientStoppingErrorHandler(String errorMsg) { //NOOP } + @Override public void ClientStoppedHandler() { //NOOP diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java index 150b495..8fbd86d 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/DefaultServerOperation.java @@ -74,8 +74,8 @@ public class DefaultServerOperation implements ServerOperation { } @Override - public void ServerStartingErrorHandler() { - + public void ServerStartingErrorHandler(String errorMessage) { + //NOOP } @Override @@ -89,10 +89,11 @@ public class DefaultServerOperation implements ServerOperation { } @Override - public void ServerStoppingErrorHandler() { - + public void ServerStoppingErrorHandler(String errorMessage) { + //NOOP } + @Override public void ServerStoppedHandler() { //NOOP diff --git a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ClientOperation.java b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ClientOperation.java index 546b204..7416584 100644 --- a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ClientOperation.java +++ b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ClientOperation.java @@ -34,9 +34,9 @@ public interface ClientOperation extends IOperation { /** * 客户端启动遇到错误后处理 + * @param errorMsg 错误消息 */ - void ClientStartingErrorHandler(); - + void ClientStartingErrorHandler(String errorMsg); /** * 客户端线程关闭中处理 */ @@ -44,9 +44,9 @@ public interface ClientOperation extends IOperation { /** * 客户端线程关闭中遇到错误后处理 + * @param errorMsg 错误消息 */ - void ClientStoppingErrorHandler(); - + void ClientStoppingErrorHandler(String errorMsg); /** * 客户端线程完全关闭后处理 */ diff --git a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ServerOperation.java b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ServerOperation.java index 12a3cac..648c2ed 100644 --- a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ServerOperation.java +++ b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/operation/ServerOperation.java @@ -31,8 +31,9 @@ public interface ServerOperation extends IOperation { /** * 服务器线程开启中遇到错误后处理 + * @param errorMessage 错误消息 */ - void ServerStartingErrorHandler(); + void ServerStartingErrorHandler(String errorMessage); /** * 服务器线程开启后处理 @@ -46,8 +47,9 @@ public interface ServerOperation extends IOperation { /** * 服务器线程关闭中遇到错误后处理 + * @param errorMessage 错误消息 */ - void ServerStoppingErrorHandler(); + void ServerStoppingErrorHandler(String errorMessage); /** * 服务器线程完全关闭后处理 diff --git a/gradle.properties b/gradle.properties index 9a5ad8e..5f96082 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.configuration-cache=true org.gradle.configuration-cache.problems=warn # ROOT project_name=DgLab -project_version=4.2.11.18 +project_version=4.3.11.18 project_group=top.r3944realms.dg_lab # API diff --git a/versionlog.txt b/versionlog.txt index 6e889b8..32ab082 100644 --- a/versionlog.txt +++ b/versionlog.txt @@ -2,6 +2,11 @@ 统一用4位版本，对于测试性更新统一在其后加-Beta。 修复问题更新为加0.0.0.1，添加/移除新特性加0.0.1.0，小部分重构更新加0.1.0.0，大量重构加1.0.0.0 +2025-09-23-1 +project_version=4.3.11.18 +* 添加操作Operation类的Error方法错误的参数，同时移除无参方法 +* + 2025-09-21-4 project_version=4.2.11.18 * 添加服务器对SSL密码参数支持