Skip to content

Commit 9d26ced

Browse files
xlornexlorne
committed
Merge remote-tracking branch 'origin/5.0.0-dev' into 5.0.0-dev
# Conflicts: # tx-spi-message-netty/src/main/java/com/codingapi/txlcn/spi/message/netty/impl/NettyRpcClientInitializer.java
2 parents 47ab404 + 35f5eb6 commit 9d26ced

18 files changed

Lines changed: 156 additions & 125 deletions

File tree

‎pom.xml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -416,35 +416,35 @@
416416

417417
<!-- 手动打包时，将下面的plugin注释掉 -->
418418

419-
<plugin>
420-
<groupId>org.apache.maven.plugins</groupId>
421-
<artifactId>maven-javadoc-plugin</artifactId>
422-
<version>${maven.javadoc.plugin}</version>
423-
<executions>
424-
<execution>
425-
<id>attach-javadocs</id>
426-
<goals>
427-
<goal>jar</goal>
428-
</goals>
429-
</execution>
430-
</executions>
431-
</plugin>
432-
433-
434-
<plugin>
435-
<groupId>org.apache.maven.plugins</groupId>
436-
<artifactId>maven-gpg-plugin</artifactId>
437-
<version>${maven.gpg.plugin}</version>
438-
<executions>
439-
<execution>
440-
<id>sign-artifacts</id>
441-
<phase>verify</phase>
442-
<goals>
443-
<goal>sign</goal>
444-
</goals>
445-
</execution>
446-
</executions>
447-
</plugin>
419+
<!--<plugin>-->
420+
<!--<groupId>org.apache.maven.plugins</groupId>-->
421+
<!--<artifactId>maven-javadoc-plugin</artifactId>-->
422+
<!--<version>${maven.javadoc.plugin}</version>-->
423+
<!--<executions>-->
424+
<!--<execution>-->
425+
<!--<id>attach-javadocs</id>-->
426+
<!--<goals>-->
427+
<!--<goal>jar</goal>-->
428+
<!--</goals>-->
429+
<!--</execution>-->
430+
<!--</executions>-->
431+
<!--</plugin>-->
432+
433+
434+
<!--<plugin>-->
435+
<!--<groupId>org.apache.maven.plugins</groupId>-->
436+
<!--<artifactId>maven-gpg-plugin</artifactId>-->
437+
<!--<version>${maven.gpg.plugin}</version>-->
438+
<!--<executions>-->
439+
<!--<execution>-->
440+
<!--<id>sign-artifacts</id>-->
441+
<!--<phase>verify</phase>-->
442+
<!--<goals>-->
443+
<!--<goal>sign</goal>-->
444+
<!--</goals>-->
445+
<!--</execution>-->
446+
<!--</executions>-->
447+
<!--</plugin>-->
448448

449449
</plugins>
450450
</build>

‎tx-client/src/main/java/com/codingapi/txlcn/client/CoreConfiguration.java‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
package com.codingapi.txlcn.client;
2+
3+
import com.codingapi.txlcn.client.aspect.DataSourceAspect;
4+
import com.codingapi.txlcn.client.aspect.TransactionAspect;
5+
import com.codingapi.txlcn.client.aspect.weave.DTXLogicWeaver;
6+
import com.codingapi.txlcn.client.aspect.weave.DTXResourceWeaver;
7+
import com.codingapi.txlcn.client.config.EnableDistributedTransaction;
8+
import com.codingapi.txlcn.client.config.TxClientConfig;
9+
import com.codingapi.txlcn.client.support.TXLCNTransactionBeanHelper;
10+
import com.codingapi.txlcn.client.support.TXLCNTransactionServiceExecutor;
11+
import com.codingapi.txlcn.client.support.cache.TransactionAttachmentCache;
12+
import com.codingapi.txlcn.commons.runner.TxLcnApplicationRunner;
13+
import com.codingapi.txlcn.spi.sleuth.TracerHelper;
14+
import org.springframework.boot.ApplicationRunner;
15+
import org.springframework.context.ApplicationContext;
16+
import org.springframework.context.annotation.Bean;
17+
import org.springframework.context.annotation.ComponentScan;
18+
19+
/**
20+
* Description:
21+
* Date: 1/19/19
22+
*
23+
* @author ujued
24+
* @see EnableDistributedTransaction
25+
*/
26+
@ComponentScan
27+
public class CoreConfiguration {
28+
29+
@Bean
30+
public ApplicationRunner txLcnApplicationRunner(ApplicationContext applicationContext) {
31+
return new TxLcnApplicationRunner(applicationContext);
32+
}
33+
34+
@Bean
35+
public DataSourceAspect dataSourceAspect(TxClientConfig clientConfig, DTXResourceWeaver resourceWeaver) {
36+
return new DataSourceAspect(clientConfig, resourceWeaver);
37+
}
38+
39+
@Bean
40+
public TransactionAspect transactionAspect(TxClientConfig clientConfig, DTXLogicWeaver logicWeaver) {
41+
return new TransactionAspect(clientConfig, logicWeaver);
42+
}
43+
44+
@Bean
45+
public DTXLogicWeaver dtxLogicWeaver(TracerHelper tracerHelper,
46+
TXLCNTransactionServiceExecutor transactionServiceExecutor,
47+
TransactionAttachmentCache transactionAttachmentCache) {
48+
return new DTXLogicWeaver(tracerHelper, transactionServiceExecutor, transactionAttachmentCache);
49+
}
50+
51+
@Bean
52+
public DTXResourceWeaver dtxResourceWeaver(TXLCNTransactionBeanHelper transactionBeanHelper) {
53+
return new DTXResourceWeaver(transactionBeanHelper);
54+
}
55+
}

‎tx-client/src/main/java/com/codingapi/txlcn/client/TxClientConfiguration.java‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎tx-client/src/main/java/com/codingapi/txlcn/client/aspect/DataSourceAspect.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,19 @@
2121
import org.aspectj.lang.ProceedingJoinPoint;
2222
import org.aspectj.lang.annotation.Around;
2323
import org.aspectj.lang.annotation.Aspect;
24-
import org.springframework.beans.factory.annotation.Autowired;
2524
import org.springframework.core.Ordered;
26-
import org.springframework.stereotype.Component;
2725

2826
/**
2927
* create by lorne on 2018/1/5
3028
*/
3129
@Aspect
32-
@Component
3330
@Slf4j
3431
public class DataSourceAspect implements Ordered {
3532

3633
private final TxClientConfig txClientConfig;
3734

3835
private final DTXResourceWeaver dtxResourceWeaver;
3936

40-
@Autowired
4137
public DataSourceAspect(TxClientConfig txClientConfig, DTXResourceWeaver dtxResourceWeaver) {
4238
this.txClientConfig = txClientConfig;
4339
this.dtxResourceWeaver = dtxResourceWeaver;

‎tx-client/src/main/java/com/codingapi/txlcn/client/aspect/TransactionAspect.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,20 @@
2626
import org.aspectj.lang.annotation.Around;
2727
import org.aspectj.lang.annotation.Aspect;
2828
import org.aspectj.lang.annotation.Pointcut;
29-
import org.springframework.beans.factory.annotation.Autowired;
3029
import org.springframework.core.Ordered;
31-
import org.springframework.stereotype.Component;
3230

3331
/**
3432
* LCN 事务拦截器
3533
* create by lorne on 2018/1/5
3634
*/
3735
@Aspect
38-
@Component
3936
@Slf4j
4037
public class TransactionAspect implements Ordered {
4138

4239
private final TxClientConfig txClientConfig;
4340

4441
private final DTXLogicWeaver dtxLogicWeaver;
4542

46-
@Autowired
4743
public TransactionAspect(TxClientConfig txClientConfig, DTXLogicWeaver dtxLogicWeaver) {
4844
this.txClientConfig = txClientConfig;
4945
this.dtxLogicWeaver = dtxLogicWeaver;

‎tx-client/src/main/java/com/codingapi/txlcn/client/aspect/weave/DTXLogicWeaver.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919
import com.codingapi.txlcn.client.bean.DTXInfo;
2020
import com.codingapi.txlcn.client.bean.DTXLocal;
2121
import com.codingapi.txlcn.client.bean.TxTransactionInfo;
22+
import com.codingapi.txlcn.client.support.TXLCNTransactionServiceExecutor;
2223
import com.codingapi.txlcn.client.support.cache.DTXGroupContext;
2324
import com.codingapi.txlcn.client.support.cache.TransactionAttachmentCache;
24-
import com.codingapi.txlcn.spi.sleuth.TracerHelper;
25-
import com.codingapi.txlcn.client.support.TXLCNTransactionServiceExecutor;
2625
import com.codingapi.txlcn.commons.util.RandomUtils;
26+
import com.codingapi.txlcn.spi.sleuth.TracerHelper;
2727
import lombok.extern.slf4j.Slf4j;
28-
import org.springframework.beans.factory.annotation.Autowired;
29-
import org.springframework.stereotype.Component;
3028

3129
import java.util.Objects;
3230

@@ -37,7 +35,6 @@
3735
*
3836
* @author ujued
3937
*/
40-
@Component
4138
@Slf4j
4239
public class DTXLogicWeaver {
4340

@@ -47,7 +44,6 @@ public class DTXLogicWeaver {
4744

4845
private final TransactionAttachmentCache transactionAttachmentCache;
4946

50-
@Autowired
5147
public DTXLogicWeaver(TracerHelper tracerHelper,
5248
TXLCNTransactionServiceExecutor transactionServiceExecutor,
5349
TransactionAttachmentCache transactionAttachmentCache) {

‎tx-client/src/main/java/com/codingapi/txlcn/client/aspect/weave/DTXResourceWeaver.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import com.codingapi.txlcn.client.support.resouce.TransactionResourceExecutor;
2121
import lombok.extern.slf4j.Slf4j;
2222
import org.aspectj.lang.ProceedingJoinPoint;
23-
import org.springframework.beans.factory.annotation.Autowired;
24-
import org.springframework.stereotype.Component;
2523

2624
import java.sql.Connection;
2725
import java.util.Objects;
@@ -33,13 +31,11 @@
3331
*
3432
* @author lorne
3533
*/
36-
@Component
3734
@Slf4j
3835
public class DTXResourceWeaver {
3936

4037
private final TXLCNTransactionBeanHelper transactionBeanHelper;
4138

42-
@Autowired
4339
public DTXResourceWeaver(TXLCNTransactionBeanHelper transactionBeanHelper) {
4440
this.transactionBeanHelper = transactionBeanHelper;
4541
}

‎tx-client/src/main/java/com/codingapi/txlcn/client/bean/DTXLocal.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private void setProxyTmp(boolean proxyTmp) {
105105

106106

107107
/**
108-
* 获取当前线程变量
108+
* 获取当前线程变量。不推荐用此方法，会产生NullPointerException
109109
*
110110
* @return 当前线程变量
111111
*/
@@ -114,7 +114,7 @@ public static DTXLocal cur() {
114114
}
115115

116116
/**
117-
* 获取或新建一个线程变量。第一次被调用且被创建会置justNow标志为true
117+
* 获取或新建一个线程变量。
118118
*
119119
* @return 当前线程变量
120120
*/

‎tx-client/src/main/java/com/codingapi/txlcn/client/config/EnableDistributedTransaction.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.codingapi.txlcn.client.config;
2+
3+
import com.codingapi.txlcn.client.CoreConfiguration;
4+
import org.springframework.context.annotation.Import;
5+
6+
import java.lang.annotation.*;
7+
8+
/**
9+
* Description: 允许分布式事务的注解
10+
* Date: 1/19/19
11+
*
12+
* @author ujued
13+
*/
14+
@Retention(RetentionPolicy.RUNTIME)
15+
@Target(ElementType.TYPE)
16+
@Documented
17+
@Import({CoreConfiguration.class})
18+
public @interface EnableDistributedTransaction {
19+
}

‎tx-client/src/main/java/com/codingapi/txlcn/client/config/TxClientConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public TxClientConfig() {
4646
private Integer dtxAspectOrder;
4747

4848
/**
49-
* aspect connection order
49+
* aspect connection order
5050
*/
5151
private int resourceOrder;
5252

0 commit comments

Comments
 (0)