From e343159e3a062135794146b3ed9596a12e9ce299 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 31 Oct 2021 23:51:51 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/me/chanjar/weixin/common/util/DataUtils.java | 3 ++- .../chanjar/weixin/common/util/xml/XStreamInitializer.java | 1 - .../chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java | 2 +- .../test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java | 6 +++--- .../binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java | 2 +- .../chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java | 2 +- .../binarywang/wxpay/bean/result/WxSignQueryResult.java | 2 ++ 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java index 983d9a668..b8fb42e0e 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java @@ -1,5 +1,6 @@ package me.chanjar.weixin.common.util; +import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.StringUtils; /** @@ -17,7 +18,7 @@ public class DataUtils { public static E handleDataWithSecret(E data) { E dataForLog = data; if(data instanceof String && StringUtils.contains((String)data, "&secret=")){ - dataForLog = (E) StringUtils.replaceAll((String)data,"&secret=\\w+&","&secret=******&"); + dataForLog = (E) RegExUtils.replaceAll((String)data,"&secret=\\w+&","&secret=******&"); } return dataForLog; } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java index 6997eb490..334d75ee3 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java @@ -80,7 +80,6 @@ public class XStreamInitializer { }; xstream.ignoreUnknownElements(); xstream.setMode(XStream.NO_REFERENCES); - XStream.setupDefaultSecurity(xstream); xstream.autodetectAnnotations(true); // setup proper security by limiting which classes can be loaded by XStream diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java index 2e91aacbf..739470a2d 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java @@ -92,7 +92,7 @@ public class BaseWxCpServiceImplTest { RequestExecutor re = mock(RequestExecutor.class); AtomicInteger counter = new AtomicInteger(); - Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> { + Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer(invocation -> { counter.incrementAndGet(); WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build(); throw new WxErrorException(error); diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java index afc596df1..52bc8e2ab 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java @@ -49,14 +49,14 @@ public class WxCpDemoServer { wxCpService = new WxCpServiceImpl(); wxCpService.setWxCpConfigStorage(config); - WxCpMessageHandler handler = (WxCpXmlMessage wxMessage, Map context, WxCpService wxService, WxSessionManager sessionManager) -> { + WxCpMessageHandler handler = (wxMessage, context, wxService, sessionManager) -> { WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content("测试加密消息") .fromUser(wxMessage.getToUserName()) .toUser(wxMessage.getFromUserName()).build(); return m; }; - WxCpMessageHandler oauth2handler = (WxCpXmlMessage wxMessage, Map context, WxCpService wxService, WxSessionManager sessionManager) -> { + WxCpMessageHandler oauth2handler = (wxMessage, context, wxService, sessionManager) -> { String href = "测试oauth2"; @@ -78,7 +78,7 @@ public class WxCpDemoServer { .end() .rule() .event(WxCpConsts.EventType.CHANGE_CONTACT) - .handler((WxCpXmlMessage wxMessage, Map context, WxCpService wxCpService, WxSessionManager sessionManager) -> { + .handler((wxMessage, context, wxCpService, sessionManager) -> { System.out.println("通讯录发生变更"); return null; }) diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java index 7310a8fcd..dcbe3b3b0 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java @@ -127,7 +127,7 @@ public class WxMaServiceImplTest { RequestExecutor re = mock(RequestExecutor.class); AtomicInteger counter = new AtomicInteger(); - Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> { + Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((invocation) -> { counter.incrementAndGet(); WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build(); throw new WxErrorException(error); diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java index 834ed8cb7..c4b57ff13 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java @@ -237,7 +237,7 @@ public class BaseWxMpServiceImplTest { RequestExecutor re = mock(RequestExecutor.class); AtomicInteger counter = new AtomicInteger(); - Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer((InvocationOnMock invocation) -> { + Mockito.when(re.execute(Mockito.anyString(), Mockito.any(), Mockito.any())).thenAnswer(invocation -> { counter.incrementAndGet(); WxError error = WxError.builder().errorCode(WxMpErrorMsgEnum.CODE_40001.getCode()).errorMsg(WxMpErrorMsgEnum.CODE_40001.getMsg()).build(); throw new WxErrorException(error); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java index 492c6c925..abb72a5b7 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java @@ -3,6 +3,7 @@ package com.github.binarywang.wxpay.bean.result; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import me.chanjar.weixin.common.util.json.WxGsonBuilder; import org.w3c.dom.Document; @@ -18,6 +19,7 @@ import java.io.Serializable; * */ @Data +@EqualsAndHashCode(callSuper = true) @AllArgsConstructor @NoArgsConstructor public class WxSignQueryResult extends BaseWxPayResult implements Serializable {