From c77edac111c6cc9e58d6561709eaf925bc9ac43f Mon Sep 17 00:00:00 2001
From: ManongJu <469863752@qq.com>
Date: Fri, 30 Oct 2020 09:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9D=83=E9=99=90=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../microservice/skeleton/gateway/filter/AuthFilter.java   | 7 +------
 other/db/zuul-auth.sql                                     | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/AuthFilter.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/AuthFilter.java
index 01ff55a..cf488dc 100644
--- a/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/AuthFilter.java
+++ b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/AuthFilter.java
@@ -120,7 +120,6 @@ public class AuthFilter implements GlobalFilter , Ordered {
         return false;
     }
     private boolean hasPermission(String headerToken, String path){
-        String url = getRealUrl(path);
         try {
             if (StringUtils.isEmpty(headerToken)){
                 return false;
@@ -140,16 +139,12 @@ public class AuthFilter implements GlobalFilter , Ordered {
                 return false;
             }
             List<Authority> authorities = JSON.parseArray(authStr , Authority.class);
-            return authorities.stream().anyMatch(authority -> antPathMatcher.match(authority.getAuthority(), url));
+            return authorities.stream().anyMatch(authority -> antPathMatcher.match(authority.getAuthority(), path));
         } catch (ParseException e) {
             e.printStackTrace();
         }
         return false;
     }
-    private String getRealUrl(String path){
-        String[] splitUrl = path.split("/");
-        return path.replace("/"+splitUrl[1] , "");
-    }
     private SignedJWT getSignedJWT(String headerToken) throws ParseException {
         String token = headerToken.replace(JWTConstants.TOKEN_PREFIX, "");
         log.info("token is {}", token);
diff --git a/other/db/zuul-auth.sql b/other/db/zuul-auth.sql
index 47bbeab..16a0491 100644
--- a/other/db/zuul-auth.sql
+++ b/other/db/zuul-auth.sql
@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50628
 File Encoding         : 65001
 
-Date: 2020-10-29 16:47:06
+Date: 2020-10-30 09:12:20
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -170,8 +170,8 @@ CREATE TABLE `sys_menu` (
 -- Records of sys_menu
 -- ----------------------------
 INSERT INTO `sys_menu` VALUES ('1', 'order', null, null, '订单管理', null, '1', null, null, null, null, null, null);
-INSERT INTO `sys_menu` VALUES ('2', 'order_list', 'order', '1', '订单列表查询', '/order/list', '2', null, null, null, null, null, null);
-INSERT INTO `sys_menu` VALUES ('3', 'order_detail', 'order', '1', '订单详情', '/order/detail', '2', null, null, null, null, null, null);
+INSERT INTO `sys_menu` VALUES ('2', 'order_list', 'order', '1', '订单列表查询', '/mss-upms/order/list', '2', null, null, null, null, null, null);
+INSERT INTO `sys_menu` VALUES ('3', 'order_detail', 'order', '1', '订单详情', '/mss-upms/order/detail', '2', null, null, null, null, null, null);
 
 -- ----------------------------
 -- Table structure for sys_privilege
-- 
GitLab