niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了一个bug

Browse Source
This commit is contained in:
jinyu 2015-09-01 21:48:43 +08:00
parent 535d078e9d
commit 52bf294516
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java
View File

@ -19,7 +19,7 @@ public abstract class HttpClientFactory {
private static volatile HttpClientFactory defaultFactory = newDefaultFactory(); private static volatile HttpClientFactory defaultFactory = newDefaultFactory();
/** /**
* ApachHttpClient -> SimpleHttpClient(HttpURLConnection) * NettyHttpClient -> ApachHttpClient -> SimpleHttpClient(HttpURLConnection)
* *
* @return * @return
*/ */
@ -27,10 +27,10 @@ public abstract class HttpClientFactory {
HttpClientFactory f; HttpClientFactory f;
try { try {
f = new HttpComponent4Factory(); f = new HttpComponent4Factory();
} catch (Throwable e1) { } catch (Throwable e2) {
try { try {
f = new HttpComponent3Factory(); f = new HttpComponent3Factory();
} catch (Throwable e2) { } catch (Throwable e3) {
f = new SimpleHttpClientFactory(); f = new SimpleHttpClientFactory();
} }
} }

3
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3.java
View File

@ -34,7 +34,6 @@ import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
import com.foxinmy.weixin4j.http.AbstractHttpClient; import com.foxinmy.weixin4j.http.AbstractHttpClient;
import com.foxinmy.weixin4j.http.HttpClient;
import com.foxinmy.weixin4j.http.HttpClientException; import com.foxinmy.weixin4j.http.HttpClientException;
import com.foxinmy.weixin4j.http.HttpHeaders; import com.foxinmy.weixin4j.http.HttpHeaders;
import com.foxinmy.weixin4j.http.HttpMethod; import com.foxinmy.weixin4j.http.HttpMethod;
@ -55,7 +54,7 @@ import com.foxinmy.weixin4j.util.StringUtil;
* @since JDK 1.7 * @since JDK 1.7
* @see * @see
*/ */
public class HttpComponent3 extends AbstractHttpClient implements HttpClient { public class HttpComponent3 extends AbstractHttpClient {
private final org.apache.commons.httpclient.HttpClient httpClient; private final org.apache.commons.httpclient.HttpClient httpClient;

2
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1.java
View File

@ -30,7 +30,7 @@ import com.foxinmy.weixin4j.model.Consts;
* @since JDK 1.7 * @since JDK 1.7
* @see * @see
*/ */
public class HttpComponent4_1 extends HttpComponent4 implements HttpClient { public class HttpComponent4_1 extends HttpComponent4 {
private final org.apache.http.client.HttpClient httpClient; private final org.apache.http.client.HttpClient httpClient;

3
weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2.java
View File

@ -13,7 +13,6 @@ import org.apache.http.conn.ssl.X509HostnameVerifier;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import com.foxinmy.weixin4j.http.HttpClient;
import com.foxinmy.weixin4j.http.HttpClientException; import com.foxinmy.weixin4j.http.HttpClientException;
import com.foxinmy.weixin4j.http.HttpParams; import com.foxinmy.weixin4j.http.HttpParams;
import com.foxinmy.weixin4j.http.HttpRequest; import com.foxinmy.weixin4j.http.HttpRequest;
@ -28,7 +27,7 @@ import com.foxinmy.weixin4j.http.HttpResponse;
* @since JDK 1.7 * @since JDK 1.7
* @see * @see
*/ */
public class HttpComponent4_2 extends HttpComponent4 implements HttpClient { public class HttpComponent4_2 extends HttpComponent4 {
private CloseableHttpClient httpClient; private CloseableHttpClient httpClient;

6
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java
View File

@ -586,8 +586,12 @@ public class MediaApi extends MpApi {
MediaRecord mediaRecord = null; MediaRecord mediaRecord = null;
for (;;) { for (;;) {
mediaRecord = listMaterialMedia(mediaType, pageable); mediaRecord = listMaterialMedia(mediaType, pageable);
if (mediaRecord.getItems() == null
|| !mediaRecord.getItems().isEmpty()) {
break;
}
mediaList.addAll(mediaRecord.getItems()); mediaList.addAll(mediaRecord.getItems());
if (pageable.getOffset() >= mediaRecord.getTotalCount()) { if (!mediaRecord.getPagedata().hasNext()) {
break; break;
} }
pageable = pageable.next(); pageable = pageable.next();

6
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java
View File

@ -471,8 +471,12 @@ public class MediaApi extends QyApi {
MediaRecord mediaRecord = null; MediaRecord mediaRecord = null;
for (;;) { for (;;) {
mediaRecord = listMaterialMedia(agentid, mediaType, pageable); mediaRecord = listMaterialMedia(agentid, mediaType, pageable);
if (mediaRecord.getItems() == null
|| !mediaRecord.getItems().isEmpty()) {
break;
}
mediaList.addAll(mediaRecord.getItems()); mediaList.addAll(mediaRecord.getItems());
if (pageable.getOffset() >= mediaRecord.getTotalCount()) { if (!mediaRecord.getPagedata().hasNext()) {
break; break;
} }
pageable = pageable.next(); pageable = pageable.next();