Merge pull request #193 from shiyindaxiaojie/feature

fixed curator version
shiyindaxiaojie · Sep 6, 2023 · d5e86cd · d5e86cd
2 parents 679fa93 + 75287bd
commit d5e86cd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/eden-components/eden-dependencies/pom.xml b/eden-components/eden-dependencies/pom.xml
@@ -156,7 +156,7 @@
 		<dubbo.version>3.2.1</dubbo.version>
 		<protobuf.version>4.0.0-rc-2</protobuf.version>
 		<zookeeper.version>3.7.0</zookeeper.version>
-		<curator.version>5.1.0</curator.version>
+		<curator.version>4.3.0</curator.version>
 		<zkclient.version>0.1</zkclient.version>
 		<xxl-job.version>2.4.0</xxl-job.version>
 		<grpc.version>1.57.2</grpc.version>

diff --git a/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/pom.xml b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/pom.xml
@@ -99,6 +99,10 @@
 					<groupId>org.apache.dubbo</groupId>
 					<artifactId>dubbo-common</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>simpleclient_common</artifactId>
+					<groupId>io.prometheus</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 

diff --git a/...ud/src/main/java/org/ylzl/eden/spring/cloud/sentinel/web/CustomBlockExceptionHandler.java b/...ud/src/main/java/org/ylzl/eden/spring/cloud/sentinel/web/CustomBlockExceptionHandler.java
@@ -18,8 +18,8 @@
 
 import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler;
 import com.alibaba.csp.sentinel.slots.block.BlockException;
-import org.springframework.http.MediaType;
-import org.ylzl.eden.spring.framework.json.support.JSONHelper;
+import lombok.extern.slf4j.Slf4j;
+import org.ylzl.eden.spring.framework.web.util.ServletUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -30,12 +30,14 @@
  * @author <a href="mailto:[email protected]">gyl</a>
  * @since 2.4.13
  */
+@Slf4j
 public class CustomBlockExceptionHandler implements BlockExceptionHandler {
 
 	@Override
 	public void handle(HttpServletRequest request, HttpServletResponse response, BlockException e) throws Exception {
-		Object body = BlockResponseBuilder.buildResponse(e);
-		response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
-		response.getWriter().write(JSONHelper.json().toJSONString(body));
+		String body = BlockResponseBuilder.buildResponse(e).toString();
+		log.debug("Trigger sentinel block response: {}", body);
+		response.setContentType(ServletUtils.APPLICATION_JSON_UTF8_VALUE);
+		response.getWriter().write(body);
 	}
 }