diff --git a/.gitignore b/.gitignore index db0804163..2a629437b 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ sonar-project.properties # STS .factorypath +*.zip diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java index a9b449530..80aca779d 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java @@ -24,7 +24,7 @@ public class WxCpDefaultConfigImpl implements WxCpConfigStorage, Serializable { private volatile String token; protected volatile String accessToken; - protected Lock accessTokenLock = new ReentrantLock(); + protected transient Lock accessTokenLock = new ReentrantLock(); private volatile String aesKey; protected volatile Integer agentId; private volatile long expiresTime; @@ -37,16 +37,16 @@ public class WxCpDefaultConfigImpl implements WxCpConfigStorage, Serializable { private volatile String httpProxyPassword; private volatile String jsapiTicket; - protected Lock jsapiTicketLock = new ReentrantLock(); + protected transient Lock jsapiTicketLock = new ReentrantLock(); private volatile long jsapiTicketExpiresTime; private volatile String agentJsapiTicket; - protected Lock agentJsapiTicketLock = new ReentrantLock(); + protected transient Lock agentJsapiTicketLock = new ReentrantLock(); private volatile long agentJsapiTicketExpiresTime; private volatile File tmpDirFile; - private volatile ApacheHttpClientBuilder apacheHttpClientBuilder; + private transient volatile ApacheHttpClientBuilder apacheHttpClientBuilder; private volatile String baseApiUrl; @@ -297,4 +297,9 @@ public class WxCpDefaultConfigImpl implements WxCpConfigStorage, Serializable { public void setApacheHttpClientBuilder(ApacheHttpClientBuilder apacheHttpClientBuilder) { this.apacheHttpClientBuilder = apacheHttpClientBuilder; } + + public WxCpDefaultConfigImpl setWebhookKey(String webhookKey) { + this.webhookKey = webhookKey; + return this; + } } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.zip b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.zip deleted file mode 100644 index b02696333..000000000 Binary files a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.zip and /dev/null differ