[type:bugfix] fix namespace sync error

db/init/mysql/schema.sql

@@ -2452,5 +2452,3 @@ CREATE TABLE `namespace_user_rel` (
                                       `date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'date_created',
                                       `date_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'date_updated'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='namespace user relation ';
-
-INSERT INTO `namespace_user_rel` (`id`, `namespace_id`, `user_id`) VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

db/init/ob/schema.sql

@@ -2393,4 +2393,3 @@ CREATE TABLE `namespace_user_rel` (
                                       `date_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'date_updated'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='namespace user relation ';
 
-INSERT INTO `namespace_user_rel` (`id`, `namespace_id`, `user_id`) VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

db/init/og/create-table.sql

@@ -2790,4 +2790,3 @@ COMMENT ON COLUMN "public"."namespace_user_rel"."user_id" IS 'user_id';
 COMMENT ON COLUMN "public"."namespace_user_rel"."date_created" IS 'create time';
 COMMENT ON COLUMN "public"."namespace_user_rel"."date_updated" IS 'update time';
 
-INSERT INTO "public"."namespace_user_rel" ("id", "namespace_id", "user_id") VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

db/init/oracle/schema.sql

@@ -3020,4 +3020,3 @@ comment on column NAMESPACE_USER_REL.date_created
 comment on column NAMESPACE_USER_REL.date_updated
     is 'update time';
 
-INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("namespace_user_rel" (id)) */ INTO "namespace_user_rel" (id, namespace_id, user_id) VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

db/init/pg/create-table.sql

@@ -2912,4 +2912,3 @@ COMMENT ON COLUMN "public"."namespace_user_rel"."user_id" IS 'user_id';
 COMMENT ON COLUMN "public"."namespace_user_rel"."date_created" IS 'create time';
 COMMENT ON COLUMN "public"."namespace_user_rel"."date_updated" IS 'update time';
 
-INSERT INTO "public"."namespace_user_rel" ("id", "namespace_id", "user_id") VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql

@@ -290,4 +290,3 @@ CREATE TABLE `namespace_user_rel` (
                                       `date_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'date_updated'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='namespace user relation ';
 
-INSERT INTO `namespace_user_rel` (`id`, `namespace_id`, `user_id`) VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

db/upgrade/2.6.1-upgrade-2.7.0-og.sql

@@ -332,4 +332,3 @@ COMMENT ON COLUMN "public"."namespace_user_rel"."user_id" IS 'user_id';
 COMMENT ON COLUMN "public"."namespace_user_rel"."date_created" IS 'create time';
 COMMENT ON COLUMN "public"."namespace_user_rel"."date_updated" IS 'update time';
 
-INSERT INTO "public"."namespace_user_rel" ("id", "namespace_id", "user_id") VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

db/upgrade/2.6.1-upgrade-2.7.0-oracle.sql

@@ -396,4 +396,3 @@ comment on column NAMESPACE_USER_REL.date_created
 comment on column NAMESPACE_USER_REL.date_updated
     is 'update time';
 
-INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX("namespace_user_rel" (id)) */ INTO "namespace_user_rel" (id, namespace_id, user_id) VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

db/upgrade/2.6.1-upgrade-2.7.0-pg.sql

@@ -333,4 +333,3 @@ COMMENT ON COLUMN "public"."namespace_user_rel"."user_id" IS 'user_id';
 COMMENT ON COLUMN "public"."namespace_user_rel"."date_created" IS 'create time';
 COMMENT ON COLUMN "public"."namespace_user_rel"."date_updated" IS 'update time';
 
-INSERT INTO "public"."namespace_user_rel" ("id", "namespace_id", "user_id") VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');

shenyu-admin-listener/shenyu-admin-listener-api/src/main/java/org/apache/shenyu/admin/service/SyncDataService.java

@@ -48,4 +48,13 @@ public interface SyncDataService {
      * @return the boolean
      */
     boolean syncPluginData(String id);
+
+    /**
+     * Sync plugin data boolean.
+     *
+     * @param namespaceId the namespace id
+     * @param pluginId the plugin id
+     * @return the boolean
+     */
+    boolean syncPluginData(String namespaceId, String pluginId);
 }

shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/NamespacePluginController.java

@@ -200,15 +200,15 @@ public ShenyuAdminResult syncPluginAll(@Valid @RequestBody final NamespaceSyncDT
     }
 
     /**
-     * Sync plugin data of namespace.
+     * sync plugin data.
      *
-     * @param id the id
-     * @return the mono
+     * @param pluginId    the plugin id
+     * @param namespaceId the namespace id
+     * @return {@linkplain ShenyuAdminResult}
      */
     @PutMapping("/syncPluginData")
-    public ShenyuAdminResult syncPluginData(@Existed(message = "namespace plugin is not existed", provider = NamespacePluginRelMapper.class)
-                                            @RequestParam("id") final String id) {
-        return ShenyuAdminResult.success(syncDataService.syncPluginData(id) ? ShenyuResultMessage.SYNC_SUCCESS : ShenyuResultMessage.SYNC_FAIL);
+    public ShenyuAdminResult syncPluginData(@RequestParam("id") final String pluginId, @RequestParam("namespaceId") final String namespaceId) {
+        return ShenyuAdminResult.success(syncDataService.syncPluginData(namespaceId, pluginId) ? ShenyuResultMessage.SYNC_SUCCESS : ShenyuResultMessage.SYNC_FAIL);
     }
 
     /**

shenyu-admin/src/main/java/org/apache/shenyu/admin/service/NamespacePluginService.java

@@ -42,6 +42,16 @@ public interface NamespacePluginService extends PageService<NamespacePluginQuery
      * @return {@linkplain PluginVO}
      */
     NamespacePluginVO findById(String id);
+
+
+    /**
+     * find by namespaceId and pluginId.
+     *
+     * @param namespaceId namespaceId.
+     * @param pluginId    pluginId.
+     * @return {@linkplain NamespacePluginVO}
+     */
+    NamespacePluginVO findByNamespaceIdAndPluginId(String namespaceId, String pluginId);
 
     /**
      * Update string.

shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/NamespacePluginServiceImpl.java

@@ -76,7 +76,12 @@ public NamespacePluginServiceImpl(final NamespacePluginRelMapper namespacePlugin
     public NamespacePluginVO findById(final String id) {
         return namespacePluginRelMapper.selectById(id);
     }
-
+
+    @Override
+    public NamespacePluginVO findByNamespaceIdAndPluginId(final String namespaceId, final String pluginId) {
+        return namespacePluginRelMapper.selectByPluginIdAndNamespaceId(pluginId, namespaceId);
+    }
+
     @Override
     public NamespacePluginVO create(final String namespaceId, final String pluginId) {
         NamespacePluginVO existNamespacePluginVO = namespacePluginRelMapper.selectByPluginIdAndNamespaceId(pluginId, namespaceId);

shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/NamespaceServiceImpl.java

@@ -109,6 +109,12 @@ public NamespaceVO findByNamespaceId(final String namespaceId) {
 
     @Override
     public List<NamespaceVO> list(final String name) {
+
+        if (SessionUtil.isAdmin()) {
+            List<NamespaceDO> allList = namespaceMapper.selectAll();
+            return allList.stream().map(NamespaceTransfer.INSTANCE::mapToVo).collect(Collectors.toList());
+        }
+
         List<String> namespaceIds = namespaceUserService.listNamespaceIdByUserId(SessionUtil.visitorId());
 
         if (CollectionUtils.isEmpty(namespaceIds)) {

shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SyncDataServiceImpl.java

@@ -166,4 +166,32 @@ public boolean syncPluginData(final String id) {
         }
         return true;
     }
+
+    @Override
+    public boolean syncPluginData(final String namespaceId, final String pluginId) {
+
+        NamespacePluginVO namespacePluginVO = namespacePluginService.findByNamespaceIdAndPluginId(namespaceId, pluginId);
+        if (Objects.isNull(namespacePluginVO) || Objects.isNull(namespacePluginVO.getPluginId())) {
+            LOG.error("namespace plugin is not existed");
+            return false;
+        }
+        eventPublisher.publishEvent(new DataChangedEvent(ConfigGroupEnum.PLUGIN, DataEventTypeEnum.UPDATE,
+                Collections.singletonList(PluginTransfer.INSTANCE.mapToData(namespacePluginVO))));
+
+        List<SelectorData> selectorDataList = selectorService.findByPluginIdAndNamespaceId(namespacePluginVO.getPluginId(), namespacePluginVO.getNamespaceId());
+
+        if (!CollectionUtils.isEmpty(selectorDataList)) {
+            eventPublisher.publishEvent(new DataChangedEvent(ConfigGroupEnum.SELECTOR, DataEventTypeEnum.REFRESH, selectorDataList));
+
+            List<String> selectorIdList = selectorDataList.stream().map(SelectorData::getId)
+                    .collect(Collectors.toList());
+            for (String selectorId : selectorIdList) {
+                discoveryUpstreamService.refreshBySelectorId(selectorId);
+            }
+            List<RuleData> allRuleDataList = ruleService.findBySelectorIdList(selectorIdList);
+
+            eventPublisher.publishEvent(new DataChangedEvent(ConfigGroupEnum.RULE, DataEventTypeEnum.REFRESH, allRuleDataList));
+        }
+        return true;
+    }
 }

shenyu-admin/src/main/resources/sql-script/h2/schema.sql

@@ -1422,4 +1422,3 @@ CREATE TABLE IF NOT EXISTS `namespace_user_rel`
     PRIMARY KEY (`id`)
 );
 
-INSERT INTO `namespace_user_rel` (`id`, `namespace_id`, `user_id`) VALUES ('1852580590991884288', '649330b6-c2d7-4edc-be8e-8a54df9eb385', '1');