Merge pull request #18 from SpringCloud/develop

Develop

Author: SoftwareKing

README.md

@@ -25,6 +25,11 @@ Moss(莫斯),让Spring Cloud应用不再流浪！
 
  >Spring Cloud中国社区从2017年11月份，开始规划Spring Cloud Admin的开发和设计，专注于研究这个领域。Moss将会选择一个合适的时机开源，需要更多了解的可以加我微信Software_King。
  
+ Moss-钉钉答疑群:
+ 
+ ![钉钉答疑群](/doc/images/ddq.jpeg)
+ 
+       
  #### 1.2.1 竞品分析
 
  Moss的竞品分析对比如下表所示:
@@ -312,3 +317,8 @@ spring:
 ## 5.致谢
 
 Moss中的moss-adapter-cloud和moss-core模块部分代码参考了 [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin)，感谢 Codecentric 开源了该框架。
+
+## 6.Stargazers over time
+ 
+ [![Stargazers over time](https://starchart.cc/SpringCloud/Moss.svg)](https://starchart.cc/SpringCloud/Moss)
+       

doc/images/ddq.jpeg

@@ -16,7 +16,7 @@ ${AnsiColor.BLUE} ;   | |`-'      ${AnsiColor.BLACK}   \   \ .'   ${AnsiColor.RE
 ${AnsiColor.BLUE} |   ;/          ${AnsiColor.BLACK}    `---`     ${AnsiColor.RED}           ${AnsiColor.BLUE}             ${AnsiColor.BLACK}
 ${AnsiColor.BLUE} '---'           ${AnsiColor.BLACK}              ${AnsiColor.RED}           ${AnsiColor.BLUE}             ${AnsiColor.BLACK}
 
-${AnsiColor.BLACK}>>>>>>>>>>>>莫斯(Moss)，让Spring Cloud应用不再"四处流浪"！<<<<<<<<<<<<${AnsiColor.WHITE}
+${AnsiColor.BLACK}>>>>>>>>>>>>莫斯(Moss)，让Spring Cloud应用不再"四处流浪"！<<<<<<<<<<<<${AnsiColor.BLACK}
 
 
 

moss-web/src/main/resources/banner.txt

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.3.RELEASE</version>
+		<version>2.1.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -27,21 +27,21 @@
 		<build-plugin.exec.version>1.6.0</build-plugin.exec.version>
 		<build-plugin.git-commit-id.version>2.2.2</build-plugin.git-commit-id.version>
 		<!-- used dependencies versions -->
-		<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
-		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
+		<spring-boot.version>2.1.4.RELEASE</spring-boot.version>
+		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
 		<hazelcast-tests.version>3.11</hazelcast-tests.version>
 		<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
 	</properties>
 
    <modules>
-       <module>moss-client</module>
-	   <module>moss-core</module>
-	   <module>moss-web</module>
-       <module>moss-extension</module>
-       <module>moss-service</module>
-	   <module>moss-service-api</module>
-       <module>moss-common</module>
-       <module>moss-adapter</module>
+		 <module>moss-client</module>
+		 <module>moss-core</module>
+		 <module>moss-web</module>
+		 <module>moss-extension</module>
+		 <module>moss-service</module>
+		 <module>moss-service-api</module>
+		 <module>moss-common</module>
+		 <module>moss-adapter</module>
    </modules>
 
 	<dependencyManagement>
@@ -97,12 +97,6 @@
 				<version>1.0.0.RELEASE</version>
 			</dependency>
 
-			<dependency>
-				 <groupId>org.xujin.moss</groupId>
-				<artifactId>moss-business</artifactId>
-				<version>1.0.0.RELEASE</version>
-			</dependency>
-
 			<dependency>
 				 <groupId>org.xujin.moss</groupId>
 				<artifactId>moss-adapter-cloud</artifactId>