From cbef156ac2dcffda72adc4998e6ce51007a2e674 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 17 Jun 2021 18:13:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/bean/po/ExecutorGroupRegistryInfo.java | 4 ++ .../bean/po/ExecutorRegistryMethodDocInfo.java | 2 +- .../server/bean/po/ExecutorRegistryParamInfo.java | 2 +- .../i3plus/pojo/bsp/server/common/ReturnT.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/bsp/server/util/GsonTool.java | 2 +- .../i3plus/pojo/bsp/server/util/HttpUtils.java | 20 +++----- pom.xml | 5 ++ 7 files changed, 74 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java index 4acb322..77de389 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java @@ -42,6 +42,10 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable @ApiModelProperty("自动注册 0，手动注册 1") private String type; + @Column + @ApiModelProperty("执行器组路由策略") + private String routeStrategy; + @Column(name = "UPDATE_TIME") @ApiModelProperty("更新时间") private Date updateTime; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java index 46be916..d798c1e 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java @@ -52,6 +52,6 @@ public class ExecutorRegistryMethodDocInfo extends BaseBean implements Serializa @Column(name = "METHOD_ID") @ApiModelProperty("方法ID") - private Integer methodId; + private Long methodId; //todo 缺少参数信息 } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java index 6f0e3fa..4c9ada9 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryParamInfo.java @@ -43,6 +43,6 @@ public class ExecutorRegistryParamInfo extends BaseBean implements Serializable @Column(name = "METHOD_ID") @ApiModelProperty("所属方法的ID") - private Integer methodId; + private Long methodId; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/common/ReturnT.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/common/ReturnT.java index e69de29..857e5f1 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/common/ReturnT.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/common/ReturnT.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.bsp.server.common; + +import java.io.Serializable; + +/** + * @author Castle + */ +public class ReturnT implements Serializable { + public static final long serialVersionUID = 42L; + + public static final int SUCCESS_CODE = 200; + public static final int FAIL_CODE = 500; + + public static final ReturnT SUCCESS = new ReturnT<>(null); + public static final ReturnT FAIL = new ReturnT<>(FAIL_CODE, null); + + private int code; + private String msg; + private T content; + + public ReturnT(){} + public ReturnT(int code, String msg) { + this.code = code; + this.msg = msg; + } + + public ReturnT(T content) { + this.code = SUCCESS_CODE; + this.content = content; + } + + public int getCode() { + return code; + } + public void setCode(int code) { + this.code = code; + } + public String getMsg() { + return msg; + } + public void setMsg(String msg) { + this.msg = msg; + } + public T getContent() { + return content; + } + public void setContent(T content) { + this.content = content; + } + + @Override + public String toString() { + return "ReturnT [code=" + code + ", msg=" + msg + ", content=" + content + "]"; + } + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/util/GsonTool.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/util/GsonTool.java index 9d9af08..1914442 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/util/GsonTool.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/util/GsonTool.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.bspserver.util; +package cn.estsh.i3plus.pojo.bsp.server.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/util/HttpUtils.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/util/HttpUtils.java index c0e5521..a6031d7 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/util/HttpUtils.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/util/HttpUtils.java @@ -1,8 +1,6 @@ -package cn.estsh.i3plus.bspserver.util; +package cn.estsh.i3plus.pojo.bsp.server.util; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.impp.framework.boot.util.ResultBean; -import com.google.gson.Gson; +import cn.estsh.i3plus.pojo.bsp.server.common.ReturnT; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,7 +12,6 @@ import java.net.HttpURLConnection; import java.net.URL; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import java.util.Map; /** * @Description : @@ -47,8 +44,8 @@ public class HttpUtils { private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() { @Override - public java.security.cert.X509Certificate[] getAcceptedIssuers() { - return new java.security.cert.X509Certificate[]{}; + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[]{}; } @Override @@ -71,7 +68,7 @@ public class HttpUtils { * @param returnTargClassOfT * @return */ - public static ResultBean postBody(String url, int timeout, Object requestObj, Class returnTargClassOfT) { + public static ReturnT postBody(String url, int timeout, Object requestObj, Class returnTargClassOfT) { HttpURLConnection connection = null; BufferedReader bufferedReader = null; try { @@ -110,7 +107,6 @@ public class HttpUtils { dataOutputStream.close(); } - // valid StatusCode int statusCode = connection.getResponseCode(); if (statusCode != 200) { @@ -126,17 +122,13 @@ public class HttpUtils { result.append(line); } String resultJson = result.toString(); - // parse returnT try { - - ReturnT returnT = GsonTool.fromJson(resultJson, ReturnT.class); - return returnT; + return GsonTool.fromJson(resultJson, ReturnT.class); } catch (Exception e) { logger.error("rpc remoting (url=" + url + ") response content invalid(" + resultJson + ").", e); return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting (url=" + url + ") response content invalid(" + resultJson + ")."); } - } catch (Exception e) { logger.error(e.getMessage(), e); return new ReturnT(ReturnT.FAIL_CODE, "rpc remoting error(" + e.getMessage() + "), for url : " + url); diff --git a/pom.xml b/pom.xml index a0f6edd..47ef7ef 100644 --- a/pom.xml +++ b/pom.xml @@ -180,6 +180,11 @@ xstream 1.4.11.1 + + com.google.code.gson + gson + 2.8.6 +