TxManager v4.1.0

From fefb1c822d62caa8cd7e17bb8e01625a42d5474d Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Fri, 30 Nov 2018 09:37:46 +0800 Subject: [PATCH 10/71] tx-manager/index.html --- .../interceptor/TransactionAspect.java | 21 +++++++------ .../TransactionServerFactoryServiceImpl.java | 31 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/interceptor/TransactionAspect.java b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/interceptor/TransactionAspect.java index 1b33e9c6b..aec99dd02 100644 --- a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/interceptor/TransactionAspect.java +++ b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/interceptor/TransactionAspect.java @@ -13,37 +13,40 @@ /** * LCN 事务拦截器 * create by lorne on 2018/1/5 + * + * @author Administrator */ - @Aspect @Component -public class TransactionAspect implements Ordered { +public class TransactionAspect implements Ordered +{ private Logger logger = LoggerFactory.getLogger(TransactionAspect.class); @Autowired private TxManagerInterceptor txManagerInterceptor; - @Around("@annotation(com.codingapi.tx.annotation.TxTransaction)") - public Object transactionRunning(ProceedingJoinPoint point)throws Throwable{ + public Object transactionRunning(ProceedingJoinPoint point) throws Throwable + { logger.debug("annotation-TransactionRunning-start---->"); - Object obj = txManagerInterceptor.around(point); + Object obj = txManagerInterceptor.around(point); logger.debug("annotation-TransactionRunning-end---->"); return obj; } @Around("this(com.codingapi.tx.annotation.ITxTransaction) && execution( * *(..))") - public Object around(ProceedingJoinPoint point)throws Throwable{ + public Object around(ProceedingJoinPoint point) throws Throwable + { logger.debug("interface-ITransactionRunning-start---->"); - Object obj = txManagerInterceptor.around(point); + Object obj = txManagerInterceptor.around(point); logger.debug("interface-ITransactionRunning-end---->"); return obj; } - @Override - public int getOrder() { + public int getOrder() + { return Constants.ASPECT_ORDER; } diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TransactionServerFactoryServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TransactionServerFactoryServiceImpl.java index 8d1d06c98..d6bf4bc10 100644 --- a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TransactionServerFactoryServiceImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TransactionServerFactoryServiceImpl.java @@ -1,6 +1,5 @@ package com.codingapi.tx.aop.service.impl; - import com.codingapi.tx.aop.bean.TxTransactionInfo; import com.codingapi.tx.aop.service.TransactionServer; import com.codingapi.tx.aop.service.TransactionServerFactoryService; @@ -13,13 +12,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - - /** - * Created by lorne on 2017/6/8. + * @author lorne + * @date 2017/6/8 */ @Service -public class TransactionServerFactoryServiceImpl implements TransactionServerFactoryService { +public class TransactionServerFactoryServiceImpl implements TransactionServerFactoryService +{ private Logger logger = LoggerFactory.getLogger(TransactionServerFactoryServiceImpl.class); @@ -35,21 +34,19 @@ public class TransactionServerFactoryServiceImpl implements TransactionServerFac @Autowired private TransactionServer txRunningNoTransactionServer; - @Autowired - private NettyService nettyService; - @Autowired private ILCNTransactionControl transactionControl; - - public TransactionServer createTransactionServer(TxTransactionInfo info) throws Throwable { - + @Override + public TransactionServer createTransactionServer(TxTransactionInfo info) throws Throwable + { if (!SocketManager.getInstance().isNetState()) { logger.warn("tx-manager not connected."); return txDefaultTransactionServer; } - /*********分布式事务处理逻辑*开始***********/ + /*********分布式事务处理逻辑***********/ + logger.info("分布式事务处理逻辑...createTransactionServer"); /** 尽当Transaction注解不为空，其他都为空时。表示分布式事务开始启动 **/ if (info.getTransaction() != null && info.getTransaction().isStart() && info.getTxTransactionLocal() == null && StringUtils.isEmpty(info.getTxGroupId())) { @@ -62,18 +59,18 @@ public TransactionServer createTransactionServer(TxTransactionInfo info) throws } } - /** 分布式事务已经开启，业务进行中 **/ + logger.debug("分布式事务已经开启，业务进行中"); if (info.getTxTransactionLocal() != null || StringUtils.isNotEmpty(info.getTxGroupId())) { //检查socket通讯是否正常（第一次执行时启动txRunningTransactionServer的业务处理控制，然后嵌套调用其他事务的业务方法时都并到txInServiceTransactionServer业务处理下） if (SocketManager.getInstance().isNetState()) { if (info.getTxTransactionLocal() != null) { return txDefaultTransactionServer; } else { - if(transactionControl.isNoTransactionOperation() // 表示整个应用没有获取过DB连接 - || info.getTransaction().readOnly()) { //无事务业务的操作 + /** 表示整个应用没有获取过DB连接 || 无事务业务的操作 **/ + if (transactionControl.isNoTransactionOperation() || info.getTransaction().readOnly()) { return txRunningNoTransactionServer; - }else { + } else { return txRunningTransactionServer; } } @@ -83,7 +80,7 @@ public TransactionServer createTransactionServer(TxTransactionInfo info) throws } } /*********分布式事务处理逻辑*结束***********/ - + logger.debug("分布式事务处理逻辑*结束"); return txDefaultTransactionServer; } } From b4c6bd032141b4b8af61a27ad27b71bb41e004e8 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Fri, 30 Nov 2018 10:03:31 +0800 Subject: [PATCH 11/71] add two demo --- pom.xml | 2 + springcloud-lcn-demo/pom.xml | 123 ++++++++++++++++++ .../springcloud-mybatis-demo1/pom.xml | 52 ++++++++ .../example/demo/MybatisDemo1Application.java | 46 +++++++ .../com/example/demo/client/Demo2Client.java | 23 ++++ .../demo/client/Demo2ClientHystric.java | 24 ++++ .../demo/controller/DemoController.java | 36 +++++ .../java/com/example/demo/dao/TestMapper.java | 24 ++++ .../java/com/example/demo/entity/Test.java | 29 +++++ .../com/example/demo/service/DemoService.java | 16 +++ .../demo/service/impl/DemoServiceImpl.java | 50 +++++++ .../impl/TxManagerHttpRequestServiceImpl.java | 29 +++++ .../impl/TxManagerTxUrlServiceImpl.java | 22 ++++ .../src/main/resources/application.properties | 30 +++++ .../springcloud-mybatis-demo2/pom.xml | 54 ++++++++ .../example/demo/MybatisDemo2Application.java | 47 +++++++ .../demo/controller/DemoController.java | 36 +++++ .../java/com/example/demo/dao/TestMapper.java | 24 ++++ .../java/com/example/demo/entity/Test.java | 28 ++++ .../com/example/demo/service/DemoService.java | 16 +++ .../demo/service/impl/DemoServiceImpl.java | 37 ++++++ .../impl/TxManagerTxUrlServiceImpl.java | 22 ++++ .../src/main/resources/application.properties | 22 ++++ 23 files changed, 792 insertions(+) create mode 100644 springcloud-lcn-demo/pom.xml create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2Client.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2ClientHystric.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/dao/TestMapper.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/entity/Test.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/DemoService.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerHttpRequestServiceImpl.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/controller/DemoController.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/dao/TestMapper.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/entity/Test.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/DemoService.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties diff --git a/pom.xml b/pom.xml index 93017f457..f2357a3f7 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,8 @@ transaction-springcloudtx-plugins-db + + springcloud-lcn-demo diff --git a/springcloud-lcn-demo/pom.xml b/springcloud-lcn-demo/pom.xml new file mode 100644 index 000000000..14984b730 --- /dev/null +++ b/springcloud-lcn-demo/pom.xml @@ -0,0 +1,123 @@ + + + 4.0.0 + + com.codingapi + springcloud-lcn-demo + 4.1.0 + pom + + springcloud-lcn-demo + + + springcloud-mybatis-demo1 + springcloud-mybatis-demo2 + + + + + org.springframework.boot + spring-boot-starter-parent + 2.0.4.RELEASE + + + + + UTF-8 + UTF-8 + + 1.7 + 1.7 + 1.7 + Finchley.RELEASE + + 4.2.0-SNAPSHOT + + + + + + + com.codingapi + transaction-springcloud + ${lcn.last.version} + + + org.slf4j + * + + + + + + com.codingapi + tx-plugins-db + ${lcn.last.version} + + + org.slf4j + * + + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.0.0.RELEASE + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.cloud + spring-cloud-starter-openfeign + 2.0.0.RELEASE + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${maven.compile.source} + ${maven.compile.target} + ${project.build.sourceEncoding} + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + \ No newline at end of file diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml b/springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml new file mode 100644 index 000000000..0a29dcada --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + com.example + springcloud-mybatis-demo1 + 0.0.1-SNAPSHOT + jar + + springcloud-mybatis-demo1 + Demo project for Spring Boot + + + com.codingapi + springcloud-lcn-demo + 4.1.0 + + + + UTF-8 + UTF-8 + + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.1.1 + + + + org.springframework.boot + spring-boot-starter-actuator + + + + com.alibaba + druid + 1.0.19 + + + + mysql + mysql-connector-java + 5.1.43 + + + + + diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java new file mode 100644 index 000000000..f5d96476b --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java @@ -0,0 +1,46 @@ +package com.example.demo; + +import com.alibaba.druid.pool.DruidDataSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; + +import javax.sql.DataSource; + +@Configuration +@SpringBootApplication +@EnableEurekaClient +@EnableFeignClients +public class MybatisDemo1Application { + + public static void main(String[] args) { + SpringApplication.run(MybatisDemo1Application.class, args); + } + + @Autowired + private Environment env; + + + @Bean + public DataSource dataSource() { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name")); + dataSource.setUrl(env.getProperty("spring.datasource.url")); + dataSource.setUsername(env.getProperty("spring.datasource.username"));//用户名 + dataSource.setPassword(env.getProperty("spring.datasource.password"));//密码 + dataSource.setInitialSize(10); + dataSource.setMaxActive(50); + dataSource.setMinIdle(0); + dataSource.setMaxWait(60000); + dataSource.setValidationQuery("SELECT 1"); + dataSource.setTestOnBorrow(false); + dataSource.setTestWhileIdle(true); + dataSource.setPoolPreparedStatements(false); + return dataSource; + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2Client.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2Client.java new file mode 100644 index 000000000..e1f6f3064 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2Client.java @@ -0,0 +1,23 @@ +package com.example.demo.client; + +import com.example.demo.entity.Test; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import java.util.List; + +/** + * Created by lorne on 2017/6/27. + */ +@FeignClient(value = "demo2",fallback = Demo2ClientHystric.class) +public interface Demo2Client { + + + @RequestMapping(value = "/demo/list",method = RequestMethod.GET) + List list(); + + + @RequestMapping(value = "/demo/save",method = RequestMethod.GET) + int save(); +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2ClientHystric.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2ClientHystric.java new file mode 100644 index 000000000..c13a6f507 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2ClientHystric.java @@ -0,0 +1,24 @@ +package com.example.demo.client; + +import com.example.demo.entity.Test; +import org.springframework.stereotype.Component; + +import java.util.List; + + +@Component +public class Demo2ClientHystric implements Demo2Client { + + + @Override + public List list() { + System.out.println("进入断路器-list。。。"); + throw new RuntimeException("list 保存失败."); + } + + @Override + public int save() { + System.out.println("进入断路器-save。。。"); + throw new RuntimeException("save 保存失败."); + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java new file mode 100644 index 000000000..941745160 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java @@ -0,0 +1,36 @@ +package com.example.demo.controller; + + +import com.example.demo.entity.Test; +import com.example.demo.service.DemoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Created by lorne on 2017/6/26. + */ +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private DemoService demoService; + + + @RequestMapping("/list") + @ResponseBody + public List list(){ + return demoService.list(); + } + + + @RequestMapping("/save") + @ResponseBody + public int save(){ + return demoService.save(); + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/dao/TestMapper.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/dao/TestMapper.java new file mode 100644 index 000000000..4a0148fc7 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/dao/TestMapper.java @@ -0,0 +1,24 @@ +package com.example.demo.dao; + +import com.example.demo.entity.Test; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Created by lorne on 2017/6/28. + */ +@Mapper +public interface TestMapper { + + + @Select("SELECT * FROM T_TEST") + List findAll(); + + @Insert("INSERT INTO T_TEST(NAME) VALUES(#{name})") + int save(@Param("name") String name); + +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/entity/Test.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/entity/Test.java new file mode 100644 index 000000000..763d8bffa --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/entity/Test.java @@ -0,0 +1,29 @@ +package com.example.demo.entity; + +/** + * Created by lorne on 2017/6/26. + */ + +public class Test { + + + private Integer id; + + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/DemoService.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/DemoService.java new file mode 100644 index 000000000..ecf199308 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/DemoService.java @@ -0,0 +1,16 @@ +package com.example.demo.service; + +import com.example.demo.entity.Test; + +import java.util.List; + +/** + * Created by lorne on 2017/6/26. + */ +public interface DemoService { + + List list(); + + int save(); + +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java new file mode 100644 index 000000000..75d4ab433 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java @@ -0,0 +1,50 @@ +package com.example.demo.service.impl; + +import com.codingapi.tx.annotation.TxTransaction; +import com.example.demo.client.Demo2Client; +import com.example.demo.dao.TestMapper; +import com.example.demo.entity.Test; +import com.example.demo.service.DemoService; +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.util.List; + +/** + * Created by lorne on 2017/6/26. + */ +@Service +public class DemoServiceImpl implements DemoService { + + + @Autowired + private Demo2Client demo2Client; + + + @Autowired + private TestMapper testMapper; + + private Logger logger = LoggerFactory.getLogger(DemoServiceImpl.class); + + @Override + public List list() { + return testMapper.findAll(); + } + + @Override + @TxTransaction(isStart = true) + @Transactional + public int save() { + + int rs1 = testMapper.save("mybatis-hello-1"); + + int rs2 = demo2Client.save(); + + + + return rs1+rs2; + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerHttpRequestServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerHttpRequestServiceImpl.java new file mode 100644 index 000000000..004b86dd9 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerHttpRequestServiceImpl.java @@ -0,0 +1,29 @@ +package com.example.demo.service.impl; + +import com.codingapi.tx.netty.service.TxManagerHttpRequestService; +import com.lorne.core.framework.utils.http.HttpUtils; +import org.springframework.stereotype.Service; + +/** + * create by lorne on 2017/11/18 + */ + +@Service +public class TxManagerHttpRequestServiceImpl implements TxManagerHttpRequestService{ + + @Override + public String httpGet(String url) { + System.out.println("httpGet-start"); + String res = HttpUtils.get(url); + System.out.println("httpGet-end"); + return res; + } + + @Override + public String httpPost(String url, String params) { + System.out.println("httpPost-start"); + String res = HttpUtils.post(url,params); + System.out.println("httpPost-end"); + return res; + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java new file mode 100644 index 000000000..7332ff60f --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java @@ -0,0 +1,22 @@ +package com.example.demo.service.impl; + +import com.codingapi.tx.config.service.TxManagerTxUrlService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +/** + * create by lorne on 2017/11/18 + */ +@Service +public class TxManagerTxUrlServiceImpl implements TxManagerTxUrlService{ + + + @Value("${tm.manager.url}") + private String url; + + @Override + public String getTxUrl() { + System.out.println("load tm.manager.url "); + return url; + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties new file mode 100644 index 000000000..3f369a4ca --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties @@ -0,0 +1,30 @@ +#feign.hystrix.enabled=true + +spring.datasource.driver-class-name = com.mysql.jdbc.Driver +spring.datasource.url= jdbc:mysql://localhost:3306/test?useSSL=false +spring.datasource.username= root +spring.datasource.password=root +spring.datasource.initialize = true +init-db= true + + +## \u5173\u4E8Espringcloud-hystrix\u673A\u5236 +#hystrix.command.default.execution.isolation.strategy= SEMAPHORE +#hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000 + + +spring.application.name = demo1 +server.port = 8081 +#${random.int[9000,9999]} +eureka.client.service-url.defaultZone=http://127.0.0.1:1111/eureka/ + +#Ribbon\u7684\u8D1F\u8F7D\u5747\u8861\u7B56\u7565 +ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.RandomRule +ribbon.MaxAutoRetriesNextServer=0 + +ribbon.eureka.enabled=true + +#txmanager\u5730\u5740 +tm.manager.url=http://127.0.0.1:9010/tx/manager/ + +logging.level.com.codingapi=debug \ No newline at end of file diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml b/springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml new file mode 100644 index 000000000..2a53f7ccf --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + com.example + springcloud-mybatis-demo2 + 0.0.1-SNAPSHOT + jar + + springcloud-mybatis-demo2 + Demo project for Spring Boot + + + com.codingapi + springcloud-lcn-demo + 4.1.0 + + + + UTF-8 + UTF-8 + + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.1.1 + + + + org.springframework.boot + spring-boot-starter-actuator + + + + com.alibaba + druid + 1.0.19 + + + + mysql + mysql-connector-java + 5.1.43 + + + + + + + diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java new file mode 100644 index 000000000..69a9c9747 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java @@ -0,0 +1,47 @@ +package com.example.demo; + +import com.alibaba.druid.pool.DruidDataSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; + +import javax.sql.DataSource; + + +@Configuration +@SpringBootApplication +@EnableEurekaClient +@EnableFeignClients +public class MybatisDemo2Application { + + public static void main(String[] args) { + SpringApplication.run(MybatisDemo2Application.class, args); + } + + @Autowired + private Environment env; + + @Bean + public DataSource dataSource() { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name")); + dataSource.setUrl(env.getProperty("spring.datasource.url")); + dataSource.setUsername(env.getProperty("spring.datasource.username"));//用户名 + dataSource.setPassword(env.getProperty("spring.datasource.password"));//密码 + dataSource.setInitialSize(2); + dataSource.setMaxActive(20); + dataSource.setMinIdle(0); + dataSource.setMaxWait(60000); + dataSource.setValidationQuery("SELECT 1"); + dataSource.setTestOnBorrow(false); + dataSource.setTestWhileIdle(true); + dataSource.setPoolPreparedStatements(false); + return dataSource; + } + +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/controller/DemoController.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/controller/DemoController.java new file mode 100644 index 000000000..941745160 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/controller/DemoController.java @@ -0,0 +1,36 @@ +package com.example.demo.controller; + + +import com.example.demo.entity.Test; +import com.example.demo.service.DemoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Created by lorne on 2017/6/26. + */ +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private DemoService demoService; + + + @RequestMapping("/list") + @ResponseBody + public List list(){ + return demoService.list(); + } + + + @RequestMapping("/save") + @ResponseBody + public int save(){ + return demoService.save(); + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/dao/TestMapper.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/dao/TestMapper.java new file mode 100644 index 000000000..4a0148fc7 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/dao/TestMapper.java @@ -0,0 +1,24 @@ +package com.example.demo.dao; + +import com.example.demo.entity.Test; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Created by lorne on 2017/6/28. + */ +@Mapper +public interface TestMapper { + + + @Select("SELECT * FROM T_TEST") + List findAll(); + + @Insert("INSERT INTO T_TEST(NAME) VALUES(#{name})") + int save(@Param("name") String name); + +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/entity/Test.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/entity/Test.java new file mode 100644 index 000000000..973c06547 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/entity/Test.java @@ -0,0 +1,28 @@ +package com.example.demo.entity; + +/** + * Created by lorne on 2017/6/26. + */ + +public class Test { + + private Integer id; + + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/DemoService.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/DemoService.java new file mode 100644 index 000000000..ecf199308 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/DemoService.java @@ -0,0 +1,16 @@ +package com.example.demo.service; + +import com.example.demo.entity.Test; + +import java.util.List; + +/** + * Created by lorne on 2017/6/26. + */ +public interface DemoService { + + List list(); + + int save(); + +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java new file mode 100644 index 000000000..180697586 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java @@ -0,0 +1,37 @@ +package com.example.demo.service.impl; + +import com.codingapi.tx.annotation.ITxTransaction; +import com.codingapi.tx.annotation.TxTransaction; +import com.example.demo.dao.TestMapper; +import com.example.demo.entity.Test; +import com.example.demo.service.DemoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * Created by lorne on 2017/6/26. + */ +@Service +public class DemoServiceImpl implements DemoService ,ITxTransaction{ + + @Autowired + private TestMapper testMapper; + + @Override + public List list() { + return testMapper.findAll(); + } + + @Override + @TxTransaction + @Transactional + public int save() { + + int rs = testMapper.save("mybatis-hello-2"); +// int v = 100/0; + return rs; + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java new file mode 100644 index 000000000..7332ff60f --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java @@ -0,0 +1,22 @@ +package com.example.demo.service.impl; + +import com.codingapi.tx.config.service.TxManagerTxUrlService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +/** + * create by lorne on 2017/11/18 + */ +@Service +public class TxManagerTxUrlServiceImpl implements TxManagerTxUrlService{ + + + @Value("${tm.manager.url}") + private String url; + + @Override + public String getTxUrl() { + System.out.println("load tm.manager.url "); + return url; + } +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties new file mode 100644 index 000000000..47a5e4cfc --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties @@ -0,0 +1,22 @@ +spring.datasource.driver-class-name = com.mysql.jdbc.Driver +spring.datasource.url= jdbc:mysql://localhost:3306/test?useSSL=false +spring.datasource.username= root +spring.datasource.password=root +spring.datasource.initialize = true +init-db= true + +spring.application.name = demo2 +server.port = 8082 +#${random.int[9000,9999]} +eureka.client.service-url.defaultZone=http://127.0.0.1:1111/eureka/ + +##Ribbon\u7684\u8D1F\u8F7D\u5747\u8861\u7B56\u7565 +ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.RandomRule +ribbon.MaxAutoRetriesNextServer=0 + +ribbon.eureka.enabled=true + +#txmanager\u5730\u5740 +tm.manager.url=http://127.0.0.1:9010/tx/manager/ + +logging.level.com.codingapi=debug \ No newline at end of file From 42611b2044b2ab39f82593a7e7ce1f71ab714b95 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Fri, 30 Nov 2018 10:03:44 +0800 Subject: [PATCH 12/71] add two demo --- transaction-springcloud/src/main/resources/banner.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transaction-springcloud/src/main/resources/banner.txt b/transaction-springcloud/src/main/resources/banner.txt index 51d683404..9161fc577 100644 --- a/transaction-springcloud/src/main/resources/banner.txt +++ b/transaction-springcloud/src/main/resources/banner.txt @@ -7,7 +7,7 @@ >=> >=> >=> >=> >>=> >=======> >===> >=> >=> - LCN-Client version:4.1.0 + LCN-Client version:4.2.0 From a59fe9c8363c097bdcb4b94bbd2d012bd22d4216 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Fri, 30 Nov 2018 10:05:08 +0800 Subject: [PATCH 13/71] add two demo --- springcloud-lcn-demo/pom.xml | 2 +- springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml | 2 +- springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/springcloud-lcn-demo/pom.xml b/springcloud-lcn-demo/pom.xml index 14984b730..2b7f475cd 100644 --- a/springcloud-lcn-demo/pom.xml +++ b/springcloud-lcn-demo/pom.xml @@ -5,7 +5,7 @@ com.codingapi springcloud-lcn-demo - 4.1.0 + 4.2.0 pom springcloud-lcn-demo diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml b/springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml index 0a29dcada..db80dd3d1 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/pom.xml @@ -14,7 +14,7 @@ com.codingapi springcloud-lcn-demo - 4.1.0 + 4.2.0 diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml b/springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml index 2a53f7ccf..98724199f 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/pom.xml @@ -14,7 +14,7 @@ com.codingapi springcloud-lcn-demo - 4.1.0 + 4.2.0 From 9110ded7ba6d8422bd1992d7a2aad0f1000518aa Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Fri, 30 Nov 2018 14:31:09 +0800 Subject: [PATCH 14/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TxStartTransactionServerImpl.java | 7 ++-- .../impl/TxManagerSenderServiceImpl.java | 39 +++++++++---------- .../relational/LCNStartConnection.java | 4 +- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java index 69d90bf07..655780c5b 100644 --- a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java @@ -35,7 +35,7 @@ public class TxStartTransactionServerImpl implements TransactionServer { public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) throws Throwable { //分布式事务开始执行 - logger.debug("--->begin start transaction"); + logger.debug("--->分布式事务开始执行 begin start transaction"); final long start = System.currentTimeMillis(); @@ -46,7 +46,6 @@ public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) th //创建事务组 txManagerService.createTransactionGroup(groupId); - TxTransactionLocal txTransactionLocal = new TxTransactionLocal(); txTransactionLocal.setGroupId(groupId); txTransactionLocal.setHasStart(true); @@ -55,7 +54,6 @@ public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) th txTransactionLocal.setReadOnly(info.getTransaction().readOnly()); TxTransactionLocal.setCurrent(txTransactionLocal); - try { Object obj = point.proceed(); state = 1; @@ -102,6 +100,7 @@ public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) th long time = end - start; if ((executeConnectionError == 1&&rs == 1)||(lastState == 1 && rs == 0)) { //记录补偿日志 + logger.debug("记录补偿日志"); txManagerService.sendCompensateMsg(groupId, time, info,executeConnectionError); } }else{ @@ -113,7 +112,7 @@ public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) th } TxTransactionLocal.setCurrent(null); - logger.debug("<---end start transaction"); + logger.debug("<---分布式事务 end start transaction"); logger.debug("start transaction over, res -> groupId:" + groupId + ", now state:" + (lastState == 1 ? "commit" : "rollback")); } diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerSenderServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerSenderServiceImpl.java index e5ee4e270..846f13121 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerSenderServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerSenderServiceImpl.java @@ -113,10 +113,8 @@ private void setChannel(List list) { * @param checkSate */ private boolean transaction(final TxGroup txGroup, final int checkSate) { - - if (checkSate == 1) { - + logger.info("事务提交"); //补偿请求，加载历史数据 if (txGroup.getIsCompensate() == 1) { compensateService.reloadCompensate(txGroup); @@ -135,8 +133,8 @@ public Boolean execute() { final JSONObject jsonObject = new JSONObject(); jsonObject.put("a", "t"); - - if (txGroup.getIsCompensate() == 1) { //补偿请求 + /** 补偿请求 **/ + if (txGroup.getIsCompensate() == 1) { jsonObject.put("c", txInfo.getIsCommit()); } else { //正常业务 jsonObject.put("c", checkSate); @@ -193,24 +191,25 @@ public Boolean execute() { } logger.info("--->" + hasOk + ",group:" + txGroup.getGroupId() + ",state:" + checkSate + ",list:" + txGroup.toJsonString()); return hasOk; - }else{ - //回滚操作只发送通过不需要等待确认 - for (TxInfo txInfo : txGroup.getList()) { - if(txInfo.getChannel()!=null) { - if (txInfo.getIsGroup() == 0) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("a", "t"); - jsonObject.put("c", checkSate); - jsonObject.put("t", txInfo.getKid()); - String key = KidUtils.generateShortUuid(); - jsonObject.put("k", key); - txInfo.getChannel().send(jsonObject.toJSONString()); - } + } + + logger.info("事务回滚"); + //回滚操作只发送通过不需要等待确认 + for (TxInfo txInfo : txGroup.getList()) { + if(txInfo.getChannel()!=null) { + if (txInfo.getIsGroup() == 0) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("a", "t"); + jsonObject.put("c", checkSate); + jsonObject.put("t", txInfo.getKid()); + String key = KidUtils.generateShortUuid(); + jsonObject.put("k", key); + txInfo.getChannel().send(jsonObject.toJSONString()); } } - txManagerService.deleteTxGroup(txGroup); - return true; } + txManagerService.deleteTxGroup(txGroup); + return true; } diff --git a/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNStartConnection.java b/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNStartConnection.java index 536cb5b29..c3408bf5f 100644 --- a/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNStartConnection.java +++ b/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNStartConnection.java @@ -44,8 +44,6 @@ public LCNStartConnection(Connection connection, ICallClose subNow this.connection = connection; this.subNowCount = subNowCount; - - if(TxCompensateLocal.current()!=null){ isCompensate = true; logger.info("transaction is compensate-connection."); @@ -140,6 +138,7 @@ protected void rollbackConnection() throws SQLException { connection.rollback(); } + @Override public void transaction()throws SQLException{ if (waitTask == null) { rollbackConnection(); @@ -184,6 +183,7 @@ public void transaction()throws SQLException{ } + @Override protected void closeConnection() throws SQLException{ subNowCount.close(this); From 67fc180e2eb542226a6fda1d6d0fe9c4489a7a34 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Fri, 30 Nov 2018 14:56:59 +0800 Subject: [PATCH 15/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aop/service/impl/TransactionServerFactoryServiceImpl.java | 2 +- .../tx/aop/service/impl/TxStartTransactionServerImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TransactionServerFactoryServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TransactionServerFactoryServiceImpl.java index d6bf4bc10..69db11c9f 100644 --- a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TransactionServerFactoryServiceImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TransactionServerFactoryServiceImpl.java @@ -48,7 +48,7 @@ public TransactionServer createTransactionServer(TxTransactionInfo info) throws /*********分布式事务处理逻辑***********/ logger.info("分布式事务处理逻辑...createTransactionServer"); - /** 尽当Transaction注解不为空，其他都为空时。表示分布式事务开始启动 **/ + /** 仅当Transaction注解不为空，其他都为空时。表示分布式事务开始启动 **/ if (info.getTransaction() != null && info.getTransaction().isStart() && info.getTxTransactionLocal() == null && StringUtils.isEmpty(info.getTxGroupId())) { //检查socket通讯是否正常（当启动事务的主业务方法执行完以后，再执行其他业务方法时将进入txInServiceTransactionServer业务处理） if (SocketManager.getInstance().isNetState()) { diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java index 655780c5b..9c1a5f91b 100644 --- a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java @@ -44,6 +44,7 @@ public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) th final String groupId = TxCompensateLocal.current()==null?KidUtils.generateShortUuid():TxCompensateLocal.current().getGroupId(); //创建事务组 + logger.debug("创建事务组并发送消息"); txManagerService.createTransactionGroup(groupId); TxTransactionLocal txTransactionLocal = new TxTransactionLocal(); From 52a986452ac366f0ac11ad0f5c21bae8bce2f67f Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 09:09:54 +0800 Subject: [PATCH 16/71] format --- .../demo/service/impl/TxManagerTxUrlServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java index 7332ff60f..83d1df328 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java @@ -8,14 +8,16 @@ * create by lorne on 2017/11/18 */ @Service -public class TxManagerTxUrlServiceImpl implements TxManagerTxUrlService{ +public class TxManagerTxUrlServiceImpl implements TxManagerTxUrlService +{ @Value("${tm.manager.url}") private String url; @Override - public String getTxUrl() { + public String getTxUrl() + { System.out.println("load tm.manager.url "); return url; } From ab67d577ef963b8d0c8edfe3ed030964e754a9e9 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 09:15:36 +0800 Subject: [PATCH 17/71] format --- tx-client/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tx-client/pom.xml b/tx-client/pom.xml index e82d12fee..193a0dd33 100644 --- a/tx-client/pom.xml +++ b/tx-client/pom.xml @@ -75,8 +75,6 @@ ${org.slf4j-version} - - javax.servlet javax.servlet-api From 86fb974db0693bd6de9d4e60f5f5609156c8b457 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 10:11:19 +0800 Subject: [PATCH 18/71] format --- .../tx/aop/service/impl/TxStartTransactionServerImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java index 9c1a5f91b..d8b39d852 100644 --- a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java @@ -100,7 +100,6 @@ public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) th long end = System.currentTimeMillis(); long time = end - start; if ((executeConnectionError == 1&&rs == 1)||(lastState == 1 && rs == 0)) { - //记录补偿日志 logger.debug("记录补偿日志"); txManagerService.sendCompensateMsg(groupId, time, info,executeConnectionError); } From be0e64cf1bf546c9aeb7a78b0468b7190d1ea5cd Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 15:10:31 +0800 Subject: [PATCH 19/71] add log for compensate --- .../codingapi/tm/compensate/dao/impl/CompensateDaoImpl.java | 4 ++++ .../tm/compensate/service/impl/CompensateServiceImpl.java | 1 + 2 files changed, 5 insertions(+) diff --git a/tx-manager/src/main/java/com/codingapi/tm/compensate/dao/impl/CompensateDaoImpl.java b/tx-manager/src/main/java/com/codingapi/tm/compensate/dao/impl/CompensateDaoImpl.java index 46b7c2278..2969da2cf 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/compensate/dao/impl/CompensateDaoImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/compensate/dao/impl/CompensateDaoImpl.java @@ -6,6 +6,8 @@ import com.codingapi.tm.config.ConfigReader; import com.codingapi.tm.redis.service.RedisServerService; import com.lorne.core.framework.utils.DateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,6 +20,7 @@ @Service public class CompensateDaoImpl implements CompensateDao { + Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private RedisServerService redisServerService; @@ -33,6 +36,7 @@ public String saveCompensateMsg(TransactionCompensateMsg transactionCompensateMs String json = JSON.toJSONString(transactionCompensateMsg); + logger.debug("保存补偿数据至redis: {}", json); redisServerService.saveCompensateMsg(name, json); return name; diff --git a/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java index 84d183bd6..ced09a7d9 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java @@ -114,6 +114,7 @@ public void autoCompensate(final String compensateKey, TransactionCompensateMsg final String json = JSON.toJSONString(transactionCompensateMsg); logger.info("Auto Compensate->" + json); //自动补偿业务执行... + logger.debug("自动补偿业务执行..."); final int tryTime = configReader.getCompensateTryTime(); boolean autoExecuteRes = false; try { From 7ee69668d216746ec3cdaa5b638d19234cba7f2f Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 15:11:18 +0800 Subject: [PATCH 20/71] =?UTF-8?q?=E4=BF=AE=E6=94=B9demo2=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0(id,=20name)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/client/Demo2Client.java | 10 +++++----- .../example/demo/client/Demo2ClientHystric.java | 2 +- .../example/demo/controller/DemoController.java | 16 ++++++++++++++-- .../com/example/demo/service/DemoService.java | 2 +- .../demo/service/impl/DemoServiceImpl.java | 10 ++++------ .../example/demo/controller/DemoController.java | 4 ++-- .../java/com/example/demo/dao/TestMapper.java | 4 ++-- .../com/example/demo/service/DemoService.java | 2 +- .../demo/service/impl/DemoServiceImpl.java | 9 +++------ 9 files changed, 33 insertions(+), 26 deletions(-) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2Client.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2Client.java index e1f6f3064..dae430696 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2Client.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2Client.java @@ -4,20 +4,20 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; /** * Created by lorne on 2017/6/27. */ -@FeignClient(value = "demo2",fallback = Demo2ClientHystric.class) +@FeignClient(value = "demo2", fallback = Demo2ClientHystric.class) public interface Demo2Client { - - @RequestMapping(value = "/demo/list",method = RequestMethod.GET) + @RequestMapping(value = "/demo/list", method = RequestMethod.GET) List list(); - @RequestMapping(value = "/demo/save",method = RequestMethod.GET) - int save(); + @RequestMapping(value = "/demo/save", method = RequestMethod.GET) + int save(@RequestParam(value = "id") String id, @RequestParam(value = "name") String name); } diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2ClientHystric.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2ClientHystric.java index c13a6f507..8e4796335 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2ClientHystric.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/client/Demo2ClientHystric.java @@ -17,7 +17,7 @@ public List list() { } @Override - public int save() { + public int save(String id, String name) { System.out.println("进入断路器-save。。。"); throw new RuntimeException("save 保存失败."); } diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java index 941745160..e0a25934d 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java @@ -1,9 +1,12 @@ package com.example.demo.controller; +import com.alibaba.druid.support.json.JSONUtils; +import com.codingapi.tx.compensate.model.CompensateInfo; import com.example.demo.entity.Test; import com.example.demo.service.DemoService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -30,7 +33,16 @@ public List list(){ @RequestMapping("/save") @ResponseBody - public int save(){ - return demoService.save(); + public int save(String id, String name){ + return demoService.save(id, name); + } + + @GetMapping("notifyResult") + public String notifyResult(String jsonStr) + { + System.out.println("通知地址..."); + CompensateInfo compensateInfo = (CompensateInfo)JSONUtils.parse(jsonStr); + System.out.println(compensateInfo); + return null; } } diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/DemoService.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/DemoService.java index ecf199308..979dccf67 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/DemoService.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/DemoService.java @@ -11,6 +11,6 @@ public interface DemoService { List list(); - int save(); + int save(String id, String name); } diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java index 75d4ab433..06668b105 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java @@ -37,14 +37,12 @@ public List list() { @Override @TxTransaction(isStart = true) @Transactional - public int save() { + public int save(String id, String name) { - int rs1 = testMapper.save("mybatis-hello-1"); + testMapper.save("mybatis1"); - int rs2 = demo2Client.save(); + demo2Client.save(id, name); - - - return rs1+rs2; + return 2; } } diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/controller/DemoController.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/controller/DemoController.java index 941745160..832188de9 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/controller/DemoController.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/controller/DemoController.java @@ -30,7 +30,7 @@ public List list(){ @RequestMapping("/save") @ResponseBody - public int save(){ - return demoService.save(); + public int save(String id, String name){ + return demoService.save(id, name); } } diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/dao/TestMapper.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/dao/TestMapper.java index 4a0148fc7..648d9ac2f 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/dao/TestMapper.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/dao/TestMapper.java @@ -18,7 +18,7 @@ public interface TestMapper { @Select("SELECT * FROM T_TEST") List findAll(); - @Insert("INSERT INTO T_TEST(NAME) VALUES(#{name})") - int save(@Param("name") String name); + @Insert("INSERT INTO T_TEST(ID, NAME) VALUES(#{id}, #{name})") + int save(@Param("id") String id, @Param("name") String name); } diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/DemoService.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/DemoService.java index ecf199308..979dccf67 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/DemoService.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/DemoService.java @@ -11,6 +11,6 @@ public interface DemoService { List list(); - int save(); + int save(String id, String name); } diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java index 180697586..deb941fdb 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/DemoServiceImpl.java @@ -15,7 +15,7 @@ * Created by lorne on 2017/6/26. */ @Service -public class DemoServiceImpl implements DemoService ,ITxTransaction{ +public class DemoServiceImpl implements DemoService, ITxTransaction { @Autowired private TestMapper testMapper; @@ -28,10 +28,7 @@ public List list() { @Override @TxTransaction @Transactional - public int save() { - - int rs = testMapper.save("mybatis-hello-2"); -// int v = 100/0; - return rs; + public int save(String id, String name) { + return testMapper.save(id, name); } } From e1f83a9fa2995c98f42d6465b2e39670cf5bbadb Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 15:30:55 +0800 Subject: [PATCH 21/71] add markdown for demo --- springcloud-lcn-demo/README.md | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 springcloud-lcn-demo/README.md diff --git a/springcloud-lcn-demo/README.md b/springcloud-lcn-demo/README.md new file mode 100644 index 000000000..a4807a43a --- /dev/null +++ b/springcloud-lcn-demo/README.md @@ -0,0 +1,44 @@ +>1.maven引入 +````xml + + com.codingapi + transaction-springcloud + ${lcn.last.version} + + + org.slf4j + * + + + + + com.codingapi + tx-plugins-db + ${lcn.last.version} + + + org.slf4j + * + + + +```` + +>2.application.properties文件配置eureka地址和Txmanager地址，其中eureka地址与Txmanager的eureka地址保持一致 +```properties +tm.manager.url=http://127.0.0.1:8899/tx/manager/ +eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ +``` + +>3.实现TxManagerHttpRequestService和TxManagerTxUrlService，参考service下的实现 + +>4.事务参与方(事务发起方不需要)中的业务service要实现ITxTransaction接口 + +>5.事务发起方(事务参与方不需要)中的涉及分布式事务的方法要添加@TxTransaction(isStart = true)注解 + +>6.无论事务发起方还是事务参与方的业务方法都需要实现本地事务添加@Transactional注解 + +>7.txmanager启动前要配置redis + + +注意事项：避免事务发起方和调用方操作一张表的数据，会导致锁表 \ No newline at end of file From 02ecbad8023ebd72b930edc0716b204808bd03e4 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 17:49:49 +0800 Subject: [PATCH 22/71] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/springcloud-lcn-demo/README.md b/springcloud-lcn-demo/README.md index a4807a43a..8331486df 100644 --- a/springcloud-lcn-demo/README.md +++ b/springcloud-lcn-demo/README.md @@ -38,7 +38,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ >6.无论事务发起方还是事务参与方的业务方法都需要实现本地事务添加@Transactional注解 ->7.txmanager启动前要配置redis +>7.tx-manager启动前要配置redis 注意事项：避免事务发起方和调用方操作一张表的数据，会导致锁表 \ No newline at end of file From 166cd4686a0017758c6371bc237de59559f71e7a Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 18:53:29 +0800 Subject: [PATCH 23/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/springcloud-lcn-demo/README.md b/springcloud-lcn-demo/README.md index 8331486df..dbf6113b5 100644 --- a/springcloud-lcn-demo/README.md +++ b/springcloud-lcn-demo/README.md @@ -36,7 +36,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ >5.事务发起方(事务参与方不需要)中的涉及分布式事务的方法要添加@TxTransaction(isStart = true)注解 ->6.无论事务发起方还是事务参与方的业务方法都需要实现本地事务添加@Transactional注解 +>6.无论事务发起方还是事务参与方的业务方法都需要实现本地事务添加@Transactional注解和@TxTransaction注解 >7.tx-manager启动前要配置redis From 055c67d8e548a7a8f0809c109835ea49d68aec7b Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 20:27:28 +0800 Subject: [PATCH 24/71] =?UTF-8?q?tx-manager=20=E5=8D=87=E7=BA=A7=E5=88=B02?= =?UTF-8?q?.0.4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tx-manager/pom.xml | 14 ++++------- .../com/codingapi/tm/ServletInitializer.java | 2 +- .../codingapi/tm/TxManagerApplication.java | 5 ++-- .../tm/listener/ApplicationStartListener.java | 8 +++---- .../service/impl/MicroServiceImpl.java | 23 +++++++++++++++---- 5 files changed, 29 insertions(+), 23 deletions(-) diff --git a/tx-manager/pom.xml b/tx-manager/pom.xml index 896c075b8..a1ffc0a69 100644 --- a/tx-manager/pom.xml +++ b/tx-manager/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.4.RELEASE @@ -26,7 +26,7 @@ 1.8 19.0 - Dalston.SR1 + Finchley.RELEASE true true @@ -65,16 +65,10 @@ org.springframework.cloud - spring-cloud-starter-eureka-server - - - com.google.guava - guava - - + spring-cloud-starter-netflix-eureka-client + 2.0.0.RELEASE - org.springframework.boot spring-boot-starter-web diff --git a/tx-manager/src/main/java/com/codingapi/tm/ServletInitializer.java b/tx-manager/src/main/java/com/codingapi/tm/ServletInitializer.java index f9ee98fd9..466d28de7 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/ServletInitializer.java +++ b/tx-manager/src/main/java/com/codingapi/tm/ServletInitializer.java @@ -1,7 +1,7 @@ package com.codingapi.tm; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * Created by lorne on 2017/7/3. diff --git a/tx-manager/src/main/java/com/codingapi/tm/TxManagerApplication.java b/tx-manager/src/main/java/com/codingapi/tm/TxManagerApplication.java index e61237911..e4b8112d8 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/TxManagerApplication.java +++ b/tx-manager/src/main/java/com/codingapi/tm/TxManagerApplication.java @@ -2,11 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +@EnableEurekaClient @SpringBootApplication -@EnableDiscoveryClient public class TxManagerApplication { public static void main(String[] args) { diff --git a/tx-manager/src/main/java/com/codingapi/tm/listener/ApplicationStartListener.java b/tx-manager/src/main/java/com/codingapi/tm/listener/ApplicationStartListener.java index ecb20d049..3d86c4918 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/listener/ApplicationStartListener.java +++ b/tx-manager/src/main/java/com/codingapi/tm/listener/ApplicationStartListener.java @@ -1,7 +1,7 @@ package com.codingapi.tm.listener; import com.codingapi.tm.Constants; -import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; +import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; @@ -12,12 +12,12 @@ * create by lorne on 2017/8/7 */ @Component -public class ApplicationStartListener implements ApplicationListener { +public class ApplicationStartListener implements ApplicationListener { @Override - public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) { - int serverPort = event.getEmbeddedServletContainer().getPort(); + public void onApplicationEvent(WebServerInitializedEvent event) { + int serverPort = event.getWebServer().getPort(); String ip = getIp(); Constants.address = ip+":"+serverPort; } diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java index 5a74ac913..8ccfbae75 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java @@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import org.springframework.web.client.RestTemplate; import java.util.ArrayList; @@ -34,7 +36,11 @@ public class MicroServiceImpl implements MicroService { @Autowired private DiscoveryClient discoveryClient; - + /** + * 服务注册 + */ + @Autowired + private Registration registration; private boolean isIp(String ipAddress) { String ip = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}"; @@ -43,15 +49,22 @@ private boolean isIp(String ipAddress) { return matcher.matches(); } - - @Override public TxState getState() { TxState state = new TxState(); - String ipAddress = discoveryClient.getLocalServiceInstance().getHost(); - if(!isIp(ipAddress)){ + List list = discoveryClient.getInstances(registration.getServiceId()); + String ipAddress; + if(CollectionUtils.isEmpty(list)) + { ipAddress = "127.0.0.1"; + }else{ + ServiceInstance serviceInstance = list.get(0); + ipAddress = serviceInstance.getHost(); + if(!isIp(ipAddress)){ + ipAddress = "127.0.0.1"; + } } + state.setIp(ipAddress); state.setPort(Constants.socketPort); state.setMaxConnection(SocketManager.getInstance().getMaxConnection()); From b404a29f6c29bebb945ab5be957733804d2293f2 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 20:29:55 +0800 Subject: [PATCH 25/71] =?UTF-8?q?tx-manager=20=E5=8D=87=E7=BA=A7=E5=88=B02?= =?UTF-8?q?.0.4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/springcloud-lcn-demo/pom.xml b/springcloud-lcn-demo/pom.xml index 2b7f475cd..c4ef8f9bb 100644 --- a/springcloud-lcn-demo/pom.xml +++ b/springcloud-lcn-demo/pom.xml @@ -36,6 +36,18 @@ + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + @@ -87,18 +99,6 @@ - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - From caecf11f02542682e8703b60395ea386ba08291c Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 20:32:40 +0800 Subject: [PATCH 26/71] format --- .../src/main/java/com/codingapi/tm/ServletInitializer.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/tx-manager/src/main/java/com/codingapi/tm/ServletInitializer.java b/tx-manager/src/main/java/com/codingapi/tm/ServletInitializer.java index 466d28de7..dbf897b36 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/ServletInitializer.java +++ b/tx-manager/src/main/java/com/codingapi/tm/ServletInitializer.java @@ -8,11 +8,9 @@ */ public class ServletInitializer extends SpringBootServletInitializer { - @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { return builder.sources(TxManagerApplication.class); } - } From 02b2d8f7bb922667f775e86450a649503b87b2a1 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 20:38:03 +0800 Subject: [PATCH 27/71] format --- README.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/README.md b/README.md index 8962f1404..f877211ee 100644 --- a/README.md +++ b/README.md @@ -30,12 +30,8 @@ ## 目录说明 -transaction-dubbo LCN dubbo rpc框架扩展支持 - transaction-springcloud LCN springcloud rpc框架扩展支持 -transaction-motan LCN motan rpc框架扩展支持 - tx-client 是LCN核心tx模块端控制框架 tx-manager 是LCN 分布式事务协调器 @@ -148,19 +144,8 @@ tx-plugins-db 是LCN 对关系型数据库的插件支持 ``` -依赖gradle等形式，见中心库 - -[http://mvnrepository.com/search?q=codingapi](http://mvnrepository.com/search?q=codingapi) - - ## demo演示教程每个demo下有区分为 jdbc/hibernate/mybatis不同框架的版本demo -[springcloud版本](https://github.com/codingapi/springcloud-lcn-demo) - -[dubbo版本](https://github.com/codingapi/dubbo-lcn-demo) - -[motan版本](https://gitee.com/zfvipCase/motan-lcn-demo) - -技术交流群：554855843 +[springcloud版本](https://github.com/yizhishang/tx-lcn/tree/springcloud-2.0.4/springcloud-lcn-demo) From beda82f75a0273c252488c75be559fd064a245b6 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 3 Dec 2018 20:44:11 +0800 Subject: [PATCH 28/71] =?UTF-8?q?tx-manager=20=E5=8D=87=E7=BA=A7=E5=88=B02?= =?UTF-8?q?.0.4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index f877211ee..343e003d0 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,4 @@ tx-plugins-db 是LCN 对关系型数据库的插件支持 ## demo演示教程 -每个demo下有区分为 jdbc/hibernate/mybatis不同框架的版本demo - [springcloud版本](https://github.com/yizhishang/tx-lcn/tree/springcloud-2.0.4/springcloud-lcn-demo) From 877da02788b65fddfe41fa69d0afbe551c6911b3 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 4 Dec 2018 09:05:17 +0800 Subject: [PATCH 29/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0RestTemplate=20?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tx/RequestInterceptorConfiguration.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/transaction-springcloud/src/main/java/com/codingapi/tx/RequestInterceptorConfiguration.java b/transaction-springcloud/src/main/java/com/codingapi/tx/RequestInterceptorConfiguration.java index 1b7c36f17..7aea96456 100644 --- a/transaction-springcloud/src/main/java/com/codingapi/tx/RequestInterceptorConfiguration.java +++ b/transaction-springcloud/src/main/java/com/codingapi/tx/RequestInterceptorConfiguration.java @@ -1,9 +1,12 @@ package com.codingapi.tx; import com.codingapi.tx.springcloud.feign.TransactionRestTemplateInterceptor; +import com.codingapi.tx.springcloud.http.TransactionHttpRequestInterceptor; import feign.RequestInterceptor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; /** * create by lorne on 2018/1/18 @@ -15,4 +18,13 @@ public class RequestInterceptorConfiguration { public RequestInterceptor requestInterceptor(){ return new TransactionRestTemplateInterceptor(); } + + @Bean + public TransactionHttpRequestInterceptor transactionHttpRequestInterceptor(@Autowired(required = false) RestTemplate restTemplate){ + TransactionHttpRequestInterceptor transactionHttpRequestInterceptor = new TransactionHttpRequestInterceptor(); + if(restTemplate != null){ + restTemplate.getInterceptors().add(transactionHttpRequestInterceptor); + } + return transactionHttpRequestInterceptor; + } } From 14847efe0a51d3bcb2571a7cfe05a864edcb2dcf Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 4 Dec 2018 15:38:59 +0800 Subject: [PATCH 30/71] format --- tx-client/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tx-client/pom.xml b/tx-client/pom.xml index 193a0dd33..0e53719b8 100644 --- a/tx-client/pom.xml +++ b/tx-client/pom.xml @@ -41,7 +41,6 @@ 4.1.12.Final - org.aspectj aspectjweaver @@ -53,7 +52,6 @@ 1.8.4 - org.slf4j slf4j-api @@ -81,14 +79,12 @@ 3.1.0 - org.springframework spring-context ${org.springframework-version} - com.caucho hessian From cbff588d06edea34c538a2c08ea1988b29c2ec9d Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 4 Dec 2018 15:43:28 +0800 Subject: [PATCH 31/71] =?UTF-8?q?=E8=B0=83=E6=95=B4pom=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/pom.xml | 6 ------ transaction-springcloud/pom.xml | 6 ------ tx-client/pom.xml | 6 ++++++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/springcloud-lcn-demo/pom.xml b/springcloud-lcn-demo/pom.xml index c4ef8f9bb..083465aa2 100644 --- a/springcloud-lcn-demo/pom.xml +++ b/springcloud-lcn-demo/pom.xml @@ -85,12 +85,6 @@ spring-boot-starter-web - - org.springframework.cloud - spring-cloud-starter-openfeign - 2.0.0.RELEASE - - org.springframework.boot spring-boot-starter-test diff --git a/transaction-springcloud/pom.xml b/transaction-springcloud/pom.xml index 96e9c4ccc..805515790 100644 --- a/transaction-springcloud/pom.xml +++ b/transaction-springcloud/pom.xml @@ -31,12 +31,6 @@ ${lcn.last.version} - - org.springframework.cloud - spring-cloud-starter-openfeign - 2.0.0.RELEASE - - org.springframework spring-context diff --git a/tx-client/pom.xml b/tx-client/pom.xml index 0e53719b8..e7cc44607 100644 --- a/tx-client/pom.xml +++ b/tx-client/pom.xml @@ -29,6 +29,12 @@ + + org.springframework.cloud + spring-cloud-starter-openfeign + 2.0.0.RELEASE + + com.github.1991wangliang lorne_core From da3b66c7f5805bb0be8a27348b440002ad474a4d Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Wed, 5 Dec 2018 16:56:27 +0800 Subject: [PATCH 32/71] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/example/demo/MybatisDemo1Application.java | 5 ++--- .../main/java/com/example/demo/MybatisDemo2Application.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java index f5d96476b..1f00d833d 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java @@ -25,14 +25,13 @@ public static void main(String[] args) { @Autowired private Environment env; - @Bean public DataSource dataSource() { DruidDataSource dataSource = new DruidDataSource(); dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name")); dataSource.setUrl(env.getProperty("spring.datasource.url")); - dataSource.setUsername(env.getProperty("spring.datasource.username"));//用户名 - dataSource.setPassword(env.getProperty("spring.datasource.password"));//密码 + dataSource.setUsername(env.getProperty("spring.datasource.username")); + dataSource.setPassword(env.getProperty("spring.datasource.password")); dataSource.setInitialSize(10); dataSource.setMaxActive(50); dataSource.setMinIdle(0); diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java index 69a9c9747..192d798ab 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java @@ -12,7 +12,6 @@ import javax.sql.DataSource; - @Configuration @SpringBootApplication @EnableEurekaClient @@ -31,8 +30,8 @@ public DataSource dataSource() { DruidDataSource dataSource = new DruidDataSource(); dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name")); dataSource.setUrl(env.getProperty("spring.datasource.url")); - dataSource.setUsername(env.getProperty("spring.datasource.username"));//用户名 - dataSource.setPassword(env.getProperty("spring.datasource.password"));//密码 + dataSource.setUsername(env.getProperty("spring.datasource.username")); + dataSource.setPassword(env.getProperty("spring.datasource.password")); dataSource.setInitialSize(2); dataSource.setMaxActive(20); dataSource.setMinIdle(0); From 62f653238634a68c7885f4585014821a664dcddb Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Wed, 5 Dec 2018 16:56:58 +0800 Subject: [PATCH 33/71] =?UTF-8?q?notifyResult=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E6=88=90post?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/controller/DemoController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java index e0a25934d..34d59cbd5 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/controller/DemoController.java @@ -6,10 +6,7 @@ import com.example.demo.entity.Test; import com.example.demo.service.DemoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -37,7 +34,7 @@ public int save(String id, String name){ return demoService.save(id, name); } - @GetMapping("notifyResult") + @PostMapping("notifyResult") public String notifyResult(String jsonStr) { System.out.println("通知地址..."); From a215cf829706e123d8b6cdf992fef10f13fa3962 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Wed, 5 Dec 2018 16:58:32 +0800 Subject: [PATCH 34/71] =?UTF-8?q?tx-manager=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codingapi/tm/manager/service/impl/MicroServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java index 8ccfbae75..6c300fdb7 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java @@ -6,6 +6,8 @@ import com.codingapi.tm.manager.service.MicroService; import com.codingapi.tm.model.TxServer; import com.codingapi.tm.model.TxState; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; @@ -25,6 +27,7 @@ @Service public class MicroServiceImpl implements MicroService { + private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private RestTemplate restTemplate; @@ -64,7 +67,7 @@ public TxState getState() { ipAddress = "127.0.0.1"; } } - + logger.info("ipAddress: {}, port: {}", ipAddress, Constants.socketPort); state.setIp(ipAddress); state.setPort(Constants.socketPort); state.setMaxConnection(SocketManager.getInstance().getMaxConnection()); From abd6f675b876ff96a6a8764284c7f10fed9073e8 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Wed, 5 Dec 2018 16:59:51 +0800 Subject: [PATCH 35/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ribbon=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 2 ++ .../src/main/resources/application.properties | 2 ++ 2 files changed, 4 insertions(+) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties index 3f369a4ca..a3f4ec419 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties @@ -23,6 +23,8 @@ ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.RandomRule ribbon.MaxAutoRetriesNextServer=0 ribbon.eureka.enabled=true +ribbon.readTimeout=6000 +ribbon.ConnectTimeout=6000 #txmanager\u5730\u5740 tm.manager.url=http://127.0.0.1:9010/tx/manager/ diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties index 47a5e4cfc..43d3f1d03 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties @@ -15,6 +15,8 @@ ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.RandomRule ribbon.MaxAutoRetriesNextServer=0 ribbon.eureka.enabled=true +ribbon.readTimeout=6000 +ribbon.ConnectTimeout=6000 #txmanager\u5730\u5740 tm.manager.url=http://127.0.0.1:9010/tx/manager/ From a3742be1690830de6e572d71cbed3cdd11c64d30 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Wed, 5 Dec 2018 17:00:24 +0800 Subject: [PATCH 36/71] =?UTF-8?q?tx-client=E5=BC=95=E5=85=A5ribbon=20?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tx-client/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tx-client/pom.xml b/tx-client/pom.xml index e7cc44607..f21b6b168 100644 --- a/tx-client/pom.xml +++ b/tx-client/pom.xml @@ -34,6 +34,11 @@ spring-cloud-starter-openfeign 2.0.0.RELEASE + + org.springframework.cloud + spring-cloud-starter-ribbon + 1.4.4.RELEASE + com.github.1991wangliang From dfdc70ba92c28aa1e702ee1ffb52c7950196e034 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Wed, 5 Dec 2018 17:02:29 +0800 Subject: [PATCH 37/71] =?UTF-8?q?=E4=B8=BA=E6=BB=A1=E8=B6=B3tx-manager?= =?UTF-8?q?=E9=9B=86=E7=BE=A4=EF=BC=9A=E4=BD=BF=E7=94=A8feign=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/service/impl/MQTxManagerFegin.java | 41 +++++++++++++ .../impl/MQTxManagerFeginServiceImpl.java | 59 +++++++++++++++++++ .../demo/service/impl/MQTxManagerFegin.java | 41 +++++++++++++ .../impl/MQTxManagerFeginServiceImpl.java | 59 +++++++++++++++++++ .../service/MQTxManagerFeginService.java | 38 ++++++++++++ .../service/impl/MQTxManagerServiceImpl.java | 17 ++++-- 6 files changed, 249 insertions(+), 6 deletions(-) create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java create mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java create mode 100644 tx-client/src/main/java/com/codingapi/tx/netty/service/MQTxManagerFeginService.java diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java new file mode 100644 index 000000000..783528da8 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java @@ -0,0 +1,41 @@ +package com.example.demo.service.impl; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author yizhishang + */ +@FeignClient(value = "tx-manager") +public interface MQTxManagerFegin { + + /** + * 检查并清理事务数据 + * @param groupId 事务组id + * @param waitTaskId 任务id + * @return 事务状态 + */ + @GetMapping("/tx/manager/cleanNotifyTransactionHttp") + String cleanNotifyTransactionHttp(@RequestParam(value = "groupId") String groupId, @RequestParam(value = "waitTaskId") String waitTaskId); + + /** + * 记录补偿事务数据到tm + */ + @PostMapping("/tx/manager/sendCompensateMsg") + String sendCompensateMsg(@RequestParam("currentTime") long currentTime, @RequestParam("groupId") String groupId, + @RequestParam("model") String model, @RequestParam("address") String address, + @RequestParam("uniqueKey") String uniqueKey, + @RequestParam("className") String className, @RequestParam("methodStr") String methodStr, + @RequestParam("data") String data, @RequestParam("time") long time, + @RequestParam("startError") int startError); + + /** + * 获取TM服务地址 + * @return txServer + */ + @GetMapping("/tx/manager/getServer") + String getServer(); + +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java new file mode 100644 index 000000000..8397361f7 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java @@ -0,0 +1,59 @@ +package com.example.demo.service.impl; + +import com.codingapi.tx.netty.service.MQTxManagerFeginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; + +/** + * @author yizhishang + */ +@Service +public class MQTxManagerFeginServiceImpl implements MQTxManagerFeginService { + + @Autowired + private ApplicationContext spring; + + @Autowired + private MQTxManagerFegin mqTxManagerFegin; + + public void reloadMqTxManagerFegin() { +// if(mqTxManagerFegin == null){ +// this.mqTxManagerFegin = spring.getBean(MQTxManagerFegin.class); +// } + } + + /** + * 检查并清理事务数据 + * + * @param groupId 事务组id + * @param waitTaskId 任务id + * @return 事务状态 + */ + @Override + public String cleanNotifyTransactionHttp(String groupId, String waitTaskId) { + reloadMqTxManagerFegin(); + return mqTxManagerFegin.cleanNotifyTransactionHttp(groupId, waitTaskId); + } + + /** + * 记录补偿事务数据到tm + */ + @Override + public String sendCompensateMsg(long currentTime, String groupId, String model, String address, String uniqueKey, String className, String methodStr, String data, long time,int startError) { + reloadMqTxManagerFegin(); + return mqTxManagerFegin.sendCompensateMsg(currentTime, groupId, model, address, uniqueKey, className, methodStr, data, time,startError); + } + + /** + * 获取TM服务地址 + * + * @return txServer + */ + @Override + public String getServer() { + reloadMqTxManagerFegin(); + return mqTxManagerFegin.getServer(); + } + +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java new file mode 100644 index 000000000..f54068a8c --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java @@ -0,0 +1,41 @@ +package com.example.demo.service.impl; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author yizhishang + */ +@FeignClient(value = "tx-manager") +public interface MQTxManagerFegin { + + /** + * 检查并清理事务数据 + * @param groupId 事务组id + * @param waitTaskId 任务id + * @return 事务状态 + */ + @GetMapping("/tx/manager/cleanNotifyTransactionHttp") + String cleanNotifyTransactionHttp(@RequestParam(value = "groupId") String groupId, @RequestParam(value = "waitTaskId") String waitTaskId); + + /** + * 记录补偿事务数据到tm + */ + @PostMapping("/tx/manager/sendCompensateMsg") + String sendCompensateMsg(@RequestParam("currentTime") long currentTime,@RequestParam("groupId") String groupId, + @RequestParam("model") String model, @RequestParam("address") String address, + @RequestParam("uniqueKey") String uniqueKey, + @RequestParam("className") String className,@RequestParam("methodStr") String methodStr, + @RequestParam("data") String data,@RequestParam("time") long time, + @RequestParam("startError") int startError); + + /** + * 获取TM服务地址 + * @return txServer + */ + @GetMapping("/tx/manager/getServer") + String getServer(); + +} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java new file mode 100644 index 000000000..8397361f7 --- /dev/null +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java @@ -0,0 +1,59 @@ +package com.example.demo.service.impl; + +import com.codingapi.tx.netty.service.MQTxManagerFeginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; + +/** + * @author yizhishang + */ +@Service +public class MQTxManagerFeginServiceImpl implements MQTxManagerFeginService { + + @Autowired + private ApplicationContext spring; + + @Autowired + private MQTxManagerFegin mqTxManagerFegin; + + public void reloadMqTxManagerFegin() { +// if(mqTxManagerFegin == null){ +// this.mqTxManagerFegin = spring.getBean(MQTxManagerFegin.class); +// } + } + + /** + * 检查并清理事务数据 + * + * @param groupId 事务组id + * @param waitTaskId 任务id + * @return 事务状态 + */ + @Override + public String cleanNotifyTransactionHttp(String groupId, String waitTaskId) { + reloadMqTxManagerFegin(); + return mqTxManagerFegin.cleanNotifyTransactionHttp(groupId, waitTaskId); + } + + /** + * 记录补偿事务数据到tm + */ + @Override + public String sendCompensateMsg(long currentTime, String groupId, String model, String address, String uniqueKey, String className, String methodStr, String data, long time,int startError) { + reloadMqTxManagerFegin(); + return mqTxManagerFegin.sendCompensateMsg(currentTime, groupId, model, address, uniqueKey, className, methodStr, data, time,startError); + } + + /** + * 获取TM服务地址 + * + * @return txServer + */ + @Override + public String getServer() { + reloadMqTxManagerFegin(); + return mqTxManagerFegin.getServer(); + } + +} diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/service/MQTxManagerFeginService.java b/tx-client/src/main/java/com/codingapi/tx/netty/service/MQTxManagerFeginService.java new file mode 100644 index 000000000..d1f0314ce --- /dev/null +++ b/tx-client/src/main/java/com/codingapi/tx/netty/service/MQTxManagerFeginService.java @@ -0,0 +1,38 @@ +package com.codingapi.tx.netty.service; + +/** + * @author yizhishang + */ +public interface MQTxManagerFeginService { + + /** + * 检查并清理事务数据 + * @param groupId 事务组id + * @param waitTaskId 任务id + * @return 事务状态 + */ + String cleanNotifyTransactionHttp(String groupId, String waitTaskId); + + /** + * 记录补偿事务数据到tm + * @param currentTime 时间 + * @param groupId 事务组id + * @param model 模块名称 + * @param address 模块地址 + * @param uniqueKey 唯一标示 + * @param className 事务启动类 + * @param methodStr 事务启动方法 + * @param data 切面数据 + * @param time 执行时间 + * @param startError 启动模块异常 + * @return 是否保存成功 + */ + String sendCompensateMsg(long currentTime, String groupId, String model, String address, String uniqueKey, String className, String methodStr, String data, long time,int startError); + + /** + * 获取TM服务地址 + * @return txServer + */ + String getServer(); + +} diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerServiceImpl.java index 5362b63d8..f74422a78 100644 --- a/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerServiceImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerServiceImpl.java @@ -1,7 +1,6 @@ package com.codingapi.tx.netty.service.impl; import com.alibaba.fastjson.JSONObject; -import com.codingapi.tx.aop.bean.TxCompensateLocal; import com.codingapi.tx.aop.bean.TxTransactionInfo; import com.codingapi.tx.compensate.model.CompensateInfo; import com.codingapi.tx.compensate.service.CompensateService; @@ -11,6 +10,7 @@ import com.codingapi.tx.listener.service.ModelNameService; import com.codingapi.tx.model.Request; import com.codingapi.tx.model.TxGroup; +import com.codingapi.tx.netty.service.MQTxManagerFeginService; import com.codingapi.tx.netty.service.MQTxManagerService; import com.codingapi.tx.netty.service.TxManagerHttpRequestHelper; import com.lorne.core.framework.utils.encode.Base64Utils; @@ -36,6 +36,9 @@ public class MQTxManagerServiceImpl implements MQTxManagerService { @Autowired private TxManagerHttpRequestHelper managerHelper; + @Autowired + private MQTxManagerFeginService mqTxManagerFeginService; + @Override public void createTransactionGroup(String groupId) { @@ -57,7 +60,6 @@ public TxGroup addTransactionGroup(String groupId, String taskId, boolean isGrou return TxGroup.parser(json); } - @Override public int closeTransactionGroup(final String groupId, final int state) { JSONObject jsonObject = new JSONObject(); @@ -101,7 +103,8 @@ public int cleanNotifyTransaction(String groupId, String taskId) { @Override public int cleanNotifyTransactionHttp(String groupId, String waitTaskId) { String url = configReader.getTxUrl() + "cleanNotifyTransactionHttp?groupId=" + groupId + "&taskId=" + waitTaskId; - String clearRes = managerHelper.httpGet(url); +// String clearRes = managerHelper.httpGet(url); + String clearRes = mqTxManagerFeginService.cleanNotifyTransactionHttp(groupId, waitTaskId); if(clearRes==null){ return -1; } @@ -111,8 +114,9 @@ public int cleanNotifyTransactionHttp(String groupId, String waitTaskId) { @Override public String httpGetServer() { - String url = configReader.getTxUrl() + "getServer"; - return managerHelper.httpGet(url); +// String url = configReader.getTxUrl() + "getServer"; +// return managerHelper.httpGet(url); + return mqTxManagerFeginService.getServer(); } @Override @@ -133,7 +137,8 @@ public void sendCompensateMsg(String groupId, long time, TxTransactionInfo info, CompensateInfo compensateInfo = new CompensateInfo(currentTime, modelName, uniqueKey, data, methodStr, className, groupId, address, time,startError); - String json = managerHelper.httpPost(configReader.getTxUrl() + "sendCompensateMsg", compensateInfo.toParamsString()); +// String json = managerHelper.httpPost(configReader.getTxUrl() + "sendCompensateMsg", compensateInfo.toParamsString()); + String json = mqTxManagerFeginService.sendCompensateMsg(currentTime, groupId, modelName, address, uniqueKey, className, methodStr, data, time,startError); compensateInfo.setResJson(json); From 9292748d6339d0083909eef6275abcf3b5ab63a7 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 13:45:23 +0800 Subject: [PATCH 38/71] =?UTF-8?q?=E4=B8=BA=E6=BB=A1=E8=B6=B3tx-manager?= =?UTF-8?q?=E9=9B=86=E7=BE=A4=EF=BC=9A=E4=BD=BF=E7=94=A8feign=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/service/impl/MQTxManagerFegin.java | 6 +++--- .../service/impl/MQTxManagerFeginServiceImpl.java | 7 +++++++ .../netty/service/impl/MQTxManagerServiceImpl.java | 14 -------------- tx-manager/pom.xml | 10 ++++++++++ .../src/main/resources/application.properties | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java index 783528da8..f34407607 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java @@ -14,11 +14,11 @@ public interface MQTxManagerFegin { /** * 检查并清理事务数据 * @param groupId 事务组id - * @param waitTaskId 任务id + * @param taskId 任务id * @return 事务状态 */ - @GetMapping("/tx/manager/cleanNotifyTransactionHttp") - String cleanNotifyTransactionHttp(@RequestParam(value = "groupId") String groupId, @RequestParam(value = "waitTaskId") String waitTaskId); + @GetMapping("/tx/manager/cleanNotifyTransaction") + String cleanNotifyTransactionHttp(@RequestParam(value = "groupId") String groupId, @RequestParam(value = "taskId") String taskId); /** * 记录补偿事务数据到tm diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java index 8397361f7..22d5027ea 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java @@ -1,6 +1,8 @@ package com.example.demo.service.impl; import com.codingapi.tx.netty.service.MQTxManagerFeginService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; @@ -11,6 +13,8 @@ @Service public class MQTxManagerFeginServiceImpl implements MQTxManagerFeginService { + private Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired private ApplicationContext spring; @@ -33,6 +37,7 @@ public void reloadMqTxManagerFegin() { @Override public String cleanNotifyTransactionHttp(String groupId, String waitTaskId) { reloadMqTxManagerFegin(); + logger.info("检查并清理事务数据...groupId:{}, waitTaskId:{}", groupId, waitTaskId); return mqTxManagerFegin.cleanNotifyTransactionHttp(groupId, waitTaskId); } @@ -42,6 +47,7 @@ public String cleanNotifyTransactionHttp(String groupId, String waitTaskId) { @Override public String sendCompensateMsg(long currentTime, String groupId, String model, String address, String uniqueKey, String className, String methodStr, String data, long time,int startError) { reloadMqTxManagerFegin(); + logger.info("记录补偿事务数据到tm"); return mqTxManagerFegin.sendCompensateMsg(currentTime, groupId, model, address, uniqueKey, className, methodStr, data, time,startError); } @@ -53,6 +59,7 @@ public String sendCompensateMsg(long currentTime, String groupId, String model, @Override public String getServer() { reloadMqTxManagerFegin(); + logger.info("获取TM服务地址"); return mqTxManagerFegin.getServer(); } diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerServiceImpl.java index f74422a78..a6fbb4a10 100644 --- a/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerServiceImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerServiceImpl.java @@ -4,7 +4,6 @@ import com.codingapi.tx.aop.bean.TxTransactionInfo; import com.codingapi.tx.compensate.model.CompensateInfo; import com.codingapi.tx.compensate.service.CompensateService; -import com.codingapi.tx.config.ConfigReader; import com.codingapi.tx.framework.utils.SerializerUtils; import com.codingapi.tx.framework.utils.SocketManager; import com.codingapi.tx.listener.service.ModelNameService; @@ -12,7 +11,6 @@ import com.codingapi.tx.model.TxGroup; import com.codingapi.tx.netty.service.MQTxManagerFeginService; import com.codingapi.tx.netty.service.MQTxManagerService; -import com.codingapi.tx.netty.service.TxManagerHttpRequestHelper; import com.lorne.core.framework.utils.encode.Base64Utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,19 +25,12 @@ public class MQTxManagerServiceImpl implements MQTxManagerService { @Autowired private ModelNameService modelNameService; - @Autowired - private ConfigReader configReader; - @Autowired private CompensateService compensateService; - @Autowired - private TxManagerHttpRequestHelper managerHelper; - @Autowired private MQTxManagerFeginService mqTxManagerFeginService; - @Override public void createTransactionGroup(String groupId) { JSONObject jsonObject = new JSONObject(); @@ -102,8 +93,6 @@ public int cleanNotifyTransaction(String groupId, String taskId) { @Override public int cleanNotifyTransactionHttp(String groupId, String waitTaskId) { - String url = configReader.getTxUrl() + "cleanNotifyTransactionHttp?groupId=" + groupId + "&taskId=" + waitTaskId; -// String clearRes = managerHelper.httpGet(url); String clearRes = mqTxManagerFeginService.cleanNotifyTransactionHttp(groupId, waitTaskId); if(clearRes==null){ return -1; @@ -114,8 +103,6 @@ public int cleanNotifyTransactionHttp(String groupId, String waitTaskId) { @Override public String httpGetServer() { -// String url = configReader.getTxUrl() + "getServer"; -// return managerHelper.httpGet(url); return mqTxManagerFeginService.getServer(); } @@ -137,7 +124,6 @@ public void sendCompensateMsg(String groupId, long time, TxTransactionInfo info, CompensateInfo compensateInfo = new CompensateInfo(currentTime, modelName, uniqueKey, data, methodStr, className, groupId, address, time,startError); -// String json = managerHelper.httpPost(configReader.getTxUrl() + "sendCompensateMsg", compensateInfo.toParamsString()); String json = mqTxManagerFeginService.sendCompensateMsg(currentTime, groupId, modelName, address, uniqueKey, className, methodStr, data, time,startError); compensateInfo.setResJson(json); diff --git a/tx-manager/pom.xml b/tx-manager/pom.xml index a1ffc0a69..38d14dd99 100644 --- a/tx-manager/pom.xml +++ b/tx-manager/pom.xml @@ -72,6 +72,16 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow diff --git a/tx-manager/src/main/resources/application.properties b/tx-manager/src/main/resources/application.properties index 991c354c4..957ac29ea 100644 --- a/tx-manager/src/main/resources/application.properties +++ b/tx-manager/src/main/resources/application.properties @@ -83,7 +83,7 @@ tm.compensate.auto=false #SUCCESS #\u8BF7\u6C42\u8865\u507F\u7ED3\u679C\u901A\u77E5\u7684\u6837\u4F8B\u6570\u636E\u683C\u5F0F: #{"resState":true,"groupId":"TtQxTwJP","action":"notify"} -tm.compensate.notifyUrl=http://ip:port/path +tm.compensate.notifyUrl=http://yizhishang:8081/demo/notifyResult #\u8865\u507F\u5931\u8D25\uFF0C\u518D\u6B21\u5C1D\u8BD5\u95F4\u9694\uFF08\u79D2\uFF09\uFF0C\u6700\u5927\u5C1D\u8BD5\u6B21\u65703\u6B21\uFF0C\u5F53\u8D85\u8FC73\u6B21\u5373\u4E3A\u8865\u507F\u5931\u8D25,\u5931\u8D25\u7684\u6570\u636E\u4F9D\u65E7\u8FD8\u4F1A\u5B58\u5728TxManager\u4E0B\u3002 tm.compensate.tryTime=30 From a29242b224acacc4dd3a481f91d49ba4e5ce7626 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 14:21:03 +0800 Subject: [PATCH 39/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compensate/service/impl/CompensateServiceImpl.java | 2 ++ .../service/impl/TxManagerSenderServiceImpl.java | 2 +- .../tm/manager/service/impl/TxManagerServiceImpl.java | 10 ++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java index ced09a7d9..398455aa7 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java @@ -279,9 +279,11 @@ public void reloadCompensate(TxGroup txGroup) { } } } + logger.info("重新加载补偿数据..."); logger.info("Compensate Loaded->"+JSON.toJSONString(txGroup)); } + @Override public TxGroup getCompensateByGroupId(String groupId) { String json = compensateDao.getCompensateByGroupId(groupId); if (json == null) { diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerSenderServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerSenderServiceImpl.java index 846f13121..2edae671a 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerSenderServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerSenderServiceImpl.java @@ -110,7 +110,7 @@ private void setChannel(List list) { /** * 事务提交或回归 * - * @param checkSate + * @param checkSate 1-提交事务 */ private boolean transaction(final TxGroup txGroup, final int checkSate) { if (checkSate == 1) { diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerServiceImpl.java index da6e1360f..76700de76 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/TxManagerServiceImpl.java @@ -23,8 +23,6 @@ @Service public class TxManagerServiceImpl implements TxManagerService { - - @Autowired private ConfigReader configReader; @@ -42,12 +40,12 @@ public class TxManagerServiceImpl implements TxManagerService { @Autowired private CompensateService compensateService; - private Logger logger = LoggerFactory.getLogger(TxManagerServiceImpl.class); @Override public TxGroup createTransactionGroup(String groupId) { + logger.info("创建事物组"); TxGroup txGroup = new TxGroup(); if (compensateService.getCompensateByGroupId(groupId)!=null) { txGroup.setIsCompensate(1); @@ -65,6 +63,8 @@ public TxGroup createTransactionGroup(String groupId) { @Override public TxGroup addTransactionGroup(String groupId, String taskId, int isGroup, String channelAddress, String methodStr) { + + logger.info("添加事务组子对象..."); String key = getTxGroupKey(groupId); TxGroup txGroup = getTxGroup(groupId); if (txGroup==null) { @@ -77,7 +77,6 @@ public TxGroup addTransactionGroup(String groupId, String taskId, int isGroup, S txInfo.setIsGroup(isGroup); txInfo.setMethodStr(methodStr); - ModelInfo modelInfo = ModelInfoManager.getInstance().getModelByChannelName(channelAddress); if(modelInfo!=null) { txInfo.setUniqueKey(modelInfo.getUniqueKey()); @@ -94,6 +93,7 @@ public TxGroup addTransactionGroup(String groupId, String taskId, int isGroup, S @Override public boolean rollbackTransactionGroup(String groupId) { + logger.info("设置强制回滚事务..."); String key = getTxGroupKey(groupId); TxGroup txGroup = getTxGroup(groupId); if (txGroup==null) { @@ -106,6 +106,7 @@ public boolean rollbackTransactionGroup(String groupId) { @Override public int cleanNotifyTransaction(String groupId, String taskId) { + logger.info("检查事务组数据..."); int res = 0; logger.info("start-cleanNotifyTransaction->groupId:"+groupId+",taskId:"+taskId); String key = getTxGroupKey(groupId); @@ -169,6 +170,7 @@ public int cleanNotifyTransaction(String groupId, String taskId) { @Override public int closeTransactionGroup(String groupId,int state) { + logger.info("关闭事务组"); String key = getTxGroupKey(groupId); TxGroup txGroup = getTxGroup(groupId); if(txGroup==null){ From 2b1c666ccd28445796aff5d90a8adde07eeb3437 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 15:30:53 +0800 Subject: [PATCH 40/71] =?UTF-8?q?=E6=94=B9=E9=80=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springcloud/listener/ServerListener.java | 22 +++++++------------ .../service/impl/ModelNameServiceImpl.java | 4 ++-- .../service/impl/MicroServiceImpl.java | 12 ++-------- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java index 9b542ae19..69c47aed3 100644 --- a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java +++ b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/listener/ServerListener.java @@ -4,8 +4,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; -import org.springframework.boot.web.context.WebServerInitializedEvent; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; @@ -15,6 +15,7 @@ public class ServerListener implements ApplicationListener onApplicationEvent. "+event.getWebServer()); this.serverPort = event.getWebServer().getPort(); - Thread thread = new Thread(new Runnable() { - @Override - public void run() { - // 若连接不上txmanager start()方法将阻塞 - initService.start(); - } + Thread thread = new Thread(() -> { + // 若连接不上txmanager start()方法将阻塞 + initService.start(); }); thread.setName("TxInit-thread"); thread.start(); } - public int getPort() { - return this.serverPort; - } - - public void setServerPort(int serverPort) { - this.serverPort = serverPort; + public int getServerPort() { + return serverPort; } } diff --git a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/service/impl/ModelNameServiceImpl.java b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/service/impl/ModelNameServiceImpl.java index a9b6f9de4..5fff0e50a 100644 --- a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/service/impl/ModelNameServiceImpl.java +++ b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/service/impl/ModelNameServiceImpl.java @@ -44,7 +44,7 @@ private String getIp() { } private int getPort() { - int port = serverListener.getPort(); + int port = serverListener.getServerPort(); int count = 0; while (port == 0) { try { @@ -52,7 +52,7 @@ private int getPort() { } catch (InterruptedException e) { e.printStackTrace(); } - port = serverListener.getPort(); + port = serverListener.getServerPort(); count++; if(count==2000){ diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java index 6c300fdb7..5855b14bb 100644 --- a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java +++ b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/MicroServiceImpl.java @@ -55,17 +55,9 @@ private boolean isIp(String ipAddress) { @Override public TxState getState() { TxState state = new TxState(); - List list = discoveryClient.getInstances(registration.getServiceId()); - String ipAddress; - if(CollectionUtils.isEmpty(list)) - { + String ipAddress = registration.getHost(); + if(!isIp(ipAddress)){ ipAddress = "127.0.0.1"; - }else{ - ServiceInstance serviceInstance = list.get(0); - ipAddress = serviceInstance.getHost(); - if(!isIp(ipAddress)){ - ipAddress = "127.0.0.1"; - } } logger.info("ipAddress: {}, port: {}", ipAddress, Constants.socketPort); state.setIp(ipAddress); From 19c44bbc444704081eab280898ce98cc643c5cb4 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 15:52:11 +0800 Subject: [PATCH 41/71] =?UTF-8?q?=E6=94=B9=E9=80=A0=E6=88=90=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8F=91=E7=8E=B0=E5=90=8E=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=86=97=E4=BD=99=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TxManagerHttpRequestServiceImpl.java | 29 --------- .../impl/TxManagerTxUrlServiceImpl.java | 24 ------- .../impl/TxManagerTxUrlServiceImpl.java | 22 ------- .../com/codingapi/tx/config/ConfigReader.java | 57 ----------------- .../service/TxManagerHttpRequestHelper.java | 62 ------------------- .../service/TxManagerHttpRequestService.java | 12 ---- 6 files changed, 206 deletions(-) delete mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerHttpRequestServiceImpl.java delete mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java delete mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java delete mode 100644 tx-client/src/main/java/com/codingapi/tx/config/ConfigReader.java delete mode 100644 tx-client/src/main/java/com/codingapi/tx/netty/service/TxManagerHttpRequestHelper.java delete mode 100644 tx-client/src/main/java/com/codingapi/tx/netty/service/TxManagerHttpRequestService.java diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerHttpRequestServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerHttpRequestServiceImpl.java deleted file mode 100644 index 004b86dd9..000000000 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerHttpRequestServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.example.demo.service.impl; - -import com.codingapi.tx.netty.service.TxManagerHttpRequestService; -import com.lorne.core.framework.utils.http.HttpUtils; -import org.springframework.stereotype.Service; - -/** - * create by lorne on 2017/11/18 - */ - -@Service -public class TxManagerHttpRequestServiceImpl implements TxManagerHttpRequestService{ - - @Override - public String httpGet(String url) { - System.out.println("httpGet-start"); - String res = HttpUtils.get(url); - System.out.println("httpGet-end"); - return res; - } - - @Override - public String httpPost(String url, String params) { - System.out.println("httpPost-start"); - String res = HttpUtils.post(url,params); - System.out.println("httpPost-end"); - return res; - } -} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java deleted file mode 100644 index 83d1df328..000000000 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.demo.service.impl; - -import com.codingapi.tx.config.service.TxManagerTxUrlService; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -/** - * create by lorne on 2017/11/18 - */ -@Service -public class TxManagerTxUrlServiceImpl implements TxManagerTxUrlService -{ - - - @Value("${tm.manager.url}") - private String url; - - @Override - public String getTxUrl() - { - System.out.println("load tm.manager.url "); - return url; - } -} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java deleted file mode 100644 index 7332ff60f..000000000 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/TxManagerTxUrlServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.demo.service.impl; - -import com.codingapi.tx.config.service.TxManagerTxUrlService; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -/** - * create by lorne on 2017/11/18 - */ -@Service -public class TxManagerTxUrlServiceImpl implements TxManagerTxUrlService{ - - - @Value("${tm.manager.url}") - private String url; - - @Override - public String getTxUrl() { - System.out.println("load tm.manager.url "); - return url; - } -} diff --git a/tx-client/src/main/java/com/codingapi/tx/config/ConfigReader.java b/tx-client/src/main/java/com/codingapi/tx/config/ConfigReader.java deleted file mode 100644 index 63e90b257..000000000 --- a/tx-client/src/main/java/com/codingapi/tx/config/ConfigReader.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.codingapi.tx.config; - -import com.codingapi.tx.config.service.TxManagerTxUrlService; -import com.lorne.core.framework.utils.config.ConfigUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -/** - * create by lorne on 2017/11/13 - */ -@Component -public class ConfigReader { - - - private Logger logger = LoggerFactory.getLogger(ConfigReader.class); - - - private TxManagerTxUrlService txManagerTxUrlService; - - @Autowired - private ApplicationContext spring; - - - public String getTxUrl() { - - try { - txManagerTxUrlService = spring.getBean(TxManagerTxUrlService.class); - }catch (Exception e){ - logger.debug("load default txManagerTxUrlService "); - } - - if(txManagerTxUrlService == null){ - txManagerTxUrlService = new TxManagerTxUrlService() { - - private final String configName = "tx.properties"; - - private final String configKey = "url"; - - @Override - public String getTxUrl() { - return ConfigUtils.getString(configName,configKey); - } - }; - - logger.debug("load default txManagerTxUrlService"); - }else{ - logger.debug("load txManagerTxUrlService"); - } - - return txManagerTxUrlService.getTxUrl(); - } - - -} diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/service/TxManagerHttpRequestHelper.java b/tx-client/src/main/java/com/codingapi/tx/netty/service/TxManagerHttpRequestHelper.java deleted file mode 100644 index c3438938d..000000000 --- a/tx-client/src/main/java/com/codingapi/tx/netty/service/TxManagerHttpRequestHelper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.codingapi.tx.netty.service; - - -import com.lorne.core.framework.utils.http.HttpUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -/** - * create by lorne on 2017/11/17 - */ -@Component -public class TxManagerHttpRequestHelper { - - - private TxManagerHttpRequestService httpRequestService; - - @Autowired - private ApplicationContext spring; - - private Logger logger = LoggerFactory.getLogger(TxManagerHttpRequestHelper.class); - - - private void reloadHttpRequestService(){ - try { - httpRequestService = spring.getBean(TxManagerHttpRequestService.class); - }catch (Exception e){ - logger.debug("load default httpRequestService "); - } - - if(httpRequestService==null){ - httpRequestService = new TxManagerHttpRequestService() { - @Override - public String httpGet(String url) { - return HttpUtils.get(url); - } - - @Override - public String httpPost(String url, String params) { - return HttpUtils.post(url, params); - } - }; - logger.info("load default HttpRequestService ."); - }else { - logger.info("load HttpRequestService ."); - } - } - - public String httpGet(String url) { - reloadHttpRequestService(); - return httpRequestService.httpGet(url); - } - - public String httpPost(String url, String params) { - reloadHttpRequestService(); - return httpRequestService.httpPost(url,params); - } - - -} diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/service/TxManagerHttpRequestService.java b/tx-client/src/main/java/com/codingapi/tx/netty/service/TxManagerHttpRequestService.java deleted file mode 100644 index e8ae5769d..000000000 --- a/tx-client/src/main/java/com/codingapi/tx/netty/service/TxManagerHttpRequestService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.codingapi.tx.netty.service; - -/** - * create by lorne on 2017/11/17 - */ -public interface TxManagerHttpRequestService { - - String httpGet(String url); - - String httpPost(String url, String params); - -} From 0a271edef6905d11c263d79050733dddc7a831cc Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 16:41:16 +0800 Subject: [PATCH 42/71] =?UTF-8?q?maven=E4=B8=AD=E5=88=A0=E9=99=A4javadoc?= =?UTF-8?q?=E7=9A=84=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pom.xml b/pom.xml index f2357a3f7..7fe4e1463 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,6 @@ - org.sonatype.plugins nexus-staging-maven-plugin @@ -72,19 +71,6 @@ true - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - - From 457f1abc2a9c87254547f434ebfd2584fdf76cc7 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 18:41:33 +0800 Subject: [PATCH 43/71] =?UTF-8?q?=E5=B0=86feign=E7=A7=BB=E6=A4=8D=E5=88=B0?= =?UTF-8?q?tx-client=E4=B8=AD=EF=BC=8C=E4=BF=9D=E6=8C=81=E5=92=8Cdemo?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=B8=80=E6=A0=B7=E7=9A=84=E5=8C=85=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=8C=E8=BF=99=E6=A0=B7=E6=89=8D=E8=83=BD=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/service/impl/MQTxManagerFegin.java | 41 ------------ .../impl/MQTxManagerFeginServiceImpl.java | 66 ------------------- .../impl/MQTxManagerFeginServiceImpl.java | 3 +- .../com/example/demo}/MQTxManagerFegin.java | 2 +- 4 files changed, 3 insertions(+), 109 deletions(-) delete mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java delete mode 100644 springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java rename {springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo => tx-client/src/main/java/com/codingapi/tx/netty}/service/impl/MQTxManagerFeginServiceImpl.java (95%) rename {springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl => tx-client/src/main/java/com/example/demo}/MQTxManagerFegin.java (97%) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java deleted file mode 100644 index f34407607..000000000 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.example.demo.service.impl; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * @author yizhishang - */ -@FeignClient(value = "tx-manager") -public interface MQTxManagerFegin { - - /** - * 检查并清理事务数据 - * @param groupId 事务组id - * @param taskId 任务id - * @return 事务状态 - */ - @GetMapping("/tx/manager/cleanNotifyTransaction") - String cleanNotifyTransactionHttp(@RequestParam(value = "groupId") String groupId, @RequestParam(value = "taskId") String taskId); - - /** - * 记录补偿事务数据到tm - */ - @PostMapping("/tx/manager/sendCompensateMsg") - String sendCompensateMsg(@RequestParam("currentTime") long currentTime, @RequestParam("groupId") String groupId, - @RequestParam("model") String model, @RequestParam("address") String address, - @RequestParam("uniqueKey") String uniqueKey, - @RequestParam("className") String className, @RequestParam("methodStr") String methodStr, - @RequestParam("data") String data, @RequestParam("time") long time, - @RequestParam("startError") int startError); - - /** - * 获取TM服务地址 - * @return txServer - */ - @GetMapping("/tx/manager/getServer") - String getServer(); - -} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java deleted file mode 100644 index 22d5027ea..000000000 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.example.demo.service.impl; - -import com.codingapi.tx.netty.service.MQTxManagerFeginService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; - -/** - * @author yizhishang - */ -@Service -public class MQTxManagerFeginServiceImpl implements MQTxManagerFeginService { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private ApplicationContext spring; - - @Autowired - private MQTxManagerFegin mqTxManagerFegin; - - public void reloadMqTxManagerFegin() { -// if(mqTxManagerFegin == null){ -// this.mqTxManagerFegin = spring.getBean(MQTxManagerFegin.class); -// } - } - - /** - * 检查并清理事务数据 - * - * @param groupId 事务组id - * @param waitTaskId 任务id - * @return 事务状态 - */ - @Override - public String cleanNotifyTransactionHttp(String groupId, String waitTaskId) { - reloadMqTxManagerFegin(); - logger.info("检查并清理事务数据...groupId:{}, waitTaskId:{}", groupId, waitTaskId); - return mqTxManagerFegin.cleanNotifyTransactionHttp(groupId, waitTaskId); - } - - /** - * 记录补偿事务数据到tm - */ - @Override - public String sendCompensateMsg(long currentTime, String groupId, String model, String address, String uniqueKey, String className, String methodStr, String data, long time,int startError) { - reloadMqTxManagerFegin(); - logger.info("记录补偿事务数据到tm"); - return mqTxManagerFegin.sendCompensateMsg(currentTime, groupId, model, address, uniqueKey, className, methodStr, data, time,startError); - } - - /** - * 获取TM服务地址 - * - * @return txServer - */ - @Override - public String getServer() { - reloadMqTxManagerFegin(); - logger.info("获取TM服务地址"); - return mqTxManagerFegin.getServer(); - } - -} diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerFeginServiceImpl.java similarity index 95% rename from springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java rename to tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerFeginServiceImpl.java index 8397361f7..0ab315f9c 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFeginServiceImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerFeginServiceImpl.java @@ -1,5 +1,6 @@ -package com.example.demo.service.impl; +package com.codingapi.tx.netty.service.impl; +import com.example.demo.MQTxManagerFegin; import com.codingapi.tx.netty.service.MQTxManagerFeginService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java b/tx-client/src/main/java/com/example/demo/MQTxManagerFegin.java similarity index 97% rename from springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java rename to tx-client/src/main/java/com/example/demo/MQTxManagerFegin.java index f54068a8c..592074eaa 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/service/impl/MQTxManagerFegin.java +++ b/tx-client/src/main/java/com/example/demo/MQTxManagerFegin.java @@ -1,4 +1,4 @@ -package com.example.demo.service.impl; +package com.example.demo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; From 4c540fe68f51baf565fa6e89dea529be81872538 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 18:53:38 +0800 Subject: [PATCH 44/71] =?UTF-8?q?=E7=BC=96=E5=86=99demo=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/README.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/springcloud-lcn-demo/README.md b/springcloud-lcn-demo/README.md index dbf6113b5..b0e42026d 100644 --- a/springcloud-lcn-demo/README.md +++ b/springcloud-lcn-demo/README.md @@ -24,21 +24,16 @@ ```` ->2.application.properties文件配置eureka地址和Txmanager地址，其中eureka地址与Txmanager的eureka地址保持一致 +>2.application.properties文件配置eureka地址 ```properties -tm.manager.url=http://127.0.0.1:8899/tx/manager/ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ ``` ->3.实现TxManagerHttpRequestService和TxManagerTxUrlService，参考service下的实现 +>3.事务发起方(事务参与方不需要)中的涉及分布式事务的方法要添加@TxTransaction(isStart = true)注解 ->4.事务参与方(事务发起方不需要)中的业务service要实现ITxTransaction接口 +>4.无论事务发起方还是事务参与方的业务方法都需要实现本地事务添加@Transactional注解和@TxTransaction注解 ->5.事务发起方(事务参与方不需要)中的涉及分布式事务的方法要添加@TxTransaction(isStart = true)注解 - ->6.无论事务发起方还是事务参与方的业务方法都需要实现本地事务添加@Transactional注解和@TxTransaction注解 - ->7.tx-manager启动前要配置redis +>5.tx-manager启动前要配置redis 注意事项：避免事务发起方和调用方操作一张表的数据，会导致锁表 \ No newline at end of file From 50ef629bf1086e6759fd4589c7d2aabc8e639495 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 18:55:39 +0800 Subject: [PATCH 45/71] =?UTF-8?q?=E7=BC=96=E5=86=99demo=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/springcloud-lcn-demo/README.md b/springcloud-lcn-demo/README.md index b0e42026d..3916048cb 100644 --- a/springcloud-lcn-demo/README.md +++ b/springcloud-lcn-demo/README.md @@ -29,9 +29,9 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ ``` ->3.事务发起方(事务参与方不需要)中的涉及分布式事务的方法要添加@TxTransaction(isStart = true)注解 +>3.发起方和参与方的业务方法添加@Transactional注解和@TxTransaction注解 ->4.无论事务发起方还是事务参与方的业务方法都需要实现本地事务添加@Transactional注解和@TxTransaction注解 +>4.发起方中的涉及分布式事务的方法要添加@TxTransaction(isStart = true)注解 >5.tx-manager启动前要配置redis From de732b7cf14b8ed2a22016ee486b4e89dbee3ad2 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Thu, 6 Dec 2018 19:52:32 +0800 Subject: [PATCH 46/71] =?UTF-8?q?demo=E4=B8=AD=E5=8E=BB=E6=8E=89pom.xml=20?= =?UTF-8?q?=E4=B8=ADweb=E5=8C=85=E5=90=AB=E7=9A=84tomcat=E7=9A=84=E5=BC=95?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BD=BF=E7=94=A8undertow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/springcloud-lcn-demo/pom.xml b/springcloud-lcn-demo/pom.xml index 083465aa2..ce55ad7d8 100644 --- a/springcloud-lcn-demo/pom.xml +++ b/springcloud-lcn-demo/pom.xml @@ -83,6 +83,16 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow From 189a515338a0557880373b5691c769e3b385d907 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Fri, 7 Dec 2018 10:49:25 +0800 Subject: [PATCH 47/71] =?UTF-8?q?=E4=BF=AE=E6=94=B9Ribbon=E8=B4=9F?= =?UTF-8?q?=E8=BD=BD=E5=9D=87=E8=A1=A1=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 4 ++-- .../src/main/resources/application.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties index a3f4ec419..a26c20ceb 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/resources/application.properties @@ -19,8 +19,8 @@ server.port = 8081 eureka.client.service-url.defaultZone=http://127.0.0.1:1111/eureka/ #Ribbon\u7684\u8D1F\u8F7D\u5747\u8861\u7B56\u7565 -ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.RandomRule -ribbon.MaxAutoRetriesNextServer=0 +tx-manager.ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.RandomRule +tx-manager.ribbon.MaxAutoRetriesNextServer=0 ribbon.eureka.enabled=true ribbon.readTimeout=6000 diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties index 43d3f1d03..e12fa5eb6 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/resources/application.properties @@ -11,8 +11,8 @@ server.port = 8082 eureka.client.service-url.defaultZone=http://127.0.0.1:1111/eureka/ ##Ribbon\u7684\u8D1F\u8F7D\u5747\u8861\u7B56\u7565 -ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.RandomRule -ribbon.MaxAutoRetriesNextServer=0 +tx-manager.ribbon.NFLoadBalancerRuleClassName=com.netflix.loadbalancer.RandomRule +tx-manager.ribbon.MaxAutoRetriesNextServer=0 ribbon.eureka.enabled=true ribbon.readTimeout=6000 From 064768e204973152d503ffdfa332756f69936452 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 10 Dec 2018 10:06:55 +0800 Subject: [PATCH 48/71] =?UTF-8?q?=E4=BF=AE=E6=94=B9Ribbon=E8=B4=9F?= =?UTF-8?q?=E8=BD=BD=E5=9D=87=E8=A1=A1=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/pom.xml | 67 +++++++++++++++++++ .../com/example/demo/MQTxManagerFegin.java | 6 +- 2 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 extensions/pom.xml rename {tx-client => extensions}/src/main/java/com/example/demo/MQTxManagerFegin.java (86%) diff --git a/extensions/pom.xml b/extensions/pom.xml new file mode 100644 index 000000000..9b4fbb053 --- /dev/null +++ b/extensions/pom.xml @@ -0,0 +1,67 @@ + + + + + tx-lcn + com.codingapi + 4.2.0 + + 4.0.0 + + extensions + + extensions + + + + org.springframework.cloud + spring-cloud-openfeign-core + 2.0.0.RELEASE + compile + + + + org.springframework + spring-web + ${org.springframework-version} + compile + + + + + + + + maven-clean-plugin + 3.0.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.7.0 + + + maven-surefire-plugin + 2.20.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + + diff --git a/tx-client/src/main/java/com/example/demo/MQTxManagerFegin.java b/extensions/src/main/java/com/example/demo/MQTxManagerFegin.java similarity index 86% rename from tx-client/src/main/java/com/example/demo/MQTxManagerFegin.java rename to extensions/src/main/java/com/example/demo/MQTxManagerFegin.java index 592074eaa..861763b16 100644 --- a/tx-client/src/main/java/com/example/demo/MQTxManagerFegin.java +++ b/extensions/src/main/java/com/example/demo/MQTxManagerFegin.java @@ -24,11 +24,11 @@ public interface MQTxManagerFegin { * 记录补偿事务数据到tm */ @PostMapping("/tx/manager/sendCompensateMsg") - String sendCompensateMsg(@RequestParam("currentTime") long currentTime,@RequestParam("groupId") String groupId, + String sendCompensateMsg(@RequestParam("currentTime") long currentTime, @RequestParam("groupId") String groupId, @RequestParam("model") String model, @RequestParam("address") String address, @RequestParam("uniqueKey") String uniqueKey, - @RequestParam("className") String className,@RequestParam("methodStr") String methodStr, - @RequestParam("data") String data,@RequestParam("time") long time, + @RequestParam("className") String className, @RequestParam("methodStr") String methodStr, + @RequestParam("data") String data, @RequestParam("time") long time, @RequestParam("startError") int startError); /** From df629cad04eb73c19d9b4d8a189948feec599697 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 10 Dec 2018 10:07:23 +0800 Subject: [PATCH 49/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 16 ++++++++++++++-- springcloud-lcn-demo/pom.xml | 11 ++++------- transaction-springcloud/pom.xml | 8 +------- tx-client/pom.xml | 24 ++++++++++-------------- tx-manager/pom.xml | 2 +- tx-plugins-db/pom.xml | 4 +--- 6 files changed, 31 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 7fe4e1463..8d257f195 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.codingapi tx-lcn - 4.2.0-SNAPSHOT + 4.2.0 pom tx-lcn @@ -20,6 +20,7 @@ tx-plugins-db springcloud-lcn-demo + extensions @@ -31,7 +32,18 @@ 1.8 3.6.0 - 4.2.0-SNAPSHOT + 1.8.4 + 19.0 + 4.0.38 + 1.1.3 + 4.0.0 + 1.7.7 + + 4.2.0 + 2.0.4.RELEASE + 5.0.8.RELEASE + + 2.0.0.RELEASE diff --git a/springcloud-lcn-demo/pom.xml b/springcloud-lcn-demo/pom.xml index ce55ad7d8..8370bf071 100644 --- a/springcloud-lcn-demo/pom.xml +++ b/springcloud-lcn-demo/pom.xml @@ -15,7 +15,6 @@ springcloud-mybatis-demo2 - org.springframework.boot spring-boot-starter-parent @@ -26,14 +25,12 @@ UTF-8 UTF-8 + 1.8 + 1.8 + 1.8 - 1.7 - 1.7 - 1.7 + 4.2.0 Finchley.RELEASE - - 4.2.0-SNAPSHOT - diff --git a/transaction-springcloud/pom.xml b/transaction-springcloud/pom.xml index 805515790..4c890ce05 100644 --- a/transaction-springcloud/pom.xml +++ b/transaction-springcloud/pom.xml @@ -7,22 +7,16 @@ com.codingapi tx-lcn - 4.2.0-SNAPSHOT + 4.2.0 transaction-springcloud - ${lcn.last.version} transaction-springcloud https://github.com/codingapi/tx-lcn transaction-springcloud project for Spring Boot - - 2.0.4.RELEASE - 5.0.8.RELEASE - - diff --git a/tx-client/pom.xml b/tx-client/pom.xml index f21b6b168..e6178542d 100644 --- a/tx-client/pom.xml +++ b/tx-client/pom.xml @@ -6,33 +6,29 @@ com.codingapi tx-lcn - 4.2.0-SNAPSHOT + 4.2.0 com.codingapi tx-client - ${lcn.last.version} tx-client https://github.com/codingapi/tx-lcn tx-client project for Spring Boot - - 5.0.8.RELEASE - 19.0 - 4.0.38 - 1.1.3 - 4.0.0 - 1.7.7 - - + + com.codingapi + extensions + 4.2.0 + + org.springframework.cloud spring-cloud-starter-openfeign - 2.0.0.RELEASE + ${spring-cloud-starter-openfeign.version} org.springframework.cloud @@ -55,12 +51,12 @@ org.aspectj aspectjweaver - 1.8.4 + ${org.aspectj.version} org.aspectj aspectjrt - 1.8.4 + ${org.aspectj.version} diff --git a/tx-manager/pom.xml b/tx-manager/pom.xml index 38d14dd99..ffcfc28aa 100644 --- a/tx-manager/pom.xml +++ b/tx-manager/pom.xml @@ -5,7 +5,7 @@ com.codingapi tx-manager - 4.2.0-SNAPSHOT + 4.2.0 jar tx-manager diff --git a/tx-plugins-db/pom.xml b/tx-plugins-db/pom.xml index a0d1612ef..51c8bd738 100644 --- a/tx-plugins-db/pom.xml +++ b/tx-plugins-db/pom.xml @@ -6,11 +6,10 @@ com.codingapi tx-lcn - 4.2.0-SNAPSHOT + 4.2.0 tx-plugins-db - ${lcn.last.version} tx-plugins-db https://github.com/codingapi/tx-lcn @@ -36,5 +35,4 @@ - From 5326cfe9622c0dd29ea5e4e88094c3fb843d9b51 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 10 Dec 2018 13:39:16 +0800 Subject: [PATCH 50/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/pom.xml | 2 +- tx-manager/pom.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/extensions/pom.xml b/extensions/pom.xml index 9b4fbb053..3e7d438f4 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -17,7 +17,7 @@ org.springframework.cloud spring-cloud-openfeign-core - 2.0.0.RELEASE + 2.0.2.RELEASE compile diff --git a/tx-manager/pom.xml b/tx-manager/pom.xml index ffcfc28aa..c8e37c9e7 100644 --- a/tx-manager/pom.xml +++ b/tx-manager/pom.xml @@ -86,8 +86,7 @@ org.springframework.boot - spring-boot-starter-redis - 1.3.8.RELEASE + spring-boot-starter-data-redis From 234280a2c63a7a8da32c9f3a68ece468faae6d5c Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 10 Dec 2018 15:39:48 +0800 Subject: [PATCH 51/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 343e003d0..1326b0f30 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,10 @@ ## 目录说明 +extensions feign扩展配置类 + +springcloud-lcn-demo demo案例 + transaction-springcloud LCN springcloud rpc框架扩展支持 tx-client 是LCN核心tx模块端控制框架 @@ -44,7 +48,6 @@ tx-plugins-db 是LCN 对关系型数据库的插件支持分布式事务发起方： ``` - @Override @TxTransaction(isStart=true) @Transactional @@ -57,13 +60,10 @@ tx-plugins-db 是LCN 对关系型数据库的插件支持 int v = 100/0; return true; } - - ``` 分布式事务被调用方(test2Service的业务实现类) ``` - @Override @Transactional @TxTransaction @@ -72,7 +72,6 @@ tx-plugins-db 是LCN 对关系型数据库的插件支持 testDao.save(); return true; } - ``` 如上代码执行完成以后两个模块都将回滚事务。 From 01ff832dd5b6fd12b92203418801baf7a8adcc09 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Mon, 10 Dec 2018 15:43:28 +0800 Subject: [PATCH 52/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/README.md b/README.md index 1326b0f30..3bc051075 100644 --- a/README.md +++ b/README.md @@ -114,27 +114,12 @@ tx-plugins-db 是LCN 对关系型数据库的插件支持 ${lcn.last.version} - com.codingapi tx-plugins-db ${lcn.last.version} - - - com.codingapi - transaction-dubbo - ${lcn.last.version} - - - - com.codingapi - transaction-motan - ${lcn.last.version} - - - com.codingapi transaction-springcloud From fbe774983778082f95ed04cd5766069639b111d0 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 11 Dec 2018 10:46:20 +0800 Subject: [PATCH 53/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tx-manager/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tx-manager/pom.xml b/tx-manager/pom.xml index c8e37c9e7..ffcfc28aa 100644 --- a/tx-manager/pom.xml +++ b/tx-manager/pom.xml @@ -86,7 +86,8 @@ org.springframework.boot - spring-boot-starter-data-redis + spring-boot-starter-redis + 1.3.8.RELEASE From 6694ed95eeed44a0093acdf0d24b9c8d12755775 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 11 Dec 2018 11:05:45 +0800 Subject: [PATCH 54/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/pom.xml | 67 ------------------- .../example/demo/MybatisDemo1Application.java | 2 +- tx-client/pom.xml | 6 -- .../com/codingapi/tx}/MQTxManagerFegin.java | 2 +- .../tx/aop/bean/TxTransactionLocal.java | 2 +- .../config/service/TxManagerTxUrlService.java | 9 --- .../impl/MQTxManagerFeginServiceImpl.java | 2 +- 7 files changed, 4 insertions(+), 86 deletions(-) delete mode 100644 extensions/pom.xml rename {extensions/src/main/java/com/example/demo => tx-client/src/main/java/com/codingapi/tx}/MQTxManagerFegin.java (98%) delete mode 100644 tx-client/src/main/java/com/codingapi/tx/config/service/TxManagerTxUrlService.java diff --git a/extensions/pom.xml b/extensions/pom.xml deleted file mode 100644 index 3e7d438f4..000000000 --- a/extensions/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - tx-lcn - com.codingapi - 4.2.0 - - 4.0.0 - - extensions - - extensions - - - - org.springframework.cloud - spring-cloud-openfeign-core - 2.0.2.RELEASE - compile - - - - org.springframework - spring-web - ${org.springframework-version} - compile - - - - - - - - maven-clean-plugin - 3.0.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.7.0 - - - maven-surefire-plugin - 2.20.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - - - diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java index 1f00d833d..913b8dd4e 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java @@ -15,7 +15,7 @@ @Configuration @SpringBootApplication @EnableEurekaClient -@EnableFeignClients +@EnableFeignClients(basePackages = {"com.codingapi.tx"}) public class MybatisDemo1Application { public static void main(String[] args) { diff --git a/tx-client/pom.xml b/tx-client/pom.xml index e6178542d..f185e56e5 100644 --- a/tx-client/pom.xml +++ b/tx-client/pom.xml @@ -19,12 +19,6 @@ - - com.codingapi - extensions - 4.2.0 - - org.springframework.cloud spring-cloud-starter-openfeign diff --git a/extensions/src/main/java/com/example/demo/MQTxManagerFegin.java b/tx-client/src/main/java/com/codingapi/tx/MQTxManagerFegin.java similarity index 98% rename from extensions/src/main/java/com/example/demo/MQTxManagerFegin.java rename to tx-client/src/main/java/com/codingapi/tx/MQTxManagerFegin.java index 861763b16..c6ca8ae9b 100644 --- a/extensions/src/main/java/com/example/demo/MQTxManagerFegin.java +++ b/tx-client/src/main/java/com/codingapi/tx/MQTxManagerFegin.java @@ -1,4 +1,4 @@ -package com.example.demo; +package com.codingapi.tx; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/bean/TxTransactionLocal.java b/tx-client/src/main/java/com/codingapi/tx/aop/bean/TxTransactionLocal.java index e134b5ea8..3fce24713 100644 --- a/tx-client/src/main/java/com/codingapi/tx/aop/bean/TxTransactionLocal.java +++ b/tx-client/src/main/java/com/codingapi/tx/aop/bean/TxTransactionLocal.java @@ -19,7 +19,7 @@ public class TxTransactionLocal { private Logger logger = LoggerFactory.getLogger(TxTransactionLocal.class); - private final static ThreadLocal currentLocal = new InheritableThreadLocal(); + private final static ThreadLocal currentLocal = new InheritableThreadLocal<>(); private String groupId; diff --git a/tx-client/src/main/java/com/codingapi/tx/config/service/TxManagerTxUrlService.java b/tx-client/src/main/java/com/codingapi/tx/config/service/TxManagerTxUrlService.java deleted file mode 100644 index 3d8004658..000000000 --- a/tx-client/src/main/java/com/codingapi/tx/config/service/TxManagerTxUrlService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.codingapi.tx.config.service; - -/** - * create by lorne on 2017/11/18 - */ -public interface TxManagerTxUrlService { - - String getTxUrl(); -} diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerFeginServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerFeginServiceImpl.java index 0ab315f9c..caeae9d7d 100644 --- a/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerFeginServiceImpl.java +++ b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/MQTxManagerFeginServiceImpl.java @@ -1,6 +1,6 @@ package com.codingapi.tx.netty.service.impl; -import com.example.demo.MQTxManagerFegin; +import com.codingapi.tx.MQTxManagerFegin; import com.codingapi.tx.netty.service.MQTxManagerFeginService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; From 5bd16ccdc3be52934546bea6855dac136889fa78 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 11 Dec 2018 11:06:22 +0800 Subject: [PATCH 55/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/example/demo/MybatisDemo2Application.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java index 192d798ab..f5f9133b1 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java @@ -15,7 +15,7 @@ @Configuration @SpringBootApplication @EnableEurekaClient -@EnableFeignClients +@@EnableFeignClients(basePackages = {"com.codingapi.tx"}) public class MybatisDemo2Application { public static void main(String[] args) { From 1586f801d21312b2fdc1ea3d6af8e3df241cd463 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 11 Dec 2018 11:07:35 +0800 Subject: [PATCH 56/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/README.md | 2 ++ .../src/main/java/com/example/demo/MybatisDemo2Application.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/springcloud-lcn-demo/README.md b/springcloud-lcn-demo/README.md index 3916048cb..a0b024d86 100644 --- a/springcloud-lcn-demo/README.md +++ b/springcloud-lcn-demo/README.md @@ -35,5 +35,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ >5.tx-manager启动前要配置redis +>6. springboot启动类添加注解配置@EnableFeignClients(basePackages = {"com.codingapi.tx"}) + 注意事项：避免事务发起方和调用方操作一张表的数据，会导致锁表 \ No newline at end of file diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java index f5f9133b1..b4d943f83 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo2/src/main/java/com/example/demo/MybatisDemo2Application.java @@ -15,7 +15,7 @@ @Configuration @SpringBootApplication @EnableEurekaClient -@@EnableFeignClients(basePackages = {"com.codingapi.tx"}) +@EnableFeignClients(basePackages = {"com.codingapi.tx"}) public class MybatisDemo2Application { public static void main(String[] args) { From 372a3c2eabae6cbe471880c5c8eab817474150bb Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 11 Dec 2018 11:27:09 +0800 Subject: [PATCH 57/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/example/demo/MybatisDemo1Application.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java index 913b8dd4e..904a1ad3d 100644 --- a/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java +++ b/springcloud-lcn-demo/springcloud-mybatis-demo1/src/main/java/com/example/demo/MybatisDemo1Application.java @@ -15,7 +15,7 @@ @Configuration @SpringBootApplication @EnableEurekaClient -@EnableFeignClients(basePackages = {"com.codingapi.tx"}) +@EnableFeignClients(basePackages = {"com.codingapi.tx", "com.example.demo"}) public class MybatisDemo1Application { public static void main(String[] args) { From 1ed77e9c6338264147c3e1c9a6967273b0a35361 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Tue, 11 Dec 2018 16:20:11 +0800 Subject: [PATCH 58/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- springcloud-lcn-demo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/springcloud-lcn-demo/README.md b/springcloud-lcn-demo/README.md index a0b024d86..b592b60f0 100644 --- a/springcloud-lcn-demo/README.md +++ b/springcloud-lcn-demo/README.md @@ -35,7 +35,7 @@ eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ >5.tx-manager启动前要配置redis ->6. springboot启动类添加注解配置@EnableFeignClients(basePackages = {"com.codingapi.tx"}) +>6.springboot启动类添加注解配置@EnableFeignClients(basePackages = {"com.codingapi.tx"}) 注意事项：避免事务发起方和调用方操作一张表的数据，会导致锁表 \ No newline at end of file From aaaddeeaf528b561773b9be5a386dd7cb095e490 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Wed, 12 Dec 2018 15:58:24 +0800 Subject: [PATCH 59/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= =?UTF-8?q?:=E5=88=A0=E9=99=A4extensions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d257f195..900705dcc 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,6 @@ tx-plugins-db springcloud-lcn-demo - extensions From 0f1722f7dd135f27f0f8abccf444a414ce901045 Mon Sep 17 00:00:00 2001 From: yizhishang <285206405@qq.com> Date: Wed, 12 Dec 2018 17:11:21 +0800 Subject: [PATCH 60/71] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=20--=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84r?= =?UTF-8?q?edis=E5=BC=95=E7=94=A8=20--=E4=BF=AE=E6=94=B9redis=E4=B8=BA?= =?UTF-8?q?=E9=9B=86=E7=BE=A4=E4=BD=BF=E7=94=A8=20--=E6=B7=BB=E5=8A=A0Redi?= =?UTF-8?q?sTemplateConfig.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tx-manager/pom.xml | 9 +- .../tm/redis/JedisClusterConfig.java | 89 ------------------- .../com/codingapi/tm/redis/RedisConfig.java | 44 --------- .../codingapi/tm/redis/RedisProperties.java | 35 -------- .../configuration/RedisTemplateConfig.java | 52 +++++++++++ .../service/impl/RedisServerServiceImpl.java | 1 + .../src/main/resources/application.properties | 20 ++--- 7 files changed, 70 insertions(+), 180 deletions(-) delete mode 100644 tx-manager/src/main/java/com/codingapi/tm/redis/JedisClusterConfig.java delete mode 100644 tx-manager/src/main/java/com/codingapi/tm/redis/RedisConfig.java delete mode 100644 tx-manager/src/main/java/com/codingapi/tm/redis/RedisProperties.java create mode 100644 tx-manager/src/main/java/com/codingapi/tm/redis/configuration/RedisTemplateConfig.java diff --git a/tx-manager/pom.xml b/tx-manager/pom.xml index ffcfc28aa..684aee77a 100644 --- a/tx-manager/pom.xml +++ b/tx-manager/pom.xml @@ -86,8 +86,13 @@ org.springframework.boot - spring-boot-starter-redis - 1.3.8.RELEASE + spring-boot-starter-data-redis + + + + com.alibaba + fastjson + 1.2.47 diff --git a/tx-manager/src/main/java/com/codingapi/tm/redis/JedisClusterConfig.java b/tx-manager/src/main/java/com/codingapi/tm/redis/JedisClusterConfig.java deleted file mode 100644 index 6f7112431..000000000 --- a/tx-manager/src/main/java/com/codingapi/tm/redis/JedisClusterConfig.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.codingapi.tm.redis; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.core.env.MapPropertySource; -import org.springframework.data.redis.connection.RedisClusterConfiguration; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import redis.clients.jedis.HostAndPort; -import redis.clients.jedis.JedisCluster; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -/** - * Created by lorne on 2017/10/31. - */ -@ConditionalOnClass({JedisCluster.class}) -@EnableConfigurationProperties(RedisProperties.class) -public class JedisClusterConfig { - - @Autowired - private RedisProperties redisProperties; - - @Bean - public JedisCluster jedisClusterFactory() { - String[] serverArray = redisProperties.getNodes().split(","); - Set nodes = new HashSet(); - for (String ipPort: serverArray) { - String[] ipPortPair = ipPort.split(":"); - nodes.add(new HostAndPort(ipPortPair[0].trim(),Integer.valueOf(ipPortPair[1].trim()))); - } - return new JedisCluster(nodes, redisProperties.getCommandTimeout()); - } - - @Bean - public RedisTemplate redisTemplateFactory(){ - RedisTemplate redisTemplate =new RedisTemplate(); - redisTemplate.setConnectionFactory(jedisConnectionFactory()); - - //指定具体序列化方式不过这种方式不是很好,一个系统中可能对应值的类型不一样,如果全部使用StringRedisSerializer 序列化 - //会照成其他类型报错,所以还是推荐使用第一种,直接指定泛型的类型,spring 会根据指定类型序列化。 -// redisTemplate.setKeySerializer( new StringRedisSerializer()); -// redisTemplate.setValueSerializer(new StringRedisSerializer()); -// redisTemplate.setHashKeySerializer(new StringRedisSerializer()); -// redisTemplate.setHashValueSerializer(new StringRedisSerializer()); - return redisTemplate; - } - - - /** - * redisCluster配置 - * @return - */ - @Bean - public RedisClusterConfiguration redisClusterConfiguration() { - Map source = new HashMap(); - source.put("spring.redis.cluster.nodes", redisProperties.getNodes()); - source.put("spring.redis.cluster.timeout", redisProperties.getCommandTimeout()); - return new RedisClusterConfiguration(new MapPropertySource("RedisClusterConfiguration", source)); - } - - - /** - * 其实在JedisConnectionFactory的afterPropertiesSet()方法中 - * if(cluster !=null) this.cluster =createCluster(); - * 也就是当 - * spring.redis.cluster.nodes 配置好的情况下,就可以实例化 JedisCluster. - * 也就是说,我们使用JedisCluster 的方式只需要在application.properties 配置文件中 - * - * #redis cluster - * spring.redis.cluster.nodes=127.0.0.1:7000,127.0.0.1:7001,127.0.0.1:7002 - * - * RedisTemplate.afterPropertiesSet() 中查看到最终方法中使用了JedisCluster 对象。 - * 也就是说 redisTemplate依赖jedis ,内部操作的就是jedis,同理内部也操作jedisCluster. - * - * - * @return - */ - @Bean - public JedisConnectionFactory jedisConnectionFactory() { - return new JedisConnectionFactory(redisClusterConfiguration()); - } -} \ No newline at end of file diff --git a/tx-manager/src/main/java/com/codingapi/tm/redis/RedisConfig.java b/tx-manager/src/main/java/com/codingapi/tm/redis/RedisConfig.java deleted file mode 100644 index 81ceae8f6..000000000 --- a/tx-manager/src/main/java/com/codingapi/tm/redis/RedisConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.codingapi.tm.redis; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.StringRedisTemplate; -import redis.clients.jedis.JedisPoolConfig; - -/** - * Created by lorne on 2017/7/5. - */ - -@EnableAutoConfiguration -public class RedisConfig { - - private static Logger logger = LoggerFactory.getLogger(RedisConfig.class); - - @Bean - @ConfigurationProperties(prefix = "spring.redis") - public JedisPoolConfig getRedisConfig() { - JedisPoolConfig config = new JedisPoolConfig(); - return config; - } - - @Bean - @ConfigurationProperties(prefix = "spring.redis") - public JedisConnectionFactory getConnectionFactory() { - JedisConnectionFactory factory = new JedisConnectionFactory(); - JedisPoolConfig config = getRedisConfig(); - factory.setPoolConfig(config); - logger.info("JedisConnectionFactory bean init success."); - return factory; - } - - - @Bean - public RedisTemplate getRedisTemplate() { - return new StringRedisTemplate(getConnectionFactory()); - } -} diff --git a/tx-manager/src/main/java/com/codingapi/tm/redis/RedisProperties.java b/tx-manager/src/main/java/com/codingapi/tm/redis/RedisProperties.java deleted file mode 100644 index bd1815c95..000000000 --- a/tx-manager/src/main/java/com/codingapi/tm/redis/RedisProperties.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.codingapi.tm.redis; - - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * Created by lorne on 2017/10/31. - */ - -@Component -@ConfigurationProperties(prefix = "spring.redis.cluster") -public class RedisProperties { - - - private String nodes; - - private Integer commandTimeout; - - public String getNodes() { - return nodes; - } - - public void setNodes(String nodes) { - this.nodes = nodes; - } - - public Integer getCommandTimeout() { - return commandTimeout; - } - - public void setCommandTimeout(Integer commandTimeout) { - this.commandTimeout = commandTimeout; - } -} diff --git a/tx-manager/src/main/java/com/codingapi/tm/redis/configuration/RedisTemplateConfig.java b/tx-manager/src/main/java/com/codingapi/tm/redis/configuration/RedisTemplateConfig.java new file mode 100644 index 000000000..e1322625f --- /dev/null +++ b/tx-manager/src/main/java/com/codingapi/tm/redis/configuration/RedisTemplateConfig.java @@ -0,0 +1,52 @@ +package com.codingapi.tm.redis.configuration; + +import com.alibaba.fastjson.parser.ParserConfig; +import com.alibaba.fastjson.support.spring.FastJsonRedisSerializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.StringRedisSerializer; +import org.springframework.stereotype.Component; + +/** + * @author yizhishhang + * @description 使用一个Transfer类间接注入RedisConnectionFactory + * Created on 2018/4/18 0018 10:21 + */ +@Component +public class RedisTemplateConfig +{ + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) + { + logger.info("redis...初始化"); + + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(redisConnectionFactory); + + FastJsonRedisSerializer

TxManagerV4.1.0 服务已启动

TxManagerV4.2.0 服务已启动