From 9afa3b06baaa4a5c1703b9d3055b851fb24a57e5 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Wed, 16 Dec 2015 17:56:53 +0800
Subject: [PATCH] md

---
 .../com/foxinmy/weixin4j/payment/README.md    |  6 +++---
 .../weixin4j/util/Weixin4jConfigUtil.java     | 21 ++++++-------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/README.md b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/README.md
index 2895e3b3..cb3cb22b 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/README.md
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/README.md
@@ -31,18 +31,18 @@
 
 * closeOrder: 关闭订单接口
 
-* downloadbill: 下载对账单接口
+* downloadBill: 下载对账单接口
 
 * refundQuery: 退款查询接口
 
 
-[Pay2Api](../api/Pay2Api.java)
+[Pay2Api](https://github.com/foxinmy/weixin4j/blob/master/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/Pay2Api.java)
 -------------------------
 
 * orderQuery: 订单查询接口
 
 * refundOrder: 退款申请接口
 
-* downloadbill: 下载对账单接口
+* downloadBill: 下载对账单接口
 
 * refundQuery: 退款查询接口
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConfigUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConfigUtil.java
index dc585b65..a424ae9f 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConfigUtil.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConfigUtil.java
@@ -46,7 +46,7 @@ public class Weixin4jConfigUtil {
 		}
 		return key;
 	}
-	
+
 	/**
 	 * 获取weixin4j.properties文件中的key值
 	 * 
@@ -70,9 +70,8 @@ public class Weixin4jConfigUtil {
 		try {
 			value = getValue(key);
 		} catch (MissingResourceException e) {
-			System.err.println("'" + key
-					+ "' key not found in weixin4j.properties file.");
-			; // error
+			System.err.println("'" + wrapKeyName(key)
+					+ "' key not found in weixin4j.properties.");
 		}
 		return value;
 	}
@@ -95,15 +94,8 @@ public class Weixin4jConfigUtil {
 	 * @return
 	 */
 	public static String getClassPathValue(String key, String defaultValue) {
-		String value = defaultValue;
-		try {
-			value = getClassPathValue(key);
-		} catch (MissingResourceException e) {
-			System.err.println("'" + key
-					+ "' key not found in weixin4j.properties file.");
-			; // error
-		}
-		return value;
+		return new File(getValue(key, defaultValue).replaceFirst(
+				CLASSPATH_PREFIX, CLASSPATH_VALUE)).getPath();
 	}
 
 	public static WeixinAccount getWeixinAccount() {
@@ -113,8 +105,7 @@ public class Weixin4jConfigUtil {
 					.parseObject(getValue("account"), WeixinAccount.class);
 		} catch (MissingResourceException e) {
 			System.err
-					.println("'account' key not found in weixin4j.properties file.");
-			; // error
+					.println("'weixin4j.account' key not found in weixin4j.properties.");
 		}
 		return account;
 	}