Skip to content

Commit 4720285

Browse files
Merge pull request #1 from SpringCloud/master
20190423 pull
2 parents fbfcaf0 + 75a2501 commit 4720285

File tree

453 files changed

+33558
-4
lines changed

Some content is hidden

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

453 files changed

+33558
-4
lines changed

.gitignore

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Created by .ignore support plugin (hsz.mobi)
2+
target
3+
!.mvn/wrapper/maven-wrapper.jar
4+
5+
### STS ###
6+
.apt_generated
7+
.classpath
8+
.factorypath
9+
.project
10+
.settings
11+
.springBeans
12+
13+
### IntelliJ IDEA ###
14+
.idea
15+
*.iws
16+
*.iml
17+
*.ipr
18+
19+
moss-ui/node_modules/
20+
21+
### BUILD ###
22+
nbproject/private/
23+
build/
24+
nbbuild/
25+
dist/
26+
nbdist/
27+
bin/
28+
out/
29+
.DS_Store
30+
/*/target
31+
target
32+

LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
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.

README.md

Lines changed: 116 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/>
88
</a>
99
</p>
10+
Moss(莫斯),让Spring Cloud应用不再流浪!
1011

1112
---
1213

@@ -24,10 +25,52 @@
2425

2526
>Spring Cloud中国社区从2017年11月份,开始规划Spring Cloud Admin的开发和设计,专注于研究这个领域。Moss将会选择一个合适的时机开源,需要更多了解的可以加我微信Software_King。
2627
28+
#### 1.2.1 竞品分析
29+
30+
Moss的竞品分析对比如下表所示:
31+
32+
| 对比选项 | Spring Boot Admin | Moss |
33+
| --- | --- | --- |
34+
| **服务画像** |||
35+
| **服务实例画像** | ☑️ ||
36+
| **支持单Eureka**| ☑️ ||
37+
| **支持单Nacos**| ☑️ ||
38+
| **支持多Eureka,在线动态增加,删除,切换**| ❌️ ||
39+
| 前端技术| Vue | Ant Design Pro|
40+
| **支持Spring Boot 1.5.X和Spring Boot 2.0.X**| ☑️ ||
41+
| **服务调用拓扑**|||
42+
| **在线查看Jar依赖**|||
43+
| **服务归属(项目,Owner)**|||
44+
| **服务和实例支持模糊查询**|||
45+
| 服务闪烁告警|||
46+
| 服务评分打星|||
47+
| 服务列表画像|||
48+
| 服务实例列表画像|||
49+
| 服务实例内部组件列表,使用哪些Spring Cloud组件|||
50+
51+
> 其中☑️表示功能相对较弱 ✅表示功能完整强大 ❌表示功能缺失
52+
53+
#### 1.2.1 Moss RoadMap
54+
55+
Roadmap 时间点:
56+
57+
✅表示当前稳定可用版本
58+
59+
| 版本 | Milestone | 主要特性 |
60+
| -------- | -------- | -------- |
61+
| ✅1.0.0.RELEASE | **2019.4.21** | 稳定可用版本|
62+
63+
#### 1.2.2 Moss开发团队
64+
65+
| 姓名 | 角色 | github地址|
66+
| -------- | -------- | -------- |
67+
| SoftwareKing | Owner | https://github.com/SoftwareKing|
68+
| iShawnWang | 前端开发 |https://github.com/iShawnWang |
2769

2870
### 1.3 Moss的功能
2971

30-
Moss的功能包括服务画像,服务实例画像,服务上下线事件记录,服务上下线websocket消息通知,针对生产应用可配置多种服务上线通知工具,支持多种注册中心,比如Eureka,Consul,Nacos.支持动态连接注册中心进去切换进行服务治理操作。
72+
* Moss的功能包括服务画像,服务实例画像,服务上下线事件记录,服务上下线websocket消息通知,针对生产应用可配置多种服务上线通知工具,支持多种注册中心,比如Eureka,Consul,Nacos.支持动态连接注册中心进去切换进行服务治理操作。
73+
3174

3275
#### 1.3.1 服务画像
3376

@@ -119,16 +162,14 @@ Moss通过注册中心接管Spring Cloud体系的微服务。然后获取每个
119162
![元数据管理](https://raw.githubusercontent.com/SoftwareKing/cdn/master/images/me20190410200459.png)
120163

121164

122-
123-
124165
#### 1.3.9 Spring Cloud组件使用情况
125166

126167

127168
## 2.Moss的架构设计
128169

129170
### 2.1 Moss的架构设计
130171

131-
Moss基于Spring Boot Admin 2.1.2版中的spring-boot-admin-server模块二次开发,基于可扩展思想。前端采用Ant Design Pro,采用Spring Boot+shiro+JWT+LDAP实现整个权限认证管理。通过Moss-Cloud-Adapter模块支持多注册中心,应用启动对应用名进行check是否规范。
172+
Moss基于Spring Boot Admin 2.1.3版中的spring-boot-admin-server模块二次开发,基于可扩展思想。前端采用Ant Design Pro,采用Spring Boot+shiro+JWT+LDAP实现整个权限认证管理。通过Moss-Cloud-Adapter模块支持多注册中心,应用启动对应用名进行check是否规范。
132173

133174
>实现细节后续补充
134175
@@ -183,6 +224,43 @@ info.version: @project.version@
183224
</plugin>
184225
```
185226

227+
#### 2.3.2 导入IDE运行
228+
229+
1.创建数据库moss,执行sql文件:/Moss/doc/sql/moss-init.sql
230+
231+
2. 修改Moss/moss-web/src/main/resources/application.yml文件,数据库链接如下所示:
232+
233+
```yml
234+
spring:
235+
application:
236+
name: halo-moss
237+
datasource:
238+
url: jdbc:mysql://ip:端口/moss?useUnicode=true&characterEncoding=utf8
239+
## 生产用户名和密码
240+
username: 用户名
241+
password: 密码
242+
driver-class-name: com.mysql.jdbc.Driver
243+
type: com.alibaba.druid.pool.DruidDataSource
244+
filters: stat
245+
maxActive: 20
246+
initialSize: 1
247+
maxWait: 60000
248+
minIdle: 1
249+
timeBetweenEvictionRunsMillis: 60000
250+
minEvictableIdleTimeMillis: 300000
251+
validationQuery: select 'x'
252+
testWhileIdle: true
253+
testOnBorrow: false
254+
testOnReturn: false
255+
poolPreparedStatements: true
256+
maxOpenPreparedStatements: 20
257+
```
258+
259+
3.运行主程序org.xujin.moss.MossApplication.java
260+
261+
4.启动之后访问http://localhost:8080/,用户名:xujin和密码:123456
262+
263+
186264
## 3.Moss的实现细节
187265
188266
关于Moss的实现细节,后续文章进行揭秘!敬请期待。
@@ -200,3 +278,37 @@ info.version: @project.version@
200278
201279
-Xloggc:/opt/logs/gc.log -verbose.gc
202280
281+
### 4.1 切换支持单Nacos
282+
283+
将moss-service/pom.xml中的依赖修改如下
284+
285+
```xml
286+
<dependency>
287+
<groupId>org.xujin.moss</groupId>
288+
<artifactId>moss-adapter-multi-eureka</artifactId>
289+
<version>1.0.0.RELEASE</version>
290+
</dependency>
291+
```
292+
修改为
293+
```xml
294+
<dependency>
295+
<groupId>org.xujin.moss</groupId>
296+
<artifactId>moss-adapter-single-nacos</artifactId>
297+
<version>1.0.0.RELEASE</version>
298+
</dependency>
299+
```
300+
301+
yml文件配置如下
302+
```yml
303+
spring:
304+
application:
305+
name: halo-moss
306+
cloud:
307+
nacos:
308+
discovery:
309+
server-addr: 127.0.0.1:8848
310+
```
311+
312+
## 5.致谢
313+
314+
Moss中的moss-adapter-cloud和moss-core模块部分代码参考了 [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin),感谢 Codecentric 开源了该框架。

doc/images/Moss-Logo.png

18.5 KB
Loading

0 commit comments

Comments
 (0)