Skip to content

Commit 5185f46

Browse files
authored
Merge pull request #7 from bitkylin/dev
Dev 项目达到完整状态
2 parents b09730b + e332489 commit 5185f46

File tree

77 files changed

+985
-1083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+985
-1083
lines changed

LICENSE

Lines changed: 21 additions & 201 deletions
Original file line numberDiff line numberDiff line change
@@ -1,201 +1,21 @@
1-
Apache License
2-
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
4-
5-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6-
7-
1. Definitions.
8-
9-
"License" shall mean the terms and conditions for use, reproduction,
10-
and distribution as defined by Sections 1 through 9 of this document.
11-
12-
"Licensor" shall mean the copyright owner or entity authorized by
13-
the copyright owner that is granting the License.
14-
15-
"Legal Entity" shall mean the union of the acting entity and all
16-
other entities that control, are controlled by, or are under common
17-
control with that entity. For the purposes of this definition,
18-
"control" means (i) the power, direct or indirect, to cause the
19-
direction or management of such entity, whether by contract or
20-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21-
outstanding shares, or (iii) beneficial ownership of such entity.
22-
23-
"You" (or "Your") shall mean an individual or Legal Entity
24-
exercising permissions granted by this License.
25-
26-
"Source" form shall mean the preferred form for making modifications,
27-
including but not limited to software source code, documentation
28-
source, and configuration files.
29-
30-
"Object" form shall mean any form resulting from mechanical
31-
transformation or translation of a Source form, including but
32-
not limited to compiled object code, generated documentation,
33-
and conversions to other media types.
34-
35-
"Work" shall mean the work of authorship, whether in Source or
36-
Object form, made available under the License, as indicated by a
37-
copyright notice that is included in or attached to the work
38-
(an example is provided in the Appendix below).
39-
40-
"Derivative Works" shall mean any work, whether in Source or Object
41-
form, that is based on (or derived from) the Work and for which the
42-
editorial revisions, annotations, elaborations, or other modifications
43-
represent, as a whole, an original work of authorship. For the purposes
44-
of this License, Derivative Works shall not include works that remain
45-
separable from, or merely link (or bind by name) to the interfaces of,
46-
the Work and Derivative Works thereof.
47-
48-
"Contribution" shall mean any work of authorship, including
49-
the original version of the Work and any modifications or additions
50-
to that Work or Derivative Works thereof, that is intentionally
51-
submitted to Licensor for inclusion in the Work by the copyright owner
52-
or by an individual or Legal Entity authorized to submit on behalf of
53-
the copyright owner. For the purposes of this definition, "submitted"
54-
means any form of electronic, verbal, or written communication sent
55-
to the Licensor or its representatives, including but not limited to
56-
communication on electronic mailing lists, source code control systems,
57-
and issue tracking systems that are managed by, or on behalf of, the
58-
Licensor for the purpose of discussing and improving the Work, but
59-
excluding communication that is conspicuously marked or otherwise
60-
designated in writing by the copyright owner as "Not a Contribution."
61-
62-
"Contributor" shall mean Licensor and any individual or Legal Entity
63-
on behalf of whom a Contribution has been received by Licensor and
64-
subsequently incorporated within the Work.
65-
66-
2. Grant of Copyright License. Subject to the terms and conditions of
67-
this License, each Contributor hereby grants to You a perpetual,
68-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69-
copyright license to reproduce, prepare Derivative Works of,
70-
publicly display, publicly perform, sublicense, and distribute the
71-
Work and such Derivative Works in Source or Object form.
72-
73-
3. Grant of Patent License. Subject to the terms and conditions of
74-
this License, each Contributor hereby grants to You a perpetual,
75-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76-
(except as stated in this section) patent license to make, have made,
77-
use, offer to sell, sell, import, and otherwise transfer the Work,
78-
where such license applies only to those patent claims licensable
79-
by such Contributor that are necessarily infringed by their
80-
Contribution(s) alone or by combination of their Contribution(s)
81-
with the Work to which such Contribution(s) was submitted. If You
82-
institute patent litigation against any entity (including a
83-
cross-claim or counterclaim in a lawsuit) alleging that the Work
84-
or a Contribution incorporated within the Work constitutes direct
85-
or contributory patent infringement, then any patent licenses
86-
granted to You under this License for that Work shall terminate
87-
as of the date such litigation is filed.
88-
89-
4. Redistribution. You may reproduce and distribute copies of the
90-
Work or Derivative Works thereof in any medium, with or without
91-
modifications, and in Source or Object form, provided that You
92-
meet the following conditions:
93-
94-
(a) You must give any other recipients of the Work or
95-
Derivative Works a copy of this License; and
96-
97-
(b) You must cause any modified files to carry prominent notices
98-
stating that You changed the files; and
99-
100-
(c) You must retain, in the Source form of any Derivative Works
101-
that You distribute, all copyright, patent, trademark, and
102-
attribution notices from the Source form of the Work,
103-
excluding those notices that do not pertain to any part of
104-
the Derivative Works; and
105-
106-
(d) If the Work includes a "NOTICE" text file as part of its
107-
distribution, then any Derivative Works that You distribute must
108-
include a readable copy of the attribution notices contained
109-
within such NOTICE file, excluding those notices that do not
110-
pertain to any part of the Derivative Works, in at least one
111-
of the following places: within a NOTICE text file distributed
112-
as part of the Derivative Works; within the Source form or
113-
documentation, if provided along with the Derivative Works; or,
114-
within a display generated by the Derivative Works, if and
115-
wherever such third-party notices normally appear. The contents
116-
of the NOTICE file are for informational purposes only and
117-
do not modify the License. You may add Your own attribution
118-
notices within Derivative Works that You distribute, alongside
119-
or as an addendum to the NOTICE text from the Work, provided
120-
that such additional attribution notices cannot be construed
121-
as modifying the License.
122-
123-
You may add Your own copyright statement to Your modifications and
124-
may provide additional or different license terms and conditions
125-
for use, reproduction, or distribution of Your modifications, or
126-
for any such Derivative Works as a whole, provided Your use,
127-
reproduction, and distribution of the Work otherwise complies with
128-
the conditions stated in this License.
129-
130-
5. Submission of Contributions. Unless You explicitly state otherwise,
131-
any Contribution intentionally submitted for inclusion in the Work
132-
by You to the Licensor shall be under the terms and conditions of
133-
this License, without any additional terms or conditions.
134-
Notwithstanding the above, nothing herein shall supersede or modify
135-
the terms of any separate license agreement you may have executed
136-
with Licensor regarding such Contributions.
137-
138-
6. Trademarks. This License does not grant permission to use the trade
139-
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for reasonable and customary use in describing the
141-
origin of the Work and reproducing the content of the NOTICE file.
142-
143-
7. Disclaimer of Warranty. Unless required by applicable law or
144-
agreed to in writing, Licensor provides the Work (and each
145-
Contributor provides its Contributions) on an "AS IS" BASIS,
146-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147-
implied, including, without limitation, any warranties or conditions
148-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149-
PARTICULAR PURPOSE. You are solely responsible for determining the
150-
appropriateness of using or redistributing the Work and assume any
151-
risks associated with Your exercise of permissions under this License.
152-
153-
8. Limitation of Liability. In no event and under no legal theory,
154-
whether in tort (including negligence), contract, or otherwise,
155-
unless required by applicable law (such as deliberate and grossly
156-
negligent acts) or agreed to in writing, shall any Contributor be
157-
liable to You for damages, including any direct, indirect, special,
158-
incidental, or consequential damages of any character arising as a
159-
result of this License or out of the use or inability to use the
160-
Work (including but not limited to damages for loss of goodwill,
161-
work stoppage, computer failure or malfunction, or any and all
162-
other commercial damages or losses), even if such Contributor
163-
has been advised of the possibility of such damages.
164-
165-
9. Accepting Warranty or Additional Liability. While redistributing
166-
the Work or Derivative Works thereof, You may choose to offer,
167-
and charge a fee for, acceptance of support, warranty, indemnity,
168-
or other liability obligations and/or rights consistent with this
169-
License. However, in accepting such obligations, You may act only
170-
on Your own behalf and on Your sole responsibility, not on behalf
171-
of any other Contributor, and only if You agree to indemnify,
172-
defend, and hold each Contributor harmless for any liability
173-
incurred by, or claims asserted against, such Contributor by reason
174-
of your accepting any such warranty or additional liability.
175-
176-
END OF TERMS AND CONDITIONS
177-
178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "{}"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright {yyyy} {name of copyright owner}
190-
191-
Licensed under the Apache License, Version 2.0 (the "License");
192-
you may not use this file except in compliance with the License.
193-
You may obtain a copy of the License at
194-
195-
http://www.apache.org/licenses/LICENSE-2.0
196-
197-
Unless required by applicable law or agreed to in writing, software
198-
distributed under the License is distributed on an "AS IS" BASIS,
199-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200-
See the License for the specific language governing permissions and
201-
limitations under the License.
1+
MIT License
2+
3+
Copyright (c) 2017 123lml123
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 112 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,112 @@
1-
# ClusterDeviceManager
2-
用于集群设备的管理系统,包括基于 Node.js 的后端管理程序,基于 .NET 平台的图形界面管理软件,基于 Vue.js 的单页应用程序。
1+
# 基于 Spring 和 Netty 的集群设备管理平台
2+
3+
[![GitHub stars](https://img.shields.io/github/stars/bitkylin/ClusterDeviceControlPlatform.svg)](https://github.com/bitkylin/ClusterDeviceControlPlatform/stargazers)
4+
![技术](https://img.shields.io/badge/%E6%8A%80%E6%9C%AF-Spring%7CNetty%7CJavaFX%7CMongoDB-brightgreen.svg)
5+
[![许可证](https://img.shields.io/badge/许可证-MIT-blue.svg)](https://github.com/bitkylin/ClusterDeviceControlPlatform/blob/master/LICENSE)
6+
7+
## 项目描述
8+
9+
Java 后端项目,大规模集群设备的管理平台,使用 Spring 作为基础框架,使用 Netty 搭建 TCP 服务器与**上万台设备**组成的集群通信,使用基于 JavaFX 的图形界面应用程序模拟上万台设备的行为,并可对服务器进行压力测试。
10+
11+
### Java 服务器运行环境
12+
13+
- JRE:Java SE 8u121 及以上环境测试通过
14+
15+
- 操作系统:在 Windows 7 及以上,CentOS、Ubuntu 等系统下测试通过
16+
17+
- 数据库:MongoDB 3.4.0 下测试通过
18+
19+
- IDE:IntelliJ IDEA 2017
20+
21+
- 构建工具:Maven
22+
23+
24+
****:在运行 Java 服务器前,需预先正确部署并启动 MongoDB 数据库
25+
26+
### 项目主框架
27+
28+
![项目主框架](./mdphoto/main1.jpg)
29+
30+
>该模型为实际项目模型的抽象,实际项目中,上万台设备通过 CAN 总线连接,并通过「CAN 转以太网模块」和 Java 服务器通信,本模型抽象为上万台设备通过一条 TCP 连接和服务器进行通信,设备区分依靠自定义帧格式。
31+
32+
## Java 服务器
33+
34+
### 服务器架构描述
35+
36+
- 以 Spring 为基础框架,集成 Netty、Spring Data、Spring MVC 等框架搭建服务器。
37+
38+
- 采用 Netty 开发 TCP 服务器,与至少 1W 台设备「智能充电柜」进行通信,处理能力 200 帧/秒以上,已有效解决粘包、半包问题。遵循 CAN 协议自定义帧格式,实现丰富的业务功能。
39+
40+
- 采用 MongoDB,对设备集群的状态信息进行持久化。
41+
42+
- 采用 Spring MVC,为 .NET 及 Web 客户端提供 RESTFul API 风格的 HTTP 服务。
43+
44+
- 采用 Redis 作为数据库的缓存,极大提升数据库的使用效率,并将服务器对帧的处理效率提升2个数量级以上。
45+
46+
### 帧调度算法概述
47+
48+
>本节介绍 Java 服务器中,Netty 模块使用的帧调度算法,由于众多硬件设备的**数据帧处理能力较差****可靠性较差**,服务器大规模下发数据帧时,需进行有效的**拥塞控制、超时重发**,可有效提升集群设备的可靠性,降低集群设备的研发难度。
49+
50+
内容较多,这部分内容被放在了独立博文中,请使用如下链接查看:
51+
52+
|来源|网址|
53+
|---|---|
54+
|简书|http://www.jianshu.com/p/c5da14855515|
55+
|主页|http://bitky.cc/2017/07/19/java/|
56+
57+
**「注」**本部分为源码「Netty服务器」部分的解释说明,需结合源码进行阅读。
58+
59+
## JavaFX 设备模拟客户端
60+
61+
基于 JavaFX 开发 GUI 客户端,模拟集群设备的行为,并可对服务器进行压力测试。
62+
63+
### 模拟客户端主界面
64+
65+
![模拟客户端主界面](./mdphoto/main21.jpg)
66+
67+
### 模拟集群设备的行为进行压力测试
68+
69+
![模拟客户端的压力测试功能](./mdphoto/main22.jpg)
70+
71+
72+
## [License](https://github.com/bitkylin/ClusterDeviceControlPlatform/blob/master/LICENSE)
73+
74+
> MIT License
75+
>
76+
> Copyright (c) 2017 123lml123
77+
>
78+
> Permission is hereby granted, free of charge, to any person obtaining a copy
79+
> of this software and associated documentation files (the "Software"), to deal
80+
> in the Software without restriction, including without limitation the rights
81+
> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
82+
> copies of the Software, and to permit persons to whom the Software is
83+
> furnished to do so, subject to the following conditions:
84+
>
85+
> The above copyright notice and this permission notice shall be included in all
86+
> copies or substantial portions of the Software.
87+
>
88+
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
89+
> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
90+
> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
91+
> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
92+
> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
93+
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
94+
> SOFTWARE.
95+
96+
## 关于我
97+
98+
### 1. 我的主页
99+
100+
名称|二级域名|原始地址
101+
---|---|---
102+
主页|http://bitky.cc|https://bitkylin.github.io
103+
GitHub|http://github.bitky.cc|https://github.com/bitkylin
104+
简书|http://js.bitky.cc|http://www.jianshu.com/u/bd2e386a6ea8
105+
CSDN|http://csdn.bitky.cc|http://blog.csdn.net/llmmll08
106+
107+
108+
### 2. 其他
109+
110+
- 兴趣方向: Java, Android, C#, JavaScript, Node.js, Kotlin 等
111+
112+

clustermanage-client-javafx/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>cc.bitky.clustermanage</groupId>
77
<artifactId>clustermanage-client</artifactId>
8-
<version>0.8.6-SNAPSHOT</version>
8+
<version>0.9.0-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<name>clustermanage-client-javafx</name>

clustermanage-client-javafx/src/main/java/cc/bitky/clustermanage/KySetting.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
public class KySetting {
44
//------------------系统---------------------------
5-
public static final String VERSION = "v0.8.6";
5+
public static final String VERSION = "v0.9.1";
66

77
//----------------网络连接--------------------------
8-
public static final String HOST_NAME = "localhost";
8+
public static final String HOST_NAME = "lml-win10";
99
public static final int PORT = 30232;
1010
}

clustermanage-client-javafx/src/main/java/cc/bitky/clustermanage/NettyLauncher.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
import java.util.Scanner;
7-
86
import cc.bitky.clustermanage.netty.NettyClient;
97
import cc.bitky.clustermanage.view.MainView;
108

119
public class NettyLauncher {
1210
private static Logger logger = LoggerFactory.getLogger(NettyLauncher.class);
1311
private static NettyLauncher nettyLauncher;
14-
private Scanner scanner = new Scanner(System.in);
1512
private NettyClient nettyClient;
1613

1714
private NettyLauncher() {
@@ -28,7 +25,7 @@ public void start(String hostName, int port) {
2825
MainView.getInstance().setLabelConnStatus(isSuccess);
2926
});
3027
nettyClient.setFinishSuccessfulListener(isSuccess -> {
31-
System.out.println("客户端优雅关闭成功");
28+
logger.info("客户端优雅关闭成功");
3229
System.exit(0);
3330
});
3431
nettyClient.start(hostName, port);
@@ -38,5 +35,4 @@ void shutdown() {
3835
if (nettyClient != null)
3936
nettyClient.shutdown();
4037
}
41-
4238
}

0 commit comments

Comments
 (0)