diff --git a/src/main/java/com/dingxianginc/ctu/client/CaptchaClient.java b/src/main/java/com/dingxianginc/ctu/client/CaptchaClient.java index dc3d67d..45419a2 100644 --- a/src/main/java/com/dingxianginc/ctu/client/CaptchaClient.java +++ b/src/main/java/com/dingxianginc/ctu/client/CaptchaClient.java @@ -8,6 +8,7 @@ import com.dingxianginc.ctu.client.util.InputStreamUtils; import com.dingxianginc.ctu.client.util.StringUtils; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -50,6 +51,24 @@ public CaptchaClient( .build(); } + public CaptchaClient(String appId, + String appSecret, + int connectTimeout, + int connectionRequestTimeout, + int socketTimeout, + String proxyHostName, + int proxyPort) { + this.appId = appId; + this.appSecret = appSecret; + this.httpClient = HttpClientPool.getInstance().getHttpClient(); + this.requestConfig = RequestConfig.custom() + .setConnectTimeout(connectTimeout) + .setConnectionRequestTimeout(connectionRequestTimeout) + .setSocketTimeout(socketTimeout) + .setProxy(new HttpHost(proxyHostName, proxyPort)) + .build(); + } + public CaptchaResponse verifyToken(String token, String ip) throws Exception { return getResponse(token, ip); } diff --git a/src/main/java/com/dingxianginc/ctu/client/CtuClient.java b/src/main/java/com/dingxianginc/ctu/client/CtuClient.java index b5a9267..33b8ed9 100644 --- a/src/main/java/com/dingxianginc/ctu/client/CtuClient.java +++ b/src/main/java/com/dingxianginc/ctu/client/CtuClient.java @@ -11,6 +11,7 @@ import com.dingxianginc.ctu.client.util.InputStreamUtils; import com.dingxianginc.ctu.client.util.SignUtil; import org.apache.commons.codec.binary.Base64; +import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; @@ -52,6 +53,26 @@ public CtuClient( .setSocketTimeout(socketTimeout).build(); } + public CtuClient(String url, + String appKey, + String appSecret, + int connectTimeout, + int connectionRequestTimeout, + int socketTimeout, + String proxyHostName, + int proxyPort) { + this.url = url; + this.appKey = appKey; + this.appSecret = appSecret; + this.httpClient = HttpClientPool.getInstance().getHttpClient(); + this.requestConfig = RequestConfig.custom() + .setConnectTimeout(connectTimeout) + .setConnectionRequestTimeout(connectionRequestTimeout) + .setSocketTimeout(socketTimeout) + .setProxy(new HttpHost(proxyHostName, proxyPort)) + .build(); + } + public CtuResponse checkRisk(CtuRequest request) throws Exception { String sign = SignUtil.sign(appSecret, request); String reqUrl = String.format("%s?appKey=%s&sign=%s&version=%s", url, appKey, sign, version);