From f4bbb7f608cc0f28f9d06900368b0db40add76e9 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Wed, 29 May 2024 17:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dClientInternalNetworkPenetration.README.md | 18 +++++++++--------- README.md | 14 +++++++------- wu-lazy-cloud-heartbeat-client/README.md | 8 ++++---- wu-lazy-cloud-heartbeat-start/pom.xml | 4 ++-- .../Native-Dockerfile | 2 +- .../README.md | 12 ++++++------ .../k8s.yaml | 14 +++++++------- .../src/main/resources/application-dev.yml | 4 ++-- .../README.md | 10 +++++----- .../k8s-node-pod.md | 6 +++--- .../k8s.yaml | 6 +++--- .../README.md | 12 ++++++------ .../k8s.yaml | 8 ++++---- 13 files changed, 59 insertions(+), 59 deletions(-) diff --git a/CloudClientInternalNetworkPenetration.README.md b/CloudClientInternalNetworkPenetration.README.md index 2715c09..bd58584 100644 --- a/CloudClientInternalNetworkPenetration.README.md +++ b/CloudClientInternalNetworkPenetration.README.md @@ -4,9 +4,9 @@ | 模块 | 所属层级 | 描述 | 端口 | |------------------------------------------------------------------------------------|------|------------------------|----------------------------------------------------------------| -| [wu-lazy-cloud-network-heartbeat-common](wu-lazy-cloud-network-heartbeat-common) | 基础模块 | 基于Netty数据解码、编码、通道处理器声明 | 无 | -| [wu-lazy-cloud-network-heartbeat-server](wu-lazy-cloud-network-heartbeat-server) | 启动模块 | 内网穿透服务端 | http端口：6001、tcp端口:7001 (默认tcp端口=http端口+1000 如：6001+1000=7001) | -| [wu-lazy-cloud-network-heartbeat-client](wu-lazy-cloud-network-heartbeat-client) | 启动模块 | 内网穿透客户端 | 6004 | +| [wu-lazy-cloud-heartbeat-common](wu-lazy-cloud-heartbeat-common) | 基础模块 | 基于Netty数据解码、编码、通道处理器声明 | 无 | +| [wu-lazy-cloud-heartbeat-server](wu-lazy-cloud-heartbeat-server) | 启动模块 | 内网穿透服务端 | http端口：6001、tcp端口:7001 (默认tcp端口=http端口+1000 如：6001+1000=7001) | +| [wu-lazy-cloud-heartbeat-client](wu-lazy-cloud-heartbeat-client) | 启动模块 | 内网穿透客户端 | 6004 | #### 功能 @@ -54,8 +54,8 @@ spring: | 模块 | 说明 | 部署内网穿透必须 | 部署内网穿透+云上暂存必须 | |------------------------------------------------------------------|------------|----------|---------------| -| [wu-lazy-cloud-network-heartbeat-server](wu-lazy-cloud-network-heartbeat-server) | 内网穿透+心跳服务端 | ☑️ | ☑️ | -| [wu-lazy-cloud-network-heartbeat-client](wu-lazy-cloud-network-heartbeat-client) | 内网穿透+心跳客户端 | ✖️ | ☑️ | +| [wu-lazy-cloud-heartbeat-server](wu-lazy-cloud-heartbeat-server) | 内网穿透+心跳服务端 | ☑️ | ☑️ | +| [wu-lazy-cloud-heartbeat-client](wu-lazy-cloud-heartbeat-client) | 内网穿透+心跳客户端 | ✖️ | ☑️ | | [wu-lazy-cloud-staging-provider](wu-lazy-cloud-staging-provider) | 暂存服务 | ✖️ | ☑️ | | [wu-lazy-cloud-central-gateway](wu-lazy-cloud-central-gateway) | 云上暂存网关 | ✖️ | ☑️ | | [wu-lazy-cloud-central-gateway](wu-lazy-cloud-central-gateway) | 云下暂存网关 | ✖️ | ✖️ | @@ -68,8 +68,8 @@ spring: | 模块 | 说明 | 部署内网穿透必须 | 部署内网穿透+云上暂存必须 | |------------------------------------------------------------------|------------|----------|---------------| -| [wu-lazy-cloud-network-heartbeat-server](wu-lazy-cloud-network-heartbeat-server) | 内网穿透+心跳服务端 | ✖️ | ✖️ | -| [wu-lazy-cloud-network-heartbeat-client](wu-lazy-cloud-network-heartbeat-client) | 内网穿透+心跳客户端 | ✖️ | ☑️ | +| [wu-lazy-cloud-heartbeat-server](wu-lazy-cloud-heartbeat-server) | 内网穿透+心跳服务端 | ✖️ | ✖️ | +| [wu-lazy-cloud-heartbeat-client](wu-lazy-cloud-heartbeat-client) | 内网穿透+心跳客户端 | ✖️ | ☑️ | | [wu-lazy-cloud-staging-provider](wu-lazy-cloud-staging-provider) | 暂存服务 | ✖️ | ✖️ | | [wu-lazy-cloud-central-gateway](wu-lazy-cloud-central-gateway) | 云上暂存网关 | ✖️ | ☑️ | | [wu-lazy-cloud-central-gateway](wu-lazy-cloud-central-gateway) | 云下暂存网关 | ✖️ | ✖️ | @@ -83,8 +83,8 @@ spring: | 模块 | 说明 | 部署内网穿透必须 | 部署内网穿透+云上暂存必须 | |------------------------------------------------------------------|------------|----------|---------------| -| [wu-lazy-cloud-network-heartbeat-server](wu-lazy-cloud-network-heartbeat-server) | 内网穿透+心跳服务端 | ✖️ | ✖️ | -| [wu-lazy-cloud-network-heartbeat-client](wu-lazy-cloud-network-heartbeat-client) | 内网穿透+心跳客户端 | ☑️ | ☑️ | +| [wu-lazy-cloud-heartbeat-server](wu-lazy-cloud-heartbeat-server) | 内网穿透+心跳服务端 | ✖️ | ✖️ | +| [wu-lazy-cloud-heartbeat-client](wu-lazy-cloud-heartbeat-client) | 内网穿透+心跳客户端 | ☑️ | ☑️ | | [wu-lazy-cloud-staging-provider](wu-lazy-cloud-staging-provider) | 暂存服务 | ✖️ | ☑️ | | [wu-lazy-cloud-central-gateway](wu-lazy-cloud-central-gateway) | 云上暂存网关 | ✖️ | ✖️ | | [wu-lazy-cloud-central-gateway](wu-lazy-cloud-central-gateway) | 云下暂存网关 | ✖️ | ☑️ | diff --git a/README.md b/README.md index 68fde60..68c17b6 100644 --- a/README.md +++ b/README.md @@ -249,12 +249,12 @@ public class NettyClientSocket { | 模块 | 版本 | 描述 | |-----------------------------------------------------------------------------------------------------------------------------------------|----------------------|------------------------------| -| [wu-lazy-cloud-network-heartbeat-common](wu-lazy-cloud-network-heartbeat-common) | 1.2.6-JDK17-SNAPSHOT | 内网穿透公共模块（声明接口、枚举、常量、适配器、解析器） | -| [wu-lazy-cloud-network-heartbeat-client](wu-lazy-cloud-network-heartbeat-client) | 1.2.6-JDK17-SNAPSHOT | 客户端（支持二次开发） | -| [wu-lazy-cloud-network-heartbeat-server](wu-lazy-cloud-network-heartbeat-server) | 1.2.6-JDK17-SNAPSHOT | 服务端（支持二次开发） | -| [wu-lazy-cloud-network-ui](wu-lazy-cloud-network-heartbeat-server-ui) | 1.2.6-JDK17-SNAPSHOT | 服务端页面 | -| [wu-lazy-cloud-network-heartbeat-client-start](wu-lazy-cloud-network-heartbeat-sample/wu-lazy-cloud-network-heartbeat-client-sample) | 1.2.6-JDK17-SNAPSHOT | 客户端样例 | -| [wu-lazy-cloud-network-heartbeat-server-start](wu-lazy-cloud-network-heartbeat-sample/wu-lazy-cloud-network-heartbeat-server-sample) | 1.2.6-JDK17-SNAPSHOT | 服务端样例 | +| [wu-lazy-cloud-heartbeat-common](wu-lazy-cloud-heartbeat-common) | 1.2.6-JDK17-SNAPSHOT | 内网穿透公共模块（声明接口、枚举、常量、适配器、解析器） | +| [wu-lazy-cloud-heartbeat-client](wu-lazy-cloud-heartbeat-client) | 1.2.6-JDK17-SNAPSHOT | 客户端（支持二次开发） | +| [wu-lazy-cloud-heartbeat-server](wu-lazy-cloud-heartbeat-server) | 1.2.6-JDK17-SNAPSHOT | 服务端（支持二次开发） | +| [wu-lazy-cloud-network-ui](wu-lazy-cloud-heartbeat-server-ui) | 1.2.6-JDK17-SNAPSHOT | 服务端页面 | +| [wu-lazy-cloud-heartbeat-client-start](wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample) | 1.2.6-JDK17-SNAPSHOT | 客户端样例 | +| [wu-lazy-cloud-heartbeat-server-start](wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample) | 1.2.6-JDK17-SNAPSHOT | 服务端样例 | ### 使用技术 @@ -277,7 +277,7 @@ public class NettyClientSocket { docker启动 - docker run -d -it -p 18080:18080 --name wu-lazy-cloud-network-heartbeat-server registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server:1.2.6-JDK17-SNAPSHOT + docker run -d -it -p 18080:18080 --name wu-lazy-cloud-heartbeat-server registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.2.6-JDK17-SNAPSHOT http://127.0.0.1:18080/swagger-ui/index.html diff --git a/wu-lazy-cloud-heartbeat-client/README.md b/wu-lazy-cloud-heartbeat-client/README.md index e097345..cc418fe 100644 --- a/wu-lazy-cloud-heartbeat-client/README.md +++ b/wu-lazy-cloud-heartbeat-client/README.md @@ -20,15 +20,15 @@ docker push docker-registry.wujiawei.com/lazy/lazy-under-cloud-heartbeat-client: #docker login --username=1207537021@qq.com registry.cn-hangzhou.aliyuncs.com -docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client:server-jdk17-master . -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client:server-jdk17-master +docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client:server-jdk17-master . +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client:server-jdk17-master ``` ### run ```shell -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-network-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 @@ -47,7 +47,7 @@ mvn native:build ``` ```RUN -docker run -d -it -p 18080:18080 --name wu-lazy-cloud-network-heartbeat-client registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client:server-jdk17-master +docker run -d -it -p 18080:18080 --name wu-lazy-cloud-heartbeat-client registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client:server-jdk17-master http://127.0.0.1:18080/swagger-ui/index.html diff --git a/wu-lazy-cloud-heartbeat-start/pom.xml b/wu-lazy-cloud-heartbeat-start/pom.xml index 88cf98b..11e7179 100644 --- a/wu-lazy-cloud-heartbeat-start/pom.xml +++ b/wu-lazy-cloud-heartbeat-start/pom.xml @@ -10,8 +10,8 @@ wu-lazy-cloud-heartbeat-start - wu-lazy-cloud-network-heartbeat-start - wu-lazy-cloud-network-heartbeat-start + wu-lazy-cloud-heartbeat-start + wu-lazy-cloud-heartbeat-start pom diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/Native-Dockerfile b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/Native-Dockerfile index b75b64b..77a2441 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/Native-Dockerfile +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/Native-Dockerfile @@ -5,7 +5,7 @@ MAINTAINER wujiawei <1207537021@qq.com> RUN echo "Asia/Shanghai" > /etc/timezone -COPY target/wu-lazy-cloud-network-heartbeat-client /native-app +COPY target/wu-lazy-cloud-heartbeat-client /native-app ENTRYPOINT ["/bin/sh" ,"-c", "exec ./native-app"] diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/README.md b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/README.md index 3be7518..966cef8 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/README.md +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/README.md @@ -9,9 +9,9 @@ mvn clean package -Pnative ```shell mvn spring-boot:build-image -Pnative -docker tag docker.io/library/wu-lazy-cloud-network-heartbeat-client-start:1.2.6-JDK17-SNAPSHOT registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client-start:1.2.6-JDK17-NATIVE-SNAPSHOT +docker tag docker.io/library/wu-lazy-cloud-heartbeat-client-start:1.2.6-JDK17-SNAPSHOT registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.2.6-JDK17-NATIVE-SNAPSHOT -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client-start:1.2.6-JDK17-NATIVE-SNAPSHOT +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.2.6-JDK17-NATIVE-SNAPSHOT ``` @@ -24,8 +24,8 @@ docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-hear mvn clean install -docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client-start:1.2.6-JDK17-SNAPSHOT . -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client-start:1.2.6-JDK17-SNAPSHOT +docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.2.6-JDK17-SNAPSHOT . +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.2.6-JDK17-SNAPSHOT ``` @@ -33,7 +33,7 @@ docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-hear ### run ```shell -docker run -d -it --privileged --name client -p 6004:6004 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client-start:1.2.6-JDK17-NATIVE-SNAPSHOT +docker run -d -it --privileged --name client -p 6004:6004 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.2.6-JDK17-NATIVE-SNAPSHOT ``` @@ -69,7 +69,7 @@ kubeadm join apiserver.demo:6443 --token 2wtcsg.0af26p9wzfgvyf5a --discovery ``` ```RUN -docker run -d -it --name client registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client-start:1.2.6-JDK17-SNAPSHOT +docker run -d -it --name client registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.2.6-JDK17-SNAPSHOT http://127.0.0.1:18080 diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/k8s.yaml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/k8s.yaml index 11fd777..ca704fb 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/k8s.yaml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/k8s.yaml @@ -5,8 +5,8 @@ metadata: annotations: {} labels: k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-network-heartbeat-client-start - name: wu-lazy-cloud-network-heartbeat-client-start + k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-client-start + name: wu-lazy-cloud-heartbeat-client-start namespace: default spec: progressDeadlineSeconds: 600 @@ -15,7 +15,7 @@ spec: selector: matchLabels: k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-network-heartbeat-client-start + k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-client-start strategy: rollingUpdate: maxSurge: 25% @@ -25,18 +25,18 @@ spec: metadata: labels: k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-network-heartbeat-client-start + k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-client-start spec: containers: - env: - name: spring.lazy.netty.client.inet-host value: wu-lazy-cloud-heartbeat-server.default - name: spring.lazy.netty.client.client-id - value: wu-lazy-cloud-network-heartbeat-client-start + value: wu-lazy-cloud-heartbeat-client-start image: >- - registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-client-start:1.2.6-JDK17-NATIVE-SNAPSHOT + registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.2.6-JDK17-NATIVE-SNAPSHOT imagePullPolicy: Always - name: wu-lazy-cloud-network-heartbeat-client-start + name: wu-lazy-cloud-heartbeat-client-start resources: {} securityContext: privileged: true diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application-dev.yml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application-dev.yml index f27a032..65a3a7c 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application-dev.yml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application-dev.yml @@ -4,10 +4,10 @@ spring: client: inet-host: 127.0.0.1 inet-port: 7001 - inet-path: wu-lazy-cloud-network-heartbeat-server + inet-path: wu-lazy-cloud-heartbeat-server # inet-host: 124.222.48.62 # 服务端地址 # inet-port: 30676 #服务端端口 - # inet-path: wu-lazy-cloud-network-heartbeat-server + # inet-path: wu-lazy-cloud-heartbeat-server client-id: wujiawei # 客户端ID # client-id: temp_id # 客户端ID data: diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/README.md b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/README.md index 30aa118..2bce0a2 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/README.md +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/README.md @@ -11,9 +11,9 @@ mvn clean package -Pnative ```shell mvn spring-boot:build-image -Pnative -docker tag docker.io/library/wu-lazy-cloud-network-heartbeat-server-cluster-start:1.2.6-JDK17-SNAPSHOT registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-cluster-start:1.2.6-JDK17-NATIVE-SNAPSHOT +docker tag docker.io/library/wu-lazy-cloud-heartbeat-server-cluster-start:1.2.6-JDK17-SNAPSHOT registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-cluster-start:1.2.6-JDK17-NATIVE-SNAPSHOT -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-cluster-start:1.2.6-JDK17-NATIVE-SNAPSHOT +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-cluster-start:1.2.6-JDK17-NATIVE-SNAPSHOT ``` @@ -23,14 +23,14 @@ docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-hear mvn clean install -docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-cluster-start:1.2.6-JDK17-SNAPSHOT . -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-cluster-start:1.2.6-JDK17-SNAPSHOT +docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-cluster-start:1.2.6-JDK17-SNAPSHOT . +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-cluster-start:1.2.6-JDK17-SNAPSHOT ``` ```RUN -docker run -d -it -p 18080:18080 --name wu-lazy-cloud-network-heartbeat-server-cluster-start registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-cluster-start:1.2.6-JDK17-SNAPSHOT +docker run -d -it -p 18080:18080 --name wu-lazy-cloud-heartbeat-server-cluster-start registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-cluster-start:1.2.6-JDK17-SNAPSHOT http://127.0.0.1:18080/swagger-ui/index.html diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/k8s-node-pod.md b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/k8s-node-pod.md index c686dd5..c0ffaef 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/k8s-node-pod.md +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/k8s-node-pod.md @@ -71,9 +71,9 @@ spec: value: '7101' envFrom: - configMapRef: - name: wu-lazy-cloud-network-heartbeat-server-cluster-start-conf + name: wu-lazy-cloud-heartbeat-server-cluster-start-conf image: >- - registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-cluster-start:1.2.6-JDK17-NATIVE-SNAPSHOT + registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-cluster-start:1.2.6-JDK17-NATIVE-SNAPSHOT imagePullPolicy: Always name: network-server-cluster-start ports: @@ -124,7 +124,7 @@ data: spring.lazy.netty.server.node-host: '${HOSTNAME}.network-server-cluster-start.default.svc.cluster.local' kind: ConfigMap metadata: - name: wu-lazy-cloud-network-heartbeat-server-cluster-start-conf + name: wu-lazy-cloud-heartbeat-server-cluster-start-conf namespace: default --- diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/k8s.yaml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/k8s.yaml index bef67b9..f0da83b 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/k8s.yaml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/k8s.yaml @@ -52,9 +52,9 @@ spec: value: '7101' envFrom: - configMapRef: - name: wu-lazy-cloud-network-heartbeat-server-cluster-start-conf + name: wu-lazy-cloud-heartbeat-server-cluster-start-conf image: >- - registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-cluster-start:1.2.6-JDK17-NATIVE-SNAPSHOT + registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-cluster-start:1.2.6-JDK17-NATIVE-SNAPSHOT imagePullPolicy: Always name: network-server-cluster-start ports: @@ -105,7 +105,7 @@ data: spring.lazy.netty.server.node-host: '${HOSTNAME}.network-server-cluster-start.default.svc.cluster.local' kind: ConfigMap metadata: - name: wu-lazy-cloud-network-heartbeat-server-cluster-start-conf + name: wu-lazy-cloud-heartbeat-server-cluster-start-conf namespace: default --- diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/README.md b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/README.md index 13cdba6..73b4abe 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/README.md +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/README.md @@ -11,9 +11,9 @@ mvn clean package -Pnative ```shell mvn spring-boot:build-image -Pnative -docker tag docker.io/library/wu-lazy-cloud-network-heartbeat-server-start:1.2.6-JDK17-SNAPSHOT registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-start:1.2.6-JDK17-NATIVE-SNAPSHOT +docker tag docker.io/library/wu-lazy-cloud-heartbeat-server-start:1.2.6-JDK17-SNAPSHOT registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.2.6-JDK17-NATIVE-SNAPSHOT -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-start:1.2.6-JDK17-NATIVE-SNAPSHOT +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.2.6-JDK17-NATIVE-SNAPSHOT ``` @@ -23,16 +23,16 @@ docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-hear mvn clean install -docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-start:1.2.6-JDK17-SNAPSHOT . -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-start:1.2.6-JDK17-SNAPSHOT +docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.2.6-JDK17-SNAPSHOT . +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.2.6-JDK17-SNAPSHOT ``` ```RUN -docker run -d -it -p 18080:18080 --name wu-lazy-cloud-network-heartbeat-server-start registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-start:1.2.6-JDK17-SNAPSHOT +docker run -d -it -p 6001:6001 --name wu-lazy-cloud-heartbeat-server-start registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.2.6-JDK17-NATIVE-SNAPSHOT -http://127.0.0.1:18080/swagger-ui/index.html +http://127.0.0.1:6001/swagger-ui/index.html ``` diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/k8s.yaml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/k8s.yaml index f9aa5b8..b2b926b 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/k8s.yaml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/k8s.yaml @@ -41,7 +41,7 @@ spec: - name: spring.datasource.driver-class-name value: com.mysql.cj.jdbc.Driver image: >- - registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-network-heartbeat-server-start:1.2.6-JDK17-NATIVE-SNAPSHOT + registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.2.6-JDK17-NATIVE-SNAPSHOT imagePullPolicy: Always name: wu-lazy-cloud-heartbeat-server resources: {} @@ -61,8 +61,8 @@ metadata: annotations: {} labels: k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-network-heartbeat-server - name: wu-lazy-cloud-network-heartbeat-server + k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-server + name: wu-lazy-cloud-heartbeat-server namespace: default spec: ports: @@ -83,7 +83,7 @@ spec: targetPort: 6001 selector: k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-network-heartbeat-server + k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-server sessionAffinity: None type: NodePort