diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/config/ServerFlowConfiguration.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/config/ServerFlowConfiguration.java index 721cf43..934e3b7 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/config/ServerFlowConfiguration.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/config/ServerFlowConfiguration.java @@ -7,6 +7,7 @@ import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.Server import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.ServerHandlerOutFlowHandler; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerHandlerOutProxyFlowHandler; import org.framework.lazy.cloud.network.heartbeat.server.properties.ServerNodeProperties; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyProxyFlowApplication; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyVisitorPortFlowApplication; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -69,8 +70,8 @@ public class ServerFlowConfiguration { */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean - public ServerHandlerInProxyFlowHandler serverHandlerInProxyFlowHandler(LazyVisitorPortFlowApplication lazyVisitorPortFlowApplication, ServerNodeProperties serverNodeProperties) { - return new ServerHandlerInProxyFlowHandler(lazyVisitorPortFlowApplication, serverNodeProperties); + public ServerHandlerInProxyFlowHandler serverHandlerInProxyFlowHandler(LazyProxyFlowApplication lazyProxyFlowApplication,ServerNodeProperties serverNodeProperties) { + return new ServerHandlerInProxyFlowHandler(lazyProxyFlowApplication,serverNodeProperties); } /** @@ -80,8 +81,8 @@ public class ServerFlowConfiguration { */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Bean - public ServerHandlerOutProxyFlowHandler serverHandlerOutProxyFlowHandler(LazyVisitorPortFlowApplication lazyVisitorPortFlowApplication, ServerNodeProperties serverNodeProperties) { - return new ServerHandlerOutProxyFlowHandler(lazyVisitorPortFlowApplication,serverNodeProperties); + public ServerHandlerOutProxyFlowHandler serverHandlerOutProxyFlowHandler(LazyProxyFlowApplication lazyProxyFlowApplication, ServerNodeProperties serverNodeProperties) { + return new ServerHandlerOutProxyFlowHandler(lazyProxyFlowApplication,serverNodeProperties); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerHandlerInProxyFlowHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerHandlerInProxyFlowHandler.java index 2918bc6..2ab1b8a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerHandlerInProxyFlowHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerHandlerInProxyFlowHandler.java @@ -8,19 +8,17 @@ import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolTy import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.server.properties.ServerNodeProperties; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyProxyFlowApplication; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyVisitorPortFlowApplication; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.proxy.flow.LazyProxyFlowStoryCommand; /** * 进口流量处理 */ public class ServerHandlerInProxyFlowHandler extends AbstractHandleChannelProxyFlowAdvanced { - private final LazyVisitorPortFlowApplication lazyVisitorPortFlowApplication; + private final LazyProxyFlowApplication lazyProxyFlowApplication; private final ServerNodeProperties serverNodeProperties; - public ServerHandlerInProxyFlowHandler(LazyVisitorPortFlowApplication lazyVisitorPortFlowApplication, LazyProxyFlowApplication lazyProxyFlowApplication, ServerNodeProperties serverNodeProperties) { - this.lazyVisitorPortFlowApplication = lazyVisitorPortFlowApplication; + public ServerHandlerInProxyFlowHandler(LazyProxyFlowApplication lazyProxyFlowApplication, ServerNodeProperties serverNodeProperties) { this.lazyProxyFlowApplication = lazyProxyFlowApplication; this.serverNodeProperties = serverNodeProperties; } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerHandlerOutProxyFlowHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerHandlerOutProxyFlowHandler.java index ae05e16..7922186 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerHandlerOutProxyFlowHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerHandlerOutProxyFlowHandler.java @@ -5,22 +5,27 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.flow.proxy.Abs import org.framework.lazy.cloud.network.heartbeat.common.advanced.flow.ChannelFlow; import org.framework.lazy.cloud.network.heartbeat.common.advanced.flow.proxy.ChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.server.properties.ServerNodeProperties; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyProxyFlowApplication; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyVisitorPortFlowApplication; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.proxy.flow.LazyProxyFlowStoryCommand; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.visitor.flow.LazyVisitorPortFlowStoryCommand; /** * 出口流量处理 */ public class ServerHandlerOutProxyFlowHandler extends AbstractHandleChannelProxyFlowAdvanced { - private final LazyVisitorPortFlowApplication lazyVisitorPortFlowApplication; + private final LazyProxyFlowApplication lazyProxyFlowApplication; private final ServerNodeProperties serverNodeProperties; - public ServerHandlerOutProxyFlowHandler(LazyVisitorPortFlowApplication lazyVisitorPortFlowApplication, ServerNodeProperties serverNodeProperties) { - this.lazyVisitorPortFlowApplication = lazyVisitorPortFlowApplication; + public ServerHandlerOutProxyFlowHandler(LazyProxyFlowApplication lazyProxyFlowApplication, ServerNodeProperties serverNodeProperties) { + this.lazyProxyFlowApplication = lazyProxyFlowApplication; this.serverNodeProperties = serverNodeProperties; } + /** * 处理是否支持这种类型 * @@ -45,16 +50,24 @@ public class ServerHandlerOutProxyFlowHandler extends AbstractHandleChannelProxy @Override protected void doHandler(Channel channel, ChannelProxyFlow channelProxyFlow) { String clientId = channelProxyFlow.clientId(); + String ip = channelProxyFlow.ip(); Integer port = channelProxyFlow.port(); Integer flow = channelProxyFlow.flow(); + ChannelProtocolType channelProtocolType = channelProxyFlow.channelProtocolType(); + ChannelProxyType channelProxyType = channelProxyFlow.channelProxyType(); + // 出口流量处理 - LazyVisitorPortFlowStoryCommand visitorPortFlow = new LazyVisitorPortFlowStoryCommand(); - visitorPortFlow.setOutFlow(flow); - visitorPortFlow.setClientId(clientId); - visitorPortFlow.setVisitorPort(port); - visitorPortFlow.setIsDeleted(false); - lazyVisitorPortFlowApplication.flowIncreaseStory(visitorPortFlow); + LazyProxyFlowStoryCommand lazyProxyFlowStoryCommand = new LazyProxyFlowStoryCommand(); + lazyProxyFlowStoryCommand.setOutFlow(flow); + lazyProxyFlowStoryCommand.setClientId(clientId); + lazyProxyFlowStoryCommand.setIp(ip); + lazyProxyFlowStoryCommand.setPort(port); + lazyProxyFlowStoryCommand.setProtocolType(channelProtocolType); + lazyProxyFlowStoryCommand.setProxyType(channelProxyType); + + lazyProxyFlowStoryCommand.setIsDeleted(false); + lazyProxyFlowApplication.flowIncreaseStory(lazyProxyFlowStoryCommand); } } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryListCommand.java index 9dd8111..3640177 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryListCommand.java @@ -1,13 +1,12 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.proxy.flow; +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 org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.time.LocalDateTime; -import java.lang.Long; -import java.lang.Integer; -import java.lang.Boolean; /** * describe 代理流量 * @@ -82,14 +81,14 @@ public class LazyProxyFlowQueryListCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryOneCommand.java index 61c1b26..5b08ebf 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryOneCommand.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -82,14 +85,14 @@ public class LazyProxyFlowQueryOneCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowRemoveCommand.java index 1268651..8f53a3f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowRemoveCommand.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -82,14 +85,14 @@ public class LazyProxyFlowRemoveCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowStoryCommand.java index ba78959..cc20ed5 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowStoryCommand.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -82,14 +85,14 @@ public class LazyProxyFlowStoryCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowUpdateCommand.java index aa85bbb..fff6fab 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowUpdateCommand.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -82,14 +85,14 @@ public class LazyProxyFlowUpdateCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryListCommand.java index f2908de..2522362 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryListCommand.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -89,14 +92,14 @@ public class LazyProxyPerDayFlowQueryListCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryOneCommand.java index e279010..96f4f83 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryOneCommand.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -89,14 +92,14 @@ public class LazyProxyPerDayFlowQueryOneCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowRemoveCommand.java index d5049b0..6949c87 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowRemoveCommand.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -89,14 +92,14 @@ public class LazyProxyPerDayFlowRemoveCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowStoryCommand.java index 7778b2a..25b5542 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowStoryCommand.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -89,14 +92,14 @@ public class LazyProxyPerDayFlowStoryCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowUpdateCommand.java index b4b9900..11a6a98 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowUpdateCommand.java @@ -1,13 +1,12 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.proxy.per.day.flow; +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 org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.time.LocalDateTime; -import java.lang.Long; -import java.lang.Integer; -import java.lang.Boolean; /** * describe 每日统计代理流量 * @@ -89,14 +88,14 @@ public class LazyProxyPerDayFlowUpdateCommand { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientProxyFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientProxyFlowDTO.java index a038524..9454d3a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientProxyFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientProxyFlowDTO.java @@ -3,6 +3,8 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.wu.framework.core.utils.ByteSizeUtil; import java.time.LocalDateTime; @@ -73,13 +75,13 @@ public class LazyClientProxyFlowDTO { * 协议类型 */ @Schema(description = "协议类型", name = "protocolType", example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * 代理类型 */ @Schema(description = "代理类型", name = "proxyType", example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * 服务端ID diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyFlowDTO.java index 952f27f..1af9fc7 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyFlowDTO.java @@ -3,6 +3,8 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.wu.framework.core.utils.ByteSizeUtil; import java.time.LocalDateTime; @@ -72,13 +74,13 @@ public class LazyProxyFlowDTO { * 协议类型 */ @Schema(description = "协议类型", name = "protocolType", example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * 代理类型 */ @Schema(description = "代理类型", name = "proxyType", example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * 服务端ID diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyPerDayFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyPerDayFlowDTO.java index 824f667..5f4f577 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyPerDayFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyPerDayFlowDTO.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -89,14 +92,14 @@ public class LazyProxyPerDayFlowDTO { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyProxyFlowApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyProxyFlowApplicationImpl.java index 7f38127..c6872f1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyProxyFlowApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyProxyFlowApplicationImpl.java @@ -1,6 +1,8 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application.impl; import jakarta.annotation.Resource; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.server.properties.ServerNodeProperties; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyProxyFlowApplication; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.assembler.LazyProxyFlowDTOAssembler; @@ -73,8 +75,8 @@ public class LazyProxyFlowApplicationImpl implements LazyProxyFlowApplication { public Result flowIncreaseStory(LazyProxyFlowStoryCommand lazyProxyFlowStoryCommand) { String clientId = lazyProxyFlowStoryCommand.getClientId(); String ip = lazyProxyFlowStoryCommand.getIp(); - String protocolType = lazyProxyFlowStoryCommand.getProtocolType(); - String proxyType = lazyProxyFlowStoryCommand.getProxyType(); + ChannelProtocolType protocolType = lazyProxyFlowStoryCommand.getProtocolType(); + ChannelProxyType proxyType = lazyProxyFlowStoryCommand.getProxyType(); Integer port = lazyProxyFlowStoryCommand.getPort(); String serverId = serverNodeProperties.getNodeId(); lazyProxyFlowStoryCommand.setServerId(serverId); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/flow/LazyProxyFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/flow/LazyProxyFlow.java index 8e3d7dc..d80732d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/flow/LazyProxyFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/flow/LazyProxyFlow.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.mode import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -82,14 +85,14 @@ public class LazyProxyFlow { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/per/day/flow/LazyProxyPerDayFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/per/day/flow/LazyProxyPerDayFlow.java index 45f8132..7e862a7 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/per/day/flow/LazyProxyPerDayFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/per/day/flow/LazyProxyPerDayFlow.java @@ -3,6 +3,9 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.mode import lombok.Data; import lombok.experimental.Accessors; import io.swagger.v3.oas.annotations.media.Schema; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; + import java.lang.String; import java.time.LocalDateTime; import java.lang.Long; @@ -89,14 +92,14 @@ public class LazyProxyPerDayFlow { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - private String protocolType; + private ChannelProtocolType protocolType; /** * * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java index 47caafe..edafd42 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java @@ -2,6 +2,8 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastruct import lombok.Data; import lombok.experimental.Accessors; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.wu.framework.lazy.orm.core.stereotype.LazyTableIndex; import org.wu.framework.core.stereotype.LayerField; import org.wu.framework.core.stereotype.LayerField.LayerFieldType; @@ -100,7 +102,7 @@ public class LazyProxyFlowDO { */ @Schema(description ="协议类型",name ="protocolType",example = "") @LazyTableField(name="protocol_type",comment="协议类型",columnType="varchar(255)") - private String protocolType; + private ChannelProtocolType protocolType; /** * @@ -108,7 +110,7 @@ public class LazyProxyFlowDO { */ @Schema(description ="代理类型",name ="proxyType",example = "") @LazyTableField(name="proxy_type",comment="代理类型",columnType="varchar(255)") - private String proxyType; + private ChannelProxyType proxyType; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyPerDayFlowDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyPerDayFlowDO.java index 48af7c0..1cac753 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyPerDayFlowDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyPerDayFlowDO.java @@ -2,6 +2,8 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastruct import lombok.Data; import lombok.experimental.Accessors; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.wu.framework.lazy.orm.core.stereotype.LazyTableIndex; import org.wu.framework.core.stereotype.LayerField; import org.wu.framework.core.stereotype.LayerField.LayerFieldType; @@ -108,7 +110,7 @@ public class LazyProxyPerDayFlowDO { */ @Schema(description ="协议类型",name ="protocolType",example = "") @LazyTableField(name="protocol_type",comment="协议类型",columnType="varchar(255)") - private String protocolType; + private ChannelProtocolType protocolType; /** * @@ -116,7 +118,7 @@ public class LazyProxyPerDayFlowDO { */ @Schema(description ="代理类型",name ="proxyType",example = "") @LazyTableField(name="proxy_type",comment="代理类型",columnType="varchar(255)") - private String proxyType; + private ChannelProxyType proxyType; /** *