diff --git a/changelog.md b/changelog.md index 0192b4ff..5a79ef9a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # changelog +## 4.2.3 + +- 修复nacos的group不生效问题 + ## 4.2.2 - 优化版本号 diff --git a/doc/docs/files/90001_网关性能测试.md b/doc/docs/files/90001_网关性能测试.md index cc2df6b9..f5e277d0 100644 --- a/doc/docs/files/90001_网关性能测试.md +++ b/doc/docs/files/90001_网关性能测试.md @@ -133,8 +133,8 @@ Transfer/sec: 226.50KB `restart.sh` ```bash -echo "Stopping sop-gateway-4.2.2-SNAPSHOT.jar" -pid=`ps -ef | grep sop-gateway-4.2.2-SNAPSHOT.jar | grep -v grep | awk '{print $2}'` +echo "Stopping sop-gateway-4.2.3-SNAPSHOT.jar" +pid=`ps -ef | grep sop-gateway-4.2.3-SNAPSHOT.jar | grep -v grep | awk '{print $2}'` if [ -n "$pid" ] then echo "kill -9 的id:" $pid @@ -142,7 +142,7 @@ then fi nohup java -jar -verbose:gc -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:gc.log \ -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=128m -Xms1024m -Xmx1024m -Xmn256m -Xss256k -XX:SurvivorRatio=8\ - -XX:+UseConcMarkSweepGC sop-gateway-4.2.2-SNAPSHOT.jar\ + -XX:+UseConcMarkSweepGC sop-gateway-4.2.3-SNAPSHOT.jar\ --spring.profiles.active=dev --server.port=8081 & tail -f nohup.out diff --git a/doc/pom.xml b/doc/pom.xml index 9b44b804..5744b0ef 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.gitee.sop doc - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index e8546b11..02f9de41 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 4.0.0 com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT pom 一个开放平台解决方案项目,基于Spring Cloud实现,目标是能够让用户快速得搭建起自己的开放平台 diff --git a/sop-admin/pom.xml b/sop-admin/pom.xml index 9d2696ae..adf20042 100644 --- a/sop-admin/pom.xml +++ b/sop-admin/pom.xml @@ -6,13 +6,13 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml 4.0.0 sop-admin - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT pom diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml index 3a1cbf8c..a2a8634d 100644 --- a/sop-admin/sop-admin-server/pom.xml +++ b/sop-admin/sop-admin-server/pom.xml @@ -5,13 +5,13 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../../pom.xml 4.0.0 sop-admin-server - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT jar diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/RegistryServiceNacosImpl.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/RegistryServiceNacosImpl.java index 0e9ace78..21a2afd4 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/RegistryServiceNacosImpl.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/service/impl/RegistryServiceNacosImpl.java @@ -56,7 +56,7 @@ public class RegistryServiceNacosImpl implements RegistryService { @Override public List listAllService(int pageNo, int pageSize) throws Exception { - ListView servicesOfServer = namingService.getServicesOfServer(pageNo, pageSize); + ListView servicesOfServer = namingService.getServicesOfServer(pageNo, pageSize, nacosGroup); List serverList = servicesOfServer.getData(); List serviceInfoList = new ArrayList<>(); for (String serviceName : serverList) { diff --git a/sop-auth/pom.xml b/sop-auth/pom.xml index 0f431e05..4e0d1b58 100644 --- a/sop-auth/pom.xml +++ b/sop-auth/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml @@ -25,7 +25,7 @@ com.gitee.sop sop-service-common - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT @@ -38,7 +38,7 @@ com.gitee.sop sdk-java - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT diff --git a/sop-common/pom.xml b/sop-common/pom.xml index 425b1b8a..96777b99 100644 --- a/sop-common/pom.xml +++ b/sop-common/pom.xml @@ -6,7 +6,7 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml diff --git a/sop-common/sop-bridge-eureka/pom.xml b/sop-common/sop-bridge-eureka/pom.xml index 812d8e60..fa726388 100644 --- a/sop-common/sop-bridge-eureka/pom.xml +++ b/sop-common/sop-bridge-eureka/pom.xml @@ -5,12 +5,12 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../../pom.xml 4.0.0 - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT sop-bridge-eureka @@ -18,7 +18,7 @@ com.gitee.sop sop-gateway-common - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT diff --git a/sop-common/sop-bridge-nacos/pom.xml b/sop-common/sop-bridge-nacos/pom.xml index d7eb1563..78ec9563 100644 --- a/sop-common/sop-bridge-nacos/pom.xml +++ b/sop-common/sop-bridge-nacos/pom.xml @@ -5,12 +5,12 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../../pom.xml 4.0.0 - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT sop-bridge-nacos @@ -18,7 +18,7 @@ com.gitee.sop sop-gateway-common - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT diff --git a/sop-common/sop-bridge-nacos/src/main/java/com/gitee/sop/bridge/route/NacosRegistryListener.java b/sop-common/sop-bridge-nacos/src/main/java/com/gitee/sop/bridge/route/NacosRegistryListener.java index 84f6e4fb..7dc641d4 100644 --- a/sop-common/sop-bridge-nacos/src/main/java/com/gitee/sop/bridge/route/NacosRegistryListener.java +++ b/sop-common/sop-bridge-nacos/src/main/java/com/gitee/sop/bridge/route/NacosRegistryListener.java @@ -85,7 +85,7 @@ public class NacosRegistryListener extends BaseRegistryListener { NamingService namingService = nacosDiscoveryProperties.namingServiceInstance(); ListView servicesOfServer = null; try { - servicesOfServer = namingService.getServicesOfServer(1, Integer.MAX_VALUE); + servicesOfServer = namingService.getServicesOfServer(1, Integer.MAX_VALUE, nacosGroup); } catch (NacosException e) { log.error("namingService.getServicesOfServer()错误", e); } diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml index 0ffb58f8..701c3db2 100644 --- a/sop-common/sop-gateway-common/pom.xml +++ b/sop-common/sop-gateway-common/pom.xml @@ -5,13 +5,13 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../../pom.xml 4.0.0 sop-gateway-common - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT jar diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index ab91d3c9..af8174dd 100644 --- a/sop-common/sop-service-common/pom.xml +++ b/sop-common/sop-service-common/pom.xml @@ -6,13 +6,13 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../../pom.xml 4.0.0 sop-service-common - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT jar diff --git a/sop-example/pom.xml b/sop-example/pom.xml index 94435567..9c335d63 100644 --- a/sop-example/pom.xml +++ b/sop-example/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml index cd0d9e72..132d8e8e 100644 --- a/sop-example/sop-springmvc/pom.xml +++ b/sop-example/sop-springmvc/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../../pom.xml @@ -26,7 +26,7 @@ com.gitee.sop sop-service-common - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT diff --git a/sop-example/sop-story/pom.xml b/sop-example/sop-story/pom.xml index 24abd9bd..c272066c 100644 --- a/sop-example/sop-story/pom.xml +++ b/sop-example/sop-story/pom.xml @@ -4,7 +4,7 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../../pom.xml @@ -19,7 +19,7 @@ com.gitee.sop sop-service-common - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index b9f43dee..e37a9adc 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -4,7 +4,7 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml @@ -24,7 +24,7 @@ com.gitee.sop sop-bridge-nacos - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT diff --git a/sop-sdk/pom.xml b/sop-sdk/pom.xml index 10242e19..b6ca62fd 100644 --- a/sop-sdk/pom.xml +++ b/sop-sdk/pom.xml @@ -6,13 +6,13 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml 4.0.0 sop-sdk - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT pom diff --git a/sop-sdk/sdk-java/pom.xml b/sop-sdk/sdk-java/pom.xml index 37700197..bec9d5ab 100644 --- a/sop-sdk/sdk-java/pom.xml +++ b/sop-sdk/sdk-java/pom.xml @@ -4,13 +4,13 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../../pom.xml 4.0.0 sdk-java - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT diff --git a/sop-test/pom.xml b/sop-test/pom.xml index c8fb1282..81068ca5 100644 --- a/sop-test/pom.xml +++ b/sop-test/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml diff --git a/sop-website/pom.xml b/sop-website/pom.xml index bb6b2dfe..d4d5e210 100644 --- a/sop-website/pom.xml +++ b/sop-website/pom.xml @@ -6,13 +6,13 @@ com.gitee.sop sop-parent - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml 4.0.0 sop-website - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT pom diff --git a/sop-website/sop-website-server/pom.xml b/sop-website/sop-website-server/pom.xml index d428eb67..b25ee9dc 100644 --- a/sop-website/sop-website-server/pom.xml +++ b/sop-website/sop-website-server/pom.xml @@ -5,7 +5,7 @@ com.gitee.sop sop-website - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT ../pom.xml @@ -25,7 +25,7 @@ com.gitee.sop sop-bridge-nacos - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT