From 6a51bd2a670c94d9866c3dc970bea3a1251d0978 Mon Sep 17 00:00:00 2001 From: shenkaiwen5 Date: Thu, 6 Jan 2022 21:44:16 +0800 Subject: [PATCH 1/7] =?UTF-8?q?master=20=20=E4=B8=8D=E4=BD=BF=E7=94=A8etcd?= =?UTF-8?q?=E4=BD=BF=E7=94=A8zookeeper=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clientdemo/clientdemo.iml | 9 +- ...ub_spotbugs_spotbugs_annotations_3_1_9.xml | 13 ++ .../Maven__io_netty_netty_3_10_6_Final.xml | 13 ++ .idea/libraries/Maven__jline_jline_0_9_94.xml | 13 ++ ...rg_apache_curator_curator_client_4_2_0.xml | 13 ++ ...apache_curator_curator_framework_4_2_0.xml | 13 ++ ...pache_yetus_audience_annotations_0_5_0.xml | 13 ++ ..._org_apache_zookeeper_zookeeper_3_4_14.xml | 13 ++ .idea/uiDesigner.xml | 124 ++++++++++++++++++ .../jlog/client/etcd/EtcdConfigFactory.java | 4 +- .../jlog/client/etcd/EtcdStarter.java | 16 +-- common/pom.xml | 29 ++++ .../jlog/common/config/IConfigCenter.java | 5 + .../jlog/common/config/etcd/JdEtcdClient.java | 10 ++ .../common/config/zookeeper/ZKClient.java | 122 +++++++++++++++++ .../common/config/zookeeper/ZkBuilder.java | 29 ++++ .../jlog/worker/config/EtcdConfig.java | 4 +- 17 files changed, 432 insertions(+), 11 deletions(-) create mode 100644 .idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_3_1_9.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml create mode 100644 .idea/libraries/Maven__jline_jline_0_9_94.xml create mode 100644 .idea/libraries/Maven__org_apache_curator_curator_client_4_2_0.xml create mode 100644 .idea/libraries/Maven__org_apache_curator_curator_framework_4_2_0.xml create mode 100644 .idea/libraries/Maven__org_apache_yetus_audience_annotations_0_5_0.xml create mode 100644 .idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_14.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZKClient.java create mode 100644 common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZkBuilder.java diff --git a/ clientdemo/clientdemo.iml b/ clientdemo/clientdemo.iml index 086cbad..3b6a6e0 100644 --- a/ clientdemo/clientdemo.iml +++ b/ clientdemo/clientdemo.iml @@ -50,6 +50,14 @@ + + + + + + + + @@ -79,7 +87,6 @@ - diff --git a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_3_1_9.xml b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_3_1_9.xml new file mode 100644 index 0000000..8f8349e --- /dev/null +++ b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_3_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml b/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml new file mode 100644 index 0000000..1bf9986 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jline_jline_0_9_94.xml b/.idea/libraries/Maven__jline_jline_0_9_94.xml new file mode 100644 index 0000000..903c339 --- /dev/null +++ b/.idea/libraries/Maven__jline_jline_0_9_94.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_curator_curator_client_4_2_0.xml b/.idea/libraries/Maven__org_apache_curator_curator_client_4_2_0.xml new file mode 100644 index 0000000..4c33315 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_curator_curator_client_4_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_curator_curator_framework_4_2_0.xml b/.idea/libraries/Maven__org_apache_curator_curator_framework_4_2_0.xml new file mode 100644 index 0000000..0d8e1fe --- /dev/null +++ b/.idea/libraries/Maven__org_apache_curator_curator_framework_4_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_yetus_audience_annotations_0_5_0.xml b/.idea/libraries/Maven__org_apache_yetus_audience_annotations_0_5_0.xml new file mode 100644 index 0000000..5237f9d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_yetus_audience_annotations_0_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_14.xml b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_14.xml new file mode 100644 index 0000000..124caa2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/src/main/java/com/jd/platform/jlog/client/etcd/EtcdConfigFactory.java b/client/src/main/java/com/jd/platform/jlog/client/etcd/EtcdConfigFactory.java index b2386b7..3e4b339 100644 --- a/client/src/main/java/com/jd/platform/jlog/client/etcd/EtcdConfigFactory.java +++ b/client/src/main/java/com/jd/platform/jlog/client/etcd/EtcdConfigFactory.java @@ -3,6 +3,7 @@ package com.jd.platform.jlog.client.etcd; import com.jd.platform.jlog.common.config.IConfigCenter; import com.jd.platform.jlog.common.config.etcd.JdEtcdBuilder; +import com.jd.platform.jlog.common.config.zookeeper.ZkBuilder; /** * @author wuweifeng wrote on 2020-01-07 @@ -19,6 +20,7 @@ public class EtcdConfigFactory { public static void buildConfigCenter(String etcdServer) { //连接多个时，逗号分隔 - configCenter = JdEtcdBuilder.build(etcdServer); + //configCenter = JdEtcdBuilder.build(etcdServer); + configCenter = ZkBuilder.build(etcdServer); } } diff --git a/client/src/main/java/com/jd/platform/jlog/client/etcd/EtcdStarter.java b/client/src/main/java/com/jd/platform/jlog/client/etcd/EtcdStarter.java index f7eb670..2aecf93 100644 --- a/client/src/main/java/com/jd/platform/jlog/client/etcd/EtcdStarter.java +++ b/client/src/main/java/com/jd/platform/jlog/client/etcd/EtcdStarter.java @@ -57,27 +57,27 @@ public class EtcdStarter { private void fetch() { IConfigCenter configCenter = EtcdConfigFactory.configCenter(); //获取所有worker的ip - List keyValues = null; + List keys = null; try { //如果设置了机房属性，则拉取同机房的worker。如果同机房没worker，则拉取所有 if (Context.MDC != null) { String mdc = parseMdc(Context.MDC); - keyValues = configCenter.getPrefix(Constant.WORKER_PATH + Context.APP_NAME + "/" + mdc); + keys = configCenter.getPrefixKey(Constant.WORKER_PATH + Context.APP_NAME + "/" + mdc); } - if (CollectionUtil.isEmpty(keyValues)) { - keyValues = configCenter.getPrefix(Constant.WORKER_PATH + Context.APP_NAME); + if (CollectionUtil.isEmpty(keys)) { + keys = configCenter.getPrefixKey(Constant.WORKER_PATH + Context.APP_NAME); } //全是空，给个警告 - if (CollectionUtil.isEmpty(keyValues)) { + if (CollectionUtil.isEmpty(keys)) { logger.warn("very important warn !!! workers ip info is null!!!"); } List addresses = new ArrayList<>(); - if (keyValues != null) { - for (KeyValue keyValue : keyValues) { + if (keys != null) { + for (String key : keys) { //value里放的是ip地址 - String ipPort = keyValue.getValue().toStringUtf8(); + String ipPort = configCenter.get(key); addresses.add(ipPort); } } diff --git a/common/pom.xml b/common/pom.xml index b1551c1..11d6719 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -21,9 +21,38 @@ 5.1.0 0.0.16 1.7.2 + 3.4.14 + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + org.apache.curator + curator-framework + 4.2.0 + + + org.apache.zookeeper + zookeeper + + + io.protostuff protostuff-core diff --git a/common/src/main/java/com/jd/platform/jlog/common/config/IConfigCenter.java b/common/src/main/java/com/jd/platform/jlog/common/config/IConfigCenter.java index d5e28b6..9177423 100644 --- a/common/src/main/java/com/jd/platform/jlog/common/config/IConfigCenter.java +++ b/common/src/main/java/com/jd/platform/jlog/common/config/IConfigCenter.java @@ -49,6 +49,11 @@ public interface IConfigCenter { */ List getPrefix(String key); + + /** + * 获取指定前缀的所有key + */ + List getPrefixKey(String key); /** * 监听key */ diff --git a/common/src/main/java/com/jd/platform/jlog/common/config/etcd/JdEtcdClient.java b/common/src/main/java/com/jd/platform/jlog/common/config/etcd/JdEtcdClient.java index 9f2254c..08663ff 100644 --- a/common/src/main/java/com/jd/platform/jlog/common/config/etcd/JdEtcdClient.java +++ b/common/src/main/java/com/jd/platform/jlog/common/config/etcd/JdEtcdClient.java @@ -12,8 +12,10 @@ import com.ibm.etcd.client.lease.PersistentLease; import com.ibm.etcd.client.lock.LockClient; import com.jd.platform.jlog.common.config.IConfigCenter; +import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; import static java.util.concurrent.TimeUnit.SECONDS; @@ -121,6 +123,14 @@ public class JdEtcdClient implements IConfigCenter { return rangeResponse.getKvsList(); } + @Override + public List getPrefixKey(String key) { + RangeResponse rangeResponse = kvClient.get(ByteString.copyFromUtf8(key)).asPrefix().sync(); + return rangeResponse.getKvsList().stream().map( + kv -> kv.getKey().toStringUtf8() + ).collect(Collectors.toList()); + } + @Override public KvClient.WatchIterator watch(String key) { return kvClient.watch(ByteString.copyFromUtf8(key)).start(); diff --git a/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZKClient.java b/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZKClient.java new file mode 100644 index 0000000..f4327d5 --- /dev/null +++ b/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZKClient.java @@ -0,0 +1,122 @@ +package com.jd.platform.jlog.common.config.zookeeper; + +import com.ibm.etcd.api.KeyValue; +import com.ibm.etcd.client.kv.KvClient; +import com.jd.platform.jlog.common.config.IConfigCenter; +import org.apache.curator.framework.CuratorFramework; +import org.apache.zookeeper.CreateMode; +import org.apache.zookeeper.ZooDefs; + +import java.util.List; + +/** + * @author shenkaiwen5 + * @version 1.0 + * @date 2022-01-06 + */ +public class ZKClient implements IConfigCenter { + + private CuratorFramework curator; + + public ZKClient(CuratorFramework curatorFramework) { + this.curator = curatorFramework; + } + + @Override + public void put(String key, String value) { + try { + curator.create().creatingParentsIfNeeded() // 若创建节点的父节点不存在则先创建父节点再创建子节点 + .withMode(CreateMode.EPHEMERAL) // 创建的是临时节点 + .withACL(ZooDefs.Ids.OPEN_ACL_UNSAFE) // 默认匿名权限,权限scheme id:'world,'anyone,:cdrwa + .forPath(key, value.getBytes()); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + @Override + public void put(String key, String value, long leaseId) { + + } + + @Override + public void revoke(long leaseId) { + + } + + @Override + public long putAndGrant(String key, String value, long ttl) { + return 0; + } + + @Override + public long setLease(String key, long leaseId) { + return 0; + } + + @Override + public void delete(String key) { + + } + + @Override + public String get(String key) { + try { + return curator.getData().forPath(key).toString(); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + @Override + public List getPrefix(String key) { + return null; + } + + @Override + public List getPrefixKey(String key) { + try { + return curator.getChildren().forPath(key); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + @Override + public KvClient.WatchIterator watch(String key) { + return null; + } + + @Override + public KvClient.WatchIterator watchPrefix(String key) { + return null; + } + + @Override + public long keepAlive(String key, String value, int frequencySecs, int minTtl) throws Exception { + return 0; + } + + @Override + public long buildAliveLease(int frequencySecs, int minTtl) throws Exception { + return 0; + } + + @Override + public long buildNormalLease(long ttl) { + return 0; + } + + @Override + public long timeToLive(long leaseId) { + return 0; + } + + @Override + public KeyValue getKv(String key) { + return null; + } +} diff --git a/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZkBuilder.java b/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZkBuilder.java new file mode 100644 index 0000000..a5772fb --- /dev/null +++ b/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZkBuilder.java @@ -0,0 +1,29 @@ +package com.jd.platform.jlog.common.config.zookeeper; + +import org.apache.curator.framework.CuratorFramework; +import org.apache.curator.framework.CuratorFrameworkFactory; +import org.apache.curator.retry.ExponentialBackoffRetry; + +/** + * @author shenkaiwen5 + * @version 1.0 + * @date 2022-01-06 + */ +public class ZkBuilder { + /** + * 构建ZKClient + */ + public static ZKClient build(String endPoints) { + CuratorFramework client = CuratorFrameworkFactory.builder().connectString(endPoints) + // 连接超时时间 + .sessionTimeoutMs(1000) + // 会话超时时间 + .connectionTimeoutMs(1000) + // 刚开始重试间隔为1秒，之后重试间隔逐渐增加，最多重试不超过三次 + .retryPolicy(new ExponentialBackoffRetry(1000, 3)) + .build(); + client.start(); + + return new ZKClient(client); + } +} diff --git a/worker/src/main/java/com/jd/platform/jlog/worker/config/EtcdConfig.java b/worker/src/main/java/com/jd/platform/jlog/worker/config/EtcdConfig.java index 4195e9a..3c8a7f1 100644 --- a/worker/src/main/java/com/jd/platform/jlog/worker/config/EtcdConfig.java +++ b/worker/src/main/java/com/jd/platform/jlog/worker/config/EtcdConfig.java @@ -2,6 +2,7 @@ package com.jd.platform.jlog.worker.config; import com.jd.platform.jlog.common.config.IConfigCenter; import com.jd.platform.jlog.common.config.etcd.JdEtcdBuilder; +import com.jd.platform.jlog.common.config.zookeeper.ZkBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -25,7 +26,8 @@ public class EtcdConfig { public IConfigCenter client() { logger.info("etcd address : " + etcdServer); //连接多个时，逗号分隔 - return JdEtcdBuilder.build(etcdServer); + //return JdEtcdBuilder.build(etcdServer); + return ZkBuilder.build(etcdServer); } } From 04794d0bf8bfd041d9837e62c9344743dbf9e8da Mon Sep 17 00:00:00 2001 From: shenkaiwen5 Date: Thu, 6 Jan 2022 21:47:56 +0800 Subject: [PATCH 2/7] =?UTF-8?q?master=20=20=E4=B8=8D=E4=BD=BF=E7=94=A8etcd?= =?UTF-8?q?=E4=BD=BF=E7=94=A8zookeeper=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jd/platform/jlog/worker/config/EtcdStarter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/worker/src/main/java/com/jd/platform/jlog/worker/config/EtcdStarter.java b/worker/src/main/java/com/jd/platform/jlog/worker/config/EtcdStarter.java index 67aac4a..5a514a0 100644 --- a/worker/src/main/java/com/jd/platform/jlog/worker/config/EtcdStarter.java +++ b/worker/src/main/java/com/jd/platform/jlog/worker/config/EtcdStarter.java @@ -50,8 +50,10 @@ public class EtcdStarter { scheduledExecutorService.scheduleAtFixedRate(() -> { try { - configCenter.putAndGrant(buildKey(), buildValue(), 8); - configCenter.putAndGrant(buildSecondKey(), buildValue(), 8); + //configCenter.putAndGrant(buildKey(), buildValue(), 8); + //configCenter.putAndGrant(buildSecondKey(), buildValue(), 8); + configCenter.put(buildKey(), buildValue()); + configCenter.put(buildSecondKey(), buildValue()); } catch (Exception e) { //do nothing e.printStackTrace(); From 09912ca957fbb063e9f257453fe032c4eda247da Mon Sep 17 00:00:00 2001 From: shenkaiwen5 Date: Fri, 7 Jan 2022 10:54:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?master=20=20=E4=B8=8D=E4=BD=BF=E7=94=A8etcd?= =?UTF-8?q?=E4=BD=BF=E7=94=A8zookeeper=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jd/platform/jlog/common/config/IConfigCenter.java | 6 ------ .../platform/jlog/common/config/etcd/JdEtcdClient.java | 10 +++++----- .../jlog/common/config/zookeeper/ZKClient.java | 4 ---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/common/src/main/java/com/jd/platform/jlog/common/config/IConfigCenter.java b/common/src/main/java/com/jd/platform/jlog/common/config/IConfigCenter.java index 9177423..8ebd4d3 100644 --- a/common/src/main/java/com/jd/platform/jlog/common/config/IConfigCenter.java +++ b/common/src/main/java/com/jd/platform/jlog/common/config/IConfigCenter.java @@ -44,12 +44,6 @@ public interface IConfigCenter { */ String get(String key); - /** - * 获取指定前缀的所有key-value - */ - List getPrefix(String key); - - /** * 获取指定前缀的所有key */ diff --git a/common/src/main/java/com/jd/platform/jlog/common/config/etcd/JdEtcdClient.java b/common/src/main/java/com/jd/platform/jlog/common/config/etcd/JdEtcdClient.java index 08663ff..e274685 100644 --- a/common/src/main/java/com/jd/platform/jlog/common/config/etcd/JdEtcdClient.java +++ b/common/src/main/java/com/jd/platform/jlog/common/config/etcd/JdEtcdClient.java @@ -117,11 +117,11 @@ public class JdEtcdClient implements IConfigCenter { return keyValues.get(0); } - @Override - public List getPrefix(String key) { - RangeResponse rangeResponse = kvClient.get(ByteString.copyFromUtf8(key)).asPrefix().sync(); - return rangeResponse.getKvsList(); - } +// @Override +// public List getPrefix(String key) { +// RangeResponse rangeResponse = kvClient.get(ByteString.copyFromUtf8(key)).asPrefix().sync(); +// return rangeResponse.getKvsList(); +// } @Override public List getPrefixKey(String key) { diff --git a/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZKClient.java b/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZKClient.java index f4327d5..c257bfe 100644 --- a/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZKClient.java +++ b/common/src/main/java/com/jd/platform/jlog/common/config/zookeeper/ZKClient.java @@ -70,10 +70,6 @@ public class ZKClient implements IConfigCenter { return null; } - @Override - public List getPrefix(String key) { - return null; - } @Override public List getPrefixKey(String key) { From 48766c21badfb782b54c20f7bbde6ce72773893b Mon Sep 17 00:00:00 2001 From: shenkaiwen5 Date: Fri, 7 Jan 2022 11:22:59 +0800 Subject: [PATCH 4/7] =?UTF-8?q?master=20=20=E4=B8=8D=E4=BD=BF=E7=94=A8etcd?= =?UTF-8?q?=E4=BD=BF=E7=94=A8zookeeper=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- { clientdemo => clientdemo}/clientdemo.iml | 0 { clientdemo => clientdemo}/pom.xml | 0 .../clientdemo/ClientDemoApplication.java | 0 .../jlog/clientdemo/config/DemoConfig.java | 0 .../jlog/clientdemo/web/TestController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/log4j2.xml | 0 .../platform/jlog/test/TracerPacketTest.java | 0 clientdemo/target/classes/application.yml | 5 ++ .../clientdemo/ClientDemoApplication.class | Bin 0 -> 781 bytes .../jlog/clientdemo/config/DemoConfig.class | Bin 0 -> 1995 bytes .../jlog/clientdemo/web/TestController.class | Bin 0 -> 1113 bytes clientdemo/target/classes/log4j2.xml | 54 ++++++++++++++++++ .../jlog/test/TracerPacketTest$MyRes.class | Bin 0 -> 691 bytes .../platform/jlog/test/TracerPacketTest.class | Bin 0 -> 3459 bytes 15 files changed, 59 insertions(+) rename { clientdemo => clientdemo}/clientdemo.iml (100%) rename { clientdemo => clientdemo}/pom.xml (100%) rename { clientdemo => clientdemo}/src/main/java/com/jd/platform/jlog/clientdemo/ClientDemoApplication.java (100%) rename { clientdemo => clientdemo}/src/main/java/com/jd/platform/jlog/clientdemo/config/DemoConfig.java (100%) rename { clientdemo => clientdemo}/src/main/java/com/jd/platform/jlog/clientdemo/web/TestController.java (100%) rename { clientdemo => clientdemo}/src/main/resources/application.yml (100%) rename { clientdemo => clientdemo}/src/main/resources/log4j2.xml (100%) rename { clientdemo => clientdemo}/src/test/java/com/jd/platform/jlog/test/TracerPacketTest.java (100%) create mode 100644 clientdemo/target/classes/application.yml create mode 100644 clientdemo/target/classes/com/jd/platform/jlog/clientdemo/ClientDemoApplication.class create mode 100644 clientdemo/target/classes/com/jd/platform/jlog/clientdemo/config/DemoConfig.class create mode 100644 clientdemo/target/classes/com/jd/platform/jlog/clientdemo/web/TestController.class create mode 100644 clientdemo/target/classes/log4j2.xml create mode 100644 clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest$MyRes.class create mode 100644 clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest.class diff --git a/ clientdemo/clientdemo.iml b/clientdemo/clientdemo.iml similarity index 100% rename from clientdemo/clientdemo.iml rename to clientdemo/clientdemo.iml diff --git a/ clientdemo/pom.xml b/clientdemo/pom.xml similarity index 100% rename from clientdemo/pom.xml rename to clientdemo/pom.xml diff --git a/ clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/ClientDemoApplication.java b/clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/ClientDemoApplication.java similarity index 100% rename from clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/ClientDemoApplication.java rename to clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/ClientDemoApplication.java diff --git a/ clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/config/DemoConfig.java b/clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/config/DemoConfig.java similarity index 100% rename from clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/config/DemoConfig.java rename to clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/config/DemoConfig.java diff --git a/ clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/web/TestController.java b/clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/web/TestController.java similarity index 100% rename from clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/web/TestController.java rename to clientdemo/src/main/java/com/jd/platform/jlog/clientdemo/web/TestController.java diff --git a/ clientdemo/src/main/resources/application.yml b/clientdemo/src/main/resources/application.yml similarity index 100% rename from clientdemo/src/main/resources/application.yml rename to clientdemo/src/main/resources/application.yml diff --git a/ clientdemo/src/main/resources/log4j2.xml b/clientdemo/src/main/resources/log4j2.xml similarity index 100% rename from clientdemo/src/main/resources/log4j2.xml rename to clientdemo/src/main/resources/log4j2.xml diff --git a/ clientdemo/src/test/java/com/jd/platform/jlog/test/TracerPacketTest.java b/clientdemo/src/test/java/com/jd/platform/jlog/test/TracerPacketTest.java similarity index 100% rename from clientdemo/src/test/java/com/jd/platform/jlog/test/TracerPacketTest.java rename to clientdemo/src/test/java/com/jd/platform/jlog/test/TracerPacketTest.java diff --git a/clientdemo/target/classes/application.yml b/clientdemo/target/classes/application.yml new file mode 100644 index 0000000..bf94e96 --- /dev/null +++ b/clientdemo/target/classes/application.yml @@ -0,0 +1,5 @@ +#etcd的地址，如有多个用逗号分隔 +config: + server: ${etcdServer:http://127.0.0.1:2379} #etcd的地址，重要！！！ +server: + port: 8081 \ No newline at end of file diff --git a/clientdemo/target/classes/com/jd/platform/jlog/clientdemo/ClientDemoApplication.class b/clientdemo/target/classes/com/jd/platform/jlog/clientdemo/ClientDemoApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..55c6b14f1e56ed1c7332bf38fd35d59bfa0aff74 GIT binary patch literal 781 zcmbVK%Tn7g6g>(F32w?GP+lzyb|DM2Y3U*iGc=v93}r|sU34Woiczqoj4adsR#z}A z_<(*?r&op6p(_;U>nCotlKlsgl}_ zWoG!GG(VGhI-8{`7ET%6r*WB3nqjm1Bbf|rS2Tz3k%~wWH*r)s0M~&W<|7u{KJjo_` zoHQfd=-q<-F4HZNJ`F5miDdh+00CZ+w?zJHYT^$cmCb-wr`Ef}!uRL%0cC(Ss_ImF aw5a0>#aHQXFmgPawNiGlPTG&%0R91W=%7!sV0UtHjV8#lYm?j?=m z_|gBPGY*|Gqd&kO<#_HcrLjS#jvv_j+{<&%Is3frpMU-K2Y?lPWuk!PG*(O`u$;ji zy?&U*6h6|{$NEt*aSM0TxM#xDzV}U7Sk{{dX?&8wsy5d$Sl8=A{dknd<1{`sU`o|& z)nsra0|WW$fqi5P*Y-N1rUJ+7R193%?Rm;MlyxU`8m?URJYU($@x9Q%O4ScKBJ66{ zc3>aMr+)CAXh_=&McZyFKlonQ!waHryFE$Bi6dv)d3 zZy;GL)eWT9{T3ZBRvk}n^$r^{*t01@OZA(!Teky8?+1q|^{qoyx2jG5P#m;G*R@sK z4`{o7M>JhWda5N4eG#*YhqTut0a{c;b{x;ZB^B6B8LUU%HDw1%hh}LUrr0}sg@|)e zIFC<9V8;&?8ABEHnu;#jUf@1<+=${qu{1iIzOTen*$_HNu2dqvuuHkbiBhq~h!f2U zPMsOJ_dnsx9vPpj6JrC=j^07+4=+&7&5`sBy^_c3bWjHB&6?i}nv#S%<1ccvsEg9T z?N^11Gun$IQ?c+SX4Cl0z@0HwF)D-eYdyzp>Ex$}mbKw|x;E@El&rLrt|ki`_}s!Y zUbpatwyM~)u!UIzm67f7YWZXU#|b_YaSPknVNbo>!Uhsz!NQl=WmI*7qGFBHYN3Wb z3;STJEsbFt-8BCo+io1lrZT|Z`q$nY6=jZ~P^#5#cZ=i0z-IC63@VK+y%D|lJaa6< z^8|l%YQ#-6bW%AZ*lhn%X@sWd!H(0FE(a3Zm*{aMIVWS~$1k;MMUSxycB{1?xI4CD zr|ZF4D1JTSJ?WVyVjPL7QIViWh928NRF|pZMyZas`7J2$Tfs!@BIJ67yK`LM;BO|x zRU~P!4fuSEe+jMz*NKH^Fn*ztz#N~G(cxv{fuE1a0oQPyI|K8)oQN)e!!^OPt0zc2 zd4^;@)hE!enCv6nN2XftBl`lgfC>7}AWIQBN|+|j3~@9^A;uYSOw;onyh|>vUTb-e ztAQd)1LmLTk>r^;fl20b)e~4;&u^A*^l_n_`W+XaB=fmiAFq}3`93a{DeZFkXI_b4 za29FW*OB4t24D-5dNIz*lf24>D>aQ1xk8Q(-I`4R!C5(5>f!EtttV(oQ<<=*tNsPY2gj{ z&x>$KltbbHcn@9!F;1e2hJb{%>lu&7GoQa1fB*UA8-NmSx$v-0Ek#eZy!&Y38$$_XuWTC^phz>;(+I82MHqXK)L#gcRnAfYk5eZY%3F(mz zxF3a5nW~I6Kb94KKsa`^GKr3&cIr&1s`4encyYO07e|6eLIwO$r7nF#$Xt^MUncjY zPz>vTNulFdD;^W*h##E#)9IPLmNH>155s0ifbS}$jWD5Bg!gubh(;2spq7YO9_!?J z8)JnaadGO)yYxK}jRyHr*vyfLT0}>dcfmW`bj=Qf?!Im%zT6EhUt?#lyKXP|f0@s) z}3+&^0# z3-nMtdPvk+mJ8AbNGDopK1VA~l99};oPfO}C4~ab*|u>6W2Ac>2aIEaRt%GvA}@RR z3CR@6*{?`FKEXhFwUGXZ%zI=DxzBJ?Sba;oorndbttTAJ5sV9%#(X>aWG6y5xnPbY6r8{1>hG5 CO%{a! literal 0 HcmV?d00001 diff --git a/clientdemo/target/classes/log4j2.xml b/clientdemo/target/classes/log4j2.xml new file mode 100644 index 0000000..00f41b9 --- /dev/null +++ b/clientdemo/target/classes/log4j2.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest$MyRes.class b/clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest$MyRes.class new file mode 100644 index 0000000000000000000000000000000000000000..eaf0b2e05dc5c28d23450dd65cc52d71e17b8eb6 GIT binary patch literal 691 zcmb7CO-sW-5Ph4r#>Qx3{r>jgL2EHZyeWbRf)H)BwfAkh*3>kS?N;>WU-D1{5B>mu zlsFp&K`-?%J2P*2Z(nBe{_*+-U=M3~WHDzUhk0Esm{>Bg%wPsdti*$2DEJ+I&%KDp zZLg+e7`OKsM$}E%+bA=X{2=LiotAeOadn+Ys-vXsDbZ72UGhN4Di3ajsuQ4j2Voql zLx!Wx{}BIL*lI9jkCT>QaQrY9=lyO|$U1LEgcSTF;8BCiQ1{O3>FZBD!Zn-6X9lm%J;KkOWz^q%Q+;5^66qzo)RH$7y2}c^ej1 zY>dD(vC2>$ev)4f=<%P`RGJ+T(7H04dNjr1wXjZm&(Y6dP>>hEb+tR{7=?u~y0NLc zqMV`Z6t@Rp#TOXG(g2xff((q)Igwshh+3ukf&wI-QsAIK9g$OME$m>59y2gab>6_} VlS_b>nn}-DOj5SULl%p0flsv=sxSZm literal 0 HcmV?d00001 diff --git a/clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest.class b/clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest.class new file mode 100644 index 0000000000000000000000000000000000000000..75a1963e59f2e8ac92bf32f8dc5bdb3a57b07153 GIT binary patch literal 3459 zcma)9S#;c18U8f(ScA(N|_f_+k z|Gab)z!CgO#}F>7cvMG5ye%D#xGW9@6}Ao)MGcOI#bzvFS%a%%1y?kbG?X=XDtsM# z1j8Ow#N#pX2sDHmA`MjyS2aAY;hKh34e!?Qo@Trk@6+*qJRy`kDIOotF^CWD!iVr- z9Us9*b$kp@>G(K4q2XyApTwtBd|F30KBMBZIzETbYxshWUVKr9g6#C_ zIVV(LOnROZOq8rJ6vw6$uIEOh3K}}Q78Ep2_(exS%arRmGu3jz3FfRqiJ07!Z(F4W zD{#d*K{iIqE@kvi*?!qvDVmj%6)pM!;gY{(Mot)+bAe?$!NZn)#fj#K7*WtHE@mCC zIA5&L9^3aK$BV{SiB^!gG)`L!@u9h3h0f6<$yIaUgcaWlooS1FEmJGjRm-eKZpkEq zauu4{7Gq16w`4wW&2}o0>wCP@BWcIDV|fbtx3`y0lzq=EGXkZ=Zb46OBj!F^SaIw~ zL2I4rDOdWW2hL+vx+P7!V{5EdD`~v$t79bPi8^Cvqrml+M(QxJwvkclf3S{EC`=er z-(RO3A!+w)#8gnX%%H4|M^$`P#n)Iw3i9WwUgVaY1vhk=<}uInBTIyknQ5K!gC%pN z%5pK2OzJX|(sBj2cXriTpZLSb&-&HCc22pXirQ{1hklVn1xKaqup(lx7+7WJaX+|X z7JNU7t4P+!waA>66ywAv7N~Yw$j5d_YRP4B6`itgPDt=1!LdrEKV?55Wo1WXmuLSza;l1@G<{wcrFH zONAtZ1O12lhuF+68+F&<(6Rmj{sw7e=mb}tV3O#DYT#14h#(8lz;pPKiXR*J37$9b zQ}Os2o;5I!1r({}~+KhcVVs6_^vq(N;yor!ArX}P&l`}16+1q)`lo*i%y>n8$8Y)!^Ii8Tnuq5-P zu4fZWeH$kz1$73^&rhCYUkA*;UycvCwD;vm5;(R_6N`<}QqWhgHW>`{O12an8Mn}H zW7MtmTI9zl`e_xZu&rKUD&XRlK+mp*kyBUMX+T4S-S#UioST)DxBIYJ^Jb_P-UE6Dy6T)PBm|XE<(>np@fWNrt1n~wQ z?A&2m@34YJ3Ac#ZAIbeC3tzzw+G829?~|3p^DJX3#?IIdnzwEL`gI&9NA^@+cx{#3 zf>p50MJtR}LVh=#o;^DwJ{5ccq^Uf#T_x7FTp|@6{KgyNCnwMVMeGbdkMU&kt?-@g zUW0O-KnBP8Y?8=3@fN~HOn_mG@TA}bnKObpa{yUr#Ql2%nG0)ZnA$)i-`VM&-Wr-V zpk8QgU4u5$m)n)oZ=ksW=lgQTI(Dbf^5$}_HS8rx4Y$|Omfqfx+n0iG z$mLUTf9}o{eB&ngrrcdIwzuyF4rFk?XC3W5HFP*n)$nHedH0JrSi?QTjrqoP92(B% zv+KBbIJQ@#y~Ao=&2{FR5-EB0H8EY!K^JT_^jv2op2sWrCqIlEWz1HvpRqW=h_s`X z0dK?IJRRiyJ&f2PjNx8fMkhbuyHF+eN%Y`penvloKCaRMN;`}-Qr={2|4fN5Gx~pH z%>TiNzk>Uz>8*GbqxcuzCiC(Lc9DLF*il+=lhW=dlqK&$Qj9W(FC$N_i|A-VQ~@xhBl=T9ncp-x;xL35%*bLvuvcb!?#bLU)q+b@Vayxqd#F`8Am9 z75ywg Date: Fri, 7 Jan 2022 11:47:21 +0800 Subject: [PATCH 5/7] =?UTF-8?q?master=20=20=E4=B8=8D=E4=BD=BF=E7=94=A8etcd?= =?UTF-8?q?=E4=BD=BF=E7=94=A8zookeeper=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clientdemo/clientdemo.iml | 146 -------------------------------------- 1 file changed, 146 deletions(-) delete mode 100644 clientdemo/clientdemo.iml diff --git a/clientdemo/clientdemo.iml b/clientdemo/clientdemo.iml deleted file mode 100644 index 3b6a6e0..0000000 --- a/clientdemo/clientdemo.iml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 4cbac0eedace178a7fe7bffa34a2efbe65ee4ed6 Mon Sep 17 00:00:00 2001 From: shenkaiwen5 Date: Fri, 7 Jan 2022 11:50:24 +0800 Subject: [PATCH 6/7] =?UTF-8?q?master=20=20=E4=B8=8D=E4=BD=BF=E7=94=A8etcd?= =?UTF-8?q?=E4=BD=BF=E7=94=A8zookeeper=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..153c933 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +HELP.md +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ From 34fc88a74ee16da0ad45b81da7d9c2eb9754a338 Mon Sep 17 00:00:00 2001 From: shenkaiwen5 Date: Fri, 7 Jan 2022 14:22:52 +0800 Subject: [PATCH 7/7] =?UTF-8?q?master=20=20=E4=B8=8D=E4=BD=BF=E7=94=A8etcd?= =?UTF-8?q?=E4=BD=BF=E7=94=A8zookeeper=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ub_spotbugs_spotbugs_annotations_3_1_9.xml | 13 -- ...en__com_squareup_okhttp3_okhttp_3_14_9.xml | 13 -- .../Maven__com_squareup_okio_okio_1_17_2.xml | 13 -- .../Maven__io_netty_netty_3_10_6_Final.xml | 13 -- .idea/libraries/Maven__jline_jline_0_9_94.xml | 13 -- .idea/libraries/Maven__junit_junit_4_12.xml | 13 -- ...rg_apache_curator_curator_client_4_2_0.xml | 13 -- ...apache_curator_curator_framework_4_2_0.xml | 13 -- ...apache_logging_log4j_log4j_core_2_14_1.xml | 13 -- ..._logging_log4j_log4j_slf4j_impl_2_14_1.xml | 13 -- ...pache_yetus_audience_annotations_0_5_0.xml | 13 -- ..._org_apache_zookeeper_zookeeper_3_4_14.xml | 13 -- .../Maven__org_hamcrest_hamcrest_core_2_2.xml | 13 -- .idea/uiDesigner.xml | 124 ------------------ client/pom.xml | 5 + clientdemo/target/classes/application.yml | 5 - .../clientdemo/ClientDemoApplication.class | Bin 781 -> 0 bytes .../jlog/clientdemo/config/DemoConfig.class | Bin 1995 -> 0 bytes .../jlog/clientdemo/web/TestController.class | Bin 1113 -> 0 bytes clientdemo/target/classes/log4j2.xml | 54 -------- .../jlog/test/TracerPacketTest$MyRes.class | Bin 691 -> 0 bytes .../platform/jlog/test/TracerPacketTest.class | Bin 3459 -> 0 bytes 22 files changed, 5 insertions(+), 352 deletions(-) delete mode 100644 .idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_3_1_9.xml delete mode 100644 .idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml delete mode 100644 .idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml delete mode 100644 .idea/libraries/Maven__jline_jline_0_9_94.xml delete mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml delete mode 100644 .idea/libraries/Maven__org_apache_curator_curator_client_4_2_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_curator_curator_framework_4_2_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_14_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_14_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_yetus_audience_annotations_0_5_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_14.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 clientdemo/target/classes/application.yml delete mode 100644 clientdemo/target/classes/com/jd/platform/jlog/clientdemo/ClientDemoApplication.class delete mode 100644 clientdemo/target/classes/com/jd/platform/jlog/clientdemo/config/DemoConfig.class delete mode 100644 clientdemo/target/classes/com/jd/platform/jlog/clientdemo/web/TestController.class delete mode 100644 clientdemo/target/classes/log4j2.xml delete mode 100644 clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest$MyRes.class delete mode 100644 clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest.class diff --git a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_3_1_9.xml b/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_3_1_9.xml deleted file mode 100644 index 8f8349e..0000000 --- a/.idea/libraries/Maven__com_github_spotbugs_spotbugs_annotations_3_1_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml deleted file mode 100644 index c7878f4..0000000 --- a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml b/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml deleted file mode 100644 index 9260035..0000000 --- a/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml b/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml deleted file mode 100644 index 1bf9986..0000000 --- a/.idea/libraries/Maven__io_netty_netty_3_10_6_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jline_jline_0_9_94.xml b/.idea/libraries/Maven__jline_jline_0_9_94.xml deleted file mode 100644 index 903c339..0000000 --- a/.idea/libraries/Maven__jline_jline_0_9_94.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml deleted file mode 100644 index d411041..0000000 --- a/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_curator_curator_client_4_2_0.xml b/.idea/libraries/Maven__org_apache_curator_curator_client_4_2_0.xml deleted file mode 100644 index 4c33315..0000000 --- a/.idea/libraries/Maven__org_apache_curator_curator_client_4_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_curator_curator_framework_4_2_0.xml b/.idea/libraries/Maven__org_apache_curator_curator_framework_4_2_0.xml deleted file mode 100644 index 0d8e1fe..0000000 --- a/.idea/libraries/Maven__org_apache_curator_curator_framework_4_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_14_1.xml deleted file mode 100644 index 1b2d975..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_14_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_14_1.xml deleted file mode 100644 index 22506f0..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_14_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_yetus_audience_annotations_0_5_0.xml b/.idea/libraries/Maven__org_apache_yetus_audience_annotations_0_5_0.xml deleted file mode 100644 index 5237f9d..0000000 --- a/.idea/libraries/Maven__org_apache_yetus_audience_annotations_0_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_14.xml b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_14.xml deleted file mode 100644 index 124caa2..0000000 --- a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml deleted file mode 100644 index 15f1e4c..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/client/pom.xml b/client/pom.xml index b6e665c..6e43109 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -24,6 +24,11 @@ 2.4 provided + + org.slf4j + slf4j-log4j12 + 1.7.32 + com.alibaba diff --git a/clientdemo/target/classes/application.yml b/clientdemo/target/classes/application.yml deleted file mode 100644 index bf94e96..0000000 --- a/clientdemo/target/classes/application.yml +++ /dev/null @@ -1,5 +0,0 @@ -#etcd的地址，如有多个用逗号分隔 -config: - server: ${etcdServer:http://127.0.0.1:2379} #etcd的地址，重要！！！ -server: - port: 8081 \ No newline at end of file diff --git a/clientdemo/target/classes/com/jd/platform/jlog/clientdemo/ClientDemoApplication.class b/clientdemo/target/classes/com/jd/platform/jlog/clientdemo/ClientDemoApplication.class deleted file mode 100644 index 55c6b14f1e56ed1c7332bf38fd35d59bfa0aff74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmbVK%Tn7g6g>(F32w?GP+lzyb|DM2Y3U*iGc=v93}r|sU34Woiczqoj4adsR#z}A z_<(*?r&op6p(_;U>nCotlKlsgl}_ zWoG!GG(VGhI-8{`7ET%6r*WB3nqjm1Bbf|rS2Tz3k%~wWH*r)s0M~&W<|7u{KJjo_` zoHQfd=-q<-F4HZNJ`F5miDdh+00CZ+w?zJHYT^$cmCb-wr`Ef}!uRL%0cC(Ss_ImF aw5a0>#aHQXFmgPawNiGlPTG&%0R91W=%7!sV0UtHjV8#lYm?j?=m z_|gBPGY*|Gqd&kO<#_HcrLjS#jvv_j+{<&%Is3frpMU-K2Y?lPWuk!PG*(O`u$;ji zy?&U*6h6|{$NEt*aSM0TxM#xDzV}U7Sk{{dX?&8wsy5d$Sl8=A{dknd<1{`sU`o|& z)nsra0|WW$fqi5P*Y-N1rUJ+7R193%?Rm;MlyxU`8m?URJYU($@x9Q%O4ScKBJ66{ zc3>aMr+)CAXh_=&McZyFKlonQ!waHryFE$Bi6dv)d3 zZy;GL)eWT9{T3ZBRvk}n^$r^{*t01@OZA(!Teky8?+1q|^{qoyx2jG5P#m;G*R@sK z4`{o7M>JhWda5N4eG#*YhqTut0a{c;b{x;ZB^B6B8LUU%HDw1%hh}LUrr0}sg@|)e zIFC<9V8;&?8ABEHnu;#jUf@1<+=${qu{1iIzOTen*$_HNu2dqvuuHkbiBhq~h!f2U zPMsOJ_dnsx9vPpj6JrC=j^07+4=+&7&5`sBy^_c3bWjHB&6?i}nv#S%<1ccvsEg9T z?N^11Gun$IQ?c+SX4Cl0z@0HwF)D-eYdyzp>Ex$}mbKw|x;E@El&rLrt|ki`_}s!Y zUbpatwyM~)u!UIzm67f7YWZXU#|b_YaSPknVNbo>!Uhsz!NQl=WmI*7qGFBHYN3Wb z3;STJEsbFt-8BCo+io1lrZT|Z`q$nY6=jZ~P^#5#cZ=i0z-IC63@VK+y%D|lJaa6< z^8|l%YQ#-6bW%AZ*lhn%X@sWd!H(0FE(a3Zm*{aMIVWS~$1k;MMUSxycB{1?xI4CD zr|ZF4D1JTSJ?WVyVjPL7QIViWh928NRF|pZMyZas`7J2$Tfs!@BIJ67yK`LM;BO|x zRU~P!4fuSEe+jMz*NKH^Fn*ztz#N~G(cxv{fuE1a0oQPyI|K8)oQN)e!!^OPt0zc2 zd4^;@)hE!enCv6nN2XftBl`lgfC>7}AWIQBN|+|j3~@9^A;uYSOw;onyh|>vUTb-e ztAQd)1LmLTk>r^;fl20b)e~4;&u^A*^l_n_`W+XaB=fmiAFq}3`93a{DeZFkXI_b4 za29FW*OB4t24D-5dNIz*lf24>D>aQ1xk8Q(-I`4R!C5(5>f!EtttV(oQ<<=*tNsPY2gj{ z&x>$KltbbHcn@9!F;1e2hJb{%>lu&7GoQa1fB*UA8-NmSx$v-0Ek#eZy!&Y38$$_XuWTC^phz>;(+I82MHqXK)L#gcRnAfYk5eZY%3F(mz zxF3a5nW~I6Kb94KKsa`^GKr3&cIr&1s`4encyYO07e|6eLIwO$r7nF#$Xt^MUncjY zPz>vTNulFdD;^W*h##E#)9IPLmNH>155s0ifbS}$jWD5Bg!gubh(;2spq7YO9_!?J z8)JnaadGO)yYxK}jRyHr*vyfLT0}>dcfmW`bj=Qf?!Im%zT6EhUt?#lyKXP|f0@s) z}3+&^0# z3-nMtdPvk+mJ8AbNGDopK1VA~l99};oPfO}C4~ab*|u>6W2Ac>2aIEaRt%GvA}@RR z3CR@6*{?`FKEXhFwUGXZ%zI=DxzBJ?Sba;oorndbttTAJ5sV9%#(X>aWG6y5xnPbY6r8{1>hG5 CO%{a! diff --git a/clientdemo/target/classes/log4j2.xml b/clientdemo/target/classes/log4j2.xml deleted file mode 100644 index 00f41b9..0000000 --- a/clientdemo/target/classes/log4j2.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest$MyRes.class b/clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest$MyRes.class deleted file mode 100644 index eaf0b2e05dc5c28d23450dd65cc52d71e17b8eb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 691 zcmb7CO-sW-5Ph4r#>Qx3{r>jgL2EHZyeWbRf)H)BwfAkh*3>kS?N;>WU-D1{5B>mu zlsFp&K`-?%J2P*2Z(nBe{_*+-U=M3~WHDzUhk0Esm{>Bg%wPsdti*$2DEJ+I&%KDp zZLg+e7`OKsM$}E%+bA=X{2=LiotAeOadn+Ys-vXsDbZ72UGhN4Di3ajsuQ4j2Voql zLx!Wx{}BIL*lI9jkCT>QaQrY9=lyO|$U1LEgcSTF;8BCiQ1{O3>FZBD!Zn-6X9lm%J;KkOWz^q%Q+;5^66qzo)RH$7y2}c^ej1 zY>dD(vC2>$ev)4f=<%P`RGJ+T(7H04dNjr1wXjZm&(Y6dP>>hEb+tR{7=?u~y0NLc zqMV`Z6t@Rp#TOXG(g2xff((q)Igwshh+3ukf&wI-QsAIK9g$OME$m>59y2gab>6_} VlS_b>nn}-DOj5SULl%p0flsv=sxSZm diff --git a/clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest.class b/clientdemo/target/test-classes/com/jd/platform/jlog/test/TracerPacketTest.class deleted file mode 100644 index 75a1963e59f2e8ac92bf32f8dc5bdb3a57b07153..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3459 zcma)9S#;c18U8f(ScA(N|_f_+k z|Gab)z!CgO#}F>7cvMG5ye%D#xGW9@6}Ao)MGcOI#bzvFS%a%%1y?kbG?X=XDtsM# z1j8Ow#N#pX2sDHmA`MjyS2aAY;hKh34e!?Qo@Trk@6+*qJRy`kDIOotF^CWD!iVr- z9Us9*b$kp@>G(K4q2XyApTwtBd|F30KBMBZIzETbYxshWUVKr9g6#C_ zIVV(LOnROZOq8rJ6vw6$uIEOh3K}}Q78Ep2_(exS%arRmGu3jz3FfRqiJ07!Z(F4W zD{#d*K{iIqE@kvi*?!qvDVmj%6)pM!;gY{(Mot)+bAe?$!NZn)#fj#K7*WtHE@mCC zIA5&L9^3aK$BV{SiB^!gG)`L!@u9h3h0f6<$yIaUgcaWlooS1FEmJGjRm-eKZpkEq zauu4{7Gq16w`4wW&2}o0>wCP@BWcIDV|fbtx3`y0lzq=EGXkZ=Zb46OBj!F^SaIw~ zL2I4rDOdWW2hL+vx+P7!V{5EdD`~v$t79bPi8^Cvqrml+M(QxJwvkclf3S{EC`=er z-(RO3A!+w)#8gnX%%H4|M^$`P#n)Iw3i9WwUgVaY1vhk=<}uInBTIyknQ5K!gC%pN z%5pK2OzJX|(sBj2cXriTpZLSb&-&HCc22pXirQ{1hklVn1xKaqup(lx7+7WJaX+|X z7JNU7t4P+!waA>66ywAv7N~Yw$j5d_YRP4B6`itgPDt=1!LdrEKV?55Wo1WXmuLSza;l1@G<{wcrFH zONAtZ1O12lhuF+68+F&<(6Rmj{sw7e=mb}tV3O#DYT#14h#(8lz;pPKiXR*J37$9b zQ}Os2o;5I!1r({}~+KhcVVs6_^vq(N;yor!ArX}P&l`}16+1q)`lo*i%y>n8$8Y)!^Ii8Tnuq5-P zu4fZWeH$kz1$73^&rhCYUkA*;UycvCwD;vm5;(R_6N`<}QqWhgHW>`{O12an8Mn}H zW7MtmTI9zl`e_xZu&rKUD&XRlK+mp*kyBUMX+T4S-S#UioST)DxBIYJ^Jb_P-UE6Dy6T)PBm|XE<(>np@fWNrt1n~wQ z?A&2m@34YJ3Ac#ZAIbeC3tzzw+G829?~|3p^DJX3#?IIdnzwEL`gI&9NA^@+cx{#3 zf>p50MJtR}LVh=#o;^DwJ{5ccq^Uf#T_x7FTp|@6{KgyNCnwMVMeGbdkMU&kt?-@g zUW0O-KnBP8Y?8=3@fN~HOn_mG@TA}bnKObpa{yUr#Ql2%nG0)ZnA$)i-`VM&-Wr-V zpk8QgU4u5$m)n)oZ=ksW=lgQTI(Dbf^5$}_HS8rx4Y$|Omfqfx+n0iG z$mLUTf9}o{eB&ngrrcdIwzuyF4rFk?XC3W5HFP*n)$nHedH0JrSi?QTjrqoP92(B% zv+KBbIJQ@#y~Ao=&2{FR5-EB0H8EY!K^JT_^jv2op2sWrCqIlEWz1HvpRqW=h_s`X z0dK?IJRRiyJ&f2PjNx8fMkhbuyHF+eN%Y`penvloKCaRMN;`}-Qr={2|4fN5Gx~pH z%>TiNzk>Uz>8*GbqxcuzCiC(Lc9DLF*il+=lhW=dlqK&$Qj9W(FC$N_i|A-VQ~@xhBl=T9ncp-x;xL35%*bLvuvcb!?#bLU)q+b@Vayxqd#F`8Am9 z75ywg