From 04475cc1e9dd7b00e3212a540c51f4f4d209f943 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Thu, 18 Aug 2022 01:11:28 +0800 Subject: [PATCH] =?UTF-8?q?:building=5Fconstruction:=20=E6=96=B0=E5=A2=9Ew?= =?UTF-8?q?ebsocket=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 2 +- README.md | 2 +- .../.gitignore | 0 .../README.md | 0 demo-websocket-spring/pom.xml | 75 +++++++++++++++++ .../SpringBootDemoWebsocketApplication.java | 0 .../websocket/common/WebSocketConsts.java | 0 .../websocket/config/WebSocketConfig.java | 0 .../controller/ServerController.java | 0 .../com/xkcoding/websocket/model/Server.java | 0 .../xkcoding/websocket/model/server/Cpu.java | 0 .../xkcoding/websocket/model/server/Jvm.java | 0 .../xkcoding/websocket/model/server/Mem.java | 0 .../xkcoding/websocket/model/server/Sys.java | 0 .../websocket/model/server/SysFile.java | 0 .../com/xkcoding/websocket/payload/KV.java | 0 .../xkcoding/websocket/payload/ServerVO.java | 0 .../websocket/payload/server/CpuVO.java | 0 .../websocket/payload/server/JvmVO.java | 0 .../websocket/payload/server/MemVO.java | 0 .../websocket/payload/server/SysFileVO.java | 0 .../websocket/payload/server/SysVO.java | 0 .../xkcoding/websocket/task/ServerTask.java | 0 .../com/xkcoding/websocket/util/IpUtil.java | 0 .../xkcoding/websocket/util/ServerUtil.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/static/js/sockjs.min.js | 0 .../src/main/resources/static/js/stomp.js | 0 .../src/main/resources/static/server.html | 0 ...ringBootDemoWebsocketApplicationTests.java | 0 demo-websocket/pom.xml | 80 +++---------------- pom.xml | 1 + 32 files changed, 91 insertions(+), 69 deletions(-) rename {demo-websocket => demo-websocket-spring}/.gitignore (100%) rename {demo-websocket => demo-websocket-spring}/README.md (100%) create mode 100644 demo-websocket-spring/pom.xml rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/controller/ServerController.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/model/Server.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/model/server/Cpu.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/model/server/Jvm.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/model/server/Mem.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/model/server/Sys.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/model/server/SysFile.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/payload/KV.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/payload/ServerVO.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/task/ServerTask.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/util/IpUtil.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/java/com/xkcoding/websocket/util/ServerUtil.java (100%) rename {demo-websocket => demo-websocket-spring}/src/main/resources/application.yml (100%) rename {demo-websocket => demo-websocket-spring}/src/main/resources/static/js/sockjs.min.js (100%) rename {demo-websocket => demo-websocket-spring}/src/main/resources/static/js/stomp.js (100%) rename {demo-websocket => demo-websocket-spring}/src/main/resources/static/server.html (100%) rename {demo-websocket => demo-websocket-spring}/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java (100%) diff --git a/README.en.md b/README.en.md index d3a479a..96bda9d 100644 --- a/README.en.md +++ b/README.en.md @@ -108,7 +108,7 @@ View the [TODO](./TODO.en.md) file | [demo-mq-rabbitmq](./demo-mq-rabbitmq) | a demo to integrate RabbitMQ implementation for message delivery and reception based on direct queue mode, fanout mode, topic mode, delay queue. | | [demo-mq-rocketmq](./demo-mq-rocketmq) | NOT FINISHED YET!
a demo to integrate RocketMQ implementation for message delivery and reception. | | [demo-mq-kafka](./demo-mq-kafka) | a demo to integrate Kafka implementation for message delivery and reception. | -| [demo-websocket](./demo-websocket) | a demo to integrate websocket, the backend actively pushes the server running status to front end. | +| [demo-websocket](./demo-websocket-spring) | a demo to integrate websocket, the backend actively pushes the server running status to front end. | | [demo-websocket-socketio](./demo-websocket-socketio) | a demo to integrate websocket by using `netty-socketio`, implement a simple chat room. | | [demo-ureport2](./demo-ureport2) | NOT FINISHED YET!
a demo to integrate [ureport2](https://github.com/youseries/ureport) to implement complex, customized Chinese-style reports. | | [demo-uflo](./demo-uflo) | NOT FINISHED YET!
a demo to integrate [uflo](https://github.com/youseries/uflo)(process engine like Activiti and Flowable) to quickly implement a lightweight process engine. | diff --git a/README.md b/README.md index 93ce3f2..b0204d1 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ | [demo-mq-rabbitmq](./demo-mq-rabbitmq) | spring-boot 集成 RabbitMQ 实现基于直接队列模式、分列模式、主题模式、延迟队列的消息发送和接收 | | [demo-mq-rocketmq](./demo-mq-rocketmq) | spring-boot 集成 RocketMQ,实现消息的发送和接收
待完成 | | [demo-mq-kafka](./demo-mq-kafka) | spring-boot 集成 kafka,实现消息的发送和接收 | -| [demo-websocket](./demo-websocket) | spring-boot 集成 websocket,后端主动推送前端服务器运行信息 | +| [demo-websocket](./demo-websocket-spring) | spring-boot 集成 websocket,后端主动推送前端服务器运行信息 | | [demo-websocket-socketio](./demo-websocket-socketio) | spring-boot 使用 netty-socketio 集成 websocket,实现一个简单的聊天室 | | [demo-ureport2](./demo-ureport2) | spring-boot 集成 ureport2 实现复杂的自定义的中国式报表
待完成 | | [demo-uflo](./demo-uflo) | spring-boot 集成 uflo 快速实现轻量级流程引擎
待完成 | diff --git a/demo-websocket/.gitignore b/demo-websocket-spring/.gitignore similarity index 100% rename from demo-websocket/.gitignore rename to demo-websocket-spring/.gitignore diff --git a/demo-websocket/README.md b/demo-websocket-spring/README.md similarity index 100% rename from demo-websocket/README.md rename to demo-websocket-spring/README.md diff --git a/demo-websocket-spring/pom.xml b/demo-websocket-spring/pom.xml new file mode 100644 index 0000000..6811ec1 --- /dev/null +++ b/demo-websocket-spring/pom.xml @@ -0,0 +1,75 @@ + + + 4.0.0 + + demo-websocket + 1.0.0-SNAPSHOT + + demo-websocket + Demo project for Spring Boot + + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + + + + UTF-8 + UTF-8 + 1.8 + 3.9.1 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-websocket + + + + org.springframework.boot + spring-boot-starter-test + test + + + + com.github.oshi + oshi-core + ${oshi.version} + + + + cn.hutool + hutool-all + + + + com.google.guava + guava + + + + org.projectlombok + lombok + true + + + + + demo-websocket + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/controller/ServerController.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/controller/ServerController.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/Server.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/Server.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/Cpu.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/Cpu.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/Jvm.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/Jvm.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/Mem.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/Mem.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/Sys.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/Sys.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/SysFile.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/model/server/SysFile.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/KV.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/KV.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/ServerVO.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/ServerVO.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/task/ServerTask.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/task/ServerTask.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/util/IpUtil.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/util/IpUtil.java diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java b/demo-websocket-spring/src/main/java/com/xkcoding/websocket/util/ServerUtil.java similarity index 100% rename from demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java rename to demo-websocket-spring/src/main/java/com/xkcoding/websocket/util/ServerUtil.java diff --git a/demo-websocket/src/main/resources/application.yml b/demo-websocket-spring/src/main/resources/application.yml similarity index 100% rename from demo-websocket/src/main/resources/application.yml rename to demo-websocket-spring/src/main/resources/application.yml diff --git a/demo-websocket/src/main/resources/static/js/sockjs.min.js b/demo-websocket-spring/src/main/resources/static/js/sockjs.min.js similarity index 100% rename from demo-websocket/src/main/resources/static/js/sockjs.min.js rename to demo-websocket-spring/src/main/resources/static/js/sockjs.min.js diff --git a/demo-websocket/src/main/resources/static/js/stomp.js b/demo-websocket-spring/src/main/resources/static/js/stomp.js similarity index 100% rename from demo-websocket/src/main/resources/static/js/stomp.js rename to demo-websocket-spring/src/main/resources/static/js/stomp.js diff --git a/demo-websocket/src/main/resources/static/server.html b/demo-websocket-spring/src/main/resources/static/server.html similarity index 100% rename from demo-websocket/src/main/resources/static/server.html rename to demo-websocket-spring/src/main/resources/static/server.html diff --git a/demo-websocket/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java b/demo-websocket-spring/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java similarity index 100% rename from demo-websocket/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java rename to demo-websocket-spring/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java diff --git a/demo-websocket/pom.xml b/demo-websocket/pom.xml index 6811ec1..b19762c 100644 --- a/demo-websocket/pom.xml +++ b/demo-websocket/pom.xml @@ -1,75 +1,21 @@ - - 4.0.0 - - demo-websocket + + com.xkcoding + spring-boot-demo 1.0.0-SNAPSHOT + - demo-websocket - Demo project for Spring Boot - - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - - - - UTF-8 - UTF-8 - 1.8 - 3.9.1 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-websocket - - - - org.springframework.boot - spring-boot-starter-test - test - - - - com.github.oshi - oshi-core - ${oshi.version} - - - - cn.hutool - hutool-all - - - - com.google.guava - guava - + 4.0.0 - - org.projectlombok - lombok - true - - + demo-websocket + 1.0.0-SNAPSHOT + pom - - demo-websocket - - - org.springframework.boot - spring-boot-maven-plugin - - - + + 17 + diff --git a/pom.xml b/pom.xml index a1a3d54..5e61a97 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ demo-nosql demo-mq demo-task + demo-websocket demo-monitor