更新版本号

QNJR-GROUP · Nov 28, 2019 · ba7cc37 · ba7cc37
1 parent 673d3d8
commit ba7cc37
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/easytrans-starter/src/test/java/com/yiqiniu/easytrans/test/FullTest.java b/easytrans-starter/src/test/java/com/yiqiniu/easytrans/test/FullTest.java
@@ -11,6 +11,7 @@
 import java.util.concurrent.Future;
 
 import javax.annotation.Resource;
+import javax.sql.DataSource;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -26,6 +27,7 @@
 
 import com.yiqiniu.easytrans.core.ConsistentGuardian;
 import com.yiqiniu.easytrans.core.EasytransConstant;
+import com.yiqiniu.easytrans.extensionsuite.impl.database.GetExtentionSuiteDatabase;
 import com.yiqiniu.easytrans.log.TransactionLogReader;
 import com.yiqiniu.easytrans.log.impl.database.DataBaseTransactionLogConfiguration.DataBaseForLog;
 import com.yiqiniu.easytrans.log.vo.LogCollection;
@@ -80,6 +82,8 @@ public class FullTest {
 	private WalletService walletService;
 	@Autowired(required=false)
 	private DataBaseForLog dbForLog;
+	@Autowired(required=false)
+	private GetExtentionSuiteDatabase suiteDatabase;
 
 	@Resource
 	private CouponService couponService;
@@ -561,8 +565,16 @@ private void cleanAndSetUp() {
                 "TRUNCATE `undo_log`"
 				});
 
-		if(dbForLog != null){
-			JdbcTemplate transLogJdbcTemplate = new JdbcTemplate(dbForLog.getDataSource());
+		if(dbForLog != null || suiteDatabase != null){
+
+		    DataSource dataSource = null;
+		    if(dbForLog != null) {
+		        dataSource = dbForLog.getDataSource();
+		    } else {
+		        dataSource = suiteDatabase.getDataSource();
+		    }
+
+			JdbcTemplate transLogJdbcTemplate = new JdbcTemplate(dataSource);
 			transLogJdbcTemplate
 			.batchUpdate(new String[] { "TRUNCATE `trans_log_unfinished`", "TRUNCATE `trans_log_detail`", });
 		}

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<revision>1.4.0</revision>
+		<revision>1.4.2</revision>
 	</properties>
 
 

diff --git a/readme.md b/readme.md
@@ -95,7 +95,7 @@
 	  <dependency>
         <groupId>com.yiqiniu.easytrans</groupId>
         <artifactId>easytrans-starter</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.2</version>
       </dependency>
 
 Starter里包含了若干默认的组件实现:基于mysql的分布式事务日志存储，基于ribbon-rest的RPC实现，基于KAFKA的消息队列，若不需要或者要替换，可以EXCLUDE掉