From e2fbd14725bb0b8906c238230a6ca283c7acecb3 Mon Sep 17 00:00:00 2001 From: zhuyf Date: Tue, 6 Sep 2022 09:50:01 +0800 Subject: [PATCH] no message --- .gitignore | 1 + pom.xml | 2 +- .../client/core/MethodArgumentResolver.java | 2 +- .../java/com/schbrain/web/MyCanalEvent1.java | 30 -------------- .../java/com/schbrain/web/MyCanalEvent2.java | 30 -------------- .../java/com/schbrain/web/MyCanalEvent3.java | 29 -------------- .../java/com/schbrain/web/MyCanalEvent4.java | 38 ------------------ .../java/com/schbrain/web/MyCanalEvent5.java | 39 ------------------ .../java/com/schbrain/web/MyCanalEvent6.java | 38 ------------------ .../java/com/schbrain/web/MyCanalEvent7.java | 37 ----------------- .../java/com/schbrain/web/MyCanalEvent8.java | 40 ------------------- .../java/com/schbrain/web/MyCanalEvent9.java | 40 ------------------- .../src/main/resources/application.properties | 4 +- 13 files changed, 6 insertions(+), 324 deletions(-) delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent1.java delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent2.java delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent3.java delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent4.java delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent5.java delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent6.java delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent7.java delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent8.java delete mode 100644 schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent9.java diff --git a/.gitignore b/.gitignore index 92322c4..d9fa526 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea/ target/ +*.log diff --git a/pom.xml b/pom.xml index dca65e3..cd1141f 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ schbrain-canal - 1.1.2-SNAPSHOT + 1.1.2-RELEASE diff --git a/schbrain-canal-client/src/main/java/com/schbrain/canal/client/core/MethodArgumentResolver.java b/schbrain-canal-client/src/main/java/com/schbrain/canal/client/core/MethodArgumentResolver.java index 7f8174a..b9990b9 100644 --- a/schbrain-canal-client/src/main/java/com/schbrain/canal/client/core/MethodArgumentResolver.java +++ b/schbrain-canal-client/src/main/java/com/schbrain/canal/client/core/MethodArgumentResolver.java @@ -102,11 +102,11 @@ public class MethodArgumentResolver { } public List resolver(ResolverCanalEvent event, Dml dml) throws InvocationTargetException, IllegalAccessException, ParseException,ReflectionException { - EditMetaInfo metaInfo = new EditMetaInfo(); Class c = getArgumentClass(event); List editMetaInfos=new ArrayList<>(); List datas = dml.getData(); for (Dml.Row row : datas) { + EditMetaInfo metaInfo = new EditMetaInfo(); Object after = columnsConvertObject(c,row.getData()); metaInfo.setAfter(after); Object before = columnsConvertObject(c,row.getOld()); diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent1.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent1.java deleted file mode 100644 index 8aeb7d2..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent1.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.canal.client.annotation.TableFilter; -import com.schbrain.canal.client.event.DefCanalEvent; -import org.springframework.stereotype.Service; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -@Service("myCanalEvent1") -@TableFilter(table = "wechat_user",schame = "kp_user") -public class MyCanalEvent1 implements DefCanalEvent { - - @Override - public void onInsert(CanalEntry.Header header, CanalEntry.RowData rowData) { - System.out.println("======"+header.getSchemaName()+":"+header.getTableName()+":"+"insert"); - } - - @Override - public void onUpdate(CanalEntry.Header header, CanalEntry.RowData rowData) { - System.out.println("======"+header.getSchemaName()+":"+header.getTableName()+":"+"update"); - } - - @Override - public void onDelete(CanalEntry.Header header, CanalEntry.RowData rowData) { - System.out.println("======"+header.getSchemaName()+":"+header.getTableName()+":"+"delete"); - } -} diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent2.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent2.java deleted file mode 100644 index 95cc473..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent2.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.canal.client.annotation.TableFilter; -import com.schbrain.canal.client.event.DefCanalEvent; -import org.springframework.stereotype.Service; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -//@Service("myCanalEvent2") -//@TableFilter(table = "ding_talk_user",schame = "kp_user") -public class MyCanalEvent2 implements DefCanalEvent { - - @Override - public void onInsert(CanalEntry.Header header, CanalEntry.RowData rowData) { - System.out.println("======"+header.getSchemaName()+":"+header.getTableName()+":"+"insert"); - } - - @Override - public void onUpdate(CanalEntry.Header header, CanalEntry.RowData rowData) { - System.out.println("======"+header.getSchemaName()+":"+header.getTableName()+":"+"update"); - } - - @Override - public void onDelete(CanalEntry.Header header, CanalEntry.RowData rowData) { - System.out.println("======"+header.getSchemaName()+":"+header.getTableName()+":"+"delete"); - } -} diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent3.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent3.java deleted file mode 100644 index 5f4e7f3..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent3.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.canal.client.annotation.CanalEventListener; -import com.schbrain.canal.client.annotation.InsertListenPoint; -import com.schbrain.canal.client.annotation.UpdateListenPoint; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -//@CanalEventListener -public class MyCanalEvent3 { - - @Autowired - private UserService userService; - - @InsertListenPoint(destination = "kp_user",schema = {"kp_user"},table={"wechat_user"}) - public void onInsert(CanalEntry.Header header, CanalEntry.RowData rowData) { - String user = userService.getUser(); - System.out.println("MyCanalEvent3======"+header.getSchemaName()+":"+header.getTableName()+":"+"onInsert,user:+"+user); - } - - @UpdateListenPoint(destination = "kp_user",schema = {"kp_user"},table={"wechat_user"}) - public void onUpdate(CanalEntry.Header header, CanalEntry.RowData rowData) { - System.out.println("MyCanalEvent3======"+header.getSchemaName()+":"+header.getTableName()+":"+"onUpdate"); - } -} diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent4.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent4.java deleted file mode 100644 index 7880ce6..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent4.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.bean.User; -import com.schbrain.canal.client.annotation.TableFilter; -import com.schbrain.canal.client.event.SimpleResolverCanalEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -//@Service("myCanalEvent4") -//@TableFilter(table = "wechat_user",schame = "kp_user") -@Slf4j -public class MyCanalEvent4 extends SimpleResolverCanalEvent { - - @Override - public void onInsert(CanalEntry.Header header, User user) { - String s = JSONObject.toJSONString(user); - log.info("onInsert：{}",s); - } - - @Override - public void onUpdate(CanalEntry.Header header, User before, User after) { - String s = JSONObject.toJSONString(before); - String b = JSONObject.toJSONString(after); - log.info("onUpdate,before:{},after:{}",s,b); - } - - @Override - public void onDelete(CanalEntry.Header header, User user) { - String s = JSONObject.toJSONString(user); - log.info("onDelete：{}",s); - } -} diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent5.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent5.java deleted file mode 100644 index 9ef4cae..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent5.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.bean.User; -import com.schbrain.canal.client.annotation.TableFilter; -import com.schbrain.canal.client.event.ResolverCanalEvent; -import com.schbrain.canal.client.event.SimpleResolverCanalEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -//@Service("myCanalEvent5") -//@TableFilter(table = "wechat_user",schame = "kp_user") -@Slf4j -public class MyCanalEvent5 implements ResolverCanalEvent { - - @Override - public void onInsert(CanalEntry.Header header, User user) { - String s = JSONObject.toJSONString(user); - log.info("onInsert：{}",s); - } - - @Override - public void onUpdate(CanalEntry.Header header, User before, User after) { - String s = JSONObject.toJSONString(before); - String b = JSONObject.toJSONString(after); - log.info("onUpdate,before:{},after:{}",s,b); - } - - @Override - public void onDelete(CanalEntry.Header header, User user) { - String s = JSONObject.toJSONString(user); - log.info("onDelete：{}",s); - } -} diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent6.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent6.java deleted file mode 100644 index 70b1c45..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent6.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.bean.User; -import com.schbrain.canal.client.annotation.TableFilter; -import com.schbrain.canal.client.event.ResolverCanalEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -@Slf4j -//@Service("myCanalEvent6") -//@TableFilter(table = "wechat_user",schame = "kp_user") -public class MyCanalEvent6 extends MyCanalEvent4 { - - @Override - public void onInsert(CanalEntry.Header header, User user) { - String s = JSONObject.toJSONString(user); - log.info("onInsert：{}",s); - } - - @Override - public void onUpdate(CanalEntry.Header header, User before, User after) { - String s = JSONObject.toJSONString(before); - String b = JSONObject.toJSONString(after); - log.info("onUpdate,before:{},after:{}",s,b); - } - - @Override - public void onDelete(CanalEntry.Header header, User user) { - String s = JSONObject.toJSONString(user); - log.info("onDelete：{}",s); - } -} diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent7.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent7.java deleted file mode 100644 index cb0f976..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent7.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.bean.User; -import com.schbrain.canal.client.annotation.TableFilter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -@Slf4j -//@Service("myCanalEvent7") -//@TableFilter(table = "wechat_user",schame = "kp_user") -public class MyCanalEvent7 extends MyCanalEvent6 { - - @Override - public void onInsert(CanalEntry.Header header, User user) { - String s = JSONObject.toJSONString(user); - log.info("onInsert：{}",s); - } - - @Override - public void onUpdate(CanalEntry.Header header, User before, User after) { - String s = JSONObject.toJSONString(before); - String b = JSONObject.toJSONString(after); - log.info("onUpdate,before:{},after:{}",s,b); - } - - @Override - public void onDelete(CanalEntry.Header header, User user) { - String s = JSONObject.toJSONString(user); - log.info("onDelete：{}",s); - } -} diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent8.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent8.java deleted file mode 100644 index f876b12..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent8.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.bean.User; -import com.schbrain.canal.client.annotation.TableFilter; -import com.schbrain.canal.client.event.SimpleMapCanalEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -@Slf4j -@Service("myCanalEvent8") -@TableFilter(table = "wechat_user",schame = "kp_user") -public class MyCanalEvent8 extends SimpleMapCanalEvent { - - @Override - public void onInsert(CanalEntry.Header header, Map user) { - String s = JSONObject.toJSONString(user); - log.info("onInsert：{}",s); - } - - @Override - public void onUpdate(CanalEntry.Header header, Map before, Map after) { - String s = JSONObject.toJSONString(before); - String b = JSONObject.toJSONString(after); - log.info("onUpdate,before:{},after:{}",s,b); - } - - @Override - public void onDelete(CanalEntry.Header header, Map user) { - String s = JSONObject.toJSONString(user); - log.info("onDelete：{}",s); - } -} diff --git a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent9.java b/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent9.java deleted file mode 100644 index f447c67..0000000 --- a/schbrain-canal-web/src/main/java/com/schbrain/web/MyCanalEvent9.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.schbrain.web; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.otter.canal.protocol.CanalEntry; -import com.schbrain.canal.client.annotation.TableFilter; -import com.schbrain.canal.client.event.MapCanalEvent; -import com.schbrain.canal.client.event.SimpleMapCanalEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @author zhuyf - * @date 2022/6/16 - */ -@Slf4j -@Service("myCanalEvent9") -@TableFilter(table = "wechat_user",schame = "kp_user") -public class MyCanalEvent9 implements MapCanalEvent { - - @Override - public void onInsert(CanalEntry.Header header, Map user) { - String s = JSONObject.toJSONString(user); - log.info("onInsert：{}",s); - } - - @Override - public void onUpdate(CanalEntry.Header header, Map before, Map after) { - String s = JSONObject.toJSONString(before); - String b = JSONObject.toJSONString(after); - log.info("onUpdate,before:{},after:{}",s,b); - } - - @Override - public void onDelete(CanalEntry.Header header, Map user) { - String s = JSONObject.toJSONString(user); - log.info("onDelete：{}",s); - } -} diff --git a/schbrain-canal-web/src/main/resources/application.properties b/schbrain-canal-web/src/main/resources/application.properties index 13be8d7..8c08396 100644 --- a/schbrain-canal-web/src/main/resources/application.properties +++ b/schbrain-canal-web/src/main/resources/application.properties @@ -1,3 +1,5 @@ +spring.application.name = test-canal + canal.client.instances.kp_user.addresses=192.168.36.66:11111 canal.client.instances.kp_user.username= canal.client.instances.kp_user.password= @@ -5,7 +7,7 @@ canal.client.instances.kp_user.retryCount=10 canal.client.instances.kp_user.zkHosts=192.168.22.22:2181,192.168.22.26:2181,192.168.22.21:2181 -canal.client.instances.kp_user.addresses=canal-server-stable-0.canal-server-discovery-svc-stable.devops.svc.cluster.local:11111,canal-server-stable-1.canal-server-discovery-svc-stable.devops.svc.cluster.local:11111,canal-server-stable-2.canal-server-discovery-svc-stable.devops.svc.cluster.local:11111 +#canal.client.instances.kp_user.addresses=canal-server-stable-0.canal-server-discovery-svc-stable.devops.svc.cluster.local:11111,canal-server-stable-1.canal-server-discovery-svc-stable.devops.svc.cluster.local:11111,canal-server-stable-2.canal-server-discovery-svc-stable.devops.svc.cluster.local:11111 -- GitLab