:art: 修复测试代码

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> 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;
   }

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

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java

@@ -92,7 +92,7 @@ public class BaseWxCpServiceImplTest {
     RequestExecutor<Object, Object> 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);

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 = "<a href=\""
           + wxService.getOauth2Service().buildAuthorizationUrl(wxCpConfigStorage.getOauth2redirectUri(), null)
           + "\">测试oauth2</a>";
@@ -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;
         })

weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java

@@ -127,7 +127,7 @@ public class WxMaServiceImplTest {
     RequestExecutor<Object, Object> 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);

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java

@@ -237,7 +237,7 @@ public class BaseWxMpServiceImplTest {
     RequestExecutor<Object, Object> 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);

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;
  * </pre>
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor
 @NoArgsConstructor
 public class WxSignQueryResult extends BaseWxPayResult implements Serializable {