From c5aeb6f0f72f21dda9a131ff14db12c913835ea1 Mon Sep 17 00:00:00 2001 From: wujiawei <1207537021@qq.com> Date: Mon, 14 Jul 2025 18:54:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91proxy=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BB=A4=E7=89=8C=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NettyClientSocketApplicationListener.java | 8 ++ .../proxy/auth/ClientNettyPasswordAuth.java | 18 ---- .../auth/DefaultNettyPasswordAuth.java | 17 +--- .../protocol/token/AuthenticationToken.java | 39 +++++++++ .../token/AuthenticationTokenContext.java | 83 +++++++++++++++++++ .../LazyNettyClusterNodeDTOAssembler.java | 8 +- .../LazyNettyClusterNodeQueryListCommand.java | 5 +- .../server/init/InitAuthenticationToken.java | 43 ++++++++++ ...LazyNettyClientStateRecordApplication.java | 14 +--- .../LazyVisitorPortPerDayFlowApplication.java | 11 +-- .../LazyNettyClientRouteQueryOneCommand.java | 5 +- .../LazyNettyClientRouteRemoveCommand.java | 5 +- .../LazyNettyClientRouteUpdateCommand.java | 5 +- .../LazyNettyClientRouteRepositoryImpl.java | 4 +- .../LazyNettyClientStateRepositoryImpl.java | 4 +- ...yNettyClientTokenBucketRepositoryImpl.java | 8 +- ...NettyClientVirtualRouteRepositoryImpl.java | 4 +- .../LazyNettyServerRouteRepositoryImpl.java | 4 +- ...NettyServerVirtualRouteRepositoryImpl.java | 4 +- 19 files changed, 205 insertions(+), 84 deletions(-) delete mode 100644 wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/auth/ClientNettyPasswordAuth.java create mode 100644 wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/token/AuthenticationToken.java create mode 100644 wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/token/AuthenticationTokenContext.java create mode 100644 wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/init/InitAuthenticationToken.java diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/context/NettyClientSocketApplicationListener.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/context/NettyClientSocketApplicationListener.java index 30a19d94..6a9e2244 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/context/NettyClientSocketApplicationListener.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/context/NettyClientSocketApplicationListener.java @@ -7,6 +7,8 @@ import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientPrope import org.framework.lazy.cloud.network.heartbeat.client.config.PropertiesType; import org.framework.lazy.cloud.network.heartbeat.client.infrastructure.entity.LazyNettyServerPropertiesDO; import org.framework.lazy.cloud.network.heartbeat.common.enums.ProtocolType; +import org.framework.lazy.cloud.network.heartbeat.protocol.token.AuthenticationToken; +import org.framework.lazy.cloud.network.heartbeat.protocol.token.AuthenticationTokenContext; import org.springframework.beans.factory.DisposableBean; import org.springframework.boot.context.event.ApplicationStartedEvent; import org.springframework.context.ApplicationListener; @@ -74,6 +76,12 @@ public class NettyClientSocketApplicationListener implements ApplicationListener if (!exists) { lazyLambdaStream.insert(lazyNettyServerPropertiesDO); } + // 添加本地token + AuthenticationToken authenticationToken = new AuthenticationToken(); + authenticationToken.setUsedByClientId(clientId); + authenticationToken.setAppKey(appKey); + authenticationToken.setAppSecret(appSecret); + AuthenticationTokenContext.setAuthenticationToken(authenticationToken); }catch (Exception e){ e.printStackTrace(); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/auth/ClientNettyPasswordAuth.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/auth/ClientNettyPasswordAuth.java deleted file mode 100644 index 530702c2..00000000 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/auth/ClientNettyPasswordAuth.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.auth; - -import org.framework.lazy.cloud.network.heartbeat.protocol.auth.AbstractNettyPasswordAuth; -import org.framework.lazy.cloud.network.heartbeat.protocol.properties.ProtocolProxyProperties; - -public class ClientNettyPasswordAuth extends AbstractNettyPasswordAuth { - - - public ClientNettyPasswordAuth(ProtocolProxyProperties protocolProxyProperties) { - super(protocolProxyProperties); - } - - @Override - public boolean doVerify(String username, String password) { - // 查找用户名称、密码 - return false; - } -} diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/auth/DefaultNettyPasswordAuth.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/auth/DefaultNettyPasswordAuth.java index ff3e12c5..4cf3549f 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/auth/DefaultNettyPasswordAuth.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/auth/DefaultNettyPasswordAuth.java @@ -2,6 +2,7 @@ package org.framework.lazy.cloud.network.heartbeat.protocol.auth; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.protocol.properties.ProtocolProxyProperties; +import org.framework.lazy.cloud.network.heartbeat.protocol.token.AuthenticationTokenContext; import org.springframework.stereotype.Component; import java.util.Map; @@ -11,29 +12,17 @@ import java.util.concurrent.ConcurrentHashMap; @Component public class DefaultNettyPasswordAuth extends AbstractNettyPasswordAuth { - protected Map authMap = new ConcurrentHashMap<>(); - protected DefaultNettyPasswordAuth(ProtocolProxyProperties protocolProxyProperties) { super(protocolProxyProperties); } @Override public boolean doVerify(String username, String password) { - boolean verify = authMap.containsKey(username) && authMap.get(username).equals(password); - if(!verify){ + boolean verify = AuthenticationTokenContext.verify(username, password); + if (!verify) { log.error("授权失败"); } return verify; } - /** - * 新增授权 - * - * @param username 用户 - * @param password 密码 - */ - public DefaultNettyPasswordAuth addAuth(String username, String password) { - authMap.putIfAbsent(username, password); - return this; - } } diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/token/AuthenticationToken.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/token/AuthenticationToken.java new file mode 100644 index 00000000..c6c881ea --- /dev/null +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/token/AuthenticationToken.java @@ -0,0 +1,39 @@ +package org.framework.lazy.cloud.network.heartbeat.protocol.token; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 授权信息 + */ +@Data +public class AuthenticationToken { + + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + private String appKey; + + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + private String appSecret; + + + /** + * 过期时间 + */ + @Schema(description = "过期时间", name = "expireInTime", example = "") + private LocalDateTime expireInTime; + + /** + * 被使用的客户端ID + */ + @Schema(description = "被使用的客户端ID", name = "usedByClientId", example = "") + private String usedByClientId; + +} diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/token/AuthenticationTokenContext.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/token/AuthenticationTokenContext.java new file mode 100644 index 00000000..40e421c3 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/token/AuthenticationTokenContext.java @@ -0,0 +1,83 @@ +package org.framework.lazy.cloud.network.heartbeat.protocol.token; + +import org.wu.framework.core.utils.ObjectUtils; + +import java.util.concurrent.ConcurrentHashMap; + +public class AuthenticationTokenContext { + + + // key appid value AuthenticationToken + private static final ConcurrentHashMap m = new ConcurrentHashMap<>(); + + + /** + * 设置授权信息 + * + * @param clientId 客户端ID + * @param appKey 令牌 + * @param appSecret 迷药 + */ + public static void setAuthenticationToken(String clientId, String appKey, String appSecret) { + AuthenticationToken authenticationToken = new AuthenticationToken(); + authenticationToken.setUsedByClientId(clientId); + authenticationToken.setAppKey(appKey); + authenticationToken.setAppSecret(appSecret); + AuthenticationTokenContext.setAuthenticationToken(authenticationToken); + } + + /** + * 设置授权信息 + * + * @param authenticationToken 授权信息 + */ + public static void setAuthenticationToken(AuthenticationToken authenticationToken) { + String key = authenticationToken.getAppKey(); + if (m.containsKey(key)) { + m.put(key, authenticationToken); + return; + } + m.put(key, authenticationToken); + } + + /** + * 获取授权信息 + * + * @param appKey 令牌key + */ + public static AuthenticationToken getAuthenticationToken(String appKey) { + AuthenticationToken p = m.values() + .stream() + .filter(authenticationToken -> authenticationToken.getAppKey().equals(appKey)) + .findFirst() + .orElse(null); + return p; + } + + /** + * 删除授权信息 + * + * @param appKey 令牌key + */ + public static void removeAuthenticationToken(String appKey) { + m.remove(appKey); + } + + /** + * 验证令牌 + * + * @param appKey 令牌key + */ + public static Boolean verify(String appKey, String appSecret) { + AuthenticationToken p = m.values() + .stream() + .filter(authenticationToken -> authenticationToken.getAppKey().equals(appKey) + && authenticationToken.getAppSecret().equals(appSecret) + ) + .findFirst() + .orElse(null); + return ObjectUtils.isNotEmpty(p); + } + + +} diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/assembler/LazyNettyClusterNodeDTOAssembler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/assembler/LazyNettyClusterNodeDTOAssembler.java index be3e057c..77eddf94 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/assembler/LazyNettyClusterNodeDTOAssembler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/assembler/LazyNettyClusterNodeDTOAssembler.java @@ -1,14 +1,10 @@ package org.framework.lazy.cloud.network.heartbeat.server.cluster.application.assembler; +import org.framework.lazy.cloud.network.heartbeat.server.cluster.application.command.lazy.netty.cluster.node.*; import org.framework.lazy.cloud.network.heartbeat.server.cluster.application.dto.LazyNettyClusterNodeDTO; import org.framework.lazy.cloud.network.heartbeat.server.cluster.domain.model.cluster.node.LazyNettyClusterNode; -import org.framework.lazy.cloud.network.heartbeat.server.cluster.application.command.lazy.netty.cluster.node.LazyNettyClusterNodeRemoveCommand; -import org.framework.lazy.cloud.network.heartbeat.server.cluster.application.command.lazy.netty.cluster.node.LazyNettyClusterNodeStoryCommand; -import org.framework.lazy.cloud.network.heartbeat.server.cluster.application.command.lazy.netty.cluster.node.LazyNettyClusterNodeUpdateCommand; -import org.framework.lazy.cloud.network.heartbeat.server.cluster.application.command.lazy.netty.cluster.node.LazyNettyClusterNodeQueryListCommand; -import org.framework.lazy.cloud.network.heartbeat.server.cluster.application.command.lazy.netty.cluster.node.LazyNettyClusterNodeQueryOneCommand; -import org.wu.framework.core.mapper.LazyStructMappers; import org.wu.framework.core.mapper.LazyStructMapper; +import org.wu.framework.core.mapper.LazyStructMappers; /** * describe 集群配置信息 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/command/lazy/netty/cluster/node/LazyNettyClusterNodeQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/command/lazy/netty/cluster/node/LazyNettyClusterNodeQueryListCommand.java index ceda815c..aaf09df2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/command/lazy/netty/cluster/node/LazyNettyClusterNodeQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/command/lazy/netty/cluster/node/LazyNettyClusterNodeQueryListCommand.java @@ -1,14 +1,11 @@ package org.framework.lazy.cloud.network.heartbeat.server.cluster.application.command.lazy.netty.cluster.node; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; -import io.swagger.v3.oas.annotations.media.Schema; import org.framework.lazy.cloud.network.heartbeat.common.enums.NettyClientStatus; -import java.lang.String; -import java.lang.Integer; import java.time.LocalDateTime; -import java.lang.Boolean; /** * describe 集群配置信息 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/init/InitAuthenticationToken.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/init/InitAuthenticationToken.java new file mode 100644 index 00000000..5cabc762 --- /dev/null +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/init/InitAuthenticationToken.java @@ -0,0 +1,43 @@ +package org.framework.lazy.cloud.network.heartbeat.server.init; + +import lombok.extern.slf4j.Slf4j; +import org.framework.lazy.cloud.network.heartbeat.protocol.token.AuthenticationTokenContext; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.token.bucket.LazyNettyClientTokenBucket; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.token.bucket.LazyNettyClientTokenBucketRepository; +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Configuration; + + +@Configuration +@Slf4j +public class InitAuthenticationToken implements CommandLineRunner { + + private final LazyNettyClientTokenBucketRepository lazyNettyClientTokenBucketRepository; + + public InitAuthenticationToken(LazyNettyClientTokenBucketRepository lazyNettyClientTokenBucketRepository) { + this.lazyNettyClientTokenBucketRepository = lazyNettyClientTokenBucketRepository; + } + + @Override + public void run(String... args) throws Exception { + try { + LazyNettyClientTokenBucket lazyNettyClientTokenBucket = new LazyNettyClientTokenBucket(); + lazyNettyClientTokenBucket.setIsDeleted(false); + for (LazyNettyClientTokenBucket nettyClientTokenBucket : lazyNettyClientTokenBucketRepository.findList(lazyNettyClientTokenBucket) + .getData()) { + + String clientId = nettyClientTokenBucket.getUsedByClientId(); + if (clientId != null) { + String appKey = nettyClientTokenBucket.getAppKey(); + String appSecret = nettyClientTokenBucket.getAppSecret(); + AuthenticationTokenContext.setAuthenticationToken(clientId, appKey, appSecret); + } + + } + } catch (Exception e) { + e.printStackTrace(); + log.error("初始化令牌桶失败:{}", e.getMessage()); + } + + } +} diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyNettyClientStateRecordApplication.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyNettyClientStateRecordApplication.java index c4a405ce..bc0ca000 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyNettyClientStateRecordApplication.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyNettyClientStateRecordApplication.java @@ -1,19 +1,13 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application; -import org.wu.framework.web.response.Result; -import org.wu.framework.web.response.ResultFactory; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.state.record.LazyNettyClientStateRecord; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.state.record.LazyNettyClientStateRecordRemoveCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.state.record.LazyNettyClientStateRecordStoryCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.state.record.LazyNettyClientStateRecordUpdateCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.state.record.LazyNettyClientStateRecordQueryListCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.state.record.LazyNettyClientStateRecordQueryOneCommand; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.state.record.*; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.dto.LazyNettyClientStateRecordDTO; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.state.record.LazyNettyClientStateRecord; +import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; +import org.wu.framework.web.response.Result; import java.util.List; -import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; - /** * describe 客户端状态变更记录 * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyVisitorPortPerDayFlowApplication.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyVisitorPortPerDayFlowApplication.java index 16cbcd81..793fa400 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyVisitorPortPerDayFlowApplication.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyVisitorPortPerDayFlowApplication.java @@ -1,20 +1,15 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.visitor.port.per.day.flow.*; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.dto.LazyClientFlowPerDayEchartsDTO; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.dto.LazyClientPortFlowPerDayEchartsDTO; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.dto.LazyVisitorPortPerDayFlowDTO; -import org.wu.framework.web.response.Result; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.visitor.port.per.day.flow.LazyVisitorPortPerDayFlow; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.visitor.port.per.day.flow.LazyVisitorPortPerDayFlowRemoveCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.visitor.port.per.day.flow.LazyVisitorPortPerDayFlowStoryCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.visitor.port.per.day.flow.LazyVisitorPortPerDayFlowUpdateCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.visitor.port.per.day.flow.LazyVisitorPortPerDayFlowQueryListCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.visitor.port.per.day.flow.LazyVisitorPortPerDayFlowQueryOneCommand; +import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; +import org.wu.framework.web.response.Result; import java.util.List; -import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; - /** * describe 每日统计流量 * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteQueryOneCommand.java index 92dd921d..cb84659d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteQueryOneCommand.java @@ -1,13 +1,10 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.route; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; -import io.swagger.v3.oas.annotations.media.Schema; -import java.lang.String; import java.time.LocalDateTime; -import java.lang.Long; -import java.lang.Boolean; /** * describe 客户端代理路由规则 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteRemoveCommand.java index 69588892..e69df697 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteRemoveCommand.java @@ -1,13 +1,10 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.route; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; -import io.swagger.v3.oas.annotations.media.Schema; -import java.lang.String; import java.time.LocalDateTime; -import java.lang.Long; -import java.lang.Boolean; /** * describe 客户端代理路由规则 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteUpdateCommand.java index 2a3a6a54..c5a78345 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/route/LazyNettyClientRouteUpdateCommand.java @@ -1,13 +1,10 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.route; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; -import io.swagger.v3.oas.annotations.media.Schema; -import java.lang.String; import java.time.LocalDateTime; -import java.lang.Long; -import java.lang.Boolean; /** * describe 客户端代理路由规则 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientRouteRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientRouteRepositoryImpl.java index 6fe9cf50..e3fe23d8 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientRouteRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientRouteRepositoryImpl.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Repository; import org.wu.framework.core.NormalUsedString; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; import org.wu.framework.lazy.orm.database.lambda.stream.lambda.LazyLambdaStream; -import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyUpdateSetValueWrappers; +import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazySetValueWrappers; import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyWrappers; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; @@ -183,7 +183,7 @@ public class LazyNettyClientRouteRepositoryImpl implements LazyNettyClientRouteR @Override public Result remove(LazyNettyClientRoute lazyNettyClientRoute) { - lazyLambdaStream.update(LazyUpdateSetValueWrappers.lambdaWrapper() + lazyLambdaStream.update(LazySetValueWrappers.lambdaWrapper() .set(LazyNettyClientRouteDO::getIsDeleted, true), LazyWrappers .lambdaWrapper() diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientStateRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientStateRepositoryImpl.java index b6f86cd9..992d95dc 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientStateRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientStateRepositoryImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import org.wu.framework.lazy.orm.core.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructurePersistence; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; import org.wu.framework.lazy.orm.database.lambda.stream.lambda.LazyLambdaStream; -import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyUpdateSetValueWrappers; +import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazySetValueWrappers; import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyWrappers; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; @@ -57,7 +57,7 @@ public class LazyNettyClientStateRepositoryImpl implements LazyNettyClientStateR @Override public Result updateOne(LazyNettyClientState lazyNettyClientState) { LazyNettyClientStateDO lazyNettyClientStateDO = LazyNettyClientStateConverter.INSTANCE.fromNettyClientState(lazyNettyClientState); - lazyLambdaStream.update(LazyUpdateSetValueWrappers. + lazyLambdaStream.update(LazySetValueWrappers. lambdaWrapperBeanIgnoreEmpty(lazyNettyClientStateDO) , diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientTokenBucketRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientTokenBucketRepositoryImpl.java index ae1baa65..d2e550de 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientTokenBucketRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientTokenBucketRepositoryImpl.java @@ -1,6 +1,7 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.persistence; import jakarta.annotation.Resource; +import org.framework.lazy.cloud.network.heartbeat.protocol.token.AuthenticationTokenContext; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.token.bucket.LazyNettyClientTokenBucket; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.token.bucket.LazyNettyClientTokenBucketRepository; import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyNettyClientTokenBucketConverter; @@ -8,7 +9,7 @@ import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructu import org.springframework.stereotype.Repository; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; import org.wu.framework.lazy.orm.database.lambda.stream.lambda.LazyLambdaStream; -import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyUpdateSetValueWrappers; +import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazySetValueWrappers; import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyWrappers; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; @@ -177,7 +178,7 @@ public class LazyNettyClientTokenBucketRepositoryImpl implements LazyNettyClient // 绑定客户端ID lazyLambdaStream.update( - LazyUpdateSetValueWrappers.lambdaWrapper() + LazySetValueWrappers.lambdaWrapper() .set(LazyNettyClientTokenBucketDO::getUsedByClientId, clientId) .set(LazyNettyClientTokenBucketDO::getUpdateTime, LocalDateTime.now()) , @@ -186,6 +187,9 @@ public class LazyNettyClientTokenBucketRepositoryImpl implements LazyNettyClient .eq(LazyNettyClientTokenBucketDO::getAppKey, appKey) .eq(LazyNettyClientTokenBucketDO::getAppSecret, appSecret) ); + + AuthenticationTokenContext.setAuthenticationToken(clientId,appKey,appSecret); + return ResultFactory.successOf(true); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientVirtualRouteRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientVirtualRouteRepositoryImpl.java index 0c2f5a3d..92d61a54 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientVirtualRouteRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientVirtualRouteRepositoryImpl.java @@ -16,7 +16,7 @@ import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructu import org.springframework.stereotype.Repository; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; import org.wu.framework.lazy.orm.database.lambda.stream.lambda.LazyLambdaStream; -import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyUpdateSetValueWrappers; +import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazySetValueWrappers; import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyWrappers; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; @@ -171,7 +171,7 @@ public class LazyNettyClientVirtualRouteRepositoryImpl implements LazyNettyClien @Override public Result remove(LazyNettyClientVirtualRoute lazyNettyClientVirtualRoute) { LazyNettyClientVirtualRouteDO lazyNettyClientVirtualRouteDO = LazyNettyClientVirtualRouteConverter.INSTANCE.fromLazyNettyClientVirtualRoute(lazyNettyClientVirtualRoute); - lazyLambdaStream.update(LazyUpdateSetValueWrappers.lambdaWrapper() + lazyLambdaStream.update(LazySetValueWrappers.lambdaWrapper() .set(LazyNettyClientVirtualRouteDO::getIsDeleted, true), LazyWrappers .lambdaWrapper() diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerRouteRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerRouteRepositoryImpl.java index c3ead5d8..177f13d9 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerRouteRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerRouteRepositoryImpl.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Repository; import org.wu.framework.core.NormalUsedString; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; import org.wu.framework.lazy.orm.database.lambda.stream.lambda.LazyLambdaStream; -import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyUpdateSetValueWrappers; +import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazySetValueWrappers; import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyWrappers; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; @@ -176,7 +176,7 @@ public class LazyNettyServerRouteRepositoryImpl implements LazyNettyServerRouteR @Override public Result remove(LazyNettyServerRoute lazyNettyServerRoute) { - lazyLambdaStream.update(LazyUpdateSetValueWrappers.lambdaWrapper() + lazyLambdaStream.update(LazySetValueWrappers.lambdaWrapper() .set(LazyNettyServerRouteDO::getIsDeleted, true), LazyWrappers .lambdaWrapper() diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerVirtualRouteRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerVirtualRouteRepositoryImpl.java index c94fa647..f45ca5ea 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerVirtualRouteRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerVirtualRouteRepositoryImpl.java @@ -16,7 +16,7 @@ import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructu import org.springframework.stereotype.Repository; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; import org.wu.framework.lazy.orm.database.lambda.stream.lambda.LazyLambdaStream; -import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyUpdateSetValueWrappers; +import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazySetValueWrappers; import org.wu.framework.lazy.orm.database.lambda.stream.wrapper.LazyWrappers; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; @@ -171,7 +171,7 @@ public class LazyNettyServerVirtualRouteRepositoryImpl implements LazyNettyServe @Override public Result remove(LazyNettyServerVirtualRoute lazyNettyServerVirtualRoute) { LazyNettyServerVirtualRouteDO lazyNettyServerVirtualRouteDO = LazyNettyServerVirtualRouteConverter.INSTANCE.fromLazyNettyServerVirtualRoute(lazyNettyServerVirtualRoute); - lazyLambdaStream.update(LazyUpdateSetValueWrappers.lambdaWrapper() + lazyLambdaStream.update(LazySetValueWrappers.lambdaWrapper() .set(LazyNettyServerVirtualRouteDO::getIsDeleted, true), LazyWrappers .lambdaWrapper()