codingapi · xlorne · Feb 7, 2019 · Feb 6, 2019 · Feb 7, 2019 · Feb 7, 2019
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# tx-lcn分布式事务框架 (5.0.0)
+# tx-lcn分布式事务框架 (5.0.0.RELEASE)
 
 [![Gitter](https://badges.gitter.im/codingapi/tx-lcn.svg)](https://gitter.im/codingapi/tx-lcn?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![BBS](https://bbs.txlcn.org/style/Archlinux/txlcn-bbs.svg)](https://bbs.txlcn.org)

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.codingapi.txlcn</groupId>
     <artifactId>tx-lcn</artifactId>
-    <version>5.0.0</version>
+    <version>5.0.0.RELEASE</version>
     <packaging>pom</packaging>
 
 
@@ -43,7 +43,7 @@
         <maven.javadoc.plugin>2.10.3</maven.javadoc.plugin>
         <maven.gpg.plugin>1.6</maven.gpg.plugin>
 
-        <codingapi.txlcn.version>5.0.0</codingapi.txlcn.version>
+        <codingapi.txlcn.version>5.0.0.RELEASE</codingapi.txlcn.version>
 
         <txlcn-org.projectlombok.version>1.18.0</txlcn-org.projectlombok.version>
         <txlcn-spring-cloud.version>Finchley.SR2</txlcn-spring-cloud.version>

diff --git a/run.txmanager.bat b/run.txmanager.bat
@@ -1,4 +1,4 @@
 @echo off
 
-start java -jar  -Xms256m -Xmx512m  txlcn-tm/target/txlcn-tm-5.0.0.jar
+start java -jar  -Xms256m -Xmx512m  txlcn-tm/target/txlcn-tm-5.0.0.RELEASE.jar
 
diff --git a/txlcn-common/pom.xml b/txlcn-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0</version>
+        <version>5.0.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/txlcn-common/src/main/java/com/codingapi/txlcn/common/util/Transactions.java b/txlcn-common/src/main/java/com/codingapi/txlcn/common/util/Transactions.java
@@ -43,6 +43,17 @@ public class Transactions {
 
     public static final String TAG_TASK = "Transaction Task";
 
+
+    /**
+     * 分布式事务类型 Properties传递参数key
+     */
+    public static final String DTX_TYPE = "DTX_TYPE";
+
+    /**
+     * 分布式事务传播类型 Properties传递参数key
+     */
+    public static final String DTX_PROPAGATION = "DTX_PROPAGATION";
+
     /////////// 工具方法  ////////////////////////////////////////////
 
     /**

diff --git a/txlcn-logger/pom.xml b/txlcn-logger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0</version>
+        <version>5.0.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/txlcn-tc/pom.xml b/txlcn-tc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.txlcn</groupId>
         <artifactId>tx-lcn</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.0.RELEASE</version>
     </parent>
 
     <artifactId>txlcn-tc</artifactId>

diff --git a/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/annotation/DTXPropagation.java b/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/annotation/DTXPropagation.java
@@ -30,5 +30,22 @@ public enum DTXPropagation {
     /**
      * 当前没有分布式事务，非分布式事务运行。当前有分布式事务，就加入
      */
-    SUPPORTS
+    SUPPORTS;
+
+
+
+    public static DTXPropagation parser(String code){
+        switch (code){
+            case "REQUIRED":{
+                return REQUIRED;
+            }
+            case "SUPPORTS":{
+                return SUPPORTS;
+            }
+            default:{
+                return REQUIRED;
+            }
+        }
+    }
+
 }
diff --git a/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/aspect/interceptor/DTXInterceptor.java b/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/aspect/interceptor/DTXInterceptor.java
@@ -19,6 +19,8 @@
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 
+import java.util.Properties;
+
 /**
  * Description:
  * Date: 1/12/19
@@ -30,13 +32,21 @@ public class DTXInterceptor extends TransactionInterceptor {
 
     private final DTXLogicWeaver dtxLogicWeaver;
 
+    private Properties transactionAttributes;
+
     public DTXInterceptor(DTXLogicWeaver dtxLogicWeaver) {
         this.dtxLogicWeaver = dtxLogicWeaver;
     }
 
+    @Override
+    public void setTransactionAttributes(Properties transactionAttributes) {
+        this.transactionAttributes = transactionAttributes;
+        super.setTransactionAttributes(transactionAttributes);
+    }
+
     @Override
     public Object invoke(MethodInvocation invocation) throws Throwable {
-        return dtxLogicWeaver.runTransaction(InterceptorInvocationUtils.load(invocation), () -> super.invoke(invocation));
+        return dtxLogicWeaver.runTransaction(InterceptorInvocationUtils.load(invocation,transactionAttributes), () -> super.invoke(invocation));
     }
 
 }
diff --git a/...c/src/main/java/com/codingapi/txlcn/tc/aspect/interceptor/InterceptorInvocationUtils.java b/...c/src/main/java/com/codingapi/txlcn/tc/aspect/interceptor/InterceptorInvocationUtils.java
@@ -21,6 +21,7 @@
 import org.aopalliance.intercept.MethodInvocation;
 
 import java.util.Objects;
+import java.util.Properties;
 
 /**
  * Description:
@@ -31,11 +32,17 @@
  */
 class InterceptorInvocationUtils {
 
-    static DTXInfo load(MethodInvocation invocation) {
-        TxTransaction txTransaction = invocation.getMethod().getAnnotation(TxTransaction.class);
+    static DTXInfo load(MethodInvocation invocation, Properties transactionAttributes) {
+        //默认值
         String transactionType = Transactions.LCN;
         DTXPropagation dtxPropagation = DTXPropagation.REQUIRED;
-
+        //优先获取配置的信息
+        if(transactionAttributes!=null){
+            transactionType = transactionAttributes.getProperty(Transactions.DTX_TYPE);
+            dtxPropagation =  DTXPropagation.parser(transactionAttributes.getProperty(Transactions.DTX_PROPAGATION));
+        }
+        //获取注解的信息
+        TxTransaction txTransaction = invocation.getMethod().getAnnotation(TxTransaction.class);
         if (Objects.nonNull(txTransaction)) {
             transactionType = txTransaction.type();
             dtxPropagation = txTransaction.propagation();

diff --git a/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/aspect/interceptor/TxLcnInterceptor.java b/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/aspect/interceptor/TxLcnInterceptor.java
@@ -19,6 +19,8 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
+import java.util.Properties;
+
 /**
  * Description:
  * Date: 1/12/19
@@ -29,12 +31,18 @@ public class TxLcnInterceptor implements MethodInterceptor {
 
     private final DTXLogicWeaver dtxLogicWeaver;
 
+    private Properties transactionAttributes;
+
     public TxLcnInterceptor(DTXLogicWeaver dtxLogicWeaver) {
         this.dtxLogicWeaver = dtxLogicWeaver;
     }
 
+    public void setTransactionAttributes(Properties transactionAttributes) {
+        this.transactionAttributes = transactionAttributes;
+    }
+
     @Override
     public Object invoke(MethodInvocation invocation) throws Throwable {
-        return dtxLogicWeaver.runTransaction(InterceptorInvocationUtils.load(invocation), invocation::proceed);
+        return dtxLogicWeaver.runTransaction(InterceptorInvocationUtils.load(invocation,transactionAttributes), invocation::proceed);
     }
 }
diff --git a/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/config/EnableDistributedTransaction.java b/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/config/EnableDistributedTransaction.java
@@ -25,7 +25,7 @@
  * Date: 1/19/19
  *
  * @author ujued
- * @since 5.0.0
+ * @since 5.0.0.RELEASE
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

diff --git a/txlcn-tc/src/main/resources/banner.txt b/txlcn-tc/src/main/resources/banner.txt
@@ -7,4 +7,4 @@ ${AnsiColor.BRIGHT_GREEN}
          | | / /^\ \     | |___| \__/\| |\  |
          \_/ \/   \/     \_____/\____/\_| \_/
 
-         TX-LCN TxClient  version:5.0.0
+         TX-LCN TxClient  version:5.0.0.RELEASE
diff --git a/txlcn-tm/pom.xml b/txlcn-tm/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.codingapi.txlcn</groupId>
         <artifactId>tx-lcn</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.0.RELEASE</version>
     </parent>
 
     <artifactId>txlcn-tm</artifactId>
-    <version>5.0.0</version>
+    <version>5.0.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/txlcn-tm/src/main/java/com/codingapi/txlcn/tm/support/TxLcnManagerBanner.java b/txlcn-tm/src/main/java/com/codingapi/txlcn/tm/support/TxLcnManagerBanner.java
@@ -32,7 +32,7 @@
  */
 public class TxLcnManagerBanner implements Banner {
 
-    public static final String VERSION = "5.0.0";
+    public static final String VERSION = "5.0.0.RELEASE";
 
     private static final String BANNER =
             "          _______   __      _     _____  _   _          \n" +

diff --git a/txlcn-tracing/pom.xml b/txlcn-tracing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0</version>
+        <version>5.0.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...cing/src/main/java/com/codingapi/txlcn/tracing/http/ribbon/LoadbalancerConfiguration.java b/...cing/src/main/java/com/codingapi/txlcn/tracing/http/ribbon/LoadbalancerConfiguration.java
@@ -30,10 +30,10 @@
  * @author ujued
  */
 @Configuration
+@ConditionalOnClass(IRule.class)
 public class LoadbalancerConfiguration {
 
     @Bean
-    @ConditionalOnClass(IRule.class)
     @ConditionalOnProperty(name = "tx-lcn.ribbon.loadbalancer.dtx.enabled", havingValue = "true")
     @Scope("prototype")
     public IRule ribbonRule(Registration registration) {

diff --git a/txlcn-txmsg-netty/pom.xml b/txlcn-txmsg-netty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0</version>
+        <version>5.0.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/txlcn-txmsg/pom.xml b/txlcn-txmsg/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0</version>
+        <version>5.0.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>