fix

apache · Jul 3, 2024 · 972ee5a · 972ee5a
1 parent 94b28d4
commit 972ee5a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/PluginNsRelMapper.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/PluginNsRelMapper.java
@@ -63,14 +63,23 @@ public interface PluginNsRelMapper extends ExistProvider {
     List<PluginNamespaceVO> selectByQuery(PluginNamespaceQuery pluginNamespaceQuery);
 
     /**
-     * select plugin by pluginId.
+     * select plugin by pluginNamespaceId.
      *
      * @param id    primary key.
      * @param namespaceId namespace id.
      * @return {@linkplain PluginVO}
      */
     PluginNamespaceVO selectById(String id, String namespaceId);
 
+    /**
+     * select plugin by pluginId.
+     *
+     * @param pluginId    primary key.
+     * @param namespaceId namespace id.
+     * @return {@linkplain PluginVO}
+     */
+    PluginNamespaceVO selectByPluginId(String pluginId, String namespaceId);
+
     /**
      * search by condition.
      *

diff --git a/...-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginNamespaceServiceImpl.java b/...-admin/src/main/java/org/apache/shenyu/admin/service/impl/PluginNamespaceServiceImpl.java
@@ -75,7 +75,7 @@ public String update(final PluginNamespaceDTO pluginNamespaceDTO) {
                 pluginNamespaceDTO.getNamespaceId());
         PluginNsRelDO pluginNsRelDO = PluginNsRelDO.buildPluginNsRelDO(pluginNamespaceDTO);
         if (pluginNsRelMapper.updateSelective(pluginNsRelDO) > 0) {
-            final PluginNamespaceVO now = pluginNsRelMapper.selectById(pluginNamespaceDTO.getPluginId(), pluginNamespaceDTO.getNamespaceId());
+            final PluginNamespaceVO now = pluginNsRelMapper.selectByPluginId(pluginNamespaceDTO.getPluginId(), pluginNamespaceDTO.getNamespaceId());
             // publish update event.
             pluginNamespaceEventPublisher.onUpdated(now, before);
         }

diff --git a/shenyu-admin/src/main/resources/mappers/plugin-ns-rel-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/plugin-ns-rel-sqlmap.xml
@@ -134,6 +134,30 @@
         LEFT JOIN plugin p ON pnr.plugin_id = p.id
     </select>
 
+    <select id="selectByPluginId" parameterType="java.lang.String"
+            resultType="org.apache.shenyu.admin.model.vo.PluginNamespaceVO">
+        SELECT
+        pnr.namespace_id AS namespaceId,
+        pnr.plugin_id AS pluginId,
+        pnr.config AS config,
+        pnr.sort AS sort,
+        pnr.enabled AS enabled,
+        pnr.date_created AS dateCreated,
+        pnr.date_updated AS dateUpdated,
+        p.role AS role,
+        p.NAME AS NAME,
+        p.plugin_jar AS pluginJar
+        FROM
+        ( SELECT
+        <include refid="Base_Column_List"/>
+        FROM plugin_ns_rel
+        WHERE plugin_id = #{pluginId, jdbcType=VARCHAR}
+        and namespace_id =  #{namespaceId, jdbcType=VARCHAR}
+        )
+        pnr
+        LEFT JOIN plugin p ON pnr.plugin_id = p.id
+    </select>
+
     <select id="searchByCondition" resultType="org.apache.shenyu.admin.model.vo.PluginNamespaceVO">
         SELECT
         pnr.namespace_id AS namespaceId,