Merge remote-tracking branch 'origin/4.0' into 4.0

smtweb-framework/canal/client/src/main/resources/client.properties

@@ -9,9 +9,9 @@ canal.server.port=11111
 canal.server.username=
 canal.server.password=
 # 数据库匹配规则.*\\..*, scmz\\..*
-canal.server.filter=tzrs\\..*
+canal.server.filter=pgzx\\..*
 # 文件存放路径 E:/canalFile
-canal.file.path=E:/canalFile
+canal.file.path=/data/canalFile
 # mysql、dmsql、kbsql、oracle
 
 

smtweb-framework/canal/server/src/main/resources/example/instance.properties

@@ -6,7 +6,7 @@ canal.instance.mysql.slaveId=2
 canal.instance.gtidon=false
 # 主库信息
 # 主库地址及端口
-canal.instance.master.address=172.28.123.25:3306
+canal.instance.master.address=127.0.0.1:3306
 #canal.instance.master.journal.name=
 #canal.instance.master.position=
 #canal.instance.master.timestamp=
@@ -30,14 +30,14 @@ canal.instance.tsdb.enable=true
 
 # username/password
 canal.instance.dbUsername=root
-canal.instance.dbPassword=root
+canal.instance.dbPassword=Jjkj@2022
 canal.instance.connectionCharset = UTF-8
 # enable druid Decrypt database password
 canal.instance.enableDruid=false
 #canal.instance.pwdPublicKey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALK4BUxdDltRRE5/zXpVEVPUgunvscYFtEip3pmLlhrWpacX7y7GCMo2/JM6LeHmiiNdH1FWgGCpUfircSwlWKUCAwEAAQ==
 
 # table regex
-canal.instance.filter.regex=tzrs\\..*
+canal.instance.filter.regex=pgzx\\..*
 # table black regex
 canal.instance.filter.black.regex=mysql\\.slave_.*
 # table field filter(format: schema1.tableName1:field1/field2,schema2.tableName2:field1/field2)