gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/1.2.0-beta1' into 1.2.0-beta1

Browse Source
This commit is contained in:
srzou 2024-07-30 16:29:51 +08:00
commit 685d430e96
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/JsonUtil.java
View File

@ -228,7 +228,7 @@ public class JsonUtil {
try {
return objectMapper.readValue(jsonString, clazz);
} catch (Exception e) {
throw new SnailJobCommonException("Json转对象失败", jsonString, e);
throw new SnailJobCommonException("Json转对象失败 参数:{}", jsonString, e);
}
}
@ -243,7 +243,7 @@ public class JsonUtil {
try {
return objectMapper.readValue(jsonString, typeReference);
} catch (Exception e) {
throw new SnailJobCommonException("Json转对象失败！", e);
throw new SnailJobCommonException("Json转对象失败 参数:{}", jsonString, e);
}
}
@ -258,7 +258,7 @@ public class JsonUtil {
try {
return objectMapper.readValue(jsonString, javaType);
} catch (Exception e) {
throw new SnailJobCommonException("Json转对象失败！", e);
throw new SnailJobCommonException("Json转对象失败 参数:{}", jsonString, e);
}
}
@ -272,7 +272,7 @@ public class JsonUtil {
try {
return objectMapper.readTree(jsonString);
} catch (Exception e) {
throw new SnailJobCommonException("Json转对象失败！", e);
throw new SnailJobCommonException("Json转对象失败 参数:{}", jsonString, e);
}
}

9
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/NettyChannel.java
View File

@ -23,12 +23,10 @@ import java.util.concurrent.TimeUnit;
*/
@Slf4j
public class NettyChannel {
private NettyChannel() {
}
private static Bootstrap bootstrap;
private static ConcurrentHashMap<Pair<String, String>, Channel> CHANNEL_MAP = new ConcurrentHashMap<>(16);
private NettyChannel() {
}
public static void setChannel(String hostId, String ip, Channel channel) {
CHANNEL_MAP.put(Pair.of(hostId, ip), channel);
@ -70,6 +68,9 @@ public class NettyChannel {
HttpVersion.HTTP_1_1, method, url, Unpooled.wrappedBuffer(body.getBytes(StandardCharsets.UTF_8)));
request.headers()
// Host
.set(HttpHeaderNames.HOST, hostIp)
// Content-Type
.set(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.APPLICATION_JSON)
// 开启长连接
.set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE)