From 4f0f778ed0c0e9007afc7a65b9781cf367e2c6bc Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Wed, 17 Apr 2024 11:57:21 +0200
Subject: [PATCH] fix: refs #4409 Asset fixes

---
 assets/Dockerfile.consumer | 7 +++----
 assets/Dockerfile.producer | 5 ++---
 assets/zongji.undo.sql     | 3 ++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/assets/Dockerfile.consumer b/assets/Dockerfile.consumer
index 23eda70..a741f83 100644
--- a/assets/Dockerfile.consumer
+++ b/assets/Dockerfile.consumer
@@ -22,10 +22,9 @@ RUN npm install --omit=dev --no-audit --prefer-offline \
     && git clone --depth 1 --branch fix-143 https://github.com/juan-ferrer-toribio/zongji.git \
     && (cd zongji && npm install --omit=dev)
 
-COPY config config
-COPY queues queues
-COPY lib lib
-COPY \
+COPY lib \
+    config \
+    queues \
     LICENSE \
     README.md \
     consumer.js \
diff --git a/assets/Dockerfile.producer b/assets/Dockerfile.producer
index d677b08..cb69bea 100644
--- a/assets/Dockerfile.producer
+++ b/assets/Dockerfile.producer
@@ -22,9 +22,8 @@ RUN npm install --omit=dev --no-audit --prefer-offline \
     && git clone --depth 1 --branch fix-143 https://github.com/juan-ferrer-toribio/zongji.git \
     && (cd zongji && npm install --omit=dev)
 
-COPY config config
-COPY queues queues
-COPY \
+COPY config \
+    queues \
     LICENSE \
     README.md \
     mycdc.js \
diff --git a/assets/zongji.undo.sql b/assets/zongji.undo.sql
index 62e9607..1bb1425 100644
--- a/assets/zongji.undo.sql
+++ b/assets/zongji.undo.sql
@@ -1,3 +1,4 @@
 
 DROP TABLE IF EXISTS `util`.`binlogQueue`;
-DROP USER 'zongji'@'%';
+DROP USER IF EXISTS 'mycdc-producer'@'%';
+DROP USER IF EXISTS 'mycdc-consumer'@'%';