diff --git a/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java b/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java index 29aa235..7962a1e 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/manager/DGPBClientManager.java @@ -16,6 +16,7 @@ package com.r3944realms.dg_lab.manager; +import com.r3944realms.dg_lab.api.manager.IDGLabManager; import com.r3944realms.dg_lab.api.manager.Status; import com.r3944realms.dg_lab.websocket.PowerBoxWSClient; import com.r3944realms.dg_lab.api.websocket.message.Message; diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandlerContextWrapper.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandlerContextWrapper.java index 4d32553..89e57cf 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandlerContextWrapper.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/client/ClientDLPBHandlerContextWrapper.java @@ -145,6 +145,7 @@ public class ClientDLPBHandlerContextWrapper extends AbstractDgLabPowerBoxHandle ((ClientPowerBoxSharedData)sharedData).connectionId = data.getClientId(); logger.info("收到clientId: {}", ConnectionId()); String qrCodeContext = "https://www.dungeon-lab.com/app-download.php#DGLAB-SOCKET#" + ((ClientPowerBoxSharedData)sharedData).getUrl() + ConnectionId(); + ((ClientPowerBoxSharedData) sharedData).rqCodeUrl = qrCodeContext; TryCatch(i -> ((ClientOperation)operation).QrCodeUrlHandler(qrCodeContext)); TryCatch(i -> ((ClientOperation)operation).ShowQrCodeHandler()); logger.debug("重新生成QrCodeContext: {}",qrCodeContext); 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 dbcd54b..925821b 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 @@ -34,6 +34,7 @@ public class ClientPowerBoxSharedData implements ISharedData { clone.delay = delay; clone.address = address; clone.port = port; + clone.rqCodeUrl = rqCodeUrl; return clone; } @@ -64,13 +65,16 @@ public class ClientPowerBoxSharedData implements ISharedData { /** * The Follow a strength. */ -//跟随AB的软上限 + //跟随AB的软上限 public final boolean followAStrength = false; /** * The Follow b strength. */ public final boolean followBStrength = false; - + /** + * 二维码 + */ + public String rqCodeUrl = ""; /** * Instantiates a new Client power box shared data. * diff --git a/gradle.properties b/gradle.properties index 588fd32..d3e2167 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.9.16 +project_version=4.2.10.17 project_group=top.r3944realms.dg_lab # API diff --git a/versionlog.txt b/versionlog.txt index 41f9e26..17aef75 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-21-2 +project_version=4.2.10.17 +* 修正 DGPBClientManager 的实现接口为com.r3944realms.dg_lab.api.manager.IDGLabManager +* 在ClientPowerBoxSharedData添加新字段rqCodeUrl用于辅助访问二维码Url + 2025-09-21-1 project_version=4.2.9.16 * 添加了SSL支持