Browse Source

修复一些打包时发现的不规范的javadoc

master
Binary Wang 8 years ago
parent
commit
55cfcb9abd
4 changed files with 7 additions and 12 deletions
  1. +5
    -7
      weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
  2. +1
    -2
      weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java
  3. +0
    -2
      weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java
  4. +1
    -1
      weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java

+ 5
- 7
weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java View File

@@ -13,21 +13,23 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import java.io.StringReader; import java.io.StringReader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Arrays; import java.util.Arrays;
import java.util.Random; import java.util.Random;


/** /**
* <pre>
* 对公众平台发送给公众账号的消息加解密示例代码. * 对公众平台发送给公众账号的消息加解密示例代码.
*
* @copyright Copyright (c) 1998-2014 Tencent Inc.
* Copyright (c) 1998-2014 Tencent Inc.
* 针对org.apache.commons.codec.binary.Base64, * 针对org.apache.commons.codec.binary.Base64,
* 需要导入架包commons-codec-1.9(或commons-codec-1.8等其他版本) * 需要导入架包commons-codec-1.9(或commons-codec-1.8等其他版本)
* 官方下载地址:http://commons.apache.org/proper/commons-codec/download_codec.cgi * 官方下载地址:http://commons.apache.org/proper/commons-codec/download_codec.cgi
* </pre>
*/ */
public class WxCryptUtil { public class WxCryptUtil {


private static final Base64 base64 = new Base64(); 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<DocumentBuilder> builderLocal = new ThreadLocal<DocumentBuilder>() { private static final ThreadLocal<DocumentBuilder> builderLocal = new ThreadLocal<DocumentBuilder>() {
@Override @Override
@@ -76,8 +78,6 @@ public class WxCryptUtil {


/** /**
* 将一个数字转换成生成4个字节的网络字节序bytes数组 * 将一个数字转换成生成4个字节的网络字节序bytes数组
*
* @param number
*/ */
private static byte[] number2BytesInNetworkOrder(int number) { private static byte[] number2BytesInNetworkOrder(int number) {
byte[] orderBytes = new byte[4]; byte[] orderBytes = new byte[4];
@@ -90,8 +90,6 @@ public class WxCryptUtil {


/** /**
* 4个字节的网络字节序bytes数组还原成一个数字 * 4个字节的网络字节序bytes数组还原成一个数字
*
* @param bytesInNetworkOrder
*/ */
private static int bytesNetworkOrder2Number(byte[] bytesInNetworkOrder) { private static int bytesNetworkOrder2Number(byte[] bytesInNetworkOrder) {
int sourceNumber = 0; int sourceNumber = 0;


+ 1
- 2
weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java View File

@@ -13,6 +13,7 @@ public class OkHttpProxyInfo {
private final String proxyUsername; private final String proxyUsername;
private final String proxyPassword; private final String proxyPassword;
private final ProxyType proxyType; private final ProxyType proxyType;

public OkHttpProxyInfo(ProxyType proxyType, String proxyHost, int proxyPort, String proxyUser, String proxyPassword) { public OkHttpProxyInfo(ProxyType proxyType, String proxyHost, int proxyPort, String proxyUser, String proxyPassword) {
this.proxyType = proxyType; this.proxyType = proxyType;
this.proxyAddress = proxyHost; this.proxyAddress = proxyHost;
@@ -91,8 +92,6 @@ public class OkHttpProxyInfo {


/** /**
* 返回 java.net.Proxy * 返回 java.net.Proxy
*
* @return
*/ */
public Proxy getProxy() { public Proxy getProxy() {
Proxy proxy = null; Proxy proxy = null;


+ 0
- 2
weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java View File

@@ -189,8 +189,6 @@ public class WxMaMessageRouterRule {


/** /**
* 处理微信推送过来的消息 * 处理微信推送过来的消息
*
* @return true 代表继续执行别的router,false 代表停止执行别的router
*/ */
protected void service(WxMaMessage wxMessage, protected void service(WxMaMessage wxMessage,
Map<String, Object> context, Map<String, Object> context,


+ 1
- 1
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java View File

@@ -422,7 +422,7 @@ public interface WxMpService {
void initHttp(); void initHttp();


/** /**
* @return
* @return RequestHttp对象
*/ */
RequestHttp getRequestHttp(); RequestHttp getRequestHttp();




Loading…
Cancel
Save