From b197a31e8e8a7ad420f94d44bfac8c701430b737 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Sat, 13 Apr 2024 02:04:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(all):=20=E4=BF=AE=E6=94=B9seata=20token?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/basicdata/BasicDataApplication.java | 5 +---- .../main/java/com/logpm/trunkline/TrunkLineApplication.java | 5 ++--- .../logpm-trunkline/src/main/resources/application-dev.yml | 2 +- .../logpm-trunkline/src/main/resources/application-test.yml | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java index 5debe9193..09c3dc791 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java @@ -5,17 +5,14 @@ import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; import org.springblade.core.transaction.annotation.SeataCloudApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springblade.core.cloud.feign.EnableBladeFeign; /** * Basic启动器 * * @author lmy */ -@EnableBladeFeign @SeataCloudApplication - +@BladeCloudApplication public class BasicDataApplication { public static void main(String[] args) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java index d4ce0a6b7..a82e78131 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java @@ -17,17 +17,16 @@ package com.logpm.trunkline; import org.springblade.common.constant.ModuleNameConstant; -import org.springblade.core.cloud.feign.EnableBladeFeign; +import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; import org.springblade.core.transaction.annotation.SeataCloudApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; /** * Demo启动器 * * @author Chill */ -@EnableBladeFeign +@BladeCloudApplication @SeataCloudApplication public class TrunkLineApplication { diff --git a/blade-service/logpm-trunkline/src/main/resources/application-dev.yml b/blade-service/logpm-trunkline/src/main/resources/application-dev.yml index befc8a180..d2b54064b 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-dev.yml +++ b/blade-service/logpm-trunkline/src/main/resources/application-dev.yml @@ -39,7 +39,7 @@ spring: #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration datasource: dynamic: druid: diff --git a/blade-service/logpm-trunkline/src/main/resources/application-test.yml b/blade-service/logpm-trunkline/src/main/resources/application-test.yml index fd764eb95..f1ac3486e 100644 --- a/blade-service/logpm-trunkline/src/main/resources/application-test.yml +++ b/blade-service/logpm-trunkline/src/main/resources/application-test.yml @@ -12,7 +12,7 @@ server: spring: #排除DruidDataSourceAutoConfigure autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration datasource: dynamic: druid: