Merge branch 'dev' of https://github.com/roncoo/roncoo-pay into dev_p…

…eter
zqwxxh · Aug 12, 2016 · 6bb6675 · 6bb6675
2 parents 660d083 + 5490514
commit 6bb6675
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...pay-service/src/main/java/com/roncoo/pay/reconciliation/fileDown/impl/WinXinFileDown.java b/...pay-service/src/main/java/com/roncoo/pay/reconciliation/fileDown/impl/WinXinFileDown.java
@@ -30,7 +30,7 @@
 import com.roncoo.pay.reconciliation.fileDown.service.FileDown;
 import com.roncoo.pay.reconciliation.utils.FileUtils;
 import com.roncoo.pay.reconciliation.utils.SignHelper;
-import com.roncoo.pay.reconciliation.utils.WechatBaseUtils;
+import com.roncoo.pay.reconciliation.utils.WeiXinBaseUtils;
 import com.roncoo.pay.reconciliation.utils.https.HttpClientUtil;
 import com.roncoo.pay.reconciliation.utils.https.HttpResponse;
 import com.roncoo.pay.trade.utils.WeixinConfigUtil;
@@ -136,7 +136,7 @@ public String generateXml() {
 		params.put("bill_date", bill_date);
 		params.put("bill_type", bill_type);
 		// 随机字符串，不长于32，调用随机数函数生成，将得到的值转换为字符串
-		params.put("nonce_str", WechatBaseUtils.createNoncestr());
+		params.put("nonce_str", WeiXinBaseUtils.createNoncestr());
 
 		// 过滤空值
 		for (Iterator<Entry<String, String>> it = params.entrySet().iterator(); it.hasNext();) {
@@ -148,7 +148,7 @@ public String generateXml() {
 
 		String sign = SignHelper.getSign(params, appSecret);
 		params.put("sign", sign.toUpperCase());
-		return WechatBaseUtils.arrayToXml(params);
+		return WeiXinBaseUtils.arrayToXml(params);
 	}
 
 }
diff --git a/...reconciliation/utils/WechatBaseUtils.java → ...reconciliation/utils/WeiXinBaseUtils.java b/...reconciliation/utils/WechatBaseUtils.java → ...reconciliation/utils/WeiXinBaseUtils.java
@@ -17,7 +17,7 @@
  * @版本：V1.0
  *
  */
-public class WechatBaseUtils {
+public class WeiXinBaseUtils {
 	private static String chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
 	/**