Merge branch 'dev' into pre-production

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) {

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 {
 

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:

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: