From 101e1a87cecdc17d223fb1c0fdba1d815f0cc4d6 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 2 Nov 2020 17:59:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9seata=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=EF=BC=8C=20=E5=8E=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84annotation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/ApolloExampleApplication.java | 3 --- .../example/EurekaClientApplication.java | 4 ---- .../example/FeignExampleApplication.java | 2 -- .../MybatisPlusExampleApplication.java | 4 ---- .../account/AccountSeataApplication.java | 6 ------ .../cloud/order/OrderSeataApplication.java | 6 ------ .../storage/StorageSeataApplication.java | 6 ------ .../config/SeataDatasourceConfiguration.java | 21 +++++++++---------- .../stater/ApolloStarterConfiguration.java | 3 +++ .../starter/FeignStarterConfiguration.java | 2 ++ .../resources/seata-configuration.properties | 7 ------- 11 files changed, 15 insertions(+), 49 deletions(-) diff --git a/examples/apollo-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/apollo/example/ApolloExampleApplication.java b/examples/apollo-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/apollo/example/ApolloExampleApplication.java index 93e5216..a8aca8b 100644 --- a/examples/apollo-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/apollo/example/ApolloExampleApplication.java +++ b/examples/apollo-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/apollo/example/ApolloExampleApplication.java @@ -3,9 +3,6 @@ package com.chinaunicom.mall.ebtp.cloud.apollo.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; - -@EnableApolloConfig @SpringBootApplication public class ApolloExampleApplication { public static void main(String[] args) { diff --git a/examples/eureka-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/eureka/example/EurekaClientApplication.java b/examples/eureka-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/eureka/example/EurekaClientApplication.java index c42fcd3..cc3f3c2 100644 --- a/examples/eureka-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/eureka/example/EurekaClientApplication.java +++ b/examples/eureka-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/eureka/example/EurekaClientApplication.java @@ -2,12 +2,8 @@ package com.chinaunicom.mall.ebtp.cloud.eureka.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; - -import com.chinaunicom.mall.ebtp.cloud.eureka.starter.EurekaStarterConfiguration; @SpringBootApplication -@Import(EurekaStarterConfiguration.class) public class EurekaClientApplication { public static void main(String[] args) { SpringApplication.run(EurekaClientApplication.class, args); diff --git a/examples/feign-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/example/FeignExampleApplication.java b/examples/feign-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/example/FeignExampleApplication.java index 99c592b..664f1df 100644 --- a/examples/feign-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/example/FeignExampleApplication.java +++ b/examples/feign-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/example/FeignExampleApplication.java @@ -2,9 +2,7 @@ package com.chinaunicom.mall.ebtp.cloud.feign.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; -@EnableFeignClients @SpringBootApplication public class FeignExampleApplication { public static void main(String[] args) { diff --git a/examples/mybatis-plus-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/mybatis/example/MybatisPlusExampleApplication.java b/examples/mybatis-plus-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/mybatis/example/MybatisPlusExampleApplication.java index d4cf4fa..18f169f 100644 --- a/examples/mybatis-plus-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/mybatis/example/MybatisPlusExampleApplication.java +++ b/examples/mybatis-plus-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/mybatis/example/MybatisPlusExampleApplication.java @@ -2,12 +2,8 @@ package com.chinaunicom.mall.ebtp.cloud.mybatis.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; - -import com.chinaunicom.mall.ebtp.cloud.jpa.starter.JpaStarterConfiguration; @SpringBootApplication -@Import(JpaStarterConfiguration.class) public class MybatisPlusExampleApplication { public static void main(String[] args) { SpringApplication.run(MybatisPlusExampleApplication.class, args); diff --git a/examples/seata-example/account-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/account/AccountSeataApplication.java b/examples/seata-example/account-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/account/AccountSeataApplication.java index 3989520..a84ed4a 100644 --- a/examples/seata-example/account-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/account/AccountSeataApplication.java +++ b/examples/seata-example/account-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/account/AccountSeataApplication.java @@ -3,14 +3,8 @@ package com.chinaunicom.mall.ebtp.cloud.account; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Import; - -import com.chinaunicom.mall.ebtp.cloud.eureka.starter.EurekaStarterConfiguration; @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) -@EnableFeignClients -@Import(EurekaStarterConfiguration.class) public class AccountSeataApplication { public static void main(String[] args) { diff --git a/examples/seata-example/order-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/order/OrderSeataApplication.java b/examples/seata-example/order-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/order/OrderSeataApplication.java index b9eb123..7bc21a8 100644 --- a/examples/seata-example/order-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/order/OrderSeataApplication.java +++ b/examples/seata-example/order-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/order/OrderSeataApplication.java @@ -3,14 +3,8 @@ package com.chinaunicom.mall.ebtp.cloud.order; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Import; - -import com.chinaunicom.mall.ebtp.cloud.eureka.starter.EurekaStarterConfiguration; @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) -@EnableFeignClients -@Import(EurekaStarterConfiguration.class) public class OrderSeataApplication { public static void main(String[] args) { SpringApplication.run(OrderSeataApplication.class, args); diff --git a/examples/seata-example/storage-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/storage/StorageSeataApplication.java b/examples/seata-example/storage-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/storage/StorageSeataApplication.java index b55f569..77d46ae 100644 --- a/examples/seata-example/storage-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/storage/StorageSeataApplication.java +++ b/examples/seata-example/storage-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/storage/StorageSeataApplication.java @@ -3,14 +3,8 @@ package com.chinaunicom.mall.ebtp.cloud.storage; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Import; - -import com.chinaunicom.mall.ebtp.cloud.eureka.starter.EurekaStarterConfiguration; @SpringBootApplication(exclude = DataSourceAutoConfiguration.class) -@EnableFeignClients -@Import(EurekaStarterConfiguration.class) public class StorageSeataApplication { public static void main(String[] args) { SpringApplication.run(StorageSeataApplication.class, args); diff --git a/examples/seata-example/storage-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/storage/config/SeataDatasourceConfiguration.java b/examples/seata-example/storage-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/storage/config/SeataDatasourceConfiguration.java index e797709..2e751e3 100644 --- a/examples/seata-example/storage-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/storage/config/SeataDatasourceConfiguration.java +++ b/examples/seata-example/storage-service/src/main/java/com/chinaunicom/mall/ebtp/cloud/storage/config/SeataDatasourceConfiguration.java @@ -2,15 +2,14 @@ package com.chinaunicom.mall.ebtp.cloud.storage.config; import javax.sql.DataSource; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.transaction.SpringManagedTransactionFactory; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import com.alibaba.druid.pool.DruidDataSource; +import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import io.seata.rm.datasource.DataSourceProxy; @@ -30,13 +29,13 @@ public class SeataDatasourceConfiguration { } @Bean - public SqlSessionFactory sqlSessionFactory(DataSourceProxy dataSourceProxy) throws Exception { - SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean(); - sqlSessionFactoryBean.setDataSource(dataSourceProxy); - sqlSessionFactoryBean.setTransactionFactory(new SpringManagedTransactionFactory()); - - return sqlSessionFactoryBean.getObject(); - - } + @ConfigurationProperties(prefix = "mybatis") + public MybatisSqlSessionFactoryBean sqlSessionFactoryBean(@Qualifier("dataSource") DataSource dataSource) { + // 这里用 MybatisSqlSessionFactoryBean 代替了 SqlSessionFactoryBean，否则 MyBatisPlus 不会生效 + MybatisSqlSessionFactoryBean mybatisSqlSessionFactoryBean = new MybatisSqlSessionFactoryBean(); + mybatisSqlSessionFactoryBean.setDataSource(dataSource); + + return mybatisSqlSessionFactoryBean; + } } diff --git a/mall-ebtp-cloud-apollo-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/apollo/stater/ApolloStarterConfiguration.java b/mall-ebtp-cloud-apollo-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/apollo/stater/ApolloStarterConfiguration.java index c7e36ba..37075ae 100644 --- a/mall-ebtp-cloud-apollo-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/apollo/stater/ApolloStarterConfiguration.java +++ b/mall-ebtp-cloud-apollo-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/apollo/stater/ApolloStarterConfiguration.java @@ -3,6 +3,9 @@ package com.chinaunicom.mall.ebtp.cloud.apollo.stater; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; +import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; + +@EnableApolloConfig @Configuration @PropertySource("classpath:apollo-configuration.properties") public class ApolloStarterConfiguration { diff --git a/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java b/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java index 332d331..3378578 100644 --- a/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java +++ b/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.cloud.feign.starter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -9,6 +10,7 @@ import feign.RequestInterceptor; import feign.okhttp.OkHttpClient; @Configuration +@EnableFeignClients(basePackages = "com.chinaunicom.mall.ebtp") @PropertySource("classpath:feign-configuration.properties") public class FeignStarterConfiguration { diff --git a/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties b/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties index c6805c6..e69de29 100644 --- a/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties +++ b/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties @@ -1,7 +0,0 @@ -unifast.swagger.basePackage=com.chinaunicom.mall.ebtp.cloud -unifast.swagger.title=\u6d4b\u8bd5\u63a5\u53e3\u6587\u6863 -unifast.swagger.contactName=\u5409\u6797\u9879\u76ee\u7ec4 -unifast.swagger.contactUrl=http://chinaunicom.com -unifast.swagger.contactEmail=chinaunicom@chinaunicom.com -unifast.swagger.version=0.0.1 -unifast.swagger.description=\u7840\u540e\u53f0\u529f\u80fd\u6846\u67b6 \ No newline at end of file