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