mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-07-21 15:09:48 +08:00
7.0.0.M1
This commit is contained in:
@@ -23,9 +23,9 @@
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>org.dromara.hutool</groupId>
|
||||
<groupId>cn.hutool.v7</groupId>
|
||||
<artifactId>hutool-parent</artifactId>
|
||||
<version>6.0.0-M22</version>
|
||||
<version>7.0.0.M1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hutool-http</artifactId>
|
||||
@@ -33,7 +33,7 @@
|
||||
<description>Hutool Http客户端</description>
|
||||
|
||||
<properties>
|
||||
<Automatic-Module-Name>org.dromara.hutool.http</Automatic-Module-Name>
|
||||
<Automatic-Module-Name>cn.hutool.v7.http</Automatic-Module-Name>
|
||||
<httpclient5.version>5.4.1</httpclient5.version>
|
||||
<httpclient4.version>4.5.14</httpclient4.version>
|
||||
<okhttp.version>4.12.0</okhttp.version>
|
||||
@@ -48,17 +48,17 @@
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.dromara.hutool</groupId>
|
||||
<groupId>cn.hutool.v7</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.dromara.hutool</groupId>
|
||||
<groupId>cn.hutool.v7</groupId>
|
||||
<artifactId>hutool-log</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.dromara.hutool</groupId>
|
||||
<groupId>cn.hutool.v7</groupId>
|
||||
<artifactId>hutool-crypto</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
<scope>test</scope>
|
||||
@@ -140,7 +140,7 @@
|
||||
</dependency>
|
||||
<!-- 仅用于测试 -->
|
||||
<dependency>
|
||||
<groupId>org.dromara.hutool</groupId>
|
||||
<groupId>cn.hutool.v7</groupId>
|
||||
<artifactId>hutool-json</artifactId>
|
||||
<version>${project.parent.version}</version>
|
||||
<scope>test</scope>
|
||||
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http;
|
||||
package cn.hutool.v7.http;
|
||||
|
||||
import org.dromara.hutool.core.compress.InflaterInputStream;
|
||||
import org.dromara.hutool.core.map.CaseInsensitiveMap;
|
||||
import org.dromara.hutool.core.reflect.ConstructorUtil;
|
||||
import cn.hutool.v7.core.compress.InflaterInputStream;
|
||||
import cn.hutool.v7.core.map.CaseInsensitiveMap;
|
||||
import cn.hutool.v7.core.reflect.ConstructorUtil;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.Map;
|
@@ -14,12 +14,12 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http;
|
||||
package cn.hutool.v7.http;
|
||||
|
||||
import org.dromara.hutool.core.collection.CollUtil;
|
||||
import org.dromara.hutool.core.map.MapUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import cn.hutool.v7.core.collection.CollUtil;
|
||||
import cn.hutool.v7.core.map.MapUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http;
|
||||
package cn.hutool.v7.http;
|
||||
|
||||
import org.dromara.hutool.core.exception.HutoolException;
|
||||
import cn.hutool.v7.core.exception.HutoolException;
|
||||
|
||||
/**
|
||||
* HTTP异常
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http;
|
||||
package cn.hutool.v7.http;
|
||||
|
||||
import org.dromara.hutool.core.util.RandomUtil;
|
||||
import cn.hutool.v7.core.util.RandomUtil;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.net.HttpURLConnection;
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http;
|
||||
package cn.hutool.v7.http;
|
||||
|
||||
import org.dromara.hutool.core.net.url.UrlBuilder;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.core.text.split.SplitUtil;
|
||||
import cn.hutool.v7.core.net.url.UrlBuilder;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.text.split.SplitUtil;
|
||||
|
||||
import java.util.List;
|
||||
|
@@ -14,20 +14,20 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http;
|
||||
package cn.hutool.v7.http;
|
||||
|
||||
import org.dromara.hutool.core.collection.CollUtil;
|
||||
import org.dromara.hutool.core.map.CaseInsensitiveMap;
|
||||
import org.dromara.hutool.core.map.MapUtil;
|
||||
import org.dromara.hutool.core.net.url.UrlQueryUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.client.engine.ClientEngine;
|
||||
import org.dromara.hutool.http.client.engine.ClientEngineFactory;
|
||||
import org.dromara.hutool.http.meta.Method;
|
||||
import org.dromara.hutool.http.server.engine.sun.SimpleServer;
|
||||
import cn.hutool.v7.core.collection.CollUtil;
|
||||
import cn.hutool.v7.core.map.CaseInsensitiveMap;
|
||||
import cn.hutool.v7.core.map.MapUtil;
|
||||
import cn.hutool.v7.core.net.url.UrlQueryUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.client.engine.ClientEngine;
|
||||
import cn.hutool.v7.http.client.engine.ClientEngineFactory;
|
||||
import cn.hutool.v7.http.meta.Method;
|
||||
import cn.hutool.v7.http.server.engine.sun.SimpleServer;
|
||||
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.Collection;
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.auth;
|
||||
package cn.hutool.v7.http.auth;
|
||||
|
||||
import org.dromara.hutool.core.codec.binary.Base64;
|
||||
import cn.hutool.v7.core.codec.binary.Base64;
|
||||
|
||||
import java.net.PasswordAuthentication;
|
||||
import java.nio.charset.Charset;
|
@@ -20,4 +20,4 @@
|
||||
* @author Looly
|
||||
* @since 6.0.0
|
||||
*/
|
||||
package org.dromara.hutool.http.auth;
|
||||
package cn.hutool.v7.http.auth;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client;
|
||||
package cn.hutool.v7.http.client;
|
||||
|
||||
/**
|
||||
* 针对HttpClient5和HttpClient4的配置
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client;
|
||||
package cn.hutool.v7.http.client;
|
||||
|
||||
import org.dromara.hutool.http.HttpGlobalConfig;
|
||||
import org.dromara.hutool.http.proxy.ProxyInfo;
|
||||
import org.dromara.hutool.http.ssl.SSLInfo;
|
||||
import cn.hutool.v7.http.HttpGlobalConfig;
|
||||
import cn.hutool.v7.http.proxy.ProxyInfo;
|
||||
import cn.hutool.v7.http.ssl.SSLInfo;
|
||||
|
||||
/**
|
||||
* Http客户端配置
|
@@ -14,17 +14,17 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client;
|
||||
package cn.hutool.v7.http.client;
|
||||
|
||||
import org.dromara.hutool.core.array.ArrayUtil;
|
||||
import org.dromara.hutool.core.collection.CollUtil;
|
||||
import org.dromara.hutool.core.collection.ListUtil;
|
||||
import org.dromara.hutool.core.convert.ConvertUtil;
|
||||
import org.dromara.hutool.core.map.MapUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.HttpUtil;
|
||||
import org.dromara.hutool.http.auth.HttpAuthUtil;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import cn.hutool.v7.core.array.ArrayUtil;
|
||||
import cn.hutool.v7.core.collection.CollUtil;
|
||||
import cn.hutool.v7.core.collection.ListUtil;
|
||||
import cn.hutool.v7.core.convert.ConvertUtil;
|
||||
import cn.hutool.v7.core.map.MapUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.HttpUtil;
|
||||
import cn.hutool.v7.http.auth.HttpAuthUtil;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
|
||||
import java.net.HttpCookie;
|
||||
import java.nio.charset.Charset;
|
@@ -14,14 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client;
|
||||
package cn.hutool.v7.http.client;
|
||||
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.io.StreamProgress;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.body.ResponseBody;
|
||||
import org.dromara.hutool.http.client.engine.ClientEngine;
|
||||
import org.dromara.hutool.http.client.engine.ClientEngineFactory;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.io.StreamProgress;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.body.ResponseBody;
|
||||
import cn.hutool.v7.http.client.engine.ClientEngine;
|
||||
import cn.hutool.v7.http.client.engine.ClientEngineFactory;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
@@ -14,26 +14,26 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client;
|
||||
package cn.hutool.v7.http.client;
|
||||
|
||||
import org.dromara.hutool.core.collection.ListUtil;
|
||||
import org.dromara.hutool.core.io.resource.Resource;
|
||||
import org.dromara.hutool.core.lang.Assert;
|
||||
import org.dromara.hutool.core.map.MapUtil;
|
||||
import org.dromara.hutool.core.map.multi.ListValueMap;
|
||||
import org.dromara.hutool.core.net.url.UrlBuilder;
|
||||
import org.dromara.hutool.core.net.url.UrlQuery;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.core.util.CharsetUtil;
|
||||
import org.dromara.hutool.http.GlobalHeaders;
|
||||
import org.dromara.hutool.http.HttpGlobalConfig;
|
||||
import org.dromara.hutool.http.HttpUrlUtil;
|
||||
import org.dromara.hutool.http.HttpUtil;
|
||||
import org.dromara.hutool.http.client.body.*;
|
||||
import org.dromara.hutool.http.client.engine.ClientEngine;
|
||||
import org.dromara.hutool.http.client.engine.ClientEngineFactory;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import org.dromara.hutool.http.meta.Method;
|
||||
import cn.hutool.v7.core.collection.ListUtil;
|
||||
import cn.hutool.v7.core.io.resource.Resource;
|
||||
import cn.hutool.v7.core.lang.Assert;
|
||||
import cn.hutool.v7.core.map.MapUtil;
|
||||
import cn.hutool.v7.core.map.multi.ListValueMap;
|
||||
import cn.hutool.v7.core.net.url.UrlBuilder;
|
||||
import cn.hutool.v7.core.net.url.UrlQuery;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.util.CharsetUtil;
|
||||
import cn.hutool.v7.http.GlobalHeaders;
|
||||
import cn.hutool.v7.http.HttpGlobalConfig;
|
||||
import cn.hutool.v7.http.HttpUrlUtil;
|
||||
import cn.hutool.v7.http.HttpUtil;
|
||||
import cn.hutool.v7.http.client.body.*;
|
||||
import cn.hutool.v7.http.client.engine.ClientEngine;
|
||||
import cn.hutool.v7.http.client.engine.ClientEngineFactory;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
import cn.hutool.v7.http.meta.Method;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client;
|
||||
package cn.hutool.v7.http.client;
|
||||
|
||||
/**
|
||||
* 请求上下文,用于在多次请求时保存状态信息<br>
|
@@ -14,16 +14,16 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client;
|
||||
package cn.hutool.v7.http.client;
|
||||
|
||||
import org.dromara.hutool.core.convert.ConvertUtil;
|
||||
import org.dromara.hutool.core.io.IORuntimeException;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.body.ResponseBody;
|
||||
import org.dromara.hutool.http.meta.ContentTypeUtil;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import org.dromara.hutool.http.meta.HttpHeaderUtil;
|
||||
import cn.hutool.v7.core.convert.ConvertUtil;
|
||||
import cn.hutool.v7.core.io.IORuntimeException;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.body.ResponseBody;
|
||||
import cn.hutool.v7.http.meta.ContentTypeUtil;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
import cn.hutool.v7.http.meta.HttpHeaderUtil;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.io.resource.BytesResource;
|
||||
import org.dromara.hutool.core.io.resource.HttpResource;
|
||||
import cn.hutool.v7.core.io.resource.BytesResource;
|
||||
import cn.hutool.v7.core.io.resource.HttpResource;
|
||||
|
||||
/**
|
||||
* bytes类型的Http request body,主要发送编码后的表单数据或rest body(如JSON或XML)
|
@@ -14,17 +14,17 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.collection.CollUtil;
|
||||
import org.dromara.hutool.core.convert.ConvertUtil;
|
||||
import org.dromara.hutool.core.io.resource.FileResource;
|
||||
import org.dromara.hutool.core.io.resource.MultiFileResource;
|
||||
import org.dromara.hutool.core.map.MapUtil;
|
||||
import org.dromara.hutool.core.map.TableMap;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.core.array.ArrayUtil;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.v7.core.collection.CollUtil;
|
||||
import cn.hutool.v7.core.convert.ConvertUtil;
|
||||
import cn.hutool.v7.core.io.resource.FileResource;
|
||||
import cn.hutool.v7.core.io.resource.MultiFileResource;
|
||||
import cn.hutool.v7.core.map.MapUtil;
|
||||
import cn.hutool.v7.core.map.TableMap;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.array.ArrayUtil;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.charset.Charset;
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
@@ -14,12 +14,12 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.map.MapUtil;
|
||||
import org.dromara.hutool.http.meta.ContentType;
|
||||
import org.dromara.hutool.http.HttpGlobalConfig;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.map.MapUtil;
|
||||
import cn.hutool.v7.http.meta.ContentType;
|
||||
import cn.hutool.v7.http.HttpGlobalConfig;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.OutputStream;
|
@@ -14,16 +14,16 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.convert.ConvertUtil;
|
||||
import org.dromara.hutool.core.io.IORuntimeException;
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.io.file.FileUtil;
|
||||
import org.dromara.hutool.core.io.resource.*;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.HttpGlobalConfig;
|
||||
import org.dromara.hutool.http.meta.ContentType;
|
||||
import cn.hutool.v7.core.convert.ConvertUtil;
|
||||
import cn.hutool.v7.core.io.IORuntimeException;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.io.file.FileUtil;
|
||||
import cn.hutool.v7.core.io.resource.*;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.HttpGlobalConfig;
|
||||
import cn.hutool.v7.http.meta.ContentType;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.charset.Charset;
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.io.resource.HttpResource;
|
||||
import org.dromara.hutool.core.io.resource.Resource;
|
||||
import cn.hutool.v7.core.io.resource.HttpResource;
|
||||
import cn.hutool.v7.core.io.resource.Resource;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
@@ -14,20 +14,20 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.io.StreamProgress;
|
||||
import org.dromara.hutool.core.io.file.FileNameUtil;
|
||||
import org.dromara.hutool.core.io.file.FileUtil;
|
||||
import org.dromara.hutool.core.io.stream.SyncInputStream;
|
||||
import org.dromara.hutool.core.lang.Assert;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.HttpGlobalConfig;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.html.HtmlUtil;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.io.StreamProgress;
|
||||
import cn.hutool.v7.core.io.file.FileNameUtil;
|
||||
import cn.hutool.v7.core.io.file.FileUtil;
|
||||
import cn.hutool.v7.core.io.stream.SyncInputStream;
|
||||
import cn.hutool.v7.core.lang.Assert;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.HttpGlobalConfig;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.html.HtmlUtil;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
|
||||
import java.io.*;
|
||||
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.io.resource.HttpResource;
|
||||
import org.dromara.hutool.core.io.resource.StringResource;
|
||||
import org.dromara.hutool.http.meta.ContentTypeUtil;
|
||||
import cn.hutool.v7.core.io.resource.HttpResource;
|
||||
import cn.hutool.v7.core.io.resource.StringResource;
|
||||
import cn.hutool.v7.http.meta.ContentTypeUtil;
|
||||
|
||||
import java.nio.charset.Charset;
|
||||
|
@@ -14,12 +14,12 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
||||
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.net.url.UrlQuery;
|
||||
import org.dromara.hutool.core.util.ByteUtil;
|
||||
import org.dromara.hutool.http.meta.ContentType;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.net.url.UrlQuery;
|
||||
import cn.hutool.v7.core.util.ByteUtil;
|
||||
import cn.hutool.v7.http.meta.ContentType;
|
||||
|
||||
import java.io.OutputStream;
|
||||
import java.nio.charset.Charset;
|
@@ -20,4 +20,4 @@
|
||||
* @author Looly
|
||||
*
|
||||
*/
|
||||
package org.dromara.hutool.http.client.body;
|
||||
package cn.hutool.v7.http.client.body;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.cookie;
|
||||
package cn.hutool.v7.http.client.cookie;
|
||||
|
||||
import java.time.Instant;
|
||||
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.cookie;
|
||||
package cn.hutool.v7.http.client.cookie;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.List;
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.cookie;
|
||||
package cn.hutool.v7.http.client.cookie;
|
||||
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.log.Log;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.log.Log;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.cookie;
|
||||
package cn.hutool.v7.http.client.cookie;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.List;
|
@@ -20,4 +20,4 @@
|
||||
* @author Looly
|
||||
*
|
||||
*/
|
||||
package org.dromara.hutool.http.client.cookie;
|
||||
package cn.hutool.v7.http.client.cookie;
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine;
|
||||
package cn.hutool.v7.http.client.engine;
|
||||
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
|
||||
|
||||
/**
|
||||
* 客户端引擎抽象类,用于保存配置和定义初始化,并提供:
|
@@ -14,12 +14,13 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine;
|
||||
package cn.hutool.v7.http.client.engine;
|
||||
|
||||
import org.dromara.hutool.http.client.ApacheHttpClientConfig;
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import cn.hutool.v7.http.client.engine.okhttp.OkHttpClientConfig;
|
||||
import cn.hutool.v7.http.client.ApacheHttpClientConfig;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
|
||||
import java.io.Closeable;
|
||||
|
||||
@@ -37,7 +38,7 @@ public interface ClientEngine extends Closeable {
|
||||
*
|
||||
* <ul>
|
||||
* <li>HttpClient4和HttpClient5使用{@link ApacheHttpClientConfig}</li>
|
||||
* <li>OkHttp使用{@link org.dromara.hutool.http.client.engine.okhttp.OkHttpClientConfig}</li>
|
||||
* <li>OkHttp使用{@link OkHttpClientConfig}</li>
|
||||
* </ul>
|
||||
* <p>
|
||||
* 如果混用这些配置,则个性配置不生效
|
@@ -14,16 +14,17 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine;
|
||||
package cn.hutool.v7.http.client.engine;
|
||||
|
||||
import org.dromara.hutool.core.lang.Singleton;
|
||||
import org.dromara.hutool.core.spi.ServiceLoader;
|
||||
import org.dromara.hutool.core.spi.SpiUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.ApacheHttpClientConfig;
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import org.dromara.hutool.log.LogUtil;
|
||||
import cn.hutool.v7.core.lang.Singleton;
|
||||
import cn.hutool.v7.core.spi.ServiceLoader;
|
||||
import cn.hutool.v7.core.spi.SpiUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.client.engine.okhttp.OkHttpClientConfig;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.ApacheHttpClientConfig;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
import cn.hutool.v7.log.LogUtil;
|
||||
|
||||
/**
|
||||
* Http客户端引擎工厂类
|
||||
@@ -49,7 +50,7 @@ public class ClientEngineFactory {
|
||||
*
|
||||
* <ul>
|
||||
* <li>HttpClient4和HttpClient5使用{@link ApacheHttpClientConfig}</li>
|
||||
* <li>OkHttp使用{@link org.dromara.hutool.http.client.engine.okhttp.OkHttpClientConfig}</li>
|
||||
* <li>OkHttp使用{@link OkHttpClientConfig}</li>
|
||||
* </ul>
|
||||
* <p>
|
||||
* 如果混用这些配置,则个性配置不生效
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine;
|
||||
package cn.hutool.v7.http.client.engine;
|
||||
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
|
||||
/**
|
||||
* 引擎的请求对象构建器<br>
|
@@ -14,15 +14,15 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient4;
|
||||
package cn.hutool.v7.http.client.engine.httpclient4;
|
||||
|
||||
import org.apache.http.config.Registry;
|
||||
import org.apache.http.config.RegistryBuilder;
|
||||
import org.apache.http.conn.socket.ConnectionSocketFactory;
|
||||
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
|
||||
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
|
||||
import org.dromara.hutool.core.lang.builder.Builder;
|
||||
import org.dromara.hutool.http.ssl.SSLInfo;
|
||||
import cn.hutool.v7.core.lang.builder.Builder;
|
||||
import cn.hutool.v7.http.ssl.SSLInfo;
|
||||
|
||||
/**
|
||||
* HttpClient4连接工厂注册器构建器
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient4;
|
||||
package cn.hutool.v7.http.client.engine.httpclient4;
|
||||
|
||||
import org.apache.http.entity.AbstractHttpEntity;
|
||||
import org.dromara.hutool.http.client.body.BytesBody;
|
||||
import org.dromara.hutool.http.client.body.HttpBody;
|
||||
import cn.hutool.v7.http.client.body.BytesBody;
|
||||
import cn.hutool.v7.http.client.body.HttpBody;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
@@ -14,12 +14,12 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient4;
|
||||
package cn.hutool.v7.http.client.engine.httpclient4;
|
||||
|
||||
import org.apache.http.cookie.Cookie;
|
||||
import org.dromara.hutool.core.date.DateUtil;
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.http.client.cookie.CookieSpi;
|
||||
import cn.hutool.v7.core.date.DateUtil;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.http.client.cookie.CookieSpi;
|
||||
|
||||
import java.time.Instant;
|
||||
|
@@ -14,14 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient4;
|
||||
package cn.hutool.v7.http.client.engine.httpclient4;
|
||||
|
||||
import org.apache.http.client.CookieStore;
|
||||
import org.apache.http.cookie.Cookie;
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.cookie.CookieSpi;
|
||||
import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.cookie.CookieSpi;
|
||||
import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient4;
|
||||
package cn.hutool.v7.http.client.engine.httpclient4;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpHost;
|
||||
@@ -30,18 +30,18 @@ import org.apache.http.impl.client.HttpClients;
|
||||
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
|
||||
import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
|
||||
import org.apache.http.message.BasicHeader;
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.lang.Assert;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.GlobalHeaders;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.ApacheHttpClientConfig;
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.client.cookie.InMemoryCookieStore;
|
||||
import org.dromara.hutool.http.client.engine.AbstractClientEngine;
|
||||
import org.dromara.hutool.http.proxy.ProxyInfo;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.lang.Assert;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.GlobalHeaders;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.ApacheHttpClientConfig;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.client.cookie.InMemoryCookieStore;
|
||||
import cn.hutool.v7.http.client.engine.AbstractClientEngine;
|
||||
import cn.hutool.v7.http.proxy.ProxyInfo;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.PasswordAuthentication;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient4;
|
||||
package cn.hutool.v7.http.client.engine.httpclient4;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpEntity;
|
||||
@@ -22,16 +22,16 @@ import org.apache.http.HttpResponse;
|
||||
import org.apache.http.ParseException;
|
||||
import org.apache.http.client.methods.CloseableHttpResponse;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
import org.dromara.hutool.core.array.ArrayUtil;
|
||||
import org.dromara.hutool.core.io.IORuntimeException;
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.HttpUtil;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.client.body.ResponseBody;
|
||||
import cn.hutool.v7.core.array.ArrayUtil;
|
||||
import cn.hutool.v7.core.io.IORuntimeException;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.HttpUtil;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.client.body.ResponseBody;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
@@ -14,17 +14,17 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient4;
|
||||
package cn.hutool.v7.http.client.engine.httpclient4;
|
||||
|
||||
import org.apache.http.client.config.RequestConfig;
|
||||
import org.apache.http.client.methods.HttpUriRequest;
|
||||
import org.apache.http.client.methods.RequestBuilder;
|
||||
import org.dromara.hutool.core.lang.Assert;
|
||||
import org.dromara.hutool.core.net.url.UrlBuilder;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.body.HttpBody;
|
||||
import org.dromara.hutool.http.client.engine.EngineRequestBuilder;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import cn.hutool.v7.core.lang.Assert;
|
||||
import cn.hutool.v7.core.net.url.UrlBuilder;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.body.HttpBody;
|
||||
import cn.hutool.v7.http.client.engine.EngineRequestBuilder;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
|
||||
/**
|
||||
* HttpClient4请求构建器
|
@@ -20,4 +20,4 @@
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
package org.dromara.hutool.http.client.engine.httpclient4;
|
||||
package cn.hutool.v7.http.client.engine.httpclient4;
|
@@ -14,19 +14,19 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient5;
|
||||
package cn.hutool.v7.http.client.engine.httpclient5;
|
||||
|
||||
import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
|
||||
import org.apache.hc.client5.http.config.RequestConfig;
|
||||
import org.apache.hc.core5.http.ClassicHttpRequest;
|
||||
import org.apache.hc.core5.http.Header;
|
||||
import org.apache.hc.core5.http.message.BasicHeader;
|
||||
import org.dromara.hutool.core.lang.Assert;
|
||||
import org.dromara.hutool.core.net.url.UrlBuilder;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.body.HttpBody;
|
||||
import org.dromara.hutool.http.client.engine.EngineRequestBuilder;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import cn.hutool.v7.core.lang.Assert;
|
||||
import cn.hutool.v7.core.net.url.UrlBuilder;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.body.HttpBody;
|
||||
import cn.hutool.v7.http.client.engine.EngineRequestBuilder;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient5;
|
||||
package cn.hutool.v7.http.client.engine.httpclient5;
|
||||
|
||||
import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
|
||||
import org.dromara.hutool.http.client.body.BytesBody;
|
||||
import org.dromara.hutool.http.client.body.HttpBody;
|
||||
import cn.hutool.v7.http.client.body.BytesBody;
|
||||
import cn.hutool.v7.http.client.body.HttpBody;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient5;
|
||||
package cn.hutool.v7.http.client.engine.httpclient5;
|
||||
|
||||
import org.apache.hc.client5.http.cookie.Cookie;
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.http.client.cookie.CookieSpi;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.http.client.cookie.CookieSpi;
|
||||
|
||||
import java.time.Instant;
|
||||
|
@@ -14,14 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient5;
|
||||
package cn.hutool.v7.http.client.engine.httpclient5;
|
||||
|
||||
import org.apache.hc.client5.http.cookie.Cookie;
|
||||
import org.apache.hc.client5.http.cookie.CookieStore;
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.cookie.CookieSpi;
|
||||
import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.cookie.CookieSpi;
|
||||
import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient5;
|
||||
package cn.hutool.v7.http.client.engine.httpclient5;
|
||||
|
||||
import org.apache.hc.client5.http.auth.AuthScope;
|
||||
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
|
||||
@@ -31,19 +31,19 @@ import org.apache.hc.core5.http.ClassicHttpResponse;
|
||||
import org.apache.hc.core5.http.Header;
|
||||
import org.apache.hc.core5.http.HttpHost;
|
||||
import org.apache.hc.core5.http.message.BasicHeader;
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.lang.Assert;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.GlobalHeaders;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.ApacheHttpClientConfig;
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.client.cookie.InMemoryCookieStore;
|
||||
import org.dromara.hutool.http.client.engine.AbstractClientEngine;
|
||||
import org.dromara.hutool.http.proxy.ProxyInfo;
|
||||
import org.dromara.hutool.http.ssl.SSLInfo;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.lang.Assert;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.GlobalHeaders;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.ApacheHttpClientConfig;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.client.cookie.InMemoryCookieStore;
|
||||
import cn.hutool.v7.http.client.engine.AbstractClientEngine;
|
||||
import cn.hutool.v7.http.proxy.ProxyInfo;
|
||||
import cn.hutool.v7.http.ssl.SSLInfo;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.PasswordAuthentication;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient5;
|
||||
package cn.hutool.v7.http.client.engine.httpclient5;
|
||||
|
||||
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
|
||||
import org.apache.hc.core5.http.ClassicHttpResponse;
|
||||
@@ -22,16 +22,16 @@ import org.apache.hc.core5.http.Header;
|
||||
import org.apache.hc.core5.http.HttpEntity;
|
||||
import org.apache.hc.core5.http.ParseException;
|
||||
import org.apache.hc.core5.http.io.entity.EntityUtils;
|
||||
import org.dromara.hutool.core.array.ArrayUtil;
|
||||
import org.dromara.hutool.core.io.IORuntimeException;
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.HttpUtil;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.client.body.ResponseBody;
|
||||
import cn.hutool.v7.core.array.ArrayUtil;
|
||||
import cn.hutool.v7.core.io.IORuntimeException;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.HttpUtil;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.client.body.ResponseBody;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.httpclient5;
|
||||
package cn.hutool.v7.http.client.engine.httpclient5;
|
||||
|
||||
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
|
||||
import org.apache.hc.client5.http.ssl.HostnameVerificationPolicy;
|
||||
@@ -22,8 +22,8 @@ import org.apache.hc.client5.http.ssl.HttpsSupport;
|
||||
import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
|
||||
import org.apache.hc.core5.reactor.ssl.SSLBufferMode;
|
||||
import org.apache.hc.core5.ssl.SSLContexts;
|
||||
import org.dromara.hutool.core.lang.builder.Builder;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.v7.core.lang.builder.Builder;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
|
||||
import javax.net.ssl.HostnameVerifier;
|
||||
import javax.net.ssl.SSLContext;
|
@@ -20,4 +20,4 @@
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
package org.dromara.hutool.http.client.engine.httpclient5;
|
||||
package cn.hutool.v7.http.client.engine.httpclient5;
|
@@ -14,14 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.array.ArrayUtil;
|
||||
import org.dromara.hutool.core.io.IORuntimeException;
|
||||
import org.dromara.hutool.core.reflect.FieldUtil;
|
||||
import org.dromara.hutool.core.reflect.ModifierUtil;
|
||||
import org.dromara.hutool.core.util.SystemUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import cn.hutool.v7.core.array.ArrayUtil;
|
||||
import cn.hutool.v7.core.io.IORuntimeException;
|
||||
import cn.hutool.v7.core.reflect.FieldUtil;
|
||||
import cn.hutool.v7.core.reflect.ModifierUtil;
|
||||
import cn.hutool.v7.core.util.SystemUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
import java.io.IOException;
|
@@ -14,18 +14,18 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.RequestContext;
|
||||
import org.dromara.hutool.http.client.body.HttpBody;
|
||||
import org.dromara.hutool.http.client.cookie.InMemoryCookieStore;
|
||||
import org.dromara.hutool.http.client.engine.AbstractClientEngine;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import org.dromara.hutool.http.meta.HttpStatus;
|
||||
import org.dromara.hutool.http.meta.Method;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.RequestContext;
|
||||
import cn.hutool.v7.http.client.body.HttpBody;
|
||||
import cn.hutool.v7.http.client.cookie.InMemoryCookieStore;
|
||||
import cn.hutool.v7.http.client.engine.AbstractClientEngine;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
import cn.hutool.v7.http.meta.HttpStatus;
|
||||
import cn.hutool.v7.http.meta.Method;
|
||||
|
||||
import java.io.IOException;
|
||||
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.core.reflect.method.MethodUtil;
|
||||
import org.dromara.hutool.http.client.cookie.CookieSpi;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.core.reflect.method.MethodUtil;
|
||||
import cn.hutool.v7.http.client.cookie.CookieSpi;
|
||||
|
||||
import java.net.HttpCookie;
|
||||
import java.time.Instant;
|
@@ -14,12 +14,12 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.io.IORuntimeException;
|
||||
import org.dromara.hutool.core.map.MapUtil;
|
||||
import org.dromara.hutool.core.net.url.UrlUtil;
|
||||
import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
|
||||
import cn.hutool.v7.core.io.IORuntimeException;
|
||||
import cn.hutool.v7.core.map.MapUtil;
|
||||
import cn.hutool.v7.core.net.url.UrlUtil;
|
||||
import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.CookieManager;
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.http.client.cookie.CookieSpi;
|
||||
import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.http.client.cookie.CookieSpi;
|
||||
import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
|
||||
|
||||
import java.net.CookieStore;
|
||||
import java.net.HttpCookie;
|
@@ -14,16 +14,16 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.lang.Opt;
|
||||
import org.dromara.hutool.core.net.url.UrlUtil;
|
||||
import org.dromara.hutool.core.reflect.FieldUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.HeaderOperation;
|
||||
import org.dromara.hutool.http.meta.Method;
|
||||
import org.dromara.hutool.http.ssl.SSLInfo;
|
||||
import cn.hutool.v7.core.lang.Opt;
|
||||
import cn.hutool.v7.core.net.url.UrlUtil;
|
||||
import cn.hutool.v7.core.reflect.FieldUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.HeaderOperation;
|
||||
import cn.hutool.v7.http.meta.Method;
|
||||
import cn.hutool.v7.http.ssl.SSLInfo;
|
||||
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
import java.io.Closeable;
|
@@ -14,12 +14,12 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.GlobalCompressStreamRegister;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.meta.HttpStatus;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.GlobalCompressStreamRegister;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.meta.HttpStatus;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.FileNotFoundException;
|
@@ -14,17 +14,17 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.io.stream.EmptyInputStream;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.HttpUtil;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.client.body.ResponseBody;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.io.stream.EmptyInputStream;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.HttpUtil;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.client.body.ResponseBody;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.FileNotFoundException;
|
@@ -14,15 +14,15 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
||||
|
||||
import org.dromara.hutool.core.net.url.UrlUtil;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.engine.EngineRequestBuilder;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import org.dromara.hutool.http.proxy.ProxyInfo;
|
||||
import cn.hutool.v7.core.net.url.UrlUtil;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.engine.EngineRequestBuilder;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
import cn.hutool.v7.http.proxy.ProxyInfo;
|
||||
|
||||
import java.net.Proxy;
|
||||
import java.net.URL;
|
@@ -20,4 +20,4 @@
|
||||
* @author Looly
|
||||
* @since 6.0.0
|
||||
*/
|
||||
package org.dromara.hutool.http.client.engine.jdk;
|
||||
package cn.hutool.v7.http.client.engine.jdk;
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
||||
|
||||
import okhttp3.*;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
|
||||
import java.net.PasswordAuthentication;
|
||||
|
@@ -14,14 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
||||
|
||||
import okhttp3.Cookie;
|
||||
import okhttp3.CookieJar;
|
||||
import okhttp3.HttpUrl;
|
||||
import org.dromara.hutool.core.collection.CollUtil;
|
||||
import org.dromara.hutool.http.client.cookie.CookieSpi;
|
||||
import org.dromara.hutool.http.client.cookie.CookieStoreSpi;
|
||||
import cn.hutool.v7.core.collection.CollUtil;
|
||||
import cn.hutool.v7.http.client.cookie.CookieSpi;
|
||||
import cn.hutool.v7.http.client.cookie.CookieStoreSpi;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
||||
|
||||
import okhttp3.Cookie;
|
||||
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
|
||||
import org.dromara.hutool.http.client.cookie.CookieSpi;
|
||||
import cn.hutool.v7.core.lang.wrapper.SimpleWrapper;
|
||||
import cn.hutool.v7.http.client.cookie.CookieSpi;
|
||||
|
||||
import java.time.Instant;
|
||||
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
||||
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
|
||||
/**
|
||||
* OkHttpClient 配置
|
@@ -14,24 +14,24 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
||||
|
||||
import okhttp3.ConnectionPool;
|
||||
import okhttp3.OkHttpClient;
|
||||
import org.dromara.hutool.core.lang.Assert;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.client.ClientConfig;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.RequestContext;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.client.cookie.InMemoryCookieStore;
|
||||
import org.dromara.hutool.http.client.engine.AbstractClientEngine;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import org.dromara.hutool.http.meta.HttpStatus;
|
||||
import org.dromara.hutool.http.meta.Method;
|
||||
import org.dromara.hutool.http.proxy.ProxyInfo;
|
||||
import org.dromara.hutool.http.ssl.SSLInfo;
|
||||
import cn.hutool.v7.core.lang.Assert;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.client.ClientConfig;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.RequestContext;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.client.cookie.InMemoryCookieStore;
|
||||
import cn.hutool.v7.http.client.engine.AbstractClientEngine;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
import cn.hutool.v7.http.meta.HttpStatus;
|
||||
import cn.hutool.v7.http.meta.Method;
|
||||
import cn.hutool.v7.http.proxy.ProxyInfo;
|
||||
import cn.hutool.v7.http.ssl.SSLInfo;
|
||||
|
||||
import javax.net.ssl.SSLSocketFactory;
|
||||
import javax.net.ssl.X509TrustManager;
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
||||
|
||||
import org.dromara.hutool.http.client.body.HttpBody;
|
||||
import cn.hutool.v7.http.client.body.HttpBody;
|
||||
import okhttp3.MediaType;
|
||||
import okio.BufferedSink;
|
||||
|
@@ -14,12 +14,12 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
||||
|
||||
import okhttp3.internal.http.HttpMethod;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.body.HttpBody;
|
||||
import org.dromara.hutool.http.client.engine.EngineRequestBuilder;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.body.HttpBody;
|
||||
import cn.hutool.v7.http.client.engine.EngineRequestBuilder;
|
||||
|
||||
/**
|
||||
* OkHttp请求构建器
|
@@ -14,17 +14,17 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
||||
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.io.stream.EmptyInputStream;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.GlobalCompressStreamRegister;
|
||||
import org.dromara.hutool.http.HttpUtil;
|
||||
import org.dromara.hutool.http.client.Request;
|
||||
import org.dromara.hutool.http.client.Response;
|
||||
import org.dromara.hutool.http.client.body.ResponseBody;
|
||||
import org.dromara.hutool.http.meta.HeaderName;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.io.stream.EmptyInputStream;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.GlobalCompressStreamRegister;
|
||||
import cn.hutool.v7.http.HttpUtil;
|
||||
import cn.hutool.v7.http.client.Request;
|
||||
import cn.hutool.v7.http.client.Response;
|
||||
import cn.hutool.v7.http.client.body.ResponseBody;
|
||||
import cn.hutool.v7.http.meta.HeaderName;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.nio.charset.Charset;
|
@@ -18,4 +18,4 @@
|
||||
* OKHttp3封装<br>
|
||||
* 文档见:https://square.github.io/okhttp/
|
||||
*/
|
||||
package org.dromara.hutool.http.client.engine.okhttp;
|
||||
package cn.hutool.v7.http.client.engine.okhttp;
|
@@ -19,4 +19,4 @@
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
package org.dromara.hutool.http.client.engine;
|
||||
package cn.hutool.v7.http.client.engine;
|
@@ -28,4 +28,4 @@
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
package org.dromara.hutool.http.client;
|
||||
package cn.hutool.v7.http.client;
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.html;
|
||||
package cn.hutool.v7.http.html;
|
||||
|
||||
import org.dromara.hutool.core.lang.Console;
|
||||
import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
|
||||
import org.dromara.hutool.core.text.CharUtil;
|
||||
import cn.hutool.v7.core.lang.Console;
|
||||
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
|
||||
import cn.hutool.v7.core.text.CharUtil;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
@@ -14,14 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.html;
|
||||
package cn.hutool.v7.http.html;
|
||||
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.regex.ReUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.core.text.escape.EscapeUtil;
|
||||
import org.dromara.hutool.core.util.CharsetUtil;
|
||||
import org.dromara.hutool.core.xml.XmlUtil;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.regex.ReUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.text.escape.EscapeUtil;
|
||||
import cn.hutool.v7.core.util.CharsetUtil;
|
||||
import cn.hutool.v7.core.xml.XmlUtil;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.nio.charset.Charset;
|
@@ -19,4 +19,4 @@
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
package org.dromara.hutool.http.html;
|
||||
package cn.hutool.v7.http.html;
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.meta;
|
||||
package cn.hutool.v7.http.meta;
|
||||
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
|
||||
import java.nio.charset.Charset;
|
||||
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.meta;
|
||||
package cn.hutool.v7.http.meta;
|
||||
|
||||
import org.dromara.hutool.core.regex.ReUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.core.util.CharsetUtil;
|
||||
import cn.hutool.v7.core.regex.ReUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.util.CharsetUtil;
|
||||
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.regex.Pattern;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.meta;
|
||||
package cn.hutool.v7.http.meta;
|
||||
|
||||
/**
|
||||
* Http头名称枚举
|
@@ -14,17 +14,17 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.meta;
|
||||
package cn.hutool.v7.http.meta;
|
||||
|
||||
import org.dromara.hutool.core.collection.CollUtil;
|
||||
import org.dromara.hutool.core.map.CaseInsensitiveMap;
|
||||
import org.dromara.hutool.core.net.url.UrlDecoder;
|
||||
import org.dromara.hutool.core.net.url.UrlEncoder;
|
||||
import org.dromara.hutool.core.regex.ReUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.core.text.split.SplitUtil;
|
||||
import org.dromara.hutool.core.util.CharsetUtil;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.v7.core.collection.CollUtil;
|
||||
import cn.hutool.v7.core.map.CaseInsensitiveMap;
|
||||
import cn.hutool.v7.core.net.url.UrlDecoder;
|
||||
import cn.hutool.v7.core.net.url.UrlEncoder;
|
||||
import cn.hutool.v7.core.regex.ReUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.text.split.SplitUtil;
|
||||
import cn.hutool.v7.core.util.CharsetUtil;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.nio.charset.Charset;
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.meta;
|
||||
package cn.hutool.v7.http.meta;
|
||||
|
||||
/**
|
||||
* HTTP状态码
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.meta;
|
||||
package cn.hutool.v7.http.meta;
|
||||
|
||||
/**
|
||||
* Http方法枚举
|
@@ -19,4 +19,4 @@
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
package org.dromara.hutool.http.meta;
|
||||
package cn.hutool.v7.http.meta;
|
@@ -14,12 +14,12 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.multipart;
|
||||
package cn.hutool.v7.http.multipart;
|
||||
|
||||
import org.dromara.hutool.core.collection.CollUtil;
|
||||
import org.dromara.hutool.core.convert.ConvertUtil;
|
||||
import org.dromara.hutool.core.map.multi.ListValueMap;
|
||||
import org.dromara.hutool.core.map.multi.MultiValueMap;
|
||||
import cn.hutool.v7.core.collection.CollUtil;
|
||||
import cn.hutool.v7.core.convert.ConvertUtil;
|
||||
import cn.hutool.v7.core.map.multi.ListValueMap;
|
||||
import cn.hutool.v7.core.map.multi.MultiValueMap;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.multipart;
|
||||
package cn.hutool.v7.http.multipart;
|
||||
|
||||
import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
|
||||
import cn.hutool.v7.core.io.stream.FastByteArrayOutputStream;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
@@ -14,13 +14,13 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.multipart;
|
||||
package cn.hutool.v7.http.multipart;
|
||||
|
||||
import org.dromara.hutool.core.io.IORuntimeException;
|
||||
import org.dromara.hutool.core.io.IoUtil;
|
||||
import org.dromara.hutool.core.io.file.FileNameUtil;
|
||||
import org.dromara.hutool.core.io.file.FileUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.io.IORuntimeException;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.io.file.FileNameUtil;
|
||||
import cn.hutool.v7.core.io.file.FileUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
|
||||
import java.io.*;
|
||||
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.multipart;
|
||||
package cn.hutool.v7.http.multipart;
|
||||
|
||||
import org.dromara.hutool.core.io.file.FileUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import cn.hutool.v7.core.io.file.FileUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
|
||||
/**
|
||||
* 上传的文件的头部信息<br>
|
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.multipart;
|
||||
package cn.hutool.v7.http.multipart;
|
||||
|
||||
/**
|
||||
* 上传文件设定文件
|
@@ -20,4 +20,4 @@
|
||||
* @author Looly
|
||||
*
|
||||
*/
|
||||
package org.dromara.hutool.http.multipart;
|
||||
package cn.hutool.v7.http.multipart;
|
@@ -20,4 +20,4 @@
|
||||
* @author Looly
|
||||
*
|
||||
*/
|
||||
package org.dromara.hutool.http;
|
||||
package cn.hutool.v7.http;
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.proxy;
|
||||
package cn.hutool.v7.http.proxy;
|
||||
|
||||
import org.dromara.hutool.core.collection.CollUtil;
|
||||
import org.dromara.hutool.core.collection.ListUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import cn.hutool.v7.core.collection.CollUtil;
|
||||
import cn.hutool.v7.core.collection.ListUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.*;
|
@@ -19,4 +19,4 @@
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
package org.dromara.hutool.http.proxy;
|
||||
package cn.hutool.v7.http.proxy;
|
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.server;
|
||||
package cn.hutool.v7.http.server;
|
||||
|
||||
import org.dromara.hutool.core.net.ssl.SSLContextUtil;
|
||||
import cn.hutool.v7.core.net.ssl.SSLContextUtil;
|
||||
|
||||
import javax.net.ssl.SSLContext;
|
||||
import java.security.KeyStore;
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.server.engine;
|
||||
package cn.hutool.v7.http.server.engine;
|
||||
|
||||
import org.dromara.hutool.http.server.ServerConfig;
|
||||
import org.dromara.hutool.http.server.handler.HttpHandler;
|
||||
import cn.hutool.v7.http.server.ServerConfig;
|
||||
import cn.hutool.v7.http.server.handler.HttpHandler;
|
||||
|
||||
/**
|
||||
* 服务端引擎抽象类,实现重置引擎功能
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.server.engine;
|
||||
package cn.hutool.v7.http.server.engine;
|
||||
|
||||
import org.dromara.hutool.http.server.ServerConfig;
|
||||
import org.dromara.hutool.http.server.handler.HttpHandler;
|
||||
import cn.hutool.v7.http.server.ServerConfig;
|
||||
import cn.hutool.v7.http.server.handler.HttpHandler;
|
||||
|
||||
/**
|
||||
* HTTP服务器引擎,执行流程为:
|
@@ -14,15 +14,15 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.server.engine;
|
||||
package cn.hutool.v7.http.server.engine;
|
||||
|
||||
import org.dromara.hutool.core.lang.Singleton;
|
||||
import org.dromara.hutool.core.spi.ServiceLoader;
|
||||
import org.dromara.hutool.core.spi.SpiUtil;
|
||||
import org.dromara.hutool.core.text.StrUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.server.ServerConfig;
|
||||
import org.dromara.hutool.log.LogUtil;
|
||||
import cn.hutool.v7.core.lang.Singleton;
|
||||
import cn.hutool.v7.core.spi.ServiceLoader;
|
||||
import cn.hutool.v7.core.spi.SpiUtil;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.server.ServerConfig;
|
||||
import cn.hutool.v7.log.LogUtil;
|
||||
|
||||
/**
|
||||
* Http服务器引擎工厂类
|
@@ -14,11 +14,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.server.engine.jetty;
|
||||
package cn.hutool.v7.http.server.engine.jetty;
|
||||
|
||||
import org.dromara.hutool.http.server.handler.HttpHandler;
|
||||
import org.dromara.hutool.http.server.servlet.JavaxServletRequest;
|
||||
import org.dromara.hutool.http.server.servlet.JavaxServletResponse;
|
||||
import cn.hutool.v7.http.server.handler.HttpHandler;
|
||||
import cn.hutool.v7.http.server.servlet.JavaxServletRequest;
|
||||
import cn.hutool.v7.http.server.servlet.JavaxServletResponse;
|
||||
import org.eclipse.jetty.server.Request;
|
||||
import org.eclipse.jetty.server.handler.AbstractHandler;
|
||||
|
@@ -14,13 +14,13 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.server.engine.jetty;
|
||||
package cn.hutool.v7.http.server.engine.jetty;
|
||||
|
||||
import org.dromara.hutool.core.lang.Assert;
|
||||
import org.dromara.hutool.core.util.ObjUtil;
|
||||
import org.dromara.hutool.http.HttpException;
|
||||
import org.dromara.hutool.http.server.ServerConfig;
|
||||
import org.dromara.hutool.http.server.engine.AbstractServerEngine;
|
||||
import cn.hutool.v7.core.lang.Assert;
|
||||
import cn.hutool.v7.core.util.ObjUtil;
|
||||
import cn.hutool.v7.http.HttpException;
|
||||
import cn.hutool.v7.http.server.ServerConfig;
|
||||
import cn.hutool.v7.http.server.engine.AbstractServerEngine;
|
||||
import org.eclipse.jetty.http.HttpVersion;
|
||||
import org.eclipse.jetty.server.*;
|
||||
import org.eclipse.jetty.util.ssl.SslContextFactory;
|
@@ -19,4 +19,4 @@
|
||||
*
|
||||
* @author Looly
|
||||
*/
|
||||
package org.dromara.hutool.http.server.engine.jetty;
|
||||
package cn.hutool.v7.http.server.engine.jetty;
|
@@ -20,4 +20,4 @@
|
||||
* @author Looly
|
||||
* @since 6.0.0
|
||||
*/
|
||||
package org.dromara.hutool.http.server.engine;
|
||||
package cn.hutool.v7.http.server.engine;
|
@@ -14,10 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.dromara.hutool.http.server.engine.smart;
|
||||
package cn.hutool.v7.http.server.engine.smart;
|
||||
|
||||
import org.dromara.hutool.core.io.IORuntimeException;
|
||||
import org.dromara.hutool.http.server.handler.ServerRequest;
|
||||
import cn.hutool.v7.core.io.IORuntimeException;
|
||||
import cn.hutool.v7.http.server.handler.ServerRequest;
|
||||
import org.smartboot.http.server.HttpRequest;
|
||||
|
||||
import java.io.IOException;
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user