diff --git a/pom.xml b/pom.xml index a2c8703..9ca48fe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.tccn - zhub-client + zhub-cli 1.0 @@ -27,4 +27,21 @@ + + + maven-nexus + maven-nexus + http://47.106.237.198:8081/repository/maven-public/ + + + + + + + mvn-release + mvn-release + http://47.106.237.198:8081/repository/maven-releases/ + + + \ No newline at end of file diff --git a/src/main/java/tccn/AbstractConsumer.java b/src/main/java/tccn/AbstractConsumer.java index fe5340b..7663642 100644 --- a/src/main/java/tccn/AbstractConsumer.java +++ b/src/main/java/tccn/AbstractConsumer.java @@ -19,7 +19,7 @@ public abstract class AbstractConsumer implements IConsumer { public Gson gson = Rpc.gson; // @Resource(name = "APP_NAME") - protected String APP_NAME = ""; + protected String APP_ID = ""; private Map eventMap = new HashMap<>(); diff --git a/src/main/java/tccn/zhub/Rpc.java b/src/main/java/tccn/zhub/Rpc.java index 11b5885..6ebba4e 100644 --- a/src/main/java/tccn/zhub/Rpc.java +++ b/src/main/java/tccn/zhub/Rpc.java @@ -62,21 +62,20 @@ public class Rpc { return ruk.split("::")[0]; } - public RpcResult buildResp() { + public RpcResult render() { RpcResult response = new RpcResult<>(); response.setRuk(ruk); return response; } - public RpcResult buildResp(int retcode, String retinfo) { + public RpcResult render(R result) { RpcResult response = new RpcResult<>(); response.setRuk(ruk); - response.setRetcode(retcode); - response.setRetinfo(retinfo); + response.setResult(result); return response; } - public RpcResult buildError(String retinfo) { + public RpcResult retError(String retinfo) { RpcResult response = new RpcResult<>(); response.setRuk(ruk); response.setRetcode(100); @@ -84,10 +83,11 @@ public class Rpc { return response; } - public RpcResult buildResp(R result) { + public RpcResult retError(int retcode, String retinfo) { RpcResult response = new RpcResult<>(); response.setRuk(ruk); - response.setResult(result); + response.setRetcode(retcode); + response.setRetinfo(retinfo); return response; } } diff --git a/src/main/java/tccn/zhub/ZHubClient.java b/src/main/java/tccn/zhub/ZHubClient.java index bf6a9e3..ee62ec1 100644 --- a/src/main/java/tccn/zhub/ZHubClient.java +++ b/src/main/java/tccn/zhub/ZHubClient.java @@ -55,10 +55,10 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer private boolean isMain = false;*/ private static final Map mainHub = new HashMap<>(); // 127.0.0.1:1216 - ZHubClient - public ZHubClient(String addr, String groupid, String appname, String auth) { + public ZHubClient(String addr, String groupid, String appid, String auth) { this.addr = addr; this.groupid = groupid; - this.APP_NAME = appname; + this.APP_ID = appid; this.auth = auth; init(null); } @@ -72,7 +72,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer if (config != null) { addr = config.getOrDefault("addr", addr); groupid = config.getOrDefault("groupid", groupid); - APP_NAME = config.getOrDefault("appname", APP_NAME); + APP_ID = config.getOrDefault("appname", APP_ID); } // 设置第一个启动的 实例为主实例 @@ -142,7 +142,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer continue; } // rpc back msg - if (APP_NAME.equals(topic)) { + if (APP_ID.equals(topic)) { rpcBackQueue.add(Event.of(topic, value)); continue; } @@ -359,7 +359,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer /*if (isMain) { }*/ if (mainHub.containsValue(this)) { - buf.append(" ").append(APP_NAME); + buf.append(" ").append(APP_ID); } for (String topic : getTopics()) { buf.append(" ").append(topic); @@ -533,7 +533,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer // rpc call public RpcResult rpc(String topic, T v, TypeToken typeToken, long timeout) { - Rpc rpc = new Rpc<>(APP_NAME, UUID.randomUUID().toString().replaceAll("-", ""), topic, v); + Rpc rpc = new Rpc<>(APP_ID, UUID.randomUUID().toString().replaceAll("-", ""), topic, v); String ruk = rpc.getRuk(); rpcMap.put(ruk, rpc); if (typeToken != null) { @@ -553,7 +553,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer return; } - RpcResult rpcResult = rpc.buildResp(505, "请求超时"); + RpcResult rpcResult = rpc.retError(505, "请求超时"); rpc.setRpcResult(rpcResult); logger.warning("rpc timeout: " + gson.toJson(rpc)); rpc.notify(); @@ -566,7 +566,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer } catch (InterruptedException e) { e.printStackTrace(); // call error - RpcResult rpcResult = rpc.buildResp(501, "请求失败"); + RpcResult rpcResult = rpc.retError(501, "请求失败"); rpc.setRpcResult(rpcResult); } return rpc.getRpcResult(); @@ -632,7 +632,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer publish(rpc.getBackTopic(), result); } catch (Exception e) { logger.log(Level.WARNING, "rpc call consumer error: " + v, e); - publish(rpc.getBackTopic(), rpc.buildError("服务调用失败!")); + publish(rpc.getBackTopic(), rpc.retError("服务调用失败!")); } // back };