From 64f7adcc29bb0912947e2c6749a0072d29e4a1ba Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 30 Aug 2020 10:41:38 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../cp/config/impl/WxCpDefaultConfigImpl.java | 13 +++++++++---- .../bean/request/WxPaySendRedpackRequest.zip | Bin 2180 -> 0 bytes 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPaySendRedpackRequest.zip 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 b02696333a4441acee91f7a592a0401b49654d93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2180 zcmaKuXE+;*8pk83d1@4;9II%Z2!fzAMpPO*Xd63C6)}UfW={k;4VS1r$~9wCqngm_ zp+;$`B4(_jwW>;u5=Y(B^W3lZzVGw={{Ii}^M3xJtT?&E003TIz~|a*>plwP(rX?7 zAXfwckO2Sy=m-=x($OpEu7lUzV63OVgICCXFTy=_KWrGb9_{KlGa*4-MdKp$&C(}c z>oQs`&TxJiW0GkKF9#!ccq4iIhkMiRYBJZ8`5?JT5MOyEE>UDBwDOe-MJyrkLq|aw z_>J9>fRBZ%F1?AsvONKedVI%&>z{??dL!0Fu0a&PN@BB6cc&nO{4F{VTY-xyJGk7! zV8M$n!N@gJt~YPbgTZQY63V^lDEOVbO0?vp(W=daxBnvJ=1m3Ss)qSN{LRaK3ZDo2 znp*xccTPWdgbf)Bk-B$90~1uD?x?@tDwaRC+pq(l?f=#HtL)O4S)iBPs*&VZx^)T> zRaPtyy=uDe{KMXu6rXt+wH1cW*{xyDEdq=(p5>&FFrxRV6>!n#F)yLC%h>79_gFiz z%R{@8uJ{}4FIH%H62FhtS3vzR_$9_DVYp!PTpWfOT7?lT)qS|qT7s0c7`tzornu%{ zg~yOT#UcHqRZj5=jj}SdNG`Q{;04BdeW$@?Hcg~WE|tR>AyS_0A=l@wUyG=(hrT7q zOQ#4D)XX3<;DIrr5yQP6VbQp7drd*9cB^!=k}4oYYyA2^|B~uCqF+f>V^0dl!^{8` zO39Yll*~sUDl@HTboM(kUBP$Zh^KSsy}SCORln=ejM^77%=z(=k>#CPGTA;eON&3a zLP}ZQB=@6DG^Udv)t)&PGsmzk*k-7wH*=8*TW5nCKX49P4{lg*TbktY&Zr=N&-9kf z@xV(?JDw=j!cIs@s_^}}cB$6S(lUp30aAV1<<-`{;PU!a<8BbsWeMq;`)V2rz9qkO zn8RKA%WrnBMt=~XMU=Q>C%568g+*pv6ulh0I@YCK+S?zrK7I3QMxWKAnmPFjsvfH0 zeZU_+A?^FFj$E6h3yPhf@1z?^fbJ$F3K%ejh=e7s(zkb$jgu$8?;r-lZpT<+hHy!S z`uhk>G}qb5r#jo^rO(r}$!kKBQ3SABi8S34)hHs%9ibw2JDx7xVGML?=_S)4=C}K* z%TBGDJ>$C1`>;28U`6WMPSwt^8+JqT23>Bf2n*rY(X}oI;WJ>L-UdX-LQk*bnq4t^!b?xMt>1$fjpVcIjT%MR3zz zQ!8Q+lSh(!&l8V!`?6sn+PZz9UYJtbXW_X))5++WvCxhmK0dg0DjkiqSE^;L@PPB` zwS~lMz}Ao9JHJ-B6%cvFYc#f`DIug^Dnla-EG#*7pz*6$dl18bXF>__cbIVbM3Ru) zow@J<8ybr+IPPY+=}8 z8>@l!)qV+AE(y1!Wm$fmwH#hR956n;mBF7cUk!b zRA_!?#lB+GHylZPD`~u&SvPNCc!agTC6;~NL-gr^QgvZnJ{7y)*uwU(l9@WOAlsdf z9AAdwO4z2R8tq#1l_j$_6Vs8}lioQlof@{m2Pkm+h~6dR24VRbZ}y}oBI=vvCuzP? zNVaJ}>bGw?W@%ET%7qu2^ab5J<8|}`39tKY&_dOaW@FU8`tqiK#CXiW`cuBZllotG zW@W@0qY5YwpL|`3rCt+iF2gOcCEuB+h8%QFxeTu)p@h5zhX?C25_%M3V*`_`YTD^p zrY~fvKjP&*jk1CrkV)*GgP^w~?FDji6OJ z>NmL#jI58R=vigh6?^(o)?Hk3(6E`yu!UX?kL=Mz7Z=9)qRkCMsV^t%+_f+d*i+ol z-ZeV>SRggW)SujHUW@P7QtP-0s-8Q3k9MeO-hCCwxpBmt@iTWdJ2q)=ZTKyCXA!8Q zf#51$k-