From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Feb 2022 14:58:47 +0800 Subject: [PATCH] fix conflict --- zq-erp/src/main/java/com/matrix/component/asyncmessage/AsyncMessageManager.java | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/component/asyncmessage/AsyncMessageManager.java b/zq-erp/src/main/java/com/matrix/component/asyncmessage/AsyncMessageManager.java index 90b7fdd..a27cf0a 100644 --- a/zq-erp/src/main/java/com/matrix/component/asyncmessage/AsyncMessageManager.java +++ b/zq-erp/src/main/java/com/matrix/component/asyncmessage/AsyncMessageManager.java @@ -40,10 +40,6 @@ private Map<String, List<MessageHandler>> routes; - private Map<String, ReentrantLock> lockMap = new HashMap<>(); - - private Map<String, ConcurrentLinkedQueue> messageQueue = new HashMap<>(); - @Override public void run(ApplicationArguments args) throws Exception { -- Gitblit v1.9.1