From 1b9e1db3519b00a7791b572b5e618dd9c43f983c Mon Sep 17 00:00:00 2001 From: jzdayz <1397649957@qq.com> Date: Thu, 27 Feb 2020 14:33:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/alibaba/nacos/naming/push/PushService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java b/naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java index b5a0ffb39..ea726d1b8 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java @@ -317,8 +317,6 @@ public class PushService implements ApplicationContextAware, ApplicationListener try { packet = new DatagramPacket(dataBytes, dataBytes.length, client.socketAddr); Receiver.AckEntry ackEntry = new Receiver.AckEntry(key, packet); - ackEntry.data = data; - // we must store the key be fore send, otherwise there will be a chance the // ack returns before we put in ackEntry.data = data; From deab304d5bc45c0740b82e678a25ab1f7c65063d Mon Sep 17 00:00:00 2001 From: jzdayz <1397649957@qq.com> Date: Thu, 27 Feb 2020 14:41:25 +0800 Subject: [PATCH 2/6] fix log error --- .../main/java/com/alibaba/nacos/naming/push/PushService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java b/naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java index ea726d1b8..d2f5d134f 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java @@ -647,7 +647,7 @@ public class PushService implements ApplicationContextAware, ApplicationListener try { udpSocket.receive(packet); - String json = new String(packet.getData(), 0, packet.getLength(), Charset.forName("UTF-8")).trim(); + String json = new String(packet.getData(), 0, packet.getLength(), StandardCharsets.UTF_8).trim(); AckPacket ackPacket = JSON.parseObject(json, AckPacket.class); InetSocketAddress socketAddress = (InetSocketAddress) packet.getSocketAddress(); @@ -667,7 +667,7 @@ public class PushService implements ApplicationContextAware, ApplicationListener long pushCost = System.currentTimeMillis() - udpSendTimeMap.get(ackKey); - Loggers.PUSH.info("received ack: {} from: {}:, cost: {} ms, unacked: {}, total push: {}", + Loggers.PUSH.info("received ack: {} from: {}:{}, cost: {} ms, unacked: {}, total push: {}", json, ip, port, pushCost, ackMap.size(), totalPush); pushCostMap.put(ackKey, pushCost); From 806ca5c473665d34e5e25dc4ea0de971f727cf75 Mon Sep 17 00:00:00 2001 From: liaochuntao Date: Sun, 1 Mar 2020 20:20:00 +0800 Subject: [PATCH 3/6] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a5bb3ad8b..817e0c585 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,10 @@ Contributors are welcomed to join Nacos project. Please check [CONTRIBUTING](./C ![cwex](https://img.alicdn.com/tfs/TB1bpBlQmrqK1RjSZK9XXXyypXa-830-972.png_288x480q80.jpg) +## Download + +- [Baidu Netdisk](https://pan.baidu.com/s/1186nmlqPGows9gUZKAx8Zw) Fetch Code : `rest`，If it is not available, please contact liaotao@live.com + ## Who is using From 853bc1c8f25ef9469fd1533fd965bb93037bd57b Mon Sep 17 00:00:00 2001 From: liaochuntao Date: Sun, 1 Mar 2020 20:20:33 +0800 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 817e0c585..eb962b982 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ Contributors are welcomed to join Nacos project. Please check [CONTRIBUTING](./C ## Download -- [Baidu Netdisk](https://pan.baidu.com/s/1186nmlqPGows9gUZKAx8Zw) Fetch Code : `rest`，If it is not available, please contact liaotao@live.com +- [Baidu Netdisk](https://pan.baidu.com/s/1186nmlqPGows9gUZKAx8Zw) Fetch Code : `rest`，If it is not available, please contact liaochuntao@live.com ## Who is using From 1579f5544ad71169ebcff4be1b092468a5cbe7e0 Mon Sep 17 00:00:00 2001 From: liaochuntao Date: Sun, 1 Mar 2020 20:21:34 +0800 Subject: [PATCH 5/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index eb962b982..5f84103a0 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ Contributors are welcomed to join Nacos project. Please check [CONTRIBUTING](./C ## Download +- [Github Release](https://github.com/alibaba/nacos/releases) - [Baidu Netdisk](https://pan.baidu.com/s/1186nmlqPGows9gUZKAx8Zw) Fetch Code : `rest`，If it is not available, please contact liaochuntao@live.com From 7b68943e36ecf6babc34f05651f90e979c72edb5 Mon Sep 17 00:00:00 2001 From: liaochuntao Date: Mon, 2 Mar 2020 15:02:03 +0800 Subject: [PATCH 6/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f84103a0..673a84dd8 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ Contributors are welcomed to join Nacos project. Please check [CONTRIBUTING](./C ## Download - [Github Release](https://github.com/alibaba/nacos/releases) -- [Baidu Netdisk](https://pan.baidu.com/s/1186nmlqPGows9gUZKAx8Zw) Fetch Code : `rest`，If it is not available, please contact liaochuntao@live.com +- [Baidu Netdisk](https://pan.baidu.com/s/1186nmlqPGows9gUZKAx8Zw) Fetch Code : `rest` ## Who is using