Merge pull request #80 from QNJR-GROUP/1.x

Version 1.1.0
QNJR-GROUP · Sep 16, 2018 · d14853e · d14853e
2 parents 5b82373 + f36b59d
commit d14853e
Show file tree

Hide file tree

Showing 33 changed files with 269 additions and 107 deletions.
diff --git a/...s-core/src/main/java/com/yiqiniu/easytrans/idempotent/DefaultIdempotentHandlerFilter.java b/...s-core/src/main/java/com/yiqiniu/easytrans/idempotent/DefaultIdempotentHandlerFilter.java
@@ -61,7 +61,9 @@ public EasyTransResult doInTransaction(TransactionStatus status) {
 
 								IdempotentPo idempotentPo = helper.getIdempotentPo(filterChain, header, request);
 								ExecuteOrder executeOrder = helper.getExecuteOrder(filterChain.getAppId(), filterChain.getBusCode(), filterChain.getInnerMethodName());
-								String objectMD5 = ObjectDigestUtil.getObjectMD5(request);
+
+								byte[] serialization = serializer.serialization(request);
+								String objectMD5 = ObjectDigestUtil.MD5Encode(serialization);
 
 								EasyTransResult innerResult = filterResult(idempotentPo, objectMD5, executeOrder);
 

diff --git a/...yiqiniu/easytrans/util/CallWrappUtil.java → .../yiqiniu/easytrans/util/CallWrapUtil.java b/...yiqiniu/easytrans/util/CallWrappUtil.java → .../yiqiniu/easytrans/util/CallWrapUtil.java
@@ -14,11 +14,11 @@
 import com.yiqiniu.easytrans.protocol.EasyTransRequest;
 import com.yiqiniu.easytrans.protocol.tcc.TccMethodRequest;
 
-public class CallWrappUtil {
+public class CallWrapUtil {
 
 	private EasyTransFacade facade;
 
-	public CallWrappUtil(EasyTransFacade facade) {
+	public CallWrapUtil(EasyTransFacade facade) {
 		this.facade = facade;
 	}
 

diff --git a/easytrans-core/src/main/java/com/yiqiniu/easytrans/util/ObjectDigestUtil.java b/easytrans-core/src/main/java/com/yiqiniu/easytrans/util/ObjectDigestUtil.java
@@ -82,7 +82,27 @@ public static String MD5Encode(String origin) {
 			md.update(resultString.getBytes("UTF-8"));
 			resultString = byteArrayToHexString(md.digest());
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+		return resultString;
+	}
+
+
+	/**
+	 * MD5编码
+	 * 
+	 * @param origin
+	 *            原始字符串
+	 * @return 经过MD5加密之后的结果
+	 */
+	public static String MD5Encode(byte[] origin) {
+		String resultString = null;
+		try {
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			md.update(origin);
+			resultString = byteArrayToHexString(md.digest());
+		} catch (Exception e) {
+			throw new RuntimeException(e);
 		}
 		return resultString;
 	}

diff --git a/...-order-service/src/main/java/com/yiqiniu/easytrans/demos/order/impl/OrderApplication.java b/...-order-service/src/main/java/com/yiqiniu/easytrans/demos/order/impl/OrderApplication.java
@@ -8,7 +8,7 @@
 import com.yiqiniu.easytrans.EnableEasyTransaction;
 import com.yiqiniu.easytrans.demos.wallet.api.WalletPayMoneyService;
 import com.yiqiniu.easytrans.demos.wallet.api.requestcfg.WalletPayRequestCfg;
-import com.yiqiniu.easytrans.util.CallWrappUtil;
+import com.yiqiniu.easytrans.util.CallWrapUtil;
 
 @SpringBootApplication
 @EnableEasyTransaction
@@ -22,7 +22,7 @@ public static void main(String[] args) {
 	 * create WalletPayMoneyService instance, you can inject the instance to call wallet tcc service
 	 */
 	@Bean
-	public WalletPayMoneyService payService(CallWrappUtil util) {
+	public WalletPayMoneyService payService(CallWrapUtil util) {
 		return util.createTransactionCallInstance(WalletPayMoneyService.class, WalletPayRequestCfg.class);
 	}
 

diff --git a/easytrans-demo/interface-call/pom.xml b/easytrans-demo/interface-call/pom.xml
@@ -19,7 +19,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.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/easytrans-demo/rpc-dubbo/pom.xml b/easytrans-demo/rpc-dubbo/pom.xml
@@ -19,7 +19,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.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/easytrans-demo/rpc-dubbo/rpcdubbo-order-service/pom.xml b/easytrans-demo/rpc-dubbo/rpcdubbo-order-service/pom.xml
@@ -47,7 +47,6 @@
 			<groupId>com.yiqiniu.easytrans</groupId>
 			<artifactId>easytrans-rpc-dubbo-starter</artifactId>
 			<exclusions>
-				<!-- dubbo import a very old version spring , exclude it -->
 				<exclusion>
 					<groupId>org.springframework</groupId>
 					<artifactId>spring</artifactId>

diff --git a/...-order-service/src/main/java/com/yiqiniu/easytrans/demos/order/impl/OrderApplication.java b/...-order-service/src/main/java/com/yiqiniu/easytrans/demos/order/impl/OrderApplication.java
@@ -1,10 +1,16 @@
 package com.yiqiniu.easytrans.demos.order.impl;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import com.alibaba.dubbo.config.ReferenceConfig;
+import com.alibaba.dubbo.rpc.service.GenericService;
 import com.yiqiniu.easytrans.EnableEasyTransaction;
+import com.yiqiniu.easytrans.rpc.impl.dubbo.DubboReferanceCustomizationer;
 import com.yiqiniu.easytrans.rpc.impl.dubbo.EnableRpcDubboImpl;
 
 @SpringBootApplication
@@ -15,4 +21,21 @@ public class OrderApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(OrderApplication.class, args);
 	}
+
+
+	/**
+	 * This is an optional bean, you can modify Dubbo reference here to change the behavior of consumer
+	 * @return
+	 */
+	@Bean
+	public DubboReferanceCustomizationer dubboConsumerCustomizationer() {
+		return new DubboReferanceCustomizationer() {
+
+			@Override
+			public void customDubboReferance(String appId, String busCode, ReferenceConfig<GenericService> referenceConfig) {
+				Logger logger = LoggerFactory.getLogger(getClass());
+				logger.info("custom dubbo consumer!");
+			}
+		};
+	}
 }
diff --git a/easytrans-demo/rpc-dubbo/rpcdubbo-order-service/src/main/resources/application.yml b/easytrans-demo/rpc-dubbo/rpcdubbo-order-service/src/main/resources/application.yml
@@ -17,7 +17,7 @@ easytrans:
   rpc:
     dubbo:
       enabled: true
-      dubbo-zk-url: zookeeper://${easytrans.master.zk.zooKeeperUrl}
+
   stringcodec:
     zk:
       zooKeeperUrl: ${easytrans.master.zk.zooKeeperUrl}
@@ -37,6 +37,19 @@ easytrans:
         password: 123456
 
 
-
+# Dubbo Config properties
+# please refer https://dubbo.incubator.apache.org/en-us/docs/user/references/xml/introduction.html
+dubbo:
+  application:
+    name: order-service
+  protocol:
+    name: dubbo
+    port: 20880
+  registry:
+    address: zookeeper://localhost:2281
+  provider:
+    timeout: 1000
+  consumer:
+    timeout: 1000
 
 
diff --git a/easytrans-demo/rpc-dubbo/rpcdubbo-wallet-api/pom.xml b/easytrans-demo/rpc-dubbo/rpcdubbo-wallet-api/pom.xml
@@ -23,7 +23,6 @@
 		<dependency>
 			<groupId>com.yiqiniu.easytrans</groupId>
 			<artifactId>easytrans-core</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/easytrans-demo/rpc-dubbo/rpcdubbo-wallet-service/pom.xml b/easytrans-demo/rpc-dubbo/rpcdubbo-wallet-service/pom.xml
@@ -42,7 +42,6 @@
 			<groupId>com.yiqiniu.easytrans</groupId>
 			<artifactId>easytrans-rpc-dubbo-starter</artifactId>
 			<exclusions>
-				<!-- dubbo import a very old version spring , exclude it -->
 				<exclusion>
 					<groupId>org.springframework</groupId>
 					<artifactId>spring</artifactId>

diff --git a/...llet-service/src/main/java/com/yiqiniu/easytrans/demos/wallet/impl/WalletApplication.java b/...llet-service/src/main/java/com/yiqiniu/easytrans/demos/wallet/impl/WalletApplication.java
@@ -1,10 +1,17 @@
 package com.yiqiniu.easytrans.demos.wallet.impl;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import com.alibaba.dubbo.config.ServiceConfig;
+import com.alibaba.dubbo.rpc.service.GenericService;
 import com.yiqiniu.easytrans.EnableEasyTransaction;
+import com.yiqiniu.easytrans.protocol.BusinessIdentifer;
+import com.yiqiniu.easytrans.rpc.impl.dubbo.DubboServiceCustomizationer;
 import com.yiqiniu.easytrans.rpc.impl.dubbo.EnableRpcDubboImpl;
 
 @SpringBootApplication
@@ -28,6 +35,24 @@ public void run() {
 					}
 				}
 			}
-		}.start();;
+		}.start();
+	}
+
+
+	/**
+	 * This is an optional bean, you can modify Dubbo reference here to change the behavior of consumer
+	 */
+	@Bean
+	public DubboServiceCustomizationer dubboProviderCustomizationer() {
+		return new DubboServiceCustomizationer() {
+
+			@Override
+			public void customDubboService(BusinessIdentifer businessIdentifer,
+					ServiceConfig<GenericService> serviceConfig) {
+				Logger logger = LoggerFactory.getLogger(getClass());
+				logger.info("custom dubbo provider!");
+
+			}
+		};
 	}
 }
diff --git a/...o-wallet-service/src/main/java/com/yiqiniu/easytrans/demos/wallet/impl/WalletService.java b/...o-wallet-service/src/main/java/com/yiqiniu/easytrans/demos/wallet/impl/WalletService.java
@@ -4,6 +4,7 @@
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.yiqiniu.easytrans.core.EasyTransFacade;
 import com.yiqiniu.easytrans.demos.wallet.api.vo.WalletPayVO.WalletPayRequestVO;
@@ -17,7 +18,7 @@ public class WalletService {
 	@Resource
 	private JdbcTemplate jdbcTemplate;
 
-
+	@Transactional
 	public WalletPayResponseVO doTryPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount + ? where user_id = ? and (total_amount - freeze_amount) >= ?;", 
 				param.getPayAmount(),param.getUserId(),param.getPayAmount());
@@ -31,7 +32,7 @@ public WalletPayResponseVO doTryPay(WalletPayRequestVO param) {
 		return walletPayTccMethodResult;
 	}
 
-
+	@Transactional
 	public void doConfirmPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount - ?, total_amount = total_amount - ? where user_id = ?;", 
 				param.getPayAmount(),param.getPayAmount(),param.getUserId());
@@ -41,6 +42,7 @@ public void doConfirmPay(WalletPayRequestVO param) {
 		}
 	}
 
+	@Transactional
 	public void doCancelPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount - ? where user_id = ?;", 
 				param.getPayAmount(),param.getUserId());

diff --git a/easytrans-demo/rpc-dubbo/rpcdubbo-wallet-service/src/main/resources/application.yml b/easytrans-demo/rpc-dubbo/rpcdubbo-wallet-service/src/main/resources/application.yml
@@ -18,7 +18,6 @@ easytrans:
   rpc:
     dubbo:
       enabled: true
-      dubbo-zk-url: zookeeper://${easytrans.master.zk.zooKeeperUrl}
   stringcodec:
     zk:
       zooKeeperUrl: ${easytrans.master.zk.zooKeeperUrl}
@@ -39,6 +38,16 @@ easytrans:
 
 
 
+# Dubbo Config properties
+# please refer https://dubbo.incubator.apache.org/en-us/docs/user/references/xml/introduction.html
+dubbo:
+  application:
+    name: order-service
+  protocol:
+    name: dubbo
+    port: 20881
+  registry:
+    address: zookeeper://localhost:2281
 
 
 
diff --git a/easytrans-demo/sagatcc/pom.xml b/easytrans-demo/sagatcc/pom.xml
@@ -19,7 +19,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.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/...c-wallet-service/src/main/java/com/yiqiniu/easytrans/demos/wallet/impl/WalletService.java b/...c-wallet-service/src/main/java/com/yiqiniu/easytrans/demos/wallet/impl/WalletService.java
@@ -4,6 +4,7 @@
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.yiqiniu.easytrans.core.EasyTransFacade;
 import com.yiqiniu.easytrans.demos.wallet.api.vo.WalletPayVO.WalletPayRequestVO;
@@ -16,7 +17,7 @@ public class WalletService {
 	@Resource
 	private JdbcTemplate jdbcTemplate;
 
-
+	@Transactional
 	public void doTryPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount + ? where user_id = ? and (total_amount - freeze_amount) >= ?;", 
 				param.getPayAmount(),param.getUserId(),param.getPayAmount());
@@ -26,7 +27,7 @@ public void doTryPay(WalletPayRequestVO param) {
 		}
 	}
 
-
+	@Transactional
 	public void doConfirmPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount - ?, total_amount = total_amount - ? where user_id = ?;", 
 				param.getPayAmount(),param.getPayAmount(),param.getUserId());
@@ -36,6 +37,7 @@ public void doConfirmPay(WalletPayRequestVO param) {
 		}
 	}
 
+	@Transactional
 	public void doCancelPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount - ? where user_id = ?;", 
 				param.getPayAmount(),param.getUserId());

diff --git a/easytrans-demo/tcc-and-msg/pom.xml b/easytrans-demo/tcc-and-msg/pom.xml
@@ -19,7 +19,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.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/...g-wallet-service/src/main/java/com/yiqiniu/easytrans/demos/wallet/impl/WalletService.java b/...g-wallet-service/src/main/java/com/yiqiniu/easytrans/demos/wallet/impl/WalletService.java
@@ -4,6 +4,7 @@
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.yiqiniu.easytrans.core.EasyTransFacade;
 import com.yiqiniu.easytrans.demos.wallet.api.vo.WalletPayVO.WalletPayRequestVO;
@@ -17,7 +18,7 @@ public class WalletService {
 	@Resource
 	private JdbcTemplate jdbcTemplate;
 
-
+	@Transactional
 	public WalletPayResponseVO doTryPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount + ? where user_id = ? and (total_amount - freeze_amount) >= ?;", 
 				param.getPayAmount(),param.getUserId(),param.getPayAmount());
@@ -31,7 +32,7 @@ public WalletPayResponseVO doTryPay(WalletPayRequestVO param) {
 		return walletPayTccMethodResult;
 	}
 
-
+	@Transactional
 	public void doConfirmPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount - ?, total_amount = total_amount - ? where user_id = ?;", 
 				param.getPayAmount(),param.getPayAmount(),param.getUserId());
@@ -41,6 +42,7 @@ public void doConfirmPay(WalletPayRequestVO param) {
 		}
 	}
 
+	@Transactional
 	public void doCancelPay(WalletPayRequestVO param) {
 		int update = jdbcTemplate.update("update `wallet` set freeze_amount = freeze_amount - ? where user_id = ?;", 
 				param.getPayAmount(),param.getUserId());

diff --git a/easytrans-demo/tcc-only/pom.xml b/easytrans-demo/tcc-only/pom.xml
@@ -19,7 +19,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.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/easytrans-demo/tcc-only/tcconly-wallet-api/pom.xml b/easytrans-demo/tcc-only/tcconly-wallet-api/pom.xml
@@ -23,7 +23,6 @@
 		<dependency>
 			<groupId>com.yiqiniu.easytrans</groupId>
 			<artifactId>easytrans-core</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 	</dependencies>