lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化提示

Browse Source
This commit is contained in:
redkale
2023-10-14 16:14:32 +08:00
parent 17fbb29957
commit 007db8d508
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/redkale/cluster/HttpRpcClient.java
View File

@@ -11,6 +11,7 @@ import java.util.Map;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import org.redkale.convert.json.JsonConvert; import org.redkale.convert.json.JsonConvert;
import org.redkale.net.http.*; import org.redkale.net.http.*;
import org.redkale.util.RedkaleException;
/** /**
* 不依赖MessageRecord则可兼容RPC方式 * 不依赖MessageRecord则可兼容RPC方式
@@ -60,7 +61,10 @@ public abstract class HttpRpcClient implements ClusterRpcClient<HttpSimpleReques
public <T> CompletableFuture<T> sendMessage(HttpSimpleRequest request, Type type) { public <T> CompletableFuture<T> sendMessage(HttpSimpleRequest request, Type type) {
return sendMessage(generateHttpReqTopic(request, null), 0, null, request).thenApply((HttpResult<byte[]> httbs) -> { return sendMessage(generateHttpReqTopic(request, null), 0, null, request).thenApply((HttpResult<byte[]> httbs) -> {
if (httbs == null || httbs.getResult() == null) { if (!httbs.isSuccess()) {
throw new RedkaleException(httbs.getHeader("retinfo", "Internal Server Error"));
}
if (httbs.getResult() == null) {
return null; return null;
} }
return JsonConvert.root().convertFrom(type, httbs.getResult()); return JsonConvert.root().convertFrom(type, httbs.getResult());
@@ -69,7 +73,10 @@ public abstract class HttpRpcClient implements ClusterRpcClient<HttpSimpleReques
public <T> CompletableFuture<T> sendMessage(Serializable userid, HttpSimpleRequest request, Type type) { public <T> CompletableFuture<T> sendMessage(Serializable userid, HttpSimpleRequest request, Type type) {
return sendMessage(generateHttpReqTopic(request, null), userid, null, request).thenApply((HttpResult<byte[]> httbs) -> { return sendMessage(generateHttpReqTopic(request, null), userid, null, request).thenApply((HttpResult<byte[]> httbs) -> {
if (httbs == null || httbs.getResult() == null) { if (!httbs.isSuccess()) {
throw new RedkaleException(httbs.getHeader("retinfo", "Internal Server Error"));
}
if (httbs.getResult() == null) {
return null; return null;
} }
return JsonConvert.root().convertFrom(type, httbs.getResult()); return JsonConvert.root().convertFrom(type, httbs.getResult());
@@ -78,7 +85,10 @@ public abstract class HttpRpcClient implements ClusterRpcClient<HttpSimpleReques
public <T> CompletableFuture<T> sendMessage(Serializable userid, String groupid, HttpSimpleRequest request, Type type) { public <T> CompletableFuture<T> sendMessage(Serializable userid, String groupid, HttpSimpleRequest request, Type type) {
return sendMessage(generateHttpReqTopic(request, null), userid, groupid, request).thenApply((HttpResult<byte[]> httbs) -> { return sendMessage(generateHttpReqTopic(request, null), userid, groupid, request).thenApply((HttpResult<byte[]> httbs) -> {
if (httbs == null || httbs.getResult() == null) { if (!httbs.isSuccess()) {
throw new RedkaleException(httbs.getHeader("retinfo", "Internal Server Error"));
}
if (httbs.getResult() == null) {
return null; return null;
} }
return JsonConvert.root().convertFrom(type, httbs.getResult()); return JsonConvert.root().convertFrom(type, httbs.getResult());

4
src/main/java/org/redkale/net/http/HttpResult.java
View File

@@ -168,6 +168,10 @@ public class HttpResult<T> {
this.status = status; this.status = status;
} }
public boolean isSuccess() {
return status == 0 || status == 200;
}
@Override @Override
public String toString() { public String toString() {
return JsonConvert.root().convertTo(this); return JsonConvert.root().convertTo(this);