You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2022/12/19 07:33:17 UTC

[shenyu] branch master updated: update rule-sqlmap.xml selector-sqlmap.xml (#4265)

This is an automated email from the ASF dual-hosted git repository.

xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new 0f385d86b update rule-sqlmap.xml selector-sqlmap.xml (#4265)
0f385d86b is described below

commit 0f385d86b4dc369f93c8568f66dd543d0b3cfc7a
Author: 杨阳洋 <ke...@163.com>
AuthorDate: Mon Dec 19 15:33:07 2022 +0800

    update rule-sqlmap.xml selector-sqlmap.xml (#4265)
    
    插件列表里的选择器和规则新增执行顺序列,便于根据权重了解执行顺序,同时后端sql追加排序,按执行顺序从小到大排序后返回前端
    
    Co-authored-by: 柯杨 <22...@qq.com>
    Co-authored-by: likeguo <33...@users.noreply.github.com>
    Co-authored-by: xiaoyu <xi...@apache.org>
---
 shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml     | 1 +
 shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
index 35d209fc0..e53fee421 100644
--- a/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
@@ -86,6 +86,7 @@
                 </foreach>
             </if>
         </where>
+        ORDER BY sort
     </select>
 
     <select id="findBySelectorId" parameterType="java.lang.String" resultMap="BaseResultMap">
diff --git a/shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml
index 33cc9224d..039a434a4 100644
--- a/shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/selector-sqlmap.xml
@@ -106,6 +106,7 @@
                 </foreach>
             </if>
         </where>
+        ORDER BY sort
     </select>
 
     <select id="findByPluginId" parameterType="java.lang.String" resultMap="BaseResultMap">