From 824668eed037d217135fbd80f7b634eb1a37d436 Mon Sep 17 00:00:00 2001
From: Sutra Zhou <zhoushuqun@gmail.com>
Date: Sun, 17 Jun 2018 17:10:30 +0800
Subject: [PATCH] Store properties file in resources directory.

---
 .../weixin4j/payment/weixin.properties        | 116 +++++++++---------
 .../com/foxinmy/weixin4j/api/MchApiTest.java  |  17 +++
 2 files changed, 75 insertions(+), 58 deletions(-)
 rename weixin4j-base/src/main/{java => resources}/com/foxinmy/weixin4j/payment/weixin.properties (97%)
 create mode 100644 weixin4j-base/src/test/java/com/foxinmy/weixin4j/api/MchApiTest.java

diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/weixin.properties b/weixin4j-base/src/main/resources/com/foxinmy/weixin4j/payment/weixin.properties
similarity index 97%
rename from weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/weixin.properties
rename to weixin4j-base/src/main/resources/com/foxinmy/weixin4j/payment/weixin.properties
index aa514e77..68ed23ca 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/weixin.properties
+++ b/weixin4j-base/src/main/resources/com/foxinmy/weixin4j/payment/weixin.properties
@@ -1,59 +1,59 @@
-# \u5fae\u4fe1\u5546\u6237\u5e73\u53f0\u6587\u6863\u8bf4\u660e
-# https://pay.weixin.qq.com/
-# https://pay.weixin.qq.com/wiki/doc/api/index.php
-# ----------------------------------------------------------------------------
-
-mch_base_url=https://api.mch.weixin.qq.com
-
-# \u53d1\u9001\u73b0\u91d1\u7ea2\u5305
-redpack_send_uri={mch_base_url}/mmpaymkttransfers/sendredpack
-# \u53d1\u9001\u73b0\u91d1\u88c2\u53d8\u7ea2\u5305
-groupredpack_send_uri={mch_base_url}/mmpaymkttransfers/sendgroupredpack
-# \u67e5\u8be2\u73b0\u91d1\u7ea2\u5305
-redpack_query_uri={mch_base_url}/mmpaymkttransfers/gethbinfo
-# \u7edf\u4e00\u8ba2\u5355\u751f\u6210
-order_create_uri={mch_base_url}/pay/unifiedorder
-# \u88ab\u626b\u652f\u4ed8
-micropay_uri={mch_base_url}/pay/micropay
-# \u8ba2\u5355\u67e5\u8be2
-order_query_uri={mch_base_url}/pay/orderquery
-# \u5173\u95ed\u8ba2\u5355
-order_close_uri={mch_base_url}/pay/closeorder
-# \u5bf9\u8d26\u5355\u4e0b\u8f7d
-downloadbill_uri={mch_base_url}/pay/downloadbill
-# \u9000\u6b3e\u67e5\u8be2
-refund_query_uri={mch_base_url}/pay/refundquery
-# \u9000\u6b3e\u7533\u8bf7
-refund_apply_uri={mch_base_url}/secapi/pay/refund
-# \u51b2\u6b63\u64a4\u9500
-order_reverse_uri={mch_base_url}/secapi/pay/reverse
-# \u957f\u94fe\u63a5\u8f6c\u6362
-longurl_convert_uri={mch_base_url}/tools/shorturl
-# \u53d1\u653e\u4ee3\u91d1\u5238
-coupon_send_uri={mch_base_url}/mmpaymkttransfers/send_coupon
-# \u67e5\u8be2\u4ee3\u91d1\u5238\u6279\u6b21\u4fe1\u606f
-couponstock_query_uri={mch_base_url}/mmpaymkttransfers/query_coupon_stock
-# \u67e5\u8be2\u4ee3\u91d1\u5238\u8be6\u7ec6\u4fe1\u606f
-coupondetail_query_uri={mch_base_url}/mmpaymkttransfers/querycouponsinfo
-# \u53d1\u9001\u73b0\u91d1\u7ea2\u5305
-redpack_send_uri={mch_base_url}/mmpaymkttransfers/sendredpack
-# \u67e5\u8be2\u73b0\u91d1\u7ea2\u5305
-redpack_query_uri={mch_base_url}/mmpaymkttransfers/gethbinfo
-# \u4f01\u4e1a\u5411\u4e2a\u4eba\u4ed8\u6b3e
-corppayment_send_uri={mch_base_url}/mmpaymkttransfers/promotion/transfers
-# \u4f01\u4e1a\u4ed8\u6b3e\u67e5\u8be2
-corppayment_query_uri={mch_base_url}/mmpaymkttransfers/gettransferinfo
-# \u63a5\u53e3\u4e0a\u62a5
-interface_report_uri={mch_base_url}/payitil/report
-# \u6388\u6743\u7801\u67e5\u8be2OPENID\u63a5\u53e3
-authcode_openid_uri={mch_base_url}/tools/authcodetoopenid
-# native\u652f\u4ed8url(\u6a21\u5f0f1)
-native_pay_uri=weixin://wxpay/bizpayurl?sign=%s&appid=%s&mch_id=%s&product_id=%s&time_stamp=%s&nonce_str=%s
-# \u67e5\u8be2\u7ed3\u7b97\u8d44\u91d1
-settlement_query_uri={mch_base_url}/pay/settlementquery
-# \u67e5\u8be2\u6c47\u7387
-exchagerate_query_uri={mch_base_url}/pay/queryexchagerate
-# \u8ba2\u5355\u9644\u52a0\u4fe1\u606f\u63d0\u4ea4
-customsorder_declare_uri={mch_base_url}/mch/customs/customdeclareorder
-# \u8ba2\u5355\u9644\u52a0\u4fe1\u606f\u67e5\u8be2
+# \u5fae\u4fe1\u5546\u6237\u5e73\u53f0\u6587\u6863\u8bf4\u660e
+# https://pay.weixin.qq.com/
+# https://pay.weixin.qq.com/wiki/doc/api/index.php
+# ----------------------------------------------------------------------------
+
+mch_base_url=https://api.mch.weixin.qq.com
+
+# \u53d1\u9001\u73b0\u91d1\u7ea2\u5305
+redpack_send_uri={mch_base_url}/mmpaymkttransfers/sendredpack
+# \u53d1\u9001\u73b0\u91d1\u88c2\u53d8\u7ea2\u5305
+groupredpack_send_uri={mch_base_url}/mmpaymkttransfers/sendgroupredpack
+# \u67e5\u8be2\u73b0\u91d1\u7ea2\u5305
+redpack_query_uri={mch_base_url}/mmpaymkttransfers/gethbinfo
+# \u7edf\u4e00\u8ba2\u5355\u751f\u6210
+order_create_uri={mch_base_url}/pay/unifiedorder
+# \u88ab\u626b\u652f\u4ed8
+micropay_uri={mch_base_url}/pay/micropay
+# \u8ba2\u5355\u67e5\u8be2
+order_query_uri={mch_base_url}/pay/orderquery
+# \u5173\u95ed\u8ba2\u5355
+order_close_uri={mch_base_url}/pay/closeorder
+# \u5bf9\u8d26\u5355\u4e0b\u8f7d
+downloadbill_uri={mch_base_url}/pay/downloadbill
+# \u9000\u6b3e\u67e5\u8be2
+refund_query_uri={mch_base_url}/pay/refundquery
+# \u9000\u6b3e\u7533\u8bf7
+refund_apply_uri={mch_base_url}/secapi/pay/refund
+# \u51b2\u6b63\u64a4\u9500
+order_reverse_uri={mch_base_url}/secapi/pay/reverse
+# \u957f\u94fe\u63a5\u8f6c\u6362
+longurl_convert_uri={mch_base_url}/tools/shorturl
+# \u53d1\u653e\u4ee3\u91d1\u5238
+coupon_send_uri={mch_base_url}/mmpaymkttransfers/send_coupon
+# \u67e5\u8be2\u4ee3\u91d1\u5238\u6279\u6b21\u4fe1\u606f
+couponstock_query_uri={mch_base_url}/mmpaymkttransfers/query_coupon_stock
+# \u67e5\u8be2\u4ee3\u91d1\u5238\u8be6\u7ec6\u4fe1\u606f
+coupondetail_query_uri={mch_base_url}/mmpaymkttransfers/querycouponsinfo
+# \u53d1\u9001\u73b0\u91d1\u7ea2\u5305
+redpack_send_uri={mch_base_url}/mmpaymkttransfers/sendredpack
+# \u67e5\u8be2\u73b0\u91d1\u7ea2\u5305
+redpack_query_uri={mch_base_url}/mmpaymkttransfers/gethbinfo
+# \u4f01\u4e1a\u5411\u4e2a\u4eba\u4ed8\u6b3e
+corppayment_send_uri={mch_base_url}/mmpaymkttransfers/promotion/transfers
+# \u4f01\u4e1a\u4ed8\u6b3e\u67e5\u8be2
+corppayment_query_uri={mch_base_url}/mmpaymkttransfers/gettransferinfo
+# \u63a5\u53e3\u4e0a\u62a5
+interface_report_uri={mch_base_url}/payitil/report
+# \u6388\u6743\u7801\u67e5\u8be2OPENID\u63a5\u53e3
+authcode_openid_uri={mch_base_url}/tools/authcodetoopenid
+# native\u652f\u4ed8url(\u6a21\u5f0f1)
+native_pay_uri=weixin://wxpay/bizpayurl?sign=%s&appid=%s&mch_id=%s&product_id=%s&time_stamp=%s&nonce_str=%s
+# \u67e5\u8be2\u7ed3\u7b97\u8d44\u91d1
+settlement_query_uri={mch_base_url}/pay/settlementquery
+# \u67e5\u8be2\u6c47\u7387
+exchagerate_query_uri={mch_base_url}/pay/queryexchagerate
+# \u8ba2\u5355\u9644\u52a0\u4fe1\u606f\u63d0\u4ea4
+customsorder_declare_uri={mch_base_url}/mch/customs/customdeclareorder
+# \u8ba2\u5355\u9644\u52a0\u4fe1\u606f\u67e5\u8be2
 customsorder_query_uri={mch_base_url}/mch/customs/customdeclarequery
\ No newline at end of file
diff --git a/weixin4j-base/src/test/java/com/foxinmy/weixin4j/api/MchApiTest.java b/weixin4j-base/src/test/java/com/foxinmy/weixin4j/api/MchApiTest.java
new file mode 100644
index 00000000..9f24d414
--- /dev/null
+++ b/weixin4j-base/src/test/java/com/foxinmy/weixin4j/api/MchApiTest.java
@@ -0,0 +1,17 @@
+package com.foxinmy.weixin4j.api;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+import com.foxinmy.weixin4j.model.WeixinPayAccount;
+
+public class MchApiTest {
+
+	@Test
+	public void testWeixinBundle() {
+		MchApi mchApi = new MchApi(new WeixinPayAccount(null, null, null));
+		assertNotNull(mchApi.weixinBundle());
+	}
+
+}