Merge branch 'master' into registry-nacos

changelog.md

@@ -1,5 +1,9 @@
 # changelog
 
+## 1.12.3
+
+- 修复删除zk节点导致的BUG
+
 ## 1.12.2
 
 - 沙盒支持文件上传

sop-admin/sop-admin-server/pom.xml

@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-registry-api</artifactId>
-			<version>1.12.2-SNAPSHOT</version>
+			<version>1.12.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- easyopen starter -->

sop-common/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.gitee.sop</groupId>
 	<artifactId>sop-common</artifactId>
-	<version>1.12.2-SNAPSHOT</version>
+	<version>1.12.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>

sop-common/sop-gateway-common/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>1.12.2-SNAPSHOT</version>
+        <version>1.12.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-gateway-common</artifactId>
-    <version>1.12.2-SNAPSHOT</version>
+    <version>1.12.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-gateway-common</name>

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/zuul/route/ZuulRouteRepository.java

@@ -47,6 +47,7 @@ public class ZuulRouteRepository implements RouteRepository<ZuulTargetRoute> {
     public void deleteAll(String serviceId) {
         Collection<ZuulTargetRoute> values = nameVersionTargetRouteMap.values();
         List<String> idList = values.stream()
+                .filter(zuulTargetRoute -> zuulTargetRoute.getServiceRouteInfo().getServiceId().equalsIgnoreCase(serviceId))
                 .map(zuulTargetRoute -> zuulTargetRoute.getRouteDefinition().getId())
                 .collect(Collectors.toList());
 

sop-common/sop-registry-api/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gitee.sop</groupId>
     <artifactId>sop-registry-api</artifactId>
-    <version>1.12.2-SNAPSHOT</version>
+    <version>1.12.3-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

sop-common/sop-service-common/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.gitee.sop</groupId>
         <artifactId>sop-common</artifactId>
-        <version>1.12.2-SNAPSHOT</version>
+        <version>1.12.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sop-service-common</artifactId>
-    <version>1.12.2-SNAPSHOT</version>
+    <version>1.12.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sop-service-common</name>

sop-example/sop-auth/pom.xml

@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>1.12.2-SNAPSHOT</version>
+			<version>1.12.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

sop-example/sop-book/sop-book-web/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>1.12.2-SNAPSHOT</version>
+            <version>1.12.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>

sop-example/sop-easyopen/pom.xml

@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>com.gitee.sop</groupId>
 			<artifactId>sop-service-common</artifactId>
-			<version>1.12.2-SNAPSHOT</version>
+			<version>1.12.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

sop-example/sop-springmvc/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>1.12.2-SNAPSHOT</version>
+            <version>1.12.3-SNAPSHOT</version>
         </dependency>
         <!-- eureka 服务发现 -->
         <dependency>

sop-example/sop-story/sop-story-web/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-service-common</artifactId>
-            <version>1.12.2-SNAPSHOT</version>
+            <version>1.12.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.sop</groupId>

sop-gateway/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-gateway-common</artifactId>
-            <version>1.12.2-SNAPSHOT</version>
+            <version>1.12.3-SNAPSHOT</version>
         </dependency>
 
         <!-- ↓↓↓ 使用spring cloud zuul ↓↓↓ -->

sop-website/website-server/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.gitee.sop</groupId>
             <artifactId>sop-registry-api</artifactId>
-            <version>1.12.2-SNAPSHOT</version>
+            <version>1.12.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>