Skip to content

Commit 1d3afd9

Browse files
xlornexlorne
authored
Merge pull request #4 from codingapi/dev
Dev
2 parents 00a7528 + fc6079f commit 1d3afd9

29 files changed

Lines changed: 226 additions & 95 deletions

File tree

‎transaction-dubbo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>com.codingapi</groupId>
99
<artifactId>transaction-dubbo</artifactId>
10-
<version>1.0.0</version>
10+
<version>1.0.1</version>
1111

1212
<name>transaction-dubbo</name>
1313
<url>https://github.com/codingapi/tx-lcn</url>
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>com.codingapi</groupId>
7070
<artifactId>tx-client</artifactId>
71-
<version>1.0.0</version>
71+
<version>1.0.1</version>
7272
</dependency>
7373

7474
<dependency>

‎transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/filter/TransactionFilter.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,31 @@
22

33
import com.alibaba.dubbo.rpc.*;
44
import com.codingapi.tx.aop.bean.TxTransactionLocal;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
57

68
/**
79
* Created by lorne on 2017/6/30.
810
*/
911
public class TransactionFilter implements Filter {
1012

13+
14+
private Logger logger = LoggerFactory.getLogger(TransactionFilter.class);
15+
1116
@Override
1217
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
18+
1319
TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
20+
String groupId = txTransactionLocal == null ? null : txTransactionLocal.getGroupId();
21+
int maxTimeOut = txTransactionLocal == null ? 0 : txTransactionLocal.getMaxTimeOut();
22+
23+
logger.info("LCN-dubbo TxGroup info -> groupId:"+groupId+",maxTimeOut:"+maxTimeOut);
24+
1425
if(txTransactionLocal!=null){
15-
RpcContext.getContext().setAttachment("tx-group",txTransactionLocal.getGroupId());
16-
RpcContext.getContext().setAttachment("tx-maxTimeOut",String.valueOf(txTransactionLocal.getMaxTimeOut()));
26+
RpcContext.getContext().setAttachment("tx-group",groupId);
27+
RpcContext.getContext().setAttachment("tx-maxTimeOut",String.valueOf(maxTimeOut));
1728
}
29+
1830
return invoker.invoke(invocation);
1931
}
2032
}

‎transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/interceptor/TxManagerInterceptor.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
import com.alibaba.dubbo.rpc.RpcContext;
5-
//import com.lorne.tx.bean.TxTransactionCompensate;
65
import com.codingapi.tx.aop.service.AspectBeforeService;
76
import org.aspectj.lang.ProceedingJoinPoint;
87
import org.springframework.beans.factory.annotation.Autowired;

‎transaction-springcloud/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.codingapi</groupId>
88
<artifactId>transaction-springcloud</artifactId>
9-
<version>1.0.0</version>
9+
<version>1.0.1</version>
1010

1111
<name>transaction-springcloud</name>
1212
<url>https://github.com/codingapi/tx-lcn</url>
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>com.codingapi</groupId>
7272
<artifactId>tx-client</artifactId>
73-
<version>1.0.0</version>
73+
<version>1.0.1</version>
7474
</dependency>
7575

7676
<dependency>

‎transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/feign/TransactionRestTemplateInterceptor.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
package com.codingapi.tx.springcloud.feign;
22

33
import com.codingapi.tx.aop.bean.TxTransactionLocal;
4-
//import CompensateServiceImpl;
54
import feign.RequestInterceptor;
65
import feign.RequestTemplate;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
78

89
/**
910
* Created by lorne on 2017/6/26.
1011
*/
1112
public class TransactionRestTemplateInterceptor implements RequestInterceptor {
1213

1314

15+
private Logger logger = LoggerFactory.getLogger(TransactionRestTemplateInterceptor.class);
16+
1417
@Override
1518
public void apply(RequestTemplate requestTemplate) {
1619
TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
1720
String groupId = txTransactionLocal == null ? null : txTransactionLocal.getGroupId();
1821
int maxTimeOut = txTransactionLocal == null ? 0 : txTransactionLocal.getMaxTimeOut();
22+
23+
logger.info("LCN-SpringCloud TxGroup info -> groupId:"+groupId+",maxTimeOut:"+maxTimeOut);
24+
1925
if (txTransactionLocal != null) {
2026
requestTemplate.header("tx-group", groupId);
2127
requestTemplate.header("tx-maxTimeOut", String.valueOf(maxTimeOut));

‎transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/http/TransactionHttpRequestInterceptor.java‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.codingapi.tx.springcloud.http;
22

33
import com.codingapi.tx.aop.bean.TxTransactionLocal;
4+
import org.slf4j.Logger;
5+
import org.slf4j.LoggerFactory;
46
import org.springframework.http.HttpRequest;
57
import org.springframework.http.client.ClientHttpRequestExecution;
68
import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -13,13 +15,22 @@
1315
*/
1416
public class TransactionHttpRequestInterceptor implements ClientHttpRequestInterceptor {
1517

18+
19+
private Logger logger = LoggerFactory.getLogger(TransactionHttpRequestInterceptor.class);
20+
1621
@Override
1722
public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
23+
1824
TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
19-
String groupId = txTransactionLocal==null?null:txTransactionLocal.getGroupId();
25+
String groupId = txTransactionLocal == null ? null : txTransactionLocal.getGroupId();
2026
int maxTimeOut = txTransactionLocal == null ? 0 : txTransactionLocal.getMaxTimeOut();
21-
request.getHeaders().add("tx-group",groupId);
22-
request.getHeaders().add("tx-maxTimeOut", String.valueOf(maxTimeOut));
27+
28+
logger.info("LCN-SpringCloud TxGroup info -> groupId:"+groupId+",maxTimeOut:"+maxTimeOut);
29+
30+
if(txTransactionLocal!=null) {
31+
request.getHeaders().add("tx-group", groupId);
32+
request.getHeaders().add("tx-maxTimeOut", String.valueOf(maxTimeOut));
33+
}
2334
return execution.execute(request,body);
2435
}
2536
}

‎tx-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.codingapi</groupId>
77
<artifactId>tx-client</artifactId>
8-
<version>1.0.0</version>
8+
<version>1.0.1</version>
99

1010
<name>tx-client</name>
1111
<url>https://github.com/codingapi/tx-lcn</url>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
public class TxDefaultTransactionServerImpl implements TransactionServer {
1313

1414

15+
1516
@Override
1617
public Object execute(ProceedingJoinPoint point, TxTransactionInfo info) throws Throwable {
1718
return point.proceed();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
2424

2525
String kid = KidUtils.generateShortUuid();
2626
String txGroupId = info.getTxGroupId();
27-
logger.info("tx-no-running-start->" + txGroupId);
27+
logger.info("--->begin no db transaction, groupId: " + txGroupId);
2828
long t1 = System.currentTimeMillis();
2929

3030

@@ -43,7 +43,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
4343
} finally {
4444
TxTransactionLocal.setCurrent(null);
4545
long t2 = System.currentTimeMillis();
46-
logger.info("tx-no-running-end->" + txGroupId+",time->"+(t2-t1));
46+
logger.info("<---end no db transaction,groupId:" + txGroupId+",execute time:"+(t2-t1));
4747
}
4848
}
4949

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
4141

4242
String kid = KidUtils.generateShortUuid();
4343
String txGroupId = info.getTxGroupId();
44-
logger.info("tx-running-start->" + txGroupId);
44+
logger.info("--->begin running transaction,groupId:" + txGroupId);
4545
long t1 = System.currentTimeMillis();
4646

4747
boolean isHasIsGroup = transactionControl.hasGroup(txGroupId);
@@ -85,7 +85,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
8585
//修改事务组状态异常
8686
waitTask.setState(-1);
8787
waitTask.signalTask();
88-
throw new ServiceException("修改事务组状态异常." + txGroupId);
88+
throw new ServiceException("update TxGroup error, groupId:" + txGroupId);
8989
}
9090
}
9191
}
@@ -97,7 +97,8 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
9797
} finally {
9898
TxTransactionLocal.setCurrent(null);
9999
long t2 = System.currentTimeMillis();
100-
logger.info("tx-running-end->" + txGroupId+",time->"+(t2-t1));
100+
logger.info("<---end running transaction,groupId:" + txGroupId+",execute time:"+(t2-t1));
101+
101102
}
102103
}
103104

0 commit comments

Comments
 (0)