Browse Source

Merge pull request #134 from lly835/develop

修改WxJsapiSignature对象,属性名字大小写与微信一致
master
Binary Wang 8 years ago
committed by GitHub
parent
commit
5f3623aa2b
3 changed files with 14 additions and 15 deletions
  1. +10
    -11
      weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java
  2. +2
    -2
      weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java
  3. +2
    -2
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java

+ 10
- 11
weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java View File

@@ -8,9 +8,9 @@ import java.io.Serializable;
public class WxJsapiSignature implements Serializable { public class WxJsapiSignature implements Serializable {
private static final long serialVersionUID = -1116808193154384804L; private static final long serialVersionUID = -1116808193154384804L;


private String appid;
private String appId;


private String noncestr;
private String nonceStr;


private long timestamp; private long timestamp;


@@ -26,12 +26,12 @@ public class WxJsapiSignature implements Serializable {
this.signature = 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() { public long getTimestamp() {
@@ -50,12 +50,11 @@ public class WxJsapiSignature implements Serializable {
this.url = 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;
} }

} }

+ 2
- 2
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java View File

@@ -166,12 +166,12 @@ public class WxCpServiceImpl implements WxCpService {
); );
WxJsapiSignature jsapiSignature = new WxJsapiSignature(); WxJsapiSignature jsapiSignature = new WxJsapiSignature();
jsapiSignature.setTimestamp(timestamp); jsapiSignature.setTimestamp(timestamp);
jsapiSignature.setNoncestr(noncestr);
jsapiSignature.setNonceStr(noncestr);
jsapiSignature.setUrl(url); jsapiSignature.setUrl(url);
jsapiSignature.setSignature(signature); jsapiSignature.setSignature(signature);


// Fixed bug // Fixed bug
jsapiSignature.setAppid(this.configStorage.getCorpId());
jsapiSignature.setAppId(this.configStorage.getCorpId());


return jsapiSignature; return jsapiSignature;
} }


+ 2
- 2
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java View File

@@ -151,9 +151,9 @@ public class WxMpServiceImpl implements WxMpService {
String signature = SHA1.genWithAmple("jsapi_ticket=" + jsapiTicket, String signature = SHA1.genWithAmple("jsapi_ticket=" + jsapiTicket,
"noncestr=" + noncestr, "timestamp=" + timestamp, "url=" + url); "noncestr=" + noncestr, "timestamp=" + timestamp, "url=" + url);
WxJsapiSignature jsapiSignature = new WxJsapiSignature(); WxJsapiSignature jsapiSignature = new WxJsapiSignature();
jsapiSignature.setAppid(this.wxMpConfigStorage.getAppId());
jsapiSignature.setAppId(this.wxMpConfigStorage.getAppId());
jsapiSignature.setTimestamp(timestamp); jsapiSignature.setTimestamp(timestamp);
jsapiSignature.setNoncestr(noncestr);
jsapiSignature.setNonceStr(noncestr);
jsapiSignature.setUrl(url); jsapiSignature.setUrl(url);
jsapiSignature.setSignature(signature); jsapiSignature.setSignature(signature);
return jsapiSignature; return jsapiSignature;


Loading…
Cancel
Save