diff --git a/ClientPermeateClient.md b/ClientPermeateClient.md index 64a797fb..709f9fc5 100644 --- a/ClientPermeateClient.md +++ b/ClientPermeateClient.md @@ -7,15 +7,15 @@ #### 操作步骤：拥有公网ip的服务器开发6001（web）、7001端口（tcp），然后执行命令启动服务端 ```shell -docker run -d -it -p 6001:6001 -p 7001:7001 -e spring.profiles.active=prod -e MAIN_DB_HOST=localhost:3306 -e MAIN_DB_PASSWORD=root -e MAIN_DB_PASSWORD=root --name wu-lazy-cloud-heartbeat-server-start registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT +docker run -d -it -p 6001:6001 -p 7001:7001 -e spring.profiles.active=prod -e MAIN_DB_HOST=localhost:3306 -e MAIN_DB_PASSWORD=root -e MAIN_DB_PASSWORD=root --name wu-lazy-cloud-heartbeat-server-start registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 ``` #### 操作步骤：杭州本地机房所在网络服务器启动客户端、你老家所在网络中启动客户端，命令如下 ```shell -docker run -d -it --privileged --name hangzhou-client --restart=always -e spring.lazy.netty.client.inet-host=公网IP -e spring.lazy.netty.client.inet-port=7001 -e spring.lazy.netty.client.client-id="hangzhou-jifang" registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT +docker run -d -it --privileged --name hangzhou-client --restart=always -e spring.lazy.netty.client.inet-host=公网IP -e spring.lazy.netty.client.inet-port=7001 -e spring.lazy.netty.client.client-id="hangzhou-jifang" registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 ``` ```shell -docker run -d -it --privileged --name my-home-client --restart=always -e spring.lazy.netty.client.inet-host=公网IP -e spring.lazy.netty.client.inet-port=7001 -e spring.lazy.netty.client.client-id="my-home" registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT +docker run -d -it --privileged --name my-home-client --restart=always -e spring.lazy.netty.client.inet-host=公网IP -e spring.lazy.netty.client.inet-port=7001 -e spring.lazy.netty.client.client-id="my-home" registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 ``` #### 操作步骤：配置端口 ![client_permeate_port_pool.png](client_permeate_port_pool.png) diff --git a/README.md b/README.md index 215e30f2..60e86b48 100644 --- a/README.md +++ b/README.md @@ -94,21 +94,21 @@ ORM操作数据库，使用环境JDK24 Spring Boot 3.5.0。的网络穿透、渗 | 模块 | 版本 | 描述 | |------------------------------------------------------------------------------------------------------------|-------------|------------------------------| -| [wu-lazy-cloud-heartbeat-common](wu-lazy-cloud-heartbeat-common) | 1.3.4-JDK24-SNAPSHOT | 内网穿透公共模块（声明接口、枚举、常量、适配器、解析器） | -| [wu-lazy-cloud-heartbeat-client](wu-lazy-cloud-heartbeat-client) | 1.3.4-JDK24-SNAPSHOT | 客户端（支持二次开发） | -| [wu-lazy-cloud-heartbeat-server](wu-lazy-cloud-heartbeat-server) | 1.3.4-JDK24-SNAPSHOT | 服务端（支持二次开发） | -| [wu-lazy-cloud-heartbeat-client-start](wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start) | 1.3.4-JDK24-SNAPSHOT | 客户端样例 | -| [wu-lazy-cloud-heartbeat-server-start](wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start) | 1.3.4-JDK24-SNAPSHOT | 服务端样例 | +| [wu-lazy-cloud-heartbeat-common](wu-lazy-cloud-heartbeat-common) | 1.3.5-JDK24 | 内网穿透公共模块（声明接口、枚举、常量、适配器、解析器） | +| [wu-lazy-cloud-heartbeat-client](wu-lazy-cloud-heartbeat-client) | 1.3.5-JDK24 | 客户端（支持二次开发） | +| [wu-lazy-cloud-heartbeat-server](wu-lazy-cloud-heartbeat-server) | 1.3.5-JDK24 | 服务端（支持二次开发） | +| [wu-lazy-cloud-heartbeat-client-start](wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start) | 1.3.5-JDK24 | 客户端样例 | +| [wu-lazy-cloud-heartbeat-server-start](wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start) | 1.3.5-JDK24 | 服务端样例 | ### 使用技术 | 框架 | 版本 | 描述 | |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|--------------| | spring-boot | 3.0.7 | springboot框架 | -| [wu-framework-web](https://gitee.com/wujiawei1207537021/wu-framework-parent/tree/master/wu-framework-web) | 1.3.4-JDK24-SNAPSHOT | web容器 | -| [Lazy -ORM](https://gitee.com/wujiawei1207537021/wu-framework-parent/tree/master/wu-inner-intergration/wu-database-parent) | 1.3.4-JDK24-SNAPSHOT | ORM | +| [wu-framework-web](https://gitee.com/wujiawei1207537021/wu-framework-parent/tree/master/wu-framework-web) | 1.3.5-JDK24 | web容器 | +| [Lazy -ORM](https://gitee.com/wujiawei1207537021/wu-framework-parent/tree/master/wu-inner-intergration/wu-database-parent) | 1.3.5-JDK24 | ORM | | mysql-connector-j | 8.0.33 | mysql驱动 | -| [wu-authorization-server-platform-starter](https://gitee.com/wujiawei1207537021/wu-framework-parent/tree/master/wu-smart-platform/wu-authorization-server-platform-starter) | 1.3.4-JDK24-SNAPSHOT | 用户授权体系 | +| [wu-authorization-server-platform-starter](https://gitee.com/wujiawei1207537021/wu-framework-parent/tree/master/wu-smart-platform/wu-authorization-server-platform-starter) | 1.3.5-JDK24 | 用户授权体系 | ### 使用环境 @@ -121,7 +121,7 @@ ORM操作数据库，使用环境JDK24 Spring Boot 3.5.0。的网络穿透、渗 docker启动 - 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.3.4-JDK24-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.3.5-JDK24 http://127.0.0.1:18080/swagger-ui/index.html diff --git a/client-k8s.yaml b/client-k8s.yaml index 6b31f27f..458fb9da 100644 --- a/client-k8s.yaml +++ b/client-k8s.yaml @@ -28,7 +28,7 @@ spec: containers: - name: wu-lazy-cloud-heartbeat-local-client-start image: >- - registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT + registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 env: - name: spring.lazy.netty.client.inet-host value: 124.222.48.62 diff --git a/install.md b/install.md index 87ce57f0..07ee5780 100644 --- a/install.md +++ b/install.md @@ -11,7 +11,7 @@ ```shell -docker run -d -it -p 6001:6001 -p 7001:7001 -p 8001:8001 -p 9001:9001 --name wlcn-s registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT +docker run -d -it -p 6001:6001 -p 7001:7001 -p 8001:8001 -p 9001:9001 --name wlcn-s registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24 ``` @@ -27,5 +27,5 @@ docker run -d -it -p 6001:6001 -p 7001:7001 -p 8001:8001 -p 9001:9001 --nam - 打开浏览器访问界面 http://127.0.0.1:6004/netty-client-local-ui/index.html ```shell -docker run -d -it --privileged -p 6004:6004 --name wlcn-c --restart=always -e spring.lazy.netty.client.inet-host=192.168.xx.xx -e spring.lazy.netty.client.inet-port=7001 -e spring.lazy.netty.client.client-id="wlcn-c" registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT +docker run -d -it --privileged -p 6004:6004 --name wlcn-c --restart=always -e spring.lazy.netty.client.inet-host=192.168.xx.xx -e spring.lazy.netty.client.inet-port=7001 -e spring.lazy.netty.client.client-id="wlcn-c" registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 ``` diff --git a/pom.xml b/pom.xml index 588cef47..5161a78d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,12 +8,12 @@ wu-framework-parent top.wu2020 - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 wu-lazy-cloud-network pom - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 云上云下 wlcn项目 https://gitee.com/wujiawei1207537021/wu-lazy-cloud-network @@ -93,7 +93,7 @@ top.wu2020 wu-framework-dependencies - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 pom import diff --git a/version.md b/version.md index 9b6d0aa1..7ccc603e 100644 --- a/version.md +++ b/version.md @@ -30,7 +30,7 @@ [change] 修复通道关闭导致调度线程池submit异常问题 [change] 添加记录客户端IP [change] 1.2.9为大版本，报文中添加数据无法向下兼容，建议服务端与客户端保持版本一致 -#### 1.3.4-JDK24-SNAPSHOT +#### 1.3.5-JDK24 [add] 新增http代理（客户端代理服务端、客户端代理客户杜安、服务端代理客户端、服务端代理服务端） [add] 新增socks代理（客户端代理服务端、客户端代理客户杜安、服务端代理客户端、服务端代理服务端） [add] 新增客户端路由管理、新增服务端路由管理 diff --git a/wlcn-website/BuildDocker.md b/wlcn-website/BuildDocker.md index 4a388b36..1806c3ed 100644 --- a/wlcn-website/BuildDocker.md +++ b/wlcn-website/BuildDocker.md @@ -6,7 +6,7 @@ #docker login --username=1207537021@qq.com registry.cn-hangzhou.aliyuncs.com -docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wlcn-website:1.3.4-JDK24-SNAPSHOT . -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wlcn-website:1.3.4-JDK24-SNAPSHOT +docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wlcn-website:1.3.5-JDK24 . +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wlcn-website:1.3.5-JDK24 ``` \ No newline at end of file diff --git a/wlcn-website/src/views/Docs.vue b/wlcn-website/src/views/Docs.vue index c0a1e0bf..b8b7edaa 100644 --- a/wlcn-website/src/views/Docs.vue +++ b/wlcn-website/src/views/Docs.vue @@ -60,7 +60,7 @@ 
docker run -d -it -p 6001:6001 -p 7001:7001 -p 8001:8001 -p 9001:9001 \
   --name wlcn-server \
-  registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT
+ registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24

端口说明

@@ -86,7 +86,7 @@ -e spring.lazy.netty.client.inet-host=YOUR_SERVER_IP \ -e spring.lazy.netty.client.inet-port=7001 \ -e spring.lazy.netty.client.client-id="your-client-id" \ - registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT + registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24

环境变量说明

@@ -145,18 +145,18 @@ http://127.0.0.1:6004/netty-client-local-ui/index.html

服务端部署

# 拉取镜像
-docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT
+docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24
 
 # 启动容器
 docker run -d -it -p 6001:6001 -p 7001:7001 -p 8001:8001 -p 9001:9001 \
   --name wlcn-server \
-  registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT
+ registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24

客户端部署

# 拉取镜像
-docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT
+docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24
 
 # 启动容器
 docker run -d -it --privileged -p 6004:6004 \
@@ -165,7 +165,7 @@ docker run -d -it --privileged -p 6004:6004 \
   -e spring.lazy.netty.client.inet-host=YOUR_SERVER_IP \
   -e spring.lazy.netty.client.inet-port=7001 \
   -e spring.lazy.netty.client.client-id="your-client-id" \
-  registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT
+ registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24
@@ -195,11 +195,11 @@ mvn clean package -DskipTests # 启动服务端 cd wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start -java -jar target/wu-lazy-cloud-heartbeat-server-start-1.3.4-JDK24-SNAPSHOT.jar +java -jar target/wu-lazy-cloud-heartbeat-server-start-1.3.5-JDK24.jar # 启动客户端 cd ../wu-lazy-cloud-heartbeat-client-start -java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar +java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.5-JDK24.jar diff --git a/wlcn-website/src/views/Download.vue b/wlcn-website/src/views/Download.vue index 98a32d29..98585ae3 100644 --- a/wlcn-website/src/views/Download.vue +++ b/wlcn-website/src/views/Download.vue @@ -20,7 +20,7 @@

当前版本

-
v1.3.4-JDK24-SNAPSHOT
+
v1.3.5-JDK24
@@ -66,18 +66,18 @@

服务端镜像

# 拉取镜像
-docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT
+docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24
 
 # 启动容器
 docker run -d -it -p 6001:6001 -p 7001:7001 -p 8001:8001 -p 9001:9001 \
   --name wlcn-server \
-  registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT
+ registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24

客户端镜像

# 拉取镜像
-docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT
+docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24
 
 # 启动容器
 docker run -d -it --privileged -p 6004:6004 \
@@ -86,7 +86,7 @@ docker run -d -it --privileged -p 6004:6004 \
   -e spring.lazy.netty.client.inet-host=YOUR_SERVER_IP \
   -e spring.lazy.netty.client.inet-port=7001 \
   -e spring.lazy.netty.client.client-id="your-client-id" \
-  registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT
+ registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24
@@ -127,11 +127,11 @@ mvn clean package -DskipTests # 启动服务端 cd wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start -java -jar target/wu-lazy-cloud-heartbeat-server-start-1.3.4-JDK24-SNAPSHOT.jar +java -jar target/wu-lazy-cloud-heartbeat-server-start-1.3.5-JDK24.jar # 启动客户端 cd ../wu-lazy-cloud-heartbeat-client-start -java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar +java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.5-JDK24.jar
@@ -158,19 +158,19 @@ java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar 服务端 - wu-lazy-cloud-heartbeat-server-start-1.3.4-JDK24-SNAPSHOT.jar + wu-lazy-cloud-heartbeat-server-start-1.3.5-JDK24.jar
客户端 - wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar + wu-lazy-cloud-heartbeat-client-start-1.3.5-JDK24.jar
集群版 - wu-lazy-cloud-heartbeat-server-cluster-start-1.3.4-JDK24-SNAPSHOT.jar + wu-lazy-cloud-heartbeat-server-cluster-start-1.3.5-JDK24.jar
@@ -178,10 +178,10 @@ java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar启动命令 
# 服务端启动
-java -jar wu-lazy-cloud-heartbeat-server-start-1.3.4-JDK24-SNAPSHOT.jar
+java -jar wu-lazy-cloud-heartbeat-server-start-1.3.5-JDK24.jar
 
 # 客户端启动
-java -jar wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar
+java -jar wu-lazy-cloud-heartbeat-client-start-1.3.5-JDK24.jar
@@ -221,18 +221,18 @@ java -jar wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar2. 启动服务端 
# 拉取镜像
-docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT
+docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24
 
 # 启动容器
 docker run -d -it -p 6001:6001 -p 7001:7001 -p 8001:8001 -p 9001:9001 \
   --name wlcn-server \
-  registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT
+ registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24

3. 启动客户端

# 拉取镜像
-docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT
+docker pull registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24
 
 # 启动容器（替换 YOUR_SERVER_IP 为实际服务端 IP）
 docker run -d -it --privileged -p 6004:6004 \
@@ -241,7 +241,7 @@ docker run -d -it --privileged -p 6004:6004 \
   -e spring.lazy.netty.client.inet-host=YOUR_SERVER_IP \
   -e spring.lazy.netty.client.inet-port=7001 \
   -e spring.lazy.netty.client.client-id="your-client-id" \
-  registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT
+ registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24

4. 验证部署

@@ -272,7 +272,7 @@ git clone https://gitee.com/wujiawei1207537021/wu-lazy-cloud-network.git cd wu-lazy-cloud-network # 切换到稳定版本 -git checkout v1.3.4-JDK24-SNAPSHOT +git checkout v1.3.5-JDK24

3. 编译项目

@@ -289,11 +289,11 @@ mvn clean package -pl wu-lazy-cloud-heartbeat-client-start -am -DskipTests 
# 启动服务端
 cd wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start
-java -jar target/wu-lazy-cloud-heartbeat-server-start-1.3.4-JDK24-SNAPSHOT.jar
+java -jar target/wu-lazy-cloud-heartbeat-server-start-1.3.5-JDK24.jar
 
 # 启动客户端
 cd ../wu-lazy-cloud-heartbeat-client-start
-java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar
+java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.5-JDK24.jar
@@ -321,7 +321,7 @@ java -jar target/wu-lazy-cloud-heartbeat-client-start-1.3.4-JDK24-SNAPSHOT.jar 
# 启动集群服务端
 cd wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start
-java -jar target/wu-lazy-cloud-heartbeat-server-cluster-start-1.3.4-JDK24-SNAPSHOT.jar
+java -jar target/wu-lazy-cloud-heartbeat-server-cluster-start-1.3.5-JDK24.jar

4. 负载均衡

diff --git a/wlcn-website/src/views/Home.vue b/wlcn-website/src/views/Home.vue index be07461a..df72996f 100644 --- a/wlcn-website/src/views/Home.vue +++ b/wlcn-website/src/views/Home.vue @@ -197,7 +197,7 @@ 
docker run -d -it -p 6001:6001 -p 7001:7001 -p 8001:8001 -p 9001:9001 \
   --name wlcn-server \
-  registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.4-JDK24-SNAPSHOT
+ registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server:1.3.5-JDK24
@@ -213,7 +213,7 @@ -e spring.lazy.netty.client.inet-host=YOUR_SERVER_IP \ -e spring.lazy.netty.client.inet-port=7001 \ -e spring.lazy.netty.client.client-id="your-client-id" \ - registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT + registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 diff --git a/wu-lazy-cloud-heartbeat-client/pom.xml b/wu-lazy-cloud-heartbeat-client/pom.xml index 3a265e4b..63d5273a 100644 --- a/wu-lazy-cloud-heartbeat-client/pom.xml +++ b/wu-lazy-cloud-heartbeat-client/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-network - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 4.0.0 @@ -79,7 +79,7 @@ top.wu2020 wu-framework-javafx-spring-starter - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 diff --git a/wu-lazy-cloud-heartbeat-common/pom.xml b/wu-lazy-cloud-heartbeat-common/pom.xml index f6916ea6..c1a9c29b 100644 --- a/wu-lazy-cloud-heartbeat-common/pom.xml +++ b/wu-lazy-cloud-heartbeat-common/pom.xml @@ -6,7 +6,7 @@ top.wu2020 wu-lazy-cloud-network - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 wu-lazy-cloud-heartbeat-common @@ -56,13 +56,13 @@ top.wu2020 wu-framework-queue - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 top.wu2020 wu-framework-log-spring-starter - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 diff --git a/wu-lazy-cloud-heartbeat-dns/pom.xml b/wu-lazy-cloud-heartbeat-dns/pom.xml index b9b1b0ed..f1c2a434 100644 --- a/wu-lazy-cloud-heartbeat-dns/pom.xml +++ b/wu-lazy-cloud-heartbeat-dns/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-network - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 4.0.0 diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/pom.xml b/wu-lazy-cloud-heartbeat-protocol-proxy/pom.xml index b2ac80c4..116bd1bb 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/pom.xml +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-network - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 4.0.0 @@ -81,7 +81,7 @@ top.wu2020 wu-framework-queue - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 diff --git a/wu-lazy-cloud-heartbeat-server-cluster/pom.xml b/wu-lazy-cloud-heartbeat-server-cluster/pom.xml index a5ec80ea..2bbd533b 100644 --- a/wu-lazy-cloud-heartbeat-server-cluster/pom.xml +++ b/wu-lazy-cloud-heartbeat-server-cluster/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-network - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 4.0.0 diff --git a/wu-lazy-cloud-heartbeat-server/pom.xml b/wu-lazy-cloud-heartbeat-server/pom.xml index cffd2d28..2ef9f684 100644 --- a/wu-lazy-cloud-heartbeat-server/pom.xml +++ b/wu-lazy-cloud-heartbeat-server/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-network - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 4.0.0 @@ -116,7 +116,7 @@ top.wu2020 wu-framework-javafx-spring-starter - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 diff --git a/wu-lazy-cloud-heartbeat-start/pom.xml b/wu-lazy-cloud-heartbeat-start/pom.xml index 24922a88..b8a12405 100644 --- a/wu-lazy-cloud-heartbeat-start/pom.xml +++ b/wu-lazy-cloud-heartbeat-start/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-network - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 wu-lazy-cloud-heartbeat-start 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 0f6bb046..f50826a8 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,7 +9,7 @@ mvn -Pnative -DskipTests clean package native:compile ```shell mvn spring-boot:build-image -Pnative -docker tag docker.io/library/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-NATIVE-SNAPSHOT +docker tag docker.io/library/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-NATIVE-SNAPSHOT docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-NATIVE-SNAPSHOT @@ -24,37 +24,37 @@ docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-cl mvn clean install -docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT . -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT +docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 . +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 ``` ## Docker Hub ```shell -docker tag registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT 1207537021/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT +docker tag registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 1207537021/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 -docker push 1207537021/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT +docker push 1207537021/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 ``` ### wlcn ```shell -docker tag registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT wlcn/wlcn-client:1.3.4-JDK24-SNAPSHOT +docker tag registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 wlcn/wlcn-client:1.3.5-JDK24 -docker push wlcn/wlcn-client:1.3.4-JDK24-SNAPSHOT +docker push wlcn/wlcn-client:1.3.5-JDK24 ``` ### run ```shell -docker run -d -it --privileged --name client -p 6004:6004 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-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.3.5-JDK24 ``` ```shell -docker run -d -it --privileged --name windows-client --restart=always -e spring.lazy.netty.client.inet-host=124.222.152.160 -e spring.lazy.netty.client.inet-port=30560 -e spring.lazy.netty.client.client-id="windows-11" docker.io/library/wu-lazy-cloud-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT +docker run -d -it --privileged --name windows-client --restart=always -e spring.lazy.netty.client.inet-host=124.222.152.160 -e spring.lazy.netty.client.inet-port=30560 -e spring.lazy.netty.client.client-id="windows-11" docker.io/library/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 ``` ```yaml @@ -89,7 +89,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-heartbeat-client-start:1.3.4-JDK24-SNAPSHOT +docker run -d -it --name client registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-client-start:1.3.5-JDK24 http://127.0.0.1:18080 diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/pom.xml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/pom.xml index 4446eb30..835bb658 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/pom.xml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-heartbeat-start - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 4.0.0 diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application.yml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application.yml index 3a9646b4..19084d45 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application.yml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application.yml @@ -28,7 +28,7 @@ spring: netty: protocol: proxy: - authentication: true + authentication: false enable-proxy-log: true socket-protocol-proxy: port: 9002 diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/pom.xml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/pom.xml index 10992a53..ee91ce8b 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/pom.xml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-cluster-start/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-heartbeat-start - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 4.0.0 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 653bd23b..0502b451 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,7 +11,7 @@ mvn -Pnative -DskipTests clean package native:compile ```shell mvn spring-boot:build-image -Pnative -docker tag docker.io/library/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-NATIVE-SNAPSHOT +docker tag docker.io/library/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-NATIVE-SNAPSHOT docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-NATIVE-SNAPSHOT @@ -23,28 +23,28 @@ docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-se mvn clean install -docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT . -docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT +docker build -t registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 . +docker push registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 ``` ## Docker Hub ```shell -docker tag registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT 1207537021/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT +docker tag registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 1207537021/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 -docker push 1207537021/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT +docker push 1207537021/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 ``` ### wlcn ```shell -docker tag registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT wlcn/wlcn-server:1.3.4-JDK24-SNAPSHOT +docker tag registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 wlcn/wlcn-server:1.3.5-JDK24 -docker push wlcn/wlcn-server:1.3.4-JDK24-SNAPSHOT +docker push wlcn/wlcn-server:1.3.5-JDK24 ``` ```RUN -docker run -d -it -p 6001:6001 -p 7001:7001 -e spring.profiles.active=prod -e MAIN_DB_HOST=localhost:3306 -e MAIN_DB_PASSWORD=root -e MAIN_DB_PASSWORD=root --name wu-lazy-cloud-heartbeat-server-start registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT +docker run -d -it -p 6001:6001 -p 7001:7001 -e spring.profiles.active=prod -e MAIN_DB_HOST=localhost:3306 -e MAIN_DB_PASSWORD=root -e MAIN_DB_PASSWORD=root --name wu-lazy-cloud-heartbeat-server-start registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 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 5d86a580..647d2567 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-heartbeat-server-start:1.3.4-JDK24-SNAPSHOT + registry.cn-hangzhou.aliyuncs.com/wu-lazy/wu-lazy-cloud-heartbeat-server-start:1.3.5-JDK24 imagePullPolicy: Always name: wu-lazy-cloud-heartbeat-server resources: {} diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/pom.xml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/pom.xml index b7c2bd4c..964c8554 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/pom.xml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-server-start/pom.xml @@ -5,7 +5,7 @@ top.wu2020 wu-lazy-cloud-heartbeat-start - 1.3.4-JDK24-SNAPSHOT + 1.3.5-JDK24 4.0.0