From c3584a31b1bff577a1b3fd24822d2c9a05e37e38 Mon Sep 17 00:00:00 2001
From: zlt2000 <zltdiablo@163.com>
Date: Sat, 11 Jul 2020 18:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-cloud=E5=88=B0H?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 8 ++++----
 .../com/central/admin/service/impl/IndexServiceImpl.java  | 2 +-
 .../central/sentinel/config/SentinelAutoConfigure.java    | 6 +++---
 .../gateway/error/JsonErrorWebExceptionHandler.java       | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae8f139..9ea978e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,9 +13,9 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>8</java.version>
-        <spring-cloud-alibaba-dependencies.version>2.1.2.RELEASE</spring-cloud-alibaba-dependencies.version>
-        <spring-boot-dependencies.version>2.1.14.RELEASE</spring-boot-dependencies.version>
-        <spring-cloud-dependencies.version>Greenwich.SR6</spring-cloud-dependencies.version>
+        <spring-cloud-alibaba-dependencies.version>2.2.1.RELEASE</spring-cloud-alibaba-dependencies.version>
+        <spring-boot-dependencies.version>2.2.8.RELEASE</spring-boot-dependencies.version>
+        <spring-cloud-dependencies.version>Hoxton.SR6</spring-cloud-dependencies.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <fastjson.version>1.2.70</fastjson.version>
         <swagger.version>2.9.2</swagger.version>
@@ -36,7 +36,7 @@
         <qiniu-java-sdk>7.2.28</qiniu-java-sdk>
         <easypoi.version>4.1.3</easypoi.version>
         <poi.version>4.1.1</poi.version>
-        <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
+        <spring-boot-admin.version>2.2.3</spring-boot-admin.version>
         <velocity.version>1.7</velocity.version>
         <commons-configuration2.version>2.7</commons-configuration2.version>
         <txlcn.version>5.0.2.RELEASE</txlcn.version>
diff --git a/zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java b/zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java
index 9c15eab..3639c7a 100644
--- a/zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java
+++ b/zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java
@@ -81,7 +81,7 @@ public class IndexServiceImpl implements IIndexService {
         List<Map<String, String>> listOfIndicesFromEs = null;
         if (response != null) {
             String rawBody = EntityUtils.toString(response.getEntity());
-            TypeReference<List<HashMap<String, String>>> typeRef = new TypeReference<List<HashMap<String, String>>>() {};
+            TypeReference<List<Map<String, String>>> typeRef = new TypeReference<List<Map<String, String>>>() {};
             listOfIndicesFromEs = mapper.readValue(rawBody, typeRef);
         }
         return PageResult.<Map<String, String>>builder().data(listOfIndicesFromEs).code(0).build();
diff --git a/zlt-commons/zlt-sentinel-spring-boot-starter/src/main/java/com/central/sentinel/config/SentinelAutoConfigure.java b/zlt-commons/zlt-sentinel-spring-boot-starter/src/main/java/com/central/sentinel/config/SentinelAutoConfigure.java
index bb56cc9..864d853 100644
--- a/zlt-commons/zlt-sentinel-spring-boot-starter/src/main/java/com/central/sentinel/config/SentinelAutoConfigure.java
+++ b/zlt-commons/zlt-sentinel-spring-boot-starter/src/main/java/com/central/sentinel/config/SentinelAutoConfigure.java
@@ -31,7 +31,7 @@ public class SentinelAutoConfigure {
     @ConditionalOnClass(HttpServletRequest.class)
     public static class WebmvcHandler {
         @Bean
-        public BlockExceptionHandler blockExceptionHandler() {
+        public BlockExceptionHandler webmvcBlockExceptionHandler() {
             return (request, response, e) -> {
                 response.setStatus(429);
                 Result result = Result.failed(e.getMessage());
@@ -48,11 +48,11 @@ public class SentinelAutoConfigure {
     @ConditionalOnClass(ServerResponse.class)
     public static class WebfluxHandler {
         @Bean
-        public BlockRequestHandler blockRequestHandler() {
+        public BlockRequestHandler webfluxBlockExceptionHandler() {
             return (exchange, t) ->
                     ServerResponse.status(HttpStatus.TOO_MANY_REQUESTS)
                             .contentType(MediaType.APPLICATION_JSON)
-                            .body(BodyInserters.fromObject(Result.failed(t.getMessage())));
+                            .body(BodyInserters.fromValue(Result.failed(t.getMessage())));
         }
     }
 }
diff --git a/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java b/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java
index 12d5e5d..cd59903 100644
--- a/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java
+++ b/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java
@@ -49,8 +49,8 @@ public class JsonErrorWebExceptionHandler extends DefaultErrorWebExceptionHandle
      * @param errorAttributes
      */
     @Override
-    protected HttpStatus getHttpStatus(Map<String, Object> errorAttributes) {
-        return HttpStatus.INTERNAL_SERVER_ERROR;
+    protected int getHttpStatus(Map<String, Object> errorAttributes) {
+        return HttpStatus.INTERNAL_SERVER_ERROR.value();
     }
 
     /**
-- 
GitLab