5.0.0.RELEASE

Author: [email protected]

pom.xml

@@ -29,15 +29,15 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <codingapi.txlcn.version>5.0.0</codingapi.txlcn.version>
-        <springcloud.version>Finchley.SR2</springcloud.version>
+        <codingapi.txlcn.version>5.0.0.RELEASE</codingapi.txlcn.version>
+        <springcloud.version>Greenwich.RELEASE</springcloud.version>
         <lombok.version>1.18.0</lombok.version>
     </properties>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <version>2.1.2.RELEASE</version>
         <relativePath/>
     </parent>
 

spring-demo-client/src/main/java/com/codingapi/txlcn/demo/service1/DemoServiceImpl.java

@@ -4,7 +4,6 @@
 import com.codingapi.example.common.spring.DDemoClient;
 import com.codingapi.example.common.spring.EDemoClient;
 import com.codingapi.txlcn.common.util.Transactions;
-import com.codingapi.txlcn.tc.annotation.TxcTransaction;
 import com.codingapi.txlcn.tc.core.DTXLocalContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +35,6 @@ public DemoServiceImpl(ClientDemoMapper demoMapper, DDemoClient dDemoClient, EDe
     }
 
     @Override
-    @TxcTransaction
     public String execute(String value) {
         /*
          * 注意 5.0.0 请用 DTXLocal 类

spring-demo-client/src/main/java/com/codingapi/txlcn/demo/service1/TransactionConfiguration.java

@@ -1,11 +1,11 @@
 package com.codingapi.txlcn.demo.service1;
 
-import com.codingapi.txlcn.tc.aspect.interceptor.DTXInterceptor;
+import com.codingapi.txlcn.common.util.Transactions;
+import com.codingapi.txlcn.tc.aspect.interceptor.TxLcnInterceptor;
 import com.codingapi.txlcn.tc.aspect.weave.DTXLogicWeaver;
 import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.transaction.TransactionProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -22,25 +22,44 @@
  */
 @Configuration
 @EnableTransactionManagement
-@EnableConfigurationProperties(TransactionProperties.class)
 public class TransactionConfiguration {
 
-    @ConditionalOnBean(DTXLogicWeaver.class)
+    /**
+     * 本地事务配置
+     * @param transactionManager
+     * @return
+     */
     @Bean
-    public TransactionInterceptor transactionInterceptor(PlatformTransactionManager transactionManager, DTXLogicWeaver dtxLogicWeaver) {
+    @ConditionalOnMissingBean
+    public TransactionInterceptor transactionInterceptor(PlatformTransactionManager transactionManager) {
         Properties properties = new Properties();
         properties.setProperty("*", "PROPAGATION_REQUIRED,-Throwable");
+        TransactionInterceptor transactionInterceptor = new TransactionInterceptor();
+        transactionInterceptor.setTransactionManager(transactionManager);
+        transactionInterceptor.setTransactionAttributes(properties);
+        return transactionInterceptor;
+    }
 
-        DTXInterceptor dtxInterceptor = new DTXInterceptor(dtxLogicWeaver);
-        dtxInterceptor.setTransactionManager(transactionManager);
-        dtxInterceptor.setTransactionAttributes(properties);
-        return dtxInterceptor;
+    /**
+     * 分布式事务配置 设置为LCN模式
+     * @param dtxLogicWeaver
+     * @return
+     */
+    @ConditionalOnBean(DTXLogicWeaver.class)
+    @Bean
+    public TxLcnInterceptor txLcnInterceptor(DTXLogicWeaver dtxLogicWeaver) {
+        TxLcnInterceptor txLcnInterceptor = new TxLcnInterceptor(dtxLogicWeaver);
+        Properties properties = new Properties();
+        properties.setProperty(Transactions.DTX_TYPE,Transactions.LCN);
+        properties.setProperty(Transactions.DTX_PROPAGATION, "REQUIRED");
+        txLcnInterceptor.setTransactionAttributes(properties);
+        return txLcnInterceptor;
     }
 
     @Bean
     public BeanNameAutoProxyCreator beanNameAutoProxyCreator() {
         BeanNameAutoProxyCreator beanNameAutoProxyCreator = new BeanNameAutoProxyCreator();
-        beanNameAutoProxyCreator.setInterceptorNames("transactionInterceptor");
+        beanNameAutoProxyCreator.setInterceptorNames("txLcnInterceptor","transactionInterceptor");
         beanNameAutoProxyCreator.setBeanNames("*Impl");
         return beanNameAutoProxyCreator;
     }

spring-demo-client/src/main/resources/application.properties

@@ -21,4 +21,6 @@ ribbon.ConnectTimeout=5000
 
 
 ## tx-manager 配置
-#tx-lcn.client.manager-address=127.0.0.1:8070
+#tx-lcn.client.manager-address=127.0.0.1:8070
+
+#tx-lcn.ribbon.loadbalancer.dtx.enabled=true