[type:bugfix] fix sync all error

apache · Nov 9, 2024 · 57da344 · 57da344
1 parent ab87238
commit 57da344
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...yu-admin/src/main/java/org/apache/shenyu/admin/listener/websocket/WebsocketCollector.java b/...yu-admin/src/main/java/org/apache/shenyu/admin/listener/websocket/WebsocketCollector.java
@@ -162,7 +162,8 @@ public void onMessage(final String message, final Session session) {
         if (Objects.equals(message, DataEventTypeEnum.MYSELF.name())) {
             try {
                 ThreadLocalUtils.put(SESSION_KEY, session);
-                SpringBeanUtils.getInstance().getBean(SyncDataService.class).syncAll(DataEventTypeEnum.MYSELF);
+                String namespaceId = getNamespaceId(session);
+                SpringBeanUtils.getInstance().getBean(SyncDataService.class).syncAllByNamespaceId(DataEventTypeEnum.MYSELF, namespaceId);
             } finally {
                 ThreadLocalUtils.clear();
             }

diff --git a/shenyu-admin/src/main/resources/mappers/namespace-plugin-rel-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/namespace-plugin-rel-sqlmap.xml
@@ -265,6 +265,7 @@
         p.plugin_jar AS pluginJar
         FROM namespace_plugin_rel npr
         LEFT JOIN plugin p ON p.id = npr.plugin_id
+        WHERE npr.namespace_id = #{namespaceId, jdbcType=VARCHAR}
         ORDER BY
         sort,
         npr.id ASC

diff --git a/.../main/java/org/apache/shenyu/plugin/sync/data/websocket/client/ShenyuWebsocketClient.java b/.../main/java/org/apache/shenyu/plugin/sync/data/websocket/client/ShenyuWebsocketClient.java
@@ -117,7 +117,7 @@ public ShenyuWebsocketClient(final URI serverUri, final Map<String, String> head
                                  final String namespaceId) {
         super(serverUri, headers);
         this.namespaceId = namespaceId;
-        LOG.info("shenyu bootstrap websocket namespaceId:{}", namespaceId);
+        LOG.info("shenyu bootstrap websocket namespaceId: {}", namespaceId);
         this.addHeader(Constants.SHENYU_NAMESPACE_ID, namespaceId);
         this.websocketDataHandler = new WebsocketDataHandler(pluginDataSubscriber, metaDataSubscribers, authDataSubscribers, proxySelectorDataSubscribers, discoveryUpstreamDataSubscribers);
         this.timer = WheelTimerFactory.getSharedTimer();