diff --git a/smtweb-framework/canal/client/src/main/resources/client.properties b/smtweb-framework/canal/client/src/main/resources/client.properties
index 61fb744..8da493c 100644
--- a/smtweb-framework/canal/client/src/main/resources/client.properties
+++ b/smtweb-framework/canal/client/src/main/resources/client.properties
@@ -9,7 +9,7 @@ canal.server.port=11111
canal.server.username=
canal.server.password=
# 数据库匹配规则.*\\..*, scmz\\..*
-canal.server.filter=pgzx\\..*
+canal.server.filter=pgzx.*\\..*
# 文件存放路径 E:/canalFile
canal.file.path=/data/canalFile
# mysql、dmsql、kbsql、oracle
diff --git a/smtweb-framework/canal/file/pom.xml b/smtweb-framework/canal/file/pom.xml
index 8284aa1..0f2a8c6 100644
--- a/smtweb-framework/canal/file/pom.xml
+++ b/smtweb-framework/canal/file/pom.xml
@@ -12,6 +12,7 @@
cc.smtweb
canal.file
1.1.5
+ war
1.8
@@ -28,13 +29,19 @@
test
-
org.springframework.boot
- spring-boot-devtools
- true
+ spring-boot-starter-tomcat
+ provided
+
+
+
diff --git a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileApplication.java b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileApplication.java
index 19d91bd..24b4e7c 100644
--- a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileApplication.java
+++ b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileApplication.java
@@ -2,12 +2,21 @@ package cc.smtweb.system.canal.file;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@SpringBootApplication
-public class CanalFileApplication {
+@ServletComponentScan
+public class CanalFileApplication extends SpringBootServletInitializer {
- public static void main(String[] args) {
- SpringApplication.run(CanalFileApplication.class, args);
- }
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+ return builder.sources(CanalFileApplication.class);
+ }
+
+ public static void main(String[] args) {
+ SpringApplication.run(CanalFileApplication.class, args);
+ }
}
diff --git a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java
index 89967e4..4f71826 100644
--- a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java
+++ b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java
@@ -46,7 +46,7 @@ public abstract class AbstractFileWork {
path = path + "/";
}
path = path + "increment/";
- log.debug("[解析canal文件] path:" + path);
+ log.debug("[解析canal文件]:::path:" + path);
File dir = new File(path);
File[] fs = dir.listFiles(new FileFilter() {
@Override
@@ -57,7 +57,7 @@ public abstract class AbstractFileWork {
if (fs == null) return;
List files = Arrays.asList(fs);
Collections.sort(files, (o1, o2) -> StringUtil.chineseCompare(o1.getName(), o2.getName()));
- log.debug("[解析canal文件] size:" + files.size());
+ log.debug("[解析canal文件]:::size:" + files.size());
for (File f : files) {
try {
//为保证数据一致性,发现错误,不能继续,卡在这
@@ -75,7 +75,7 @@ public abstract class AbstractFileWork {
FileUtil.copyFile(f, path + "/bak/" + DateUtil.getNowYm() + "/" + f.getName(), true);
} catch (Exception e) {
//出错了跳出,避免数据遗失
- log.error("[解析canal文件] file:" + f.getName() + " 写入数据失败", e);
+ log.error("[解析canal文件]:::file:" + f.getName() + " 写入数据失败", e);
break;
}
}
@@ -116,7 +116,7 @@ public abstract class AbstractFileWork {
deleteSize++;
}
}
- log.debug("[解析canal文件] file:" + file.getName() + " insert size:[" + insertSize + "] update size:[" + updateSize + "] delete size:[" + deleteSize + "] create size:[" + createSize + "] alter size:[" + alterSize + "]");
+ log.debug("[解析canal文件]:::file:" + file.getName() + " insert size:[" + insertSize + "] update size:[" + updateSize + "] delete size:[" + deleteSize + "] create size:[" + createSize + "] alter size:[" + alterSize + "]");
}
protected abstract String getDbType();
@@ -125,12 +125,20 @@ public abstract class AbstractFileWork {
protected abstract void doAlterSql(CanalVO canalVO);
+ protected String getSchemaName(CanalVO canalVO) {
+ return "";
+ }
+
protected void doInsertSql(CanalVO canalVO) {
Map data = canalVO.getData();
Set fields = data.keySet();
StringBuilder sql = new StringBuilder();
List