Просмотр исходного кода

!265 fix 修复 satoken最新版本依赖webmvc导致 gateway冲突问题

Merge pull request !265 from 疯狂的狮子Li/dev
疯狂的狮子Li 2 месяцев назад
Родитель
Сommit
98c23a9e82

+ 1 - 1
ruoyi-common/ruoyi-common-alibaba-bom/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <revision>2.6.1</revision>
         <spring-cloud-alibaba.version>2025.0.0.0</spring-cloud-alibaba.version>
-        <seata.version>2.5.0</seata.version>
+        <seata.version>2.6.0</seata.version>
         <nacos.client.version>2.5.1</nacos.client.version>
         <dubbo.version>3.3.6</dubbo.version>
         <dubbo-extensions.version>3.3.1</dubbo-extensions.version>

+ 6 - 0
ruoyi-gateway/pom.xml

@@ -58,6 +58,12 @@
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-satoken</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-webmvc</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- RuoYi Common Redis-->

+ 1 - 1
ruoyi-visual/ruoyi-seata-server/pom.xml

@@ -27,7 +27,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <seata.version>2.5.0</seata.version>
+        <seata.version>2.6.0</seata.version>
         <spring-boot-for-server.version>2.7.18</spring-boot-for-server.version>
         <spring-framework-for-server.version>5.3.39</spring-framework-for-server.version>
         <snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>

BIN
ruoyi-visual/ruoyi-seata-server/src/main/resources/lib/seata-server-2.5.0.jar → ruoyi-visual/ruoyi-seata-server/src/main/resources/lib/seata-server-2.6.0.jar


+ 0 - 0
script/docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-2.4.0.jar


BIN
script/docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-2.6.0.jar