ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v6-dev' into v6-dev

Browse Source 
# Conflicts:
#	hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/AnsiSqlDialect.java
This commit is contained in:
张江平 2023-06-19 15:14:08 +08:00
commit 19560cf8cf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/AnsiSqlDialect.java
View File

@ -30,10 +30,7 @@ import org.dromara.hutool.db.sql.QuoteWrapper;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
/** /**
* ANSI SQL 方言 * ANSI SQL 方言

4
hutool-http/src/main/java/org/dromara/hutool/http/client/engine/okhttp/OkHttpEngine.java
View File

@ -127,6 +127,7 @@ public class OkHttpEngine implements ClientEngine {
final okhttp3.Request.Builder builder = new okhttp3.Request.Builder() final okhttp3.Request.Builder builder = new okhttp3.Request.Builder()
.url(message.url().toURL()); .url(message.url().toURL());
// 填充方法
final String method = message.method().name(); final String method = message.method().name();
if (HttpMethod.permitsRequestBody(method)) { if (HttpMethod.permitsRequestBody(method)) {
builder.method(method, new OkHttpRequestBody(message.body())); builder.method(method, new OkHttpRequestBody(message.body()));
@ -134,6 +135,9 @@ public class OkHttpEngine implements ClientEngine {
builder.method(method, null); builder.method(method, null);
} }
// 填充头信息
message.headers().forEach((key, values)-> values.forEach(value-> builder.addHeader(key, value)));
return builder.build(); return builder.build();
} }