|
7 | 7 | import com.aliyuncs.utils.StringUtils;
|
8 | 8 | import org.apache.http.Header;
|
9 | 9 | import org.apache.http.HttpHost;
|
| 10 | +import org.apache.http.auth.AuthScope; |
| 11 | +import org.apache.http.auth.Credentials; |
| 12 | +import org.apache.http.auth.UsernamePasswordCredentials; |
10 | 13 | import org.apache.http.client.CredentialsProvider;
|
11 | 14 | import org.apache.http.client.config.RequestConfig;
|
12 | 15 | import org.apache.http.client.entity.EntityBuilder;
|
|
25 | 28 | import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
|
26 | 29 | import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
|
27 | 30 | import org.apache.http.impl.client.HttpClientBuilder;
|
| 31 | +import org.apache.http.impl.client.BasicCredentialsProvider; |
28 | 32 | import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
|
29 | 33 | import org.apache.http.protocol.HttpContext;
|
30 | 34 | import org.apache.http.util.EntityUtils;
|
@@ -189,6 +193,19 @@ protected void init(final HttpClientConfig config0) throws ClientException {
|
189 | 193 | CredentialsProvider credentialsProvider = this.clientConfig.getCredentialsProvider();
|
190 | 194 | if (null != credentialsProvider) {
|
191 | 195 | builder.setDefaultCredentialsProvider(credentialsProvider);
|
| 196 | + } else { |
| 197 | + BasicCredentialsProvider crePro = new BasicCredentialsProvider(); |
| 198 | + if (!StringUtils.isEmpty(clientConfig.getHttpsProxy())) { |
| 199 | + HttpUtil.readCredentialsFromApacheProxy(crePro, clientConfig.getHttpsProxy()); |
| 200 | + } else if (!StringUtils.isEmpty(EnvironmentUtils.getHttpsProxy())) { |
| 201 | + HttpUtil.readCredentialsFromApacheProxy(crePro, EnvironmentUtils.getHttpsProxy()); |
| 202 | + } |
| 203 | + if (!StringUtils.isEmpty(clientConfig.getHttpProxy())) { |
| 204 | + HttpUtil.readCredentialsFromApacheProxy(crePro, clientConfig.getHttpProxy()); |
| 205 | + } else if (!StringUtils.isEmpty(EnvironmentUtils.getHttpProxy())) { |
| 206 | + HttpUtil.readCredentialsFromApacheProxy(crePro, EnvironmentUtils.getHttpProxy()); |
| 207 | + } |
| 208 | + builder.setDefaultCredentialsProvider(crePro); |
192 | 209 | }
|
193 | 210 | // default request config
|
194 | 211 | RequestConfig defaultConfig = RequestConfig.custom().setConnectTimeout((int) config
|
|
0 commit comments