diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java index 8ba78381..35e46b60 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java @@ -131,7 +131,7 @@ public class CashApi extends MchApi { * * @param certificate * 后缀为*.p12的证书文件 - * @param mpPayment + * @param payment * 付款信息 * @return 付款结果 * @see com.foxinmy.weixin4j.payment.mch.CorpPayment diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java index 06ba2388..0ee50f79 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java @@ -28,7 +28,7 @@ public abstract class HttpClientFactory { private static volatile HttpClientFactory defaultFactory = newDefaultFactory(); /** - * NettyHttpClient -> ApacheHttpClient -> + * NettyHttpClient -> ApacheHttpClient(HttpComponent3&4) -> * SimpleHttpClient(HttpURLConnection) * * @return diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java index 477a6671..29373360 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java @@ -804,7 +804,7 @@ public class WeixinPayProxy { /** * 企业付款 * - * @see {@link #senCorpPayment(InputStream, CorpPayment)} + * @see {@link #sendCorpPayment(InputStream, CorpPayment)} */ public CorpPaymentResult sendCorpPayment(CorpPayment payment) throws WeixinException, IOException { return cashApi.sendCorpPayment(new FileInputStream(settings.getCertificateFile0()), payment); diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java index d12dcf67..e7a4a2e7 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java @@ -34,7 +34,7 @@ import com.foxinmy.weixin4j.mp.model.Group; import com.foxinmy.weixin4j.mp.model.KfAccount; import com.foxinmy.weixin4j.mp.model.KfChatRecord; import com.foxinmy.weixin4j.mp.model.KfSession; -import com.foxinmy.weixin4j.mp.model.KfSession.kfSessionCounter; +import com.foxinmy.weixin4j.mp.model.KfSession.KfSessionCounter; import com.foxinmy.weixin4j.mp.model.Menu; import com.foxinmy.weixin4j.mp.model.MenuMatchRule; import com.foxinmy.weixin4j.mp.model.MenuSetting; @@ -717,12 +717,12 @@ public class WeixinProxy { * @throws WeixinException * @see com.foxinmy.weixin4j.mp.api.CustomApi * @see com.foxinmy.weixin4j.mp.model.KfSession - * @see com.foxinmy.weixin4j.mp.model.KfSession.kfSessionCounter + * @see com.foxinmy.weixin4j.mp.model.KfSession.KfSessionCounter * @see * 获取客服的会话列表 */ - public kfSessionCounter listKfWaitSession() throws WeixinException { + public KfSessionCounter listKfWaitSession() throws WeixinException { return customApi.listKfWaitSession(); } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java index b237e943..b90c4689 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.model.Token; import com.foxinmy.weixin4j.mp.model.KfAccount; import com.foxinmy.weixin4j.mp.model.KfChatRecord; import com.foxinmy.weixin4j.mp.model.KfSession; -import com.foxinmy.weixin4j.mp.model.KfSession.kfSessionCounter; +import com.foxinmy.weixin4j.mp.model.KfSession.KfSessionCounter; import com.foxinmy.weixin4j.token.TokenHolder; import com.foxinmy.weixin4j.util.DigestUtil; import com.foxinmy.weixin4j.util.FileUtil; @@ -358,17 +358,17 @@ public class CustomApi extends MpApi { * @return 会话列表 * @throws WeixinException * @see com.foxinmy.weixin4j.mp.model.KfSession - * @see com.foxinmy.weixin4j.mp.model.KfSession.kfSessionCounter + * @see com.foxinmy.weixin4j.mp.model.KfSession.KfSessionCounter * @see * 获取客服的会话列表 */ - public kfSessionCounter listKfWaitSession() throws WeixinException { + public KfSessionCounter listKfWaitSession() throws WeixinException { Token token = tokenHolder.getToken(); String kfsession_wait_uri = getRequestUri("kfsession_wait_uri"); WeixinResponse response = weixinExecutor.get(String.format(kfsession_wait_uri, token.getAccessToken())); - return response.getAsObject(new TypeReference() { + return response.getAsObject(new TypeReference() { }); } } \ No newline at end of file diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfSession.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfSession.java index e59bb889..94b97e6c 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfSession.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfSession.java @@ -83,7 +83,7 @@ public class KfSession implements Serializable { * @since JDK 1.6 * @see */ - public static class kfSessionCounter implements Iterable, Serializable { + public static class KfSessionCounter implements Iterable, Serializable { private static final long serialVersionUID = -2200434961546270829L; diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java index f964d202..c6028dca 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java @@ -18,7 +18,7 @@ import com.foxinmy.weixin4j.mp.api.CustomApi; import com.foxinmy.weixin4j.mp.model.KfAccount; import com.foxinmy.weixin4j.mp.model.KfChatRecord; import com.foxinmy.weixin4j.mp.model.KfSession; -import com.foxinmy.weixin4j.mp.model.KfSession.kfSessionCounter; +import com.foxinmy.weixin4j.mp.model.KfSession.KfSessionCounter; /** * 客服消息测试 @@ -116,7 +116,7 @@ public class CustomTest extends TokenTest { @Test public void getSessionWaitList() throws WeixinException { - kfSessionCounter sessionCounter = customApi.listKfWaitSession(); + KfSessionCounter sessionCounter = customApi.listKfWaitSession(); System.err.println(sessionCounter); } } diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java index 63c07a7c..2c95f543 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java @@ -154,7 +154,7 @@ public class WeixinProxy { * 注意：TokenCreator 需为 * WeixinTokenCreator或WeixinTokenSuiteCreator * - * @see com.foxinmy.weixin4j.qy.token.WeixinTokenCreator.WeixinTokenCreator + * @see com.foxinmy.weixin4j.qy.token.WeixinTokenCreator * @param tokenHolder */ private WeixinProxy(TokenHolder tokenHolder) { @@ -716,7 +716,7 @@ public class WeixinProxy { * @see com.foxinmy.weixin4j.qy.api.UserApi * @return 成员对象 * @see {@link #getUser(String)} - * @see {@link #getUserIdByCode(String,int)} + * @see {@link #getUserIdByCode(String)} * @see * 企业获取code @@ -775,7 +775,7 @@ public class WeixinProxy { * * @param partyId * 部门ID - * @see {@link #listUser(int, boolean,UserStatus)} + * @see {@link #listUser(int, boolean, UserStatus, boolean)} * @see com.foxinmy.weixin4j.qy.api.UserApi * @return 成员列表 * @throws WeixinException diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java index bf5bc1e9..49015ccb 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java @@ -173,7 +173,7 @@ public class UserApi extends QyApi { * @see com.foxinmy.weixin4j.qy.model.User * @return 成员对象 * @see {@link #getUser(String)} - * @see {@link #getUserIdByCode(String,int)} + * @see {@link #getUserIdByCode(String)} * @see * oauth授权获取用户信息 @@ -295,7 +295,7 @@ public class UserApi extends QyApi { * * @param partyId * 部门ID - * @see {@link #listUser(int, boolean,UserStatus)} + * @see {@link #listUser(int, boolean, UserStatus,boolean)} * @return 成员列表 * @throws WeixinException */ diff --git a/weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java b/weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java index f0f65197..f776c6dc 100644 --- a/weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java +++ b/weixin4j-server/src/test/java/com/foxinmy/weixin4j/server/test/MessageServerStartup.java @@ -1,11 +1,11 @@ package com.foxinmy.weixin4j.server.test; +import io.netty.channel.ChannelHandlerContext; + import java.util.Set; import org.springframework.context.ApplicationContext; -import io.netty.channel.ChannelHandlerContext; - import com.foxinmy.weixin4j.dispatcher.BeanFactory; import com.foxinmy.weixin4j.exception.WeixinException; import com.foxinmy.weixin4j.handler.DebugMessageHandler; @@ -167,6 +167,6 @@ public class MessageServerStartup { * @throws Exception */ public static void main(String[] args) throws Exception { - new MessageServerStartup().test1(); + new MessageServerStartup().test2(); } }