From 1f110dc984185ebaf2f5750fa143ca1b87a191e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=8C=E4=BA=91?= <liaoly@59store.com>
Date: Sun, 22 Jan 2017 11:24:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9WxJsapiSignature=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/common/bean/WxJsapiSignature.java  | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java
index 177990586..783715836 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java
@@ -8,9 +8,9 @@ import java.io.Serializable;
 public class WxJsapiSignature implements Serializable {
   private static final long serialVersionUID = -1116808193154384804L;
 
-  private String appid;
+  private String appId;
 
-  private String noncestr;
+  private String nonceStr;
 
   private long timestamp;
 
@@ -26,12 +26,12 @@ public class WxJsapiSignature implements Serializable {
     this.signature = signature;
   }
 
-  public String getNoncestr() {
-    return this.noncestr;
+  public String getNonceStr() {
+    return nonceStr;
   }
 
-  public void setNoncestr(String noncestr) {
-    this.noncestr = noncestr;
+  public void setNonceStr(String nonceStr) {
+    this.nonceStr = nonceStr;
   }
 
   public long getTimestamp() {
@@ -50,12 +50,11 @@ public class WxJsapiSignature implements Serializable {
     this.url = url;
   }
 
-  public String getAppid() {
-    return this.appid;
+  public String getAppId() {
+    return appId;
   }
 
-  public void setAppid(String appid) {
-    this.appid = appid;
+  public void setAppId(String appId) {
+    this.appId = appId;
   }
-
 }

From 89a92c245297500d64ebb66357a2383f3cfe32db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=8C=E4=BA=91?= <liaoly@59store.com>
Date: Sun, 22 Jan 2017 11:28:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9WxJsapiSignature=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1,=E5=B1=9E=E6=80=A7=E5=90=8D=E5=AD=97=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=86=99=E4=B8=8E=E5=BE=AE=E4=BF=A1=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java   | 4 ++--
 .../java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java
index 8d0c47daa..a10eb42eb 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java
@@ -166,12 +166,12 @@ public class WxCpServiceImpl implements WxCpService {
     );
     WxJsapiSignature jsapiSignature = new WxJsapiSignature();
     jsapiSignature.setTimestamp(timestamp);
-    jsapiSignature.setNoncestr(noncestr);
+    jsapiSignature.setNonceStr(noncestr);
     jsapiSignature.setUrl(url);
     jsapiSignature.setSignature(signature);
 
     // Fixed bug
-    jsapiSignature.setAppid(this.configStorage.getCorpId());
+    jsapiSignature.setAppId(this.configStorage.getCorpId());
 
     return jsapiSignature;
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
index 2d250035c..eb1e58aa1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
@@ -151,9 +151,9 @@ public class WxMpServiceImpl implements WxMpService {
     String signature = SHA1.genWithAmple("jsapi_ticket=" + jsapiTicket,
       "noncestr=" + noncestr, "timestamp=" + timestamp, "url=" + url);
     WxJsapiSignature jsapiSignature = new WxJsapiSignature();
-    jsapiSignature.setAppid(this.wxMpConfigStorage.getAppId());
+    jsapiSignature.setAppId(this.wxMpConfigStorage.getAppId());
     jsapiSignature.setTimestamp(timestamp);
-    jsapiSignature.setNoncestr(noncestr);
+    jsapiSignature.setNonceStr(noncestr);
     jsapiSignature.setUrl(url);
     jsapiSignature.setSignature(signature);
     return jsapiSignature;