Merge pull request binarywang#134 from lly835/develop

binarywang · web-flow · commit 5f3623aa2b0d · 2017-01-23T16:21:35.000+08:00
修改WxJsapiSignature对象，属性名字大小写与微信一致
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
@@ -8,9 +8,9 @@
 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 void setSignature(String signature) {
     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 void setUrl(String url) {
     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;
   }
-
 }
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
@@ -166,12 +166,12 @@ public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException
     );
     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
@@ -151,9 +151,9 @@ public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException
     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;

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`public class WxJsapiSignature implements Serializable {`
`9`	`9`	`private static final long serialVersionUID = -1116808193154384804L;`
`10`	`10`
`11`		`- private String appid;`
	`11`	`+ private String appId;`
`12`	`12`
`13`		`- private String noncestr;`
	`13`	`+ private String nonceStr;`
`14`	`14`
`15`	`15`	`private long timestamp;`
`16`	`16`
`@@ -26,12 +26,12 @@ public void setSignature(String signature) {`
`26`	`26`	`this.signature = signature;`
`27`	`27`	`}`
`28`	`28`
`29`		`- public String getNoncestr() {`
`30`		`- return this.noncestr;`
	`29`	`+ public String getNonceStr() {`
	`30`	`+ return nonceStr;`
`31`	`31`	`}`
`32`	`32`
`33`		`- public void setNoncestr(String noncestr) {`
`34`		`- this.noncestr = noncestr;`
	`33`	`+ public void setNonceStr(String nonceStr) {`
	`34`	`+ this.nonceStr = nonceStr;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public long getTimestamp() {`
`@@ -50,12 +50,11 @@ public void setUrl(String url) {`
`50`	`50`	`this.url = url;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public String getAppid() {`
`54`		`- return this.appid;`
	`53`	`+ public String getAppId() {`
	`54`	`+ return appId;`
`55`	`55`	`}`
`56`	`56`
`57`		`- public void setAppid(String appid) {`
`58`		`- this.appid = appid;`
	`57`	`+ public void setAppId(String appId) {`
	`58`	`+ this.appId = appId;`
`59`	`59`	`}`
`60`		`-`
`61`	`60`	`}`