Greenwich.SR1 初步完成。

eacdy · Mar 13, 2019 · 187df40 · 187df40
1 parent 62b07da
commit 187df40
Show file tree

Hide file tree

Showing 41 changed files with 404 additions and 1,404 deletions.
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -47,5 +47,9 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/commons/src/main/java/com/itmuch/yes/core/exception/MyErrorController.java b/commons/src/main/java/com/itmuch/yes/core/exception/MyErrorController.java
@@ -3,10 +3,10 @@
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.BasicErrorController;
-import org.springframework.boot.autoconfigure.web.DefaultErrorAttributes;
-import org.springframework.boot.autoconfigure.web.ErrorAttributes;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController;
+import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
+import org.springframework.boot.web.servlet.error.ErrorAttributes;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

diff --git a/config-server/pom.xml b/config-server/pom.xml
diff --git a/config-server/src/main/docker/Dockerfile b/config-server/src/main/docker/Dockerfile
diff --git a/config-server/src/main/docker/wait-for-it.sh b/config-server/src/main/docker/wait-for-it.sh
diff --git a/config-server/src/main/java/com/itmuch/yes/ConfigServerApplication.java b/config-server/src/main/java/com/itmuch/yes/ConfigServerApplication.java
diff --git a/config-server/src/main/resources/application.yml b/config-server/src/main/resources/application.yml
diff --git a/config-server/src/main/resources/bootstrap.yml b/config-server/src/main/resources/bootstrap.yml
diff --git a/doc/4.组件搭建管理指南.md b/doc/4.组件搭建管理指南.md
@@ -10,13 +10,6 @@
 
 
 
-
-## Elasticsearch安装说明
-
-// TODO
-
-
-
 ## Keycloak搭建及整合指南
 
 [Keycloak搭建手把手操作指南](keycloak-learn/Keycloak搭建手把手操作指南.md)
@@ -37,5 +30,5 @@
 
 * [6-整合PMD](sonar/6-整合PMD.md)
 
-  
+
 
diff --git a/doc/kafka/single.md b/doc/kafka/single.md
@@ -18,4 +18,5 @@
   bin/kafka-server-start.sh config/server.properties &
   ```
 
-  
+
+