diff --git a/smtweb-framework/canal/client/canal.example.iml b/smtweb-framework/canal/client/canal.example.iml
new file mode 100644
index 0000000..4dce082
--- /dev/null
+++ b/smtweb-framework/canal/client/canal.example.iml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConfiguration.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConfiguration.java
index ad1b7b6..d90b829 100644
--- a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConfiguration.java
+++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConfiguration.java
@@ -16,6 +16,6 @@ public class ClientConfiguration {
*/
@Bean
public ControllerConfig clientConfiguration() {
- return new ControllerConfig("canalClient", "cc.smtweb.system.canal.client", null);
+ return new ControllerConfig("canalClient", "cc.smtweb.system.canal.example", null);
}
}
diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java
index f750878..58c58a8 100644
--- a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java
+++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java
@@ -27,11 +27,13 @@ public class ClientStartedListener implements IStartListener {
@Override
public void run() {
+ if (!SwConsts.SysParam.enableCanal) return;
ClientInstance.getInstance().start();
}
@Override
public void close() {
+ if (!SwConsts.SysParam.enableCanal) return;
ClientInstance.getInstance().stop();
}
}
diff --git a/smtweb-framework/canal/server/canal.deployer.iml b/smtweb-framework/canal/server/canal.deployer.iml
new file mode 100644
index 0000000..70b374f
--- /dev/null
+++ b/smtweb-framework/canal/server/canal.deployer.iml
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/smtweb-framework/canal/server/pom.xml b/smtweb-framework/canal/server/pom.xml
index 6835884..c2f91c4 100644
--- a/smtweb-framework/canal/server/pom.xml
+++ b/smtweb-framework/canal/server/pom.xml
@@ -135,7 +135,7 @@
jar-with-dependencies
- ${project.basedir}/target/canal/plugin
+ ${project.basedir}/target/canal-deployer/plugin
diff --git a/smtweb-framework/canal/server/src/main/assembly/release.xml b/smtweb-framework/canal/server/src/main/assembly/release.xml
index 601328e..f01ecd9 100644
--- a/smtweb-framework/canal/server/src/main/assembly/release.xml
+++ b/smtweb-framework/canal/server/src/main/assembly/release.xml
@@ -43,7 +43,7 @@
- ${project.basedir}/target/canal/plugin
+ ${project.basedir}/target/canal-deployer/plugin
/plugin/
diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConfiguration.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConfiguration.java
index 5519782..344a5c3 100644
--- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConfiguration.java
+++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConfiguration.java
@@ -16,6 +16,6 @@ public class CanalConfiguration {
*/
@Bean
public ControllerConfig canalConfiguration() {
- return new ControllerConfig("canalServer", "cc.smtweb.system.canal.server", null);
+ return new ControllerConfig("canalServer", "cc.smtweb.system.canal.deployer", null);
}
}
diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java
index 2721d91..5c11711 100644
--- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java
+++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java
@@ -29,6 +29,7 @@ public class CanalStartedListener implements IStartListener {
@Override
public void run() {
+ if (!SwConsts.SysParam.enableCanal) return;
SysThreadPool.getInstance().addTask(new SysThreadWorker("canal server") {
@Override
public void localWork() throws Exception {
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java
index e232480..6ed9dd0 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwConsts.java
@@ -15,6 +15,8 @@ public interface SwConsts {
public static int machineId;
//是否执行定时任务
public static boolean enableJob = false;
+ //是否启用canal
+ public static boolean enableCanal = false;
}
//事件常量
class EventConst {