diff --git a/pom.xml b/pom.xml index c2d12d28a..aa7e810f9 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 1.8 3.1.1 - 2.5.15 + 2.7.18 1.2.23 1.21 3.0.0 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 34a40e841..345ec3afb 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -39,8 +39,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index f0c66d65a..4c16b9fd7 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -87,6 +87,9 @@ spring: max-active: 8 # #连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: -1ms + mvc: + pathmatch: + matching-strategy: ant_path_matcher # token配置 token: