From 5baf97628a3713e9ac73379bfebd668f8e5886f7 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Mon, 21 Sep 2015 22:45:20 +0800
Subject: [PATCH] u

---
 .../com/foxinmy/weixin4j/mp/api/OauthApi.java |  2 +-
 .../foxinmy/weixin4j/mp/model/OauthToken.java | 24 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

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 cc0ec32b..7454201d 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
@@ -159,7 +159,7 @@ public class OauthApi extends MpApi {
 	 * @see {@link #getUser(String,Sring,Lang)}
 	 */
 	public User getUser(OauthToken token) throws WeixinException {
-		return getUser(token.getAccessToken(), token.getOpenid(), Lang.zh_CN);
+		return getUser(token.getAccessToken(), token.getOpenId(), Lang.zh_CN);
 	}
 
 	/**
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/OauthToken.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/OauthToken.java
index ac9efd9c..a850aff0 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/OauthToken.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/OauthToken.java
@@ -20,11 +20,13 @@ public class OauthToken extends Token {
 	/**
 	 * 用户的openid
 	 */
-	private String openid;
+	@JSONField(name = "openId")
+	private String openId;
 	/**
 	 * 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段
 	 */
-	private String unionid;
+	@JSONField(name = "unionid")
+	private String unionId;
 
 	/**
 	 * 刷新token时的凭证
@@ -34,20 +36,20 @@ public class OauthToken extends Token {
 
 	private String scope;
 
-	public String getOpenid() {
-		return openid;
+	public String getOpenId() {
+		return openId;
 	}
 
-	public void setOpenid(String openid) {
-		this.openid = openid;
+	public void setOpenId(String openId) {
+		this.openId = openId;
 	}
 
-	public String getUnionid() {
-		return unionid;
+	public String getUnionId() {
+		return unionId;
 	}
 
-	public void setUnionid(String unionid) {
-		this.unionid = unionid;
+	public void setUnionId(String unionId) {
+		this.unionId = unionId;
 	}
 
 	public String getRefreshToken() {
@@ -68,7 +70,7 @@ public class OauthToken extends Token {
 
 	@Override
 	public String toString() {
-		return "OauthToken [openid=" + openid + ", unionid=" + unionid
+		return "OauthToken [openId=" + openId + ", unionId=" + unionId
 				+ ", refreshToken=" + refreshToken + ", scope=" + scope
 				+ ", getAccessToken()=" + getAccessToken()
 				+ ", getExpiresIn()=" + getExpiresIn() + ", getTime()="