Skip to content

Commit 5f3623a

Browse files
authored
Merge pull request #134 from lly835/develop
修改WxJsapiSignature对象,属性名字大小写与微信一致
2 parents 3a87bda + 89a92c2 commit 5f3623a

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
public class WxJsapiSignature implements Serializable {
99
private static final long serialVersionUID = -1116808193154384804L;
1010

11-
private String appid;
11+
private String appId;
1212

13-
private String noncestr;
13+
private String nonceStr;
1414

1515
private long timestamp;
1616

@@ -26,12 +26,12 @@ public void setSignature(String signature) {
2626
this.signature = signature;
2727
}
2828

29-
public String getNoncestr() {
30-
return this.noncestr;
29+
public String getNonceStr() {
30+
return nonceStr;
3131
}
3232

33-
public void setNoncestr(String noncestr) {
34-
this.noncestr = noncestr;
33+
public void setNonceStr(String nonceStr) {
34+
this.nonceStr = nonceStr;
3535
}
3636

3737
public long getTimestamp() {
@@ -50,12 +50,11 @@ public void setUrl(String url) {
5050
this.url = url;
5151
}
5252

53-
public String getAppid() {
54-
return this.appid;
53+
public String getAppId() {
54+
return appId;
5555
}
5656

57-
public void setAppid(String appid) {
58-
this.appid = appid;
57+
public void setAppId(String appId) {
58+
this.appId = appId;
5959
}
60-
6160
}

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException
166166
);
167167
WxJsapiSignature jsapiSignature = new WxJsapiSignature();
168168
jsapiSignature.setTimestamp(timestamp);
169-
jsapiSignature.setNoncestr(noncestr);
169+
jsapiSignature.setNonceStr(noncestr);
170170
jsapiSignature.setUrl(url);
171171
jsapiSignature.setSignature(signature);
172172

173173
// Fixed bug
174-
jsapiSignature.setAppid(this.configStorage.getCorpId());
174+
jsapiSignature.setAppId(this.configStorage.getCorpId());
175175

176176
return jsapiSignature;
177177
}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException
151151
String signature = SHA1.genWithAmple("jsapi_ticket=" + jsapiTicket,
152152
"noncestr=" + noncestr, "timestamp=" + timestamp, "url=" + url);
153153
WxJsapiSignature jsapiSignature = new WxJsapiSignature();
154-
jsapiSignature.setAppid(this.wxMpConfigStorage.getAppId());
154+
jsapiSignature.setAppId(this.wxMpConfigStorage.getAppId());
155155
jsapiSignature.setTimestamp(timestamp);
156-
jsapiSignature.setNoncestr(noncestr);
156+
jsapiSignature.setNonceStr(noncestr);
157157
jsapiSignature.setUrl(url);
158158
jsapiSignature.setSignature(signature);
159159
return jsapiSignature;

0 commit comments

Comments
 (0)