diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java index e80419d7..e362e64b 100755 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java @@ -13,21 +13,23 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import java.io.StringReader; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Random; /** + *
  * 对公众平台发送给公众账号的消息加解密示例代码.
- *
- * @copyright Copyright (c) 1998-2014 Tencent Inc.
+ * Copyright (c) 1998-2014 Tencent Inc.
  * 针对org.apache.commons.codec.binary.Base64,
  * 需要导入架包commons-codec-1.9(或commons-codec-1.8等其他版本)
  * 官方下载地址:http://commons.apache.org/proper/commons-codec/download_codec.cgi
+ * 
*/ public class WxCryptUtil { private static final Base64 base64 = new Base64(); - private static final Charset CHARSET = Charset.forName("utf-8"); + private static final Charset CHARSET = StandardCharsets.UTF_8; private static final ThreadLocal builderLocal = new ThreadLocal() { @Override @@ -76,8 +78,6 @@ public class WxCryptUtil { /** * 将一个数字转换成生成4个字节的网络字节序bytes数组 - * - * @param number */ private static byte[] number2BytesInNetworkOrder(int number) { byte[] orderBytes = new byte[4]; @@ -90,8 +90,6 @@ public class WxCryptUtil { /** * 4个字节的网络字节序bytes数组还原成一个数字 - * - * @param bytesInNetworkOrder */ private static int bytesNetworkOrder2Number(byte[] bytesInNetworkOrder) { int sourceNumber = 0; diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java index 5515b0f7..eb9f7ac9 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java @@ -13,6 +13,7 @@ public class OkHttpProxyInfo { private final String proxyUsername; private final String proxyPassword; private final ProxyType proxyType; + public OkHttpProxyInfo(ProxyType proxyType, String proxyHost, int proxyPort, String proxyUser, String proxyPassword) { this.proxyType = proxyType; this.proxyAddress = proxyHost; @@ -91,8 +92,6 @@ public class OkHttpProxyInfo { /** * 返回 java.net.Proxy - * - * @return */ public Proxy getProxy() { Proxy proxy = null; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java index 9fce8b1a..835eb289 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java @@ -189,8 +189,6 @@ public class WxMaMessageRouterRule { /** * 处理微信推送过来的消息 - * - * @return true 代表继续执行别的router,false 代表停止执行别的router */ protected void service(WxMaMessage wxMessage, Map context, diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java index 71a54135..7199d4e0 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java @@ -422,7 +422,7 @@ public interface WxMpService { void initHttp(); /** - * @return + * @return RequestHttp对象 */ RequestHttp getRequestHttp();