Mobai
/
magic-Dependency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix test

master
yihua.huang 2017-04-08 20:09:43 +08:00
parent b06a248c00
commit 2622b448b8
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webmagic-core/src/main/java/us/codecraft/webmagic/Request.java
View File

@ -123,12 +123,20 @@ public class Request implements Serializable {
public int hashCode() { public int hashCode() {
int result = url != null ? url.hashCode() : 0; int result = url != null ? url.hashCode() : 0;
result = 31 * result + (method != null ? method.hashCode() : 0); result = 31 * result + (method != null ? method.hashCode() : 0);
result = 31 * result + (headers != null ? headers.hashCode() : 0);
result = 31 * result + (cookies != null ? cookies.hashCode() : 0);
return result; return result;
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Request request = (Request) o;
if (url != null ? !url.equals(request.url) : request.url != null) return false;
return method != null ? method.equals(request.method) : request.method == null;
}
public List<Cookie> getCookies() { public List<Cookie> getCookies() {
return cookies; return cookies;
} }

17
webmagic-core/src/main/java/us/codecraft/webmagic/downloader/HttpUriRequestConverter.java
View File

@ -38,9 +38,11 @@ public class HttpUriRequestConverter {
private HttpClientContext convertHttpClientContext(Request request, Site site, Proxy proxy) { private HttpClientContext convertHttpClientContext(Request request, Site site, Proxy proxy) {
HttpClientContext httpContext = new HttpClientContext(); HttpClientContext httpContext = new HttpClientContext();
AuthState authState = new AuthState(); if (proxy != null) {
authState.update(new BasicScheme(), new UsernamePasswordCredentials(proxy.getUsername(), proxy.getPassword())); AuthState authState = new AuthState();
httpContext.setAttribute(HttpClientContext.PROXY_AUTH_STATE, authState); authState.update(new BasicScheme(), new UsernamePasswordCredentials(proxy.getUsername(), proxy.getPassword()));
httpContext.setAttribute(HttpClientContext.PROXY_AUTH_STATE, authState);
}
if (request.getCookies() != null && CollectionUtils.isNotEmpty(request.getCookies())) { if (request.getCookies() != null && CollectionUtils.isNotEmpty(request.getCookies())) {
CookieStore cookieStore = new BasicCookieStore(); CookieStore cookieStore = new BasicCookieStore();
for (Cookie c : request.getCookies()) { for (Cookie c : request.getCookies()) {
@ -108,13 +110,4 @@ public class HttpUriRequestConverter {
return requestBuilder; return requestBuilder;
} }
private RequestBuilder addQueryParams(RequestBuilder requestBuilder, Map<String, String> params) {
if (params != null) {
for (Map.Entry<String, String> entry : params.entrySet()) {
requestBuilder.addParameter(entry.getKey(), entry.getValue());
}
}
return requestBuilder;
}
} }