From c8ae336116677c03ee54c211a92df50acb0b9abc Mon Sep 17 00:00:00 2001 From: 3944Realms Date: Sun, 21 Sep 2025 22:20:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0ClientPowerBoxSharedData=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5=20isEnableSsl=20&=20=E8=AE=A9PowerB?= =?UTF-8?q?oxWSClient=E7=BB=A7=E6=89=BF=E4=BA=86=E7=88=B6=E7=B1=BB?= =?UTF-8?q?=E7=9A=84#en/disableSSL=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 添加ClientPowerBoxSharedData添加新字段 isEnableSsl,用于WS地址协议头判断 * 让PowerBoxWSClient继承了父类的#enableSSL #disableSSL方法以适配添加ClientPowerBoxSharedData添加新字段的字段 isEnableSsl --- .../dg_lab/websocket/PowerBoxWSClient.java | 12 ++++++++++++ .../sharedData/ClientPowerBoxSharedData.java | 6 +++++- gradle.properties | 2 +- versionlog.txt | 6 ++++++ 4 files changed, 24 insertions(+), 2 deletions(-) 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 083b54a..9e0803f 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 @@ -207,6 +207,18 @@ public class PowerBoxWSClient extends AbstractWebSocketClient { operation.ClientStoppedHandler(); } + @Override + public void enableSSL() { + super.enableSSL(); + sharedData.isEnableSsl = true; + } + + @Override + public void disableSSL() { + super.disableSSL(); + sharedData.isEnableSsl = false; + } + @Override public void send(Message message) { if(message instanceof PowerBoxMessage PBMessage) { diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/sharedData/ClientPowerBoxSharedData.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/sharedData/ClientPowerBoxSharedData.java index 925821b..7d19c47 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/sharedData/ClientPowerBoxSharedData.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/sharedData/ClientPowerBoxSharedData.java @@ -75,6 +75,10 @@ public class ClientPowerBoxSharedData implements ISharedData { * 二维码 */ public String rqCodeUrl = ""; + /** + * 是否启用 SSL + */ + public boolean isEnableSsl = false; /** * Instantiates a new Client power box shared data. * @@ -95,7 +99,7 @@ public class ClientPowerBoxSharedData implements ISharedData { * @return the url */ public String getUrl() { - return StringHandlerUtil.buildWebSocketURL(address, port, false); + return StringHandlerUtil.buildWebSocketURL(address, port, isEnableSsl); } diff --git a/gradle.properties b/gradle.properties index d3e2167..dcb994d 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.10.17 +project_version=4.2.10.18 project_group=top.r3944realms.dg_lab # API diff --git a/versionlog.txt b/versionlog.txt index 17aef75..81770c3 100644 --- a/versionlog.txt +++ b/versionlog.txt @@ -2,6 +2,12 @@ 统一用4位版本，对于测试性更新统一在其后加-Beta。 修复问题更新为加0.0.0.1，添加/移除新特性加0.0.1.0，小部分重构更新加0.1.0.0，大量重构加1.0.0.0 +2025-09-21-3 +project_version=4.2.10.18 +* 添加ClientPowerBoxSharedData添加新字段 isEnableSsl,用于WS地址协议头判断 +* 让PowerBoxWSClient继承了父类的#enableSSL #disableSSL方法以适配添加ClientPowerBoxSharedData添加新字段的字段 isEnableSsl + + 2025-09-21-2 project_version=4.2.10.17 * 修正 DGPBClientManager 的实现接口为com.r3944realms.dg_lab.api.manager.IDGLabManager