diff --git a/wu-lazy-cloud-heartbeat-client/Native-Dockerfile b/wu-lazy-cloud-heartbeat-client/Native-Dockerfile index 9264610c..9a7595d8 100644 --- a/wu-lazy-cloud-heartbeat-client/Native-Dockerfile +++ b/wu-lazy-cloud-heartbeat-client/Native-Dockerfile @@ -5,7 +5,7 @@ MAINTAINER wujiawei <1207537021@qq.com> RUN echo "Asia/Shanghai" > /etc/timezone -COPY target/middleground-under-cloud-heartbeat-client /native-app +COPY target/lazy-cloud-heartbeat-client /native-app ENTRYPOINT ["/bin/sh" ,"-c", "exec ./native-app"] diff --git a/wu-lazy-cloud-heartbeat-client/README.md b/wu-lazy-cloud-heartbeat-client/README.md index 3389def9..8a58ab9a 100644 --- a/wu-lazy-cloud-heartbeat-client/README.md +++ b/wu-lazy-cloud-heartbeat-client/README.md @@ -9,8 +9,8 @@ mvn native:build -Pnative ``` ### 构建docker镜像 ```shell -docker build -t docker-registry.laihui.com/middleground/middleground-under-cloud-heartbeat-client:middleground-2.4.2-native-SNAPSHOT_latest -f Native-Dockerfile . -docker push docker-registry.laihui.com/middleground/middleground-under-cloud-heartbeat-client:middleground-2.4.2-native-SNAPSHOT_latest +docker build -t docker-registry.laihui.com/lazy/lazy-under-cloud-heartbeat-client:lazy-2.4.2-native-SNAPSHOT_latest -f Native-Dockerfile . +docker push docker-registry.laihui.com/lazy/lazy-under-cloud-heartbeat-client:lazy-2.4.2-native-SNAPSHOT_latest ``` @@ -29,7 +29,7 @@ docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-cl ### run ```shell -docker run -d -it --name client -e spring.middleground.netty.inet-host=124.222.48.62 -e spring.middleground.netty.inet-port=30676 -e spring.middleground.netty.client-id=node1 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client:server-jdk17-master +docker run -d -it --name client -e spring.lazy.netty.inet-host=124.222.48.62 -e spring.lazy.netty.inet-port=30676 -e spring.lazy.netty.client-id=node1 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client:server-jdk17-master diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/NettyServerProperties.java b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/NettyServerProperties.java index 2f335419..df75aaa0 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/NettyServerProperties.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/wu/framework/lazy/cloud/heartbeat/client/netty/config/NettyServerProperties.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @Data public class NettyServerProperties { - public static final String PREFIX = "spring.middleground.netty"; + public static final String PREFIX = "spring.lazy.netty"; /** * 服务端地址 */ @@ -23,7 +23,7 @@ public class NettyServerProperties { /** * 服务端path */ - private String inetPath = "middleground-on-cloud-heartbeat-server"; + private String inetPath = "lazy-cloud-heartbeat-server"; /** * 客户端ID */ diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml index b78397e3..869eeaa4 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ spring: - middleground: + lazy: netty: # inet-host: 192.168.17.221 # inet-port: 4923 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/InternalNetworkPenetrationMappingDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/InternalNetworkPenetrationMappingDO.java index d16e4dfc..19810f36 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/InternalNetworkPenetrationMappingDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/InternalNetworkPenetrationMappingDO.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; **/ @Data @Accessors(chain = true) -@LazyTable(tableName = "internal_network_penetration_mapping",schema = "middleground_cloud_netty_server",comment = "内网穿透映射") +@LazyTable(tableName = "internal_network_penetration_mapping",comment = "内网穿透映射") @Schema(title = "internal_network_penetration_mapping",description = "内网穿透映射") public class InternalNetworkPenetrationMappingDO { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientBlacklistDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientBlacklistDO.java index d5ee90f9..31f8b66a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientBlacklistDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientBlacklistDO.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; **/ @Data @Accessors(chain = true) -@LazyTable(tableName = "netty_client_blacklist", schema = "middleground_cloud_netty_server", comment = "客户端黑名单") +@LazyTable(tableName = "netty_client_blacklist", comment = "客户端黑名单") @Schema(title = "netty_client_blacklist", description = "客户端黑名单") public class NettyClientBlacklistDO { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientStateDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientStateDO.java index 26ae442a..91710fe3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientStateDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/wu/framework/lazy/cloud/heartbeat/server/infrastructure/entity/NettyClientStateDO.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; **/ @Data @Accessors(chain = true) -@LazyTable(tableName = "netty_client_state", schema = "middleground_cloud_netty_server", comment = "客户端状态") +@LazyTable(tableName = "netty_client_state", comment = "客户端状态") @Schema(title = "netty_client_state", description = "客户端状态") public class NettyClientStateDO {