From 5335ced979722f940b330f436ca3b1dac72947a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 5 Aug 2022 14:29:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20sentinel=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=9C=AA=E9=80=82=E9=85=8D=20springboot=202.?=
 =?UTF-8?q?6=20=E6=96=B0=E8=B7=AF=E7=94=B1=E7=AD=96=E7=95=A5=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/dev/application-common.yml                           | 3 ---
 config/dev/ruoyi-sentinel-dashboard.yml                     | 6 ++++++
 .../src/main/resources/application.yml                      | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/dev/application-common.yml b/config/dev/application-common.yml
index 178e39fb..542549eb 100644
--- a/config/dev/application-common.yml
+++ b/config/dev/application-common.yml
@@ -88,9 +88,6 @@ spring:
   cloud:
     # sentinel 配置
     sentinel:
-      filter:
-        # sentinel 在 springboot 2.6.x 不兼容问题的处理
-        enabled: false
       # 取消控制台懒加载
       eager: true
       transport:
diff --git a/config/dev/ruoyi-sentinel-dashboard.yml b/config/dev/ruoyi-sentinel-dashboard.yml
index 16cf3839..0ff14a28 100644
--- a/config/dev/ruoyi-sentinel-dashboard.yml
+++ b/config/dev/ruoyi-sentinel-dashboard.yml
@@ -1,3 +1,9 @@
+spring:
+  mvc:
+    pathmatch:
+      # 修复 sentinel 控制台未适配 springboot 2.6 新路由方式
+      matching-strategy: ANT_PATH_MATCHER
+
 server:
   servlet:
     encoding:
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml
index 88edd624..1072f36b 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml
@@ -32,5 +32,4 @@ spring:
   config:
     import:
       - optional:nacos:application-common.yml
-      - optional:nacos:datasource.yml
       - optional:nacos:${spring.application.name}.yml