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

Version 1.1.0

Author: skyesx

easytrans-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);
 

…iqiniu/easytrans/util/CallWrappUtil.java …yiqiniu/easytrans/util/CallWrapUtil.javaeasytrans-core/src/main/java/com/yiqiniu/easytrans/util/CallWrappUtil.java renamed to easytrans-core/src/main/java/com/yiqiniu/easytrans/util/CallWrapUtil.java easytrans-core/src/main/java/com/yiqiniu/easytrans/util/CallWrappUtil.java renamed to easytrans-core/src/main/java/com/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;
 	}
 

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;
 	}

easytrans-demo/interface-call/interfacecall-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);
 	}
 

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>
 
 

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>
 
 

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>

easytrans-demo/rpc-dubbo/rpcdubbo-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!");
+			}
+		};
+	}
 }

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
 
 

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>