From 9926655fa9342fe6c192744856eecdc2f1d1d536 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Sun, 9 Aug 2015 11:54:19 +0800
Subject: [PATCH] u

---
 weixin4j-mp/CHANGE.md                                         | 4 +++-
 .../src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java   | 2 +-
 weixin4j-mp/src/main/resources/weixin4j.properties            | 4 ++--
 weixin4j-server/README.md                                     | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/weixin4j-mp/CHANGE.md b/weixin4j-mp/CHANGE.md
index e20b75f2..eb29c408 100644
--- a/weixin4j-mp/CHANGE.md
+++ b/weixin4j-mp/CHANGE.md
@@ -140,4 +140,6 @@
   
 * 2015-08-09
  
-  + version upgrade to 1.5.2
\ No newline at end of file
+  + version upgrade to 1.5.2
+  
+  + oauth_redirect_uri配置属性名更改为user_oauth_redirect_uri
\ No newline at end of file
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java
index 0896bd85..f7c03f15 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java
@@ -32,7 +32,7 @@ public class OauthApi extends MpApi {
 	 */
 	public String getAuthorizeURL() {
 		String appId = DEFAULT_WEIXIN_ACCOUNT.getId();
-		String redirectUri = ConfigUtil.getValue("oauth_redirect_uri");
+		String redirectUri = ConfigUtil.getValue("user_oauth_redirect_uri");
 		return getAuthorizeURL(appId, redirectUri, "state", "snsapi_login");
 	}
 
diff --git a/weixin4j-mp/src/main/resources/weixin4j.properties b/weixin4j-mp/src/main/resources/weixin4j.properties
index 798fb2b3..fec4b1d7 100644
--- a/weixin4j-mp/src/main/resources/weixin4j.properties
+++ b/weixin4j-mp/src/main/resources/weixin4j.properties
@@ -19,5 +19,5 @@ ca_file=/tmp/weixin4j/xxxxx.p12
 # classpath\u8def\u5f84\u4e0b\u53ef\u4ee5\u8fd9\u4e48\u5199
 # ca_file=classpath:xxxxx.pfx
 
-# oauth\u6388\u6743\u540e\u91cd\u5b9a\u5411\u7684url
-oauth_redirect_uri=
\ No newline at end of file
+# \u7528\u6237oauth\u6388\u6743\u540e\u91cd\u5b9a\u5411\u7684url
+user_oauth_redirect_uri=
\ No newline at end of file
diff --git a/weixin4j-server/README.md b/weixin4j-server/README.md
index 057f7fc8..2c824dc1 100644
--- a/weixin4j-server/README.md
+++ b/weixin4j-server/README.md
@@ -27,7 +27,7 @@ base on netty.
 
 	public class MessageServerStartup{
 		public static void main(String[] args) {
-			new WeixinServerBootstrap("appid或微信原始ID","开发者token").addHandler(
+			new WeixinServerBootstrap("token").addHandler(
 					DebugMessageHandler.global).startup();
 		}
 	}
@@ -36,7 +36,7 @@ base on netty.
 
 	public class MessageServerStartup{
 		public static void main(String[] args) {
-			new WeixinServerBootstrap("appid","开发者token","加密密钥").addHandler(
+			new WeixinServerBootstrap("appid","token","aesKey").addHandler(
 					DebugMessageHandler.global).startup();
 		}
 	}