Pre Merge pull request !281 from twelvet/N/A

Signed-off-by: twelvet <2471835953@qq.com>

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java

@@ -1,7 +1,12 @@
 package com.ruoyi.common.security.feign;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Collection;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
+
+import com.ruoyi.common.core.exception.base.BaseException;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.ServletUtils;
@@ -22,6 +27,23 @@ public class FeignRequestInterceptor implements RequestInterceptor
     public void apply(RequestTemplate requestTemplate)
     {
         HttpServletRequest httpServletRequest = ServletUtils.getRequest();
+
+        // 兼容SpringQueryMap，移除params
+        Map<String, Collection<String>> queries = requestTemplate.queries();
+        Collection<String> params = queries.get("params");
+        if (params != null) {
+            for (String param : params) {
+                try {
+                    String encode = URLDecoder.decode(param, "UTF-8");
+                    if (encode.equals("{}")) {
+                        requestTemplate.query("params");
+                    }
+                } catch (UnsupportedEncodingException e) {
+                    throw new BaseException("feign过滤字符失败");
+                }
+            }
+        }
+
         if (StringUtils.isNotNull(httpServletRequest))
         {
             Map<String, String> headers = ServletUtils.getHeaders(httpServletRequest);

ruoyi-ui/src/views/system/menu/index.vue

@@ -130,7 +130,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24" v-if="form.menuType != 'F'">
+          <el-col :span="12" v-if="form.menuType != 'F'">
             <el-form-item label="菜单图标" prop="icon">
               <el-popover
                 placement="bottom-start"
@@ -151,6 +151,11 @@
               </el-popover>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -158,9 +163,15 @@
               <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="form.menuType == 'C'">
-            <el-form-item label="显示排序" prop="orderNum">
+            <el-form-item prop="routeName">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input v-model="form.routeName" placeholder="请输入路由名称" />
+              <span slot="label">
+                <el-tooltip content="默认不填则和路由地址相同：如地址为：`user`，则名称为`User`（注意：为避免名字的冲突，特殊情况下请自定义，保证唯一性）" placement="top">
+                <i class="el-icon-question"></i>
+                </el-tooltip>
+                路由名称
+              </span>
             </el-form-item>
           </el-col>
         </el-row>