(shenyu) branch master updated: [type:fix] fix buildDiscoveryUpstreamPath causing multiple /. (#5266)

[hefengen]

This is an automated email from the ASF dual-hosted git repository.

hefengen 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 adbf0429d6 [type:fix] fix buildDiscoveryUpstreamPath causing multiple 
/. (#5266)
adbf0429d6 is described below

commit adbf0429d6453562d90ddddb819dce631c1fc9d7
Author: yunlongn <yunlo...@outlook.com>
AuthorDate: Thu Nov 2 11:24:45 2023 +0800

    [type:fix] fix buildDiscoveryUpstreamPath causing multiple /. (#5266)
    
    * [type:fix] fix buildDiscoveryUpstreamPath causing multiple /.
    
    * Update docker-compose.yml
    
    * Update docker-compose.yml
    
    * Update docker-compose.yml
    
    * Update pom.xml
    
    ---------
    
    Co-authored-by: yunlongn <yunlong...@msyc.cc>
    Co-authored-by: moremind <hefen...@apache.org>
---
 shenyu-admin/pom.xml                                                | 6 ++++++
 .../shenyu/admin/listener/AbstractPathDataChangedListener.java      | 4 ++--
 .../shenyu-integrated-test-apache-dubbo/docker-compose.yml          | 2 +-
 .../shenyu-integrated-test-sdk-alibaba-dubbo/docker-compose.yml     | 2 +-
 .../shenyu-integrated-test-sdk-apache-dubbo/docker-compose.yml      | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml
index 0a08b975cc..2d64565c7e 100644
--- a/shenyu-admin/pom.xml
+++ b/shenyu-admin/pom.xml
@@ -318,6 +318,12 @@
         <dependency>
             <groupId>org.apache.shenyu</groupId>
             <artifactId>shenyu-discovery-eureka</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
             <version>${project.version}</version>
         </dependency>
 
diff --git 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/AbstractPathDataChangedListener.java
 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/AbstractPathDataChangedListener.java
index 2530a0f735..20af545df2 100644
--- 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/AbstractPathDataChangedListener.java
+++ 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/listener/AbstractPathDataChangedListener.java
@@ -85,7 +85,7 @@ public abstract class AbstractPathDataChangedListener 
implements DataChangedList
     @Override
     public void onProxySelectorChanged(final List<ProxySelectorData> changed, 
final DataEventTypeEnum eventType) {
         for (ProxySelectorData data : changed) {
-            String proxySelectorPath = 
DefaultPathConstants.buildProxySelectorPath(data.getPluginName(), 
data.getName());
+            String proxySelectorPath = 
DefaultPathConstants.buildProxySelectorPath(data.getPluginName(), data.getId());
             // delete
             if (eventType == DataEventTypeEnum.DELETE) {
                 deleteNode(proxySelectorPath);
@@ -101,7 +101,7 @@ public abstract class AbstractPathDataChangedListener 
implements DataChangedList
     @Override
     public void onDiscoveryUpstreamChanged(final List<DiscoverySyncData> 
changed, final DataEventTypeEnum eventType) {
         for (DiscoverySyncData data : changed) {
-            String upstreamPath = 
DefaultPathConstants.buildDiscoveryUpstreamPath(data.getPluginName(), 
data.getSelectorName());
+            String upstreamPath = 
DefaultPathConstants.buildDiscoveryUpstreamPath(data.getPluginName(), 
data.getSelectorId());
             // delete
             if (eventType == DataEventTypeEnum.DELETE) {
                 deleteNode(upstreamPath);
diff --git 
a/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/docker-compose.yml 
b/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/docker-compose.yml
index 1052d0ed06..e9a78abfd0 100644
--- 
a/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/docker-compose.yml
+++ 
b/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/docker-compose.yml
@@ -17,7 +17,7 @@ version: "3.9"
 services:
   shenyu-zk:
     container_name: shenyu-zk
-    image: zookeeper:3.5
+    image: zookeeper:latest
     restart: always
     networks:
       - shenyu
diff --git 
a/shenyu-integrated-test/shenyu-integrated-test-sdk-alibaba-dubbo/docker-compose.yml
 
b/shenyu-integrated-test/shenyu-integrated-test-sdk-alibaba-dubbo/docker-compose.yml
index a0ed410e61..c9d43db4ac 100644
--- 
a/shenyu-integrated-test/shenyu-integrated-test-sdk-alibaba-dubbo/docker-compose.yml
+++ 
b/shenyu-integrated-test/shenyu-integrated-test-sdk-alibaba-dubbo/docker-compose.yml
@@ -17,7 +17,7 @@ version: "3.9"
 services:
   shenyu-zk:
     container_name: shenyu-zk
-    image: zookeeper:3.5
+    image: zookeeper:latest
     restart: always
     networks:
       - shenyu
diff --git 
a/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/docker-compose.yml
 
b/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/docker-compose.yml
index 31445e88fc..bcb1ce255e 100644
--- 
a/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/docker-compose.yml
+++ 
b/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/docker-compose.yml
@@ -17,7 +17,7 @@ version: "3.9"
 services:
   shenyu-zk:
     container_name: shenyu-zk
-    image: zookeeper:3.5
+    image: zookeeper:latest
     restart: always
     networks:
       - shenyu