From 571fe7893dc9836530354e3ff691dbdfa87e80fa Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Wed, 9 Oct 2024 20:28:45 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E6=B7=BB=E5=8A=A0=E4=BB=A4=E7=89=8C?= =?UTF-8?q?=E5=AF=86=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...NettyServerPropertiesQueryListCommand.java | 10 +++++++++ ...yNettyServerPropertiesQueryOneCommand.java | 10 +++++++++ ...azyNettyServerPropertiesRemoveCommand.java | 10 +++++++++ ...LazyNettyServerPropertiesStoryCommand.java | 10 +++++++++ ...azyNettyServerPropertiesUpdateCommand.java | 10 +++++++++ .../dto/LazyNettyServerPropertiesDTO.java | 10 +++++++++ .../heartbeat/client/config/InitConfig.java | 5 +++++ .../properties/LazyNettyServerProperties.java | 11 ++++++++++ .../entity/LazyNettyServerPropertiesDO.java | 22 ++++++++++++++----- 9 files changed, 93 insertions(+), 5 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryListCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryListCommand.java index 8bfcc97..dd8e89c 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryListCommand.java @@ -66,7 +66,17 @@ public class LazyNettyServerPropertiesQueryListCommand { */ @Schema(description ="类型（配置、DB）",name ="type",example = "") private PropertiesType type; + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + private String appKey; + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + private String appSecret; /** * * 更新时间 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryOneCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryOneCommand.java index ef18132..82ab051 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryOneCommand.java @@ -65,7 +65,17 @@ public class LazyNettyServerPropertiesQueryOneCommand { */ @Schema(description ="类型（配置、DB）",name ="type",example = "") private PropertiesType type; + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + private String appKey; + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + private String appSecret; /** * * 更新时间 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesRemoveCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesRemoveCommand.java index 13ac337..ff82ceb 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesRemoveCommand.java @@ -66,7 +66,17 @@ public class LazyNettyServerPropertiesRemoveCommand { */ @Schema(description ="类型（配置、DB）",name ="type",example = "") private PropertiesType type; + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + private String appKey; + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + private String appSecret; /** * * 更新时间 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesStoryCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesStoryCommand.java index 88727f0..e49e0ee 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesStoryCommand.java @@ -65,7 +65,17 @@ public class LazyNettyServerPropertiesStoryCommand { */ @Schema(description ="类型（配置、DB）",name ="type",example = "") private PropertiesType type; + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + private String appKey; + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + private String appSecret; /** * * 更新时间 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesUpdateCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesUpdateCommand.java index 87b58ab..89978cc 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesUpdateCommand.java @@ -65,7 +65,17 @@ public class LazyNettyServerPropertiesUpdateCommand { */ @Schema(description ="类型（配置、DB）",name ="type",example = "") private PropertiesType type; + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + private String appKey; + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + private String appSecret; /** * * 更新时间 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/dto/LazyNettyServerPropertiesDTO.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/dto/LazyNettyServerPropertiesDTO.java index b25a775..a79504d 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/dto/LazyNettyServerPropertiesDTO.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/dto/LazyNettyServerPropertiesDTO.java @@ -65,7 +65,17 @@ public class LazyNettyServerPropertiesDTO { */ @Schema(description ="类型（配置、DB）",name ="type",example = "") private PropertiesType type; + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + private String appKey; + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + private String appSecret; /** * * 更新时间 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/InitConfig.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/InitConfig.java index d1fbfe1..ea2cbb5 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/InitConfig.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/InitConfig.java @@ -54,6 +54,8 @@ public class InitConfig implements CommandLineRunner, DisposableBean { String clientId = nettyClientProperties.getClientId(); String inetHost = nettyClientProperties.getInetHost(); int inetPort = nettyClientProperties.getInetPort(); + String appKey = nettyClientProperties.getAppKey(); + String appSecret = nettyClientProperties.getAppSecret(); if (Objects.isNull(clientId) || Objects.isNull(inetHost)) { log.warn("配置信息为空，请通过页面添加配置信息:{}", nettyClientProperties); @@ -65,6 +67,9 @@ public class InitConfig implements CommandLineRunner, DisposableBean { lazyNettyServerPropertiesDO.setInetPort(inetPort); lazyNettyServerPropertiesDO.setType(PropertiesType.CONFIG); lazyNettyServerPropertiesDO.setIsDeleted(false); + lazyNettyServerPropertiesDO.setAppKey(appKey); + lazyNettyServerPropertiesDO.setAppSecret(appSecret); + // 根据服务端端口、port 唯一性验证 boolean exists = lazyLambdaStream.exists(LazyWrappers.lambdaWrapper() .eq(LazyNettyServerPropertiesDO::getInetHost, inetHost) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/domain/model/lazy/netty/server/properties/LazyNettyServerProperties.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/domain/model/lazy/netty/server/properties/LazyNettyServerProperties.java index 99bc28f..2d1a90d 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/domain/model/lazy/netty/server/properties/LazyNettyServerProperties.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/domain/model/lazy/netty/server/properties/LazyNettyServerProperties.java @@ -5,6 +5,7 @@ import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; import org.framework.lazy.cloud.network.heartbeat.common.enums.NettyClientStatus; import org.framework.lazy.cloud.network.heartbeat.client.config.PropertiesType; +import org.wu.framework.lazy.orm.core.stereotype.LazyTableField; import java.lang.String; import java.time.LocalDateTime; @@ -65,7 +66,17 @@ public class LazyNettyServerProperties { */ @Schema(description ="类型（配置、DB）",name ="type",example = "") private PropertiesType type; + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + private String appKey; + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + private String appSecret; /** * * 更新时间 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/entity/LazyNettyServerPropertiesDO.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/entity/LazyNettyServerPropertiesDO.java index 820e24e..cfdc554 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/entity/LazyNettyServerPropertiesDO.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/entity/LazyNettyServerPropertiesDO.java @@ -1,17 +1,15 @@ package org.framework.lazy.cloud.network.heartbeat.client.infrastructure.entity; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; -import org.framework.lazy.cloud.network.heartbeat.common.enums.NettyClientStatus; import org.framework.lazy.cloud.network.heartbeat.client.config.PropertiesType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.NettyClientStatus; import org.wu.framework.lazy.orm.core.stereotype.LazyTable; import org.wu.framework.lazy.orm.core.stereotype.LazyTableField; -import org.wu.framework.lazy.orm.core.stereotype.*; -import io.swagger.v3.oas.annotations.media.Schema; +import org.wu.framework.lazy.orm.core.stereotype.LazyTableFieldUnique; -import java.lang.String; import java.time.LocalDateTime; -import java.lang.Integer; /** * describe 服务端配置信息 * @@ -75,6 +73,20 @@ public class LazyNettyServerPropertiesDO { @LazyTableField(name="is_deleted",comment="是否删除") private Boolean isDeleted; + + /** + * 令牌key + */ + @Schema(description = "令牌key", name = "appKey", example = "") + @LazyTableField(name = "app_key", comment = "令牌key") + private String appKey; + + /** + * 令牌密钥 + */ + @Schema(description = "令牌密钥", name = "appSecret", example = "") + @LazyTableField(name = "app_secret", comment = "令牌密钥") + private String appSecret; /** * * 类型（配置、DB）