This is an automated email from the ASF dual-hosted git repository.
zhangzicheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 576666968 [type:refactor] remove hutool (#4773)
576666968 is described below
commit 576666968d4973ee6c645b136764ec2e08e9d031
Author: moremind <[email protected]>
AuthorDate: Wed Jun 28 10:00:57 2023 +0800
[type:refactor] remove hutool (#4773)
---
pom.xml | 3 +--
shenyu-examples/pom.xml | 1 -
.../shenyu-example-spring-annotation-websocket/pom.xml | 5 -----
.../shenyu-example-spring-native-websocket/pom.xml | 5 -----
.../examples/websocket/interceptor/WebSocketInterceptor.java | 11 ++++++-----
shenyu-protocol/shenyu-protocol-tcp/pom.xml | 4 ----
6 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 39b0c7f15..5667eb5e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,6 @@
<springfox.version>2.6.1</springfox.version>
<mybatis.starter.version>2.2.2</mybatis.starter.version>
<mysql.version>8.0.29</mysql.version>
- <druid.version>1.2.11</druid.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<guava.version>31.1-jre</guava.version>
<commons-collections4.version>4.4</commons-collections4.version>
@@ -116,7 +115,7 @@
<shiro.version>1.8.0</shiro.version>
<jwt.version>3.12.0</jwt.version>
<motan.version>1.2.0</motan.version>
- <spring-boot.version>2.6.8</spring-boot.version>
+ <spring-boot.version>2.6.9</spring-boot.version>
<aspectjweaver.version>1.9.6</aspectjweaver.version>
<h2.version>1.4.200</h2.version>
<jetcd-core.version>0.7.3</jetcd-core.version>
diff --git a/shenyu-examples/pom.xml b/shenyu-examples/pom.xml
index cb94c5fa8..d6969131b 100644
--- a/shenyu-examples/pom.xml
+++ b/shenyu-examples/pom.xml
@@ -38,7 +38,6 @@
<versions-maven-plugin.version>2.5</versions-maven-plugin.version>
<docker-maven-plugin.version>0.40.1</docker-maven-plugin.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
- <hutool.version>5.8.16</hutool.version>
</properties>
<modules>
diff --git
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-annotation-websocket/pom.xml
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-annotation-websocket/pom.xml
index de4cab3c3..6ebbf0f47 100644
---
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-annotation-websocket/pom.xml
+++
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-annotation-websocket/pom.xml
@@ -58,11 +58,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- <version>${hutool.version}</version>
- </dependency>
</dependencies>
<build>
diff --git
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/pom.xml
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/pom.xml
index 9c88d77c6..54942c617 100644
---
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/pom.xml
+++
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/pom.xml
@@ -69,11 +69,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- <version>${hutool.version}</version>
- </dependency>
</dependencies>
<build>
diff --git
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/interceptor/WebSocketInterceptor.java
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/interceptor/WebSocketInterceptor.java
index a16a77e3b..764464bdf 100644
---
a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/interceptor/WebSocketInterceptor.java
+++
b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/src/main/java/org/apache/shenyu/examples/websocket/interceptor/WebSocketInterceptor.java
@@ -17,8 +17,7 @@
package org.apache.shenyu.examples.websocket.interceptor;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.server.ServerHttpRequest;
@@ -26,8 +25,9 @@ import org.springframework.http.server.ServerHttpResponse;
import org.springframework.stereotype.Component;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.server.HandshakeInterceptor;
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
-import java.nio.charset.Charset;
import java.util.Map;
/**
@@ -53,9 +53,10 @@ public class WebSocketInterceptor implements
HandshakeInterceptor {
final WebSocketHandler wsHandler,
final Map<String, Object> attributes)
throws Exception {
LOG.info("Shake hands.");
- Map<String, String> paramMap =
HttpUtil.decodeParamMap(request.getURI().getQuery(), Charset.defaultCharset());
+ UriComponents uriComponents =
UriComponentsBuilder.fromHttpUrl(request.getURI().toString()).build();
+ Map<String, String> paramMap =
uriComponents.getQueryParams().toSingleValueMap();
String uid = paramMap.get("token");
- if (StrUtil.isNotBlank(uid)) {
+ if (StringUtils.isNotBlank(uid)) {
attributes.put("token", uid);
LOG.info("user token " + uid + " shook hands successfully！");
return true;
diff --git a/shenyu-protocol/shenyu-protocol-tcp/pom.xml
b/shenyu-protocol/shenyu-protocol-tcp/pom.xml
index 497fcb0ee..3f27f0e7f 100644
--- a/shenyu-protocol/shenyu-protocol-tcp/pom.xml
+++ b/shenyu-protocol/shenyu-protocol-tcp/pom.xml
@@ -33,10 +33,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
