Merge pull request #10 from codingapi/dev

Dev

Author: xlorne

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-lcn</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>tx-lcn</name>

transaction-dubbo/pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>transaction-dubbo</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
 
     <name>transaction-dubbo</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <dependency>

transaction-motan/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>transaction-motan</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
 
     <name>transaction-motan</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2-SNAPSHOT</version>
         </dependency>
 
         <!-- motan config start-->

transaction-springcloud/pom.xml

@@ -3,10 +3,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-
 	<groupId>com.codingapi</groupId>
 	<artifactId>transaction-springcloud</artifactId>
-	<version>4.0.1</version>
+	<version>4.0.2-SNAPSHOT</version>
 
 	<name>transaction-springcloud</name>
 	<url>https://github.com/codingapi/tx-lcn</url>
@@ -70,7 +69,7 @@
 		<dependency>
 			<groupId>com.codingapi</groupId>
 			<artifactId>tx-client</artifactId>
-			<version>4.0.1</version>
+			<version>4.0.2-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

tx-client/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-client</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
 
     <name>tx-client</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -131,11 +131,6 @@
             <version>${org.springframework-version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${org.springframework-version}</version>
-        </dependency>
 
         <dependency>
             <groupId>com.caucho</groupId>

tx-client/src/main/java/com/codingapi/tx/aop/bean/TxTransactionInfo.java

@@ -2,7 +2,6 @@
 
 import com.codingapi.tx.annotation.TxTransaction;
 import com.codingapi.tx.model.TransactionInvocation;
-import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -14,24 +13,29 @@ public class TxTransactionInfo {
 
     private TxTransaction transaction;
 
-    private Transactional transactional;
 
     private TxTransactionLocal txTransactionLocal;
 
+    /**
+     * 事务组Id
+     */
     private String txGroupId;
 
+    /**
+     * 最大超时时间（发起方模块的）
+     */
     private int maxTimeOut;
 
+
     private TransactionInvocation invocation;
 
 
-    public TxTransactionInfo(TxTransaction transaction,Transactional transactional, TxTransactionLocal txTransactionLocal,TransactionInvocation invocation, String txGroupId, int maxTimeOut) {
+    public TxTransactionInfo(TxTransaction transaction, TxTransactionLocal txTransactionLocal, TransactionInvocation invocation, String txGroupId, int maxTimeOut) {
         this.transaction = transaction;
         this.txTransactionLocal = txTransactionLocal;
         this.txGroupId = txGroupId;
         this.maxTimeOut = maxTimeOut;
         this.invocation = invocation;
-        this.transactional = transactional;
     }
 
     public int getMaxTimeOut() {
@@ -56,7 +60,4 @@ public TransactionInvocation getInvocation() {
         return invocation;
     }
 
-    public Transactional getTransactional() {
-        return transactional;
-    }
 }

tx-client/src/main/java/com/codingapi/tx/aop/bean/TxTransactionLocal.java

@@ -1,7 +1,5 @@
 package com.codingapi.tx.aop.bean;
 
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * 分布式事务远程调用控制对象
  * Created by lorne on 2017/6/5.
@@ -14,18 +12,26 @@ public class TxTransactionLocal {
 
     private int maxTimeOut;
 
+    /**
+     * 是否同一个模块被多次请求
+     */
     private boolean hasIsGroup = false;
 
+    /**
+     * 是否是发起方模块
+     */
     private boolean hasStart = false;
 
+    /**
+     * 是否单模块下多次业务调用
+     */
+    private boolean hasMoreService = false;
+
     private String kid;
 
     private String type;
 
-    private boolean readOnly;
-
-    private Transactional transactional;
-
+    private boolean autoCommit = true;
 
     public boolean isHasIsGroup() {
         return hasIsGroup;
@@ -59,6 +65,13 @@ public void setGroupId(String groupId) {
         this.groupId = groupId;
     }
 
+    public boolean isHasMoreService() {
+        return hasMoreService;
+    }
+
+    public void setHasMoreService(boolean hasMoreService) {
+        this.hasMoreService = hasMoreService;
+    }
 
     public TxTransactionLocal() {
 
@@ -90,25 +103,11 @@ public String getType() {
         return type;
     }
 
-
-
-    public boolean isReadOnly() {
-        return readOnly;
-    }
-
-    public Transactional getTransactional() {
-        return transactional;
+    public boolean isAutoCommit() {
+        return autoCommit;
     }
 
-    public void setTransactional(Transactional transactional) {
-        this.transactional = transactional;
-
-        //set readOnly
-        if(transactional==null){
-            //没有配置事务注解的时候当做只读来处理
-            readOnly = true;
-        }else{
-            readOnly = transactional.readOnly();
-        }
+    public void setAutoCommit(boolean autoCommit) {
+        this.autoCommit = autoCommit;
     }
 }

tx-client/src/main/java/com/codingapi/tx/aop/service/impl/AspectBeforeServiceImpl.java

@@ -9,9 +9,10 @@
 import com.codingapi.tx.model.TransactionInvocation;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.lang.reflect.Method;
 
@@ -25,6 +26,9 @@ public class AspectBeforeServiceImpl implements AspectBeforeService {
     private TransactionServerFactoryService transactionServerFactoryService;
 
 
+    private Logger logger = LoggerFactory.getLogger(AspectBeforeServiceImpl.class);
+
+
     public Object around(String groupId,int maxTimeOut, ProceedingJoinPoint point) throws Throwable {
 
         MethodSignature signature = (MethodSignature) point.getSignature();
@@ -35,16 +39,19 @@ public Object around(String groupId,int maxTimeOut, ProceedingJoinPoint point) t
 
         TxTransaction transaction = thisMethod.getAnnotation(TxTransaction.class);
 
-        Transactional transactional = thisMethod.getAnnotation(Transactional.class);
-        if (transactional == null) {
-            transactional = clazz.getAnnotation(Transactional.class);
+        TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
+
+
+        if(txTransactionLocal!=null){
+            //在同一次事务下，调用多个业务模块。
+            txTransactionLocal.setHasMoreService(true);
         }
 
-        TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
+        logger.info("around--> groupId-> " +groupId+",txTransactionLocal->"+txTransactionLocal);
 
         TransactionInvocation invocation = new TransactionInvocation(clazz, thisMethod.getName(), thisMethod.toString(), args, method.getParameterTypes());
 
-        TxTransactionInfo info = new TxTransactionInfo(transaction,transactional,txTransactionLocal,invocation,groupId,maxTimeOut);
+        TxTransactionInfo info = new TxTransactionInfo(transaction,txTransactionLocal,invocation,groupId,maxTimeOut);
 
         TransactionServer server = transactionServerFactoryService.createTransactionServer(info);
 

tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxRunningNoTransactionServerImpl.java

@@ -32,7 +32,6 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
         txTransactionLocal.setGroupId(txGroupId);
         txTransactionLocal.setHasStart(false);
         txTransactionLocal.setKid(kid);
-        txTransactionLocal.setTransactional(info.getTransactional());
         txTransactionLocal.setMaxTimeOut(info.getMaxTimeOut());
         TxTransactionLocal.setCurrent(txTransactionLocal);
 

tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxRunningTransactionServerImpl.java

@@ -51,7 +51,6 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
         txTransactionLocal.setGroupId(txGroupId);
         txTransactionLocal.setHasStart(false);
         txTransactionLocal.setKid(kid);
-        txTransactionLocal.setTransactional(info.getTransactional());
         txTransactionLocal.setMaxTimeOut(info.getMaxTimeOut());
         TxTransactionLocal.setCurrent(txTransactionLocal);
 
@@ -61,7 +60,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
             Object res = point.proceed();
 
             //写操作 处理
-            if(!txTransactionLocal.isReadOnly()) {
+            if(!txTransactionLocal.isAutoCommit()) {
 
                 String methodStr = info.getInvocation().getMethodStr();