From 58289d4710c0e97f84d6d80aa2ae5cc66167a93b Mon Sep 17 00:00:00 2001 From: AE86 <836391306@qq.com> Date: Wed, 8 Sep 2021 00:11:16 +0800 Subject: [PATCH 1/6] catch es error --- .../src/main/java/org/dbsyncer/connector/es/ESConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java index 3602a2f9..ccce3aa5 100644 --- a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java +++ b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java @@ -194,7 +194,7 @@ public final class ESConnector extends AbstractConnector implements Connector Date: Wed, 8 Sep 2021 00:23:57 +0800 Subject: [PATCH 2/6] check es pk --- .../java/org/dbsyncer/connector/Connector.java | 9 ++------- .../org/dbsyncer/connector/es/ESConnector.java | 14 ++++++++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/Connector.java b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/Connector.java index 061234bb..77f938e0 100644 --- a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/Connector.java +++ b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/Connector.java @@ -3,7 +3,6 @@ package org.dbsyncer.connector; import org.dbsyncer.common.model.Result; import org.dbsyncer.connector.config.*; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -105,9 +104,7 @@ public interface Connector { * @param commandConfig * @return */ - default Map getSourceCommand(CommandConfig commandConfig) { - return Collections.EMPTY_MAP; - } + Map getSourceCommand(CommandConfig commandConfig); /** * 获取目标源同步参数 @@ -115,7 +112,5 @@ public interface Connector { * @param commandConfig * @return */ - default Map getTargetCommand(CommandConfig commandConfig) { - return Collections.EMPTY_MAP; - } + Map getTargetCommand(CommandConfig commandConfig); } \ No newline at end of file diff --git a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java index ccce3aa5..f3cb325d 100644 --- a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java +++ b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java @@ -39,10 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -263,6 +260,15 @@ public final class ESConnector extends AbstractConnector implements Connector getTargetCommand(CommandConfig commandConfig) { + Table table = commandConfig.getTable(); + if(!CollectionUtils.isEmpty(table.getColumn())){ + getPrimaryKeyField(table.getColumn()); + } + return Collections.EMPTY_MAP; + } + private void genSearchSourceBuilder(SearchSourceBuilder builder, Map command) { // 查询字段 String fieldNamesJson = command.get(ConnectorConstant.OPERTION_QUERY); -- Gitee From 57140fc37d74adf32e5501081ad019997cda2955 Mon Sep 17 00:00:00 2001 From: AE86 <836391306@qq.com> Date: Thu, 9 Sep 2021 01:17:08 +0800 Subject: [PATCH 3/6] fix bit --- .../connector/database/setter/BitSetter.java | 27 +++++++++ .../dbsyncer/connector/enums/SetterEnum.java | 1 + .../deserializer/DatetimeV2Deserialize.java | 60 +++++++++++++++++++ .../deserializer/DeleteDeserializer.java | 24 ++++++++ .../deserializer/UpdateDeserializer.java | 24 ++++++++ .../mysql/deserializer/WriteDeserializer.java | 24 ++++++++ .../java/org/dbsyncer/manager/Manager.java | 2 - .../org/dbsyncer/manager/ManagerFactory.java | 5 -- 8 files changed, 160 insertions(+), 7 deletions(-) create mode 100644 dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/setter/BitSetter.java create mode 100644 dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DatetimeV2Deserialize.java create mode 100644 dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DeleteDeserializer.java create mode 100644 dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/UpdateDeserializer.java create mode 100644 dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/WriteDeserializer.java diff --git a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/setter/BitSetter.java b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/setter/BitSetter.java new file mode 100644 index 00000000..d3128eb7 --- /dev/null +++ b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/setter/BitSetter.java @@ -0,0 +1,27 @@ +package org.dbsyncer.connector.database.setter; + +import org.dbsyncer.connector.ConnectorException; +import org.dbsyncer.connector.database.AbstractSetter; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.BitSet; + +public class BitSetter extends AbstractSetter { + + @Override + protected void set(PreparedStatement ps, int i, byte[] val) throws SQLException { + ps.setBytes(i, val); + } + + @Override + protected void setIfValueTypeNotMatch(PreparedFieldMapper mapper, PreparedStatement ps, int i, int type, Object val) throws SQLException { + if (val instanceof BitSet) { + BitSet bitSet = (BitSet) val; + ps.setBytes(i, bitSet.toByteArray()); + return; + } + throw new ConnectorException(String.format("BitSetter can not find type [%s], val [%s]", type, val)); + } + +} \ No newline at end of file diff --git a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/enums/SetterEnum.java b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/enums/SetterEnum.java index 2bd31c15..1eb33e25 100644 --- a/dbsyncer-connector/src/main/java/org/dbsyncer/connector/enums/SetterEnum.java +++ b/dbsyncer-connector/src/main/java/org/dbsyncer/connector/enums/SetterEnum.java @@ -37,6 +37,7 @@ public enum SetterEnum { DECIMAL(Types.DECIMAL, new DecimalSetter()), DOUBLE(Types.DOUBLE, new DoubleSetter()), FLOAT(Types.FLOAT, new FloatSetter()), + BIT(Types.BIT, new BitSetter()), BLOB(Types.BLOB, new BlobSetter()), CLOB(Types.CLOB, new ClobSetter()), NCLOB(Types.NCLOB, new NClobSetter()), diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DatetimeV2Deserialize.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DatetimeV2Deserialize.java new file mode 100644 index 00000000..d9fae1c7 --- /dev/null +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DatetimeV2Deserialize.java @@ -0,0 +1,60 @@ +package org.dbsyncer.listener.mysql.deserializer; + +import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream; + +import java.io.IOException; +import java.io.Serializable; +import java.sql.Timestamp; +import java.time.LocalDateTime; + +public class DatetimeV2Deserialize { + + public Serializable deserializeDatetimeV2(int meta, ByteArrayInputStream inputStream) throws IOException { + long datetime = bigEndianLong(inputStream.read(5), 0, 5); + int yearMonth = bitSlice(datetime, 1, 17, 40); + int fsp = deserializeFractionalSeconds(meta, inputStream); + LocalDateTime time = LocalDateTime.of( + yearMonth / 13, + yearMonth % 13, + bitSlice(datetime, 18, 5, 40), + bitSlice(datetime, 23, 5, 40), + bitSlice(datetime, 28, 6, 40), + bitSlice(datetime, 34, 6, 40), + fsp / 1000 + ); + return Timestamp.valueOf(time); + } + + private long bigEndianLong(byte[] bytes, int offset, int length) { + long result = 0; + for (int i = offset; i < (offset + length); i++) { + byte b = bytes[i]; + result = (result << 8) | (b >= 0 ? (int) b : (b + 256)); + } + return result; + } + + private int deserializeFractionalSeconds(int meta, ByteArrayInputStream inputStream) throws IOException { + int length = (meta + 1) / 2; + if (length > 0) { + int fraction = bigEndianInteger(inputStream.read(length), 0, length); + return fraction * (int) Math.pow(100, 3 - length); + } + return 0; + } + + private int bigEndianInteger(byte[] bytes, int offset, int length) { + int result = 0; + for (int i = offset; i < (offset + length); i++) { + byte b = bytes[i]; + result = (result << 8) | (b >= 0 ? (int) b : (b + 256)); + } + return result; + } + + private int bitSlice(long value, int bitOffset, int numberOfBits, int payloadSize) { + long result = value >> payloadSize - (bitOffset + numberOfBits); + return (int) (result & ((1 << numberOfBits) - 1)); + } + +} diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DeleteDeserializer.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DeleteDeserializer.java new file mode 100644 index 00000000..0d3905d8 --- /dev/null +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DeleteDeserializer.java @@ -0,0 +1,24 @@ +package org.dbsyncer.listener.mysql.deserializer; + +import com.github.shyiko.mysql.binlog.event.TableMapEventData; +import com.github.shyiko.mysql.binlog.event.deserialization.UpdateRowsEventDataDeserializer; +import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream; + +import java.io.IOException; +import java.io.Serializable; +import java.util.Map; + +public class DeleteDeserializer extends UpdateRowsEventDataDeserializer { + + private DatetimeV2Deserialize datetimeV2Deserialize; + + public DeleteDeserializer(Map tableMapEventByTableId) { + super(tableMapEventByTableId); + datetimeV2Deserialize = new DatetimeV2Deserialize(); + } + + protected Serializable deserializeDatetimeV2(int meta, ByteArrayInputStream inputStream) throws IOException { + return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream); + } + +} diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/UpdateDeserializer.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/UpdateDeserializer.java new file mode 100644 index 00000000..fbbab14e --- /dev/null +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/UpdateDeserializer.java @@ -0,0 +1,24 @@ +package org.dbsyncer.listener.mysql.deserializer; + +import com.github.shyiko.mysql.binlog.event.TableMapEventData; +import com.github.shyiko.mysql.binlog.event.deserialization.UpdateRowsEventDataDeserializer; +import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream; + +import java.io.IOException; +import java.io.Serializable; +import java.util.Map; + +public class UpdateDeserializer extends UpdateRowsEventDataDeserializer { + + private DatetimeV2Deserialize datetimeV2Deserialize; + + public UpdateDeserializer(Map tableMapEventByTableId) { + super(tableMapEventByTableId); + datetimeV2Deserialize = new DatetimeV2Deserialize(); + } + + protected Serializable deserializeDatetimeV2(int meta, ByteArrayInputStream inputStream) throws IOException { + return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream); + } + +} diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/WriteDeserializer.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/WriteDeserializer.java new file mode 100644 index 00000000..300d8e47 --- /dev/null +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/WriteDeserializer.java @@ -0,0 +1,24 @@ +package org.dbsyncer.listener.mysql.deserializer; + +import com.github.shyiko.mysql.binlog.event.TableMapEventData; +import com.github.shyiko.mysql.binlog.event.deserialization.UpdateRowsEventDataDeserializer; +import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream; + +import java.io.IOException; +import java.io.Serializable; +import java.util.Map; + +public class WriteDeserializer extends UpdateRowsEventDataDeserializer { + + private DatetimeV2Deserialize datetimeV2Deserialize; + + public WriteDeserializer(Map tableMapEventByTableId) { + super(tableMapEventByTableId); + datetimeV2Deserialize = new DatetimeV2Deserialize(); + } + + protected Serializable deserializeDatetimeV2(int meta, ByteArrayInputStream inputStream) throws IOException { + return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream); + } + +} diff --git a/dbsyncer-manager/src/main/java/org/dbsyncer/manager/Manager.java b/dbsyncer-manager/src/main/java/org/dbsyncer/manager/Manager.java index 5a44cdeb..9f9fecd6 100644 --- a/dbsyncer-manager/src/main/java/org/dbsyncer/manager/Manager.java +++ b/dbsyncer-manager/src/main/java/org/dbsyncer/manager/Manager.java @@ -91,8 +91,6 @@ public interface Manager extends Executor { Config getConfig(String configId); - void removeConfig(String configId); - List getConfigAll(); // Data diff --git a/dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java b/dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java index 476c2363..452a64e9 100644 --- a/dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java +++ b/dbsyncer-manager/src/main/java/org/dbsyncer/manager/ManagerFactory.java @@ -230,11 +230,6 @@ public class ManagerFactory implements Manager, ApplicationListener return operationTemplate.queryObject(Config.class, configId); } - @Override - public void removeConfig(String configId) { - operationTemplate.remove(new OperationConfig(configId)); - } - @Override public List getConfigAll() { Config config = new Config(); -- Gitee From cfc3769757661b4fffd5db45033f5308d42461d4 Mon Sep 17 00:00:00 2001 From: AE86 <836391306@qq.com> Date: Thu, 16 Sep 2021 09:22:37 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmysql=20datatime=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=97=B6=E5=8C=BA=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbsyncer/listener/mysql/BinaryLogRemoteClient.java | 9 ++++++--- .../mysql/deserializer/DatetimeV2Deserialize.java | 2 +- .../listener/mysql/deserializer/DeleteDeserializer.java | 6 +++--- .../listener/mysql/deserializer/UpdateDeserializer.java | 2 +- .../listener/mysql/deserializer/WriteDeserializer.java | 6 +++--- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/BinaryLogRemoteClient.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/BinaryLogRemoteClient.java index 2afd7c55..681eb83a 100644 --- a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/BinaryLogRemoteClient.java +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/BinaryLogRemoteClient.java @@ -7,6 +7,9 @@ import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream; import com.github.shyiko.mysql.binlog.network.*; import com.github.shyiko.mysql.binlog.network.protocol.*; import com.github.shyiko.mysql.binlog.network.protocol.command.*; +import org.dbsyncer.listener.mysql.deserializer.DeleteDeserializer; +import org.dbsyncer.listener.mysql.deserializer.UpdateDeserializer; +import org.dbsyncer.listener.mysql.deserializer.WriteDeserializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -543,9 +546,9 @@ public class BinaryLogRemoteClient implements BinaryLogClient { eventDataDeserializers.put(EventType.UPDATE_ROWS, new UpdateRowsEventDataDeserializer(tableMapEventByTableId)); eventDataDeserializers.put(EventType.WRITE_ROWS, new WriteRowsEventDataDeserializer(tableMapEventByTableId)); eventDataDeserializers.put(EventType.DELETE_ROWS, new DeleteRowsEventDataDeserializer(tableMapEventByTableId)); - eventDataDeserializers.put(EventType.EXT_WRITE_ROWS, (new WriteRowsEventDataDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true)); - eventDataDeserializers.put(EventType.EXT_UPDATE_ROWS, (new UpdateRowsEventDataDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true)); - eventDataDeserializers.put(EventType.EXT_DELETE_ROWS, (new DeleteRowsEventDataDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true)); + eventDataDeserializers.put(EventType.EXT_WRITE_ROWS, (new WriteDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true)); + eventDataDeserializers.put(EventType.EXT_UPDATE_ROWS, (new UpdateDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true)); + eventDataDeserializers.put(EventType.EXT_DELETE_ROWS, (new DeleteDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true)); eventDataDeserializers.put(EventType.XID, new XidEventDataDeserializer()); if (simpleEventModel) { diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DatetimeV2Deserialize.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DatetimeV2Deserialize.java index d9fae1c7..7c05f6b4 100644 --- a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DatetimeV2Deserialize.java +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DatetimeV2Deserialize.java @@ -57,4 +57,4 @@ public class DatetimeV2Deserialize { return (int) (result & ((1 << numberOfBits) - 1)); } -} +} \ No newline at end of file diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DeleteDeserializer.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DeleteDeserializer.java index 0d3905d8..517bdcc7 100644 --- a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DeleteDeserializer.java +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/DeleteDeserializer.java @@ -1,14 +1,14 @@ package org.dbsyncer.listener.mysql.deserializer; import com.github.shyiko.mysql.binlog.event.TableMapEventData; -import com.github.shyiko.mysql.binlog.event.deserialization.UpdateRowsEventDataDeserializer; +import com.github.shyiko.mysql.binlog.event.deserialization.DeleteRowsEventDataDeserializer; import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream; import java.io.IOException; import java.io.Serializable; import java.util.Map; -public class DeleteDeserializer extends UpdateRowsEventDataDeserializer { +public class DeleteDeserializer extends DeleteRowsEventDataDeserializer { private DatetimeV2Deserialize datetimeV2Deserialize; @@ -21,4 +21,4 @@ public class DeleteDeserializer extends UpdateRowsEventDataDeserializer { return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream); } -} +} \ No newline at end of file diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/UpdateDeserializer.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/UpdateDeserializer.java index fbbab14e..11393d39 100644 --- a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/UpdateDeserializer.java +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/UpdateDeserializer.java @@ -21,4 +21,4 @@ public class UpdateDeserializer extends UpdateRowsEventDataDeserializer { return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream); } -} +} \ No newline at end of file diff --git a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/WriteDeserializer.java b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/WriteDeserializer.java index 300d8e47..8cb65fec 100644 --- a/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/WriteDeserializer.java +++ b/dbsyncer-listener/src/main/java/org/dbsyncer/listener/mysql/deserializer/WriteDeserializer.java @@ -1,14 +1,14 @@ package org.dbsyncer.listener.mysql.deserializer; import com.github.shyiko.mysql.binlog.event.TableMapEventData; -import com.github.shyiko.mysql.binlog.event.deserialization.UpdateRowsEventDataDeserializer; +import com.github.shyiko.mysql.binlog.event.deserialization.WriteRowsEventDataDeserializer; import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream; import java.io.IOException; import java.io.Serializable; import java.util.Map; -public class WriteDeserializer extends UpdateRowsEventDataDeserializer { +public class WriteDeserializer extends WriteRowsEventDataDeserializer { private DatetimeV2Deserialize datetimeV2Deserialize; @@ -21,4 +21,4 @@ public class WriteDeserializer extends UpdateRowsEventDataDeserializer { return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream); } -} +} \ No newline at end of file -- Gitee From 750c61f99c1c73de22fd4a36eefed46f553d06bb Mon Sep 17 00:00:00 2001 From: AE86 <836391306@qq.com> Date: Sat, 25 Sep 2021 23:10:31 +0800 Subject: [PATCH 5/6] upgrade version --- README.md | 4 ++-- dbsyncer-biz/pom.xml | 2 +- dbsyncer-cache/pom.xml | 2 +- dbsyncer-cluster/pom.xml | 2 +- dbsyncer-common/pom.xml | 2 +- dbsyncer-connector/pom.xml | 2 +- dbsyncer-listener/pom.xml | 2 +- dbsyncer-manager/pom.xml | 2 +- dbsyncer-monitor/pom.xml | 2 +- dbsyncer-parser/pom.xml | 2 +- dbsyncer-plugin/pom.xml | 2 +- dbsyncer-storage/pom.xml | 2 +- dbsyncer-web/pom.xml | 2 +- dbsyncer-web/src/main/resources/application.properties | 2 +- pom.xml | 2 +- version.cmd | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 4b0807da..8cc97250 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ DBSyncer是一款开源的数据同步中间件，提供Mysql、Oracle、SqlServ 最近计划 - kafka + kafka(设计中)、Redis @@ -58,7 +58,7 @@ DBSyncer是一款开源的数据同步中间件，提供Mysql、Oracle、SqlServ ## 安装配置 #### 步骤 1. 安装[JRE 1.8](https://www.oracle.com/java/technologies/jdk8-downloads.html)（省略详细） -2. 下载安装包[DBSyncer-1.0.0-Alpha.zip](https://gitee.com/ghi/dbsyncer/releases)（也可手动编译） +2. 下载安装包[DBSyncer-1.0.0-Beta.zip](https://gitee.com/ghi/dbsyncer/releases)（也可手动编译） 3. 解压安装包，Window执行bin/startup.bat，Linux执行bin/startup.sh 4. 打开浏览器访问：http://127.0.0.1:18686 5. 账号和密码：admin/admin diff --git a/dbsyncer-biz/pom.xml b/dbsyncer-biz/pom.xml index 9dc52c15..6ac03333 100644 --- a/dbsyncer-biz/pom.xml +++ b/dbsyncer-biz/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-biz diff --git a/dbsyncer-cache/pom.xml b/dbsyncer-cache/pom.xml index 6984088a..b29c2d6f 100644 --- a/dbsyncer-cache/pom.xml +++ b/dbsyncer-cache/pom.xml @@ -4,7 +4,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-cache diff --git a/dbsyncer-cluster/pom.xml b/dbsyncer-cluster/pom.xml index 20ab33af..83b37ddb 100644 --- a/dbsyncer-cluster/pom.xml +++ b/dbsyncer-cluster/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-cluster diff --git a/dbsyncer-common/pom.xml b/dbsyncer-common/pom.xml index 156ce23f..bcdedc6b 100644 --- a/dbsyncer-common/pom.xml +++ b/dbsyncer-common/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-common diff --git a/dbsyncer-connector/pom.xml b/dbsyncer-connector/pom.xml index 739dd653..29667f55 100644 --- a/dbsyncer-connector/pom.xml +++ b/dbsyncer-connector/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-connector diff --git a/dbsyncer-listener/pom.xml b/dbsyncer-listener/pom.xml index cadc3fba..51b7de4f 100644 --- a/dbsyncer-listener/pom.xml +++ b/dbsyncer-listener/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-listener diff --git a/dbsyncer-manager/pom.xml b/dbsyncer-manager/pom.xml index e6309b94..2572a22c 100644 --- a/dbsyncer-manager/pom.xml +++ b/dbsyncer-manager/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-manager diff --git a/dbsyncer-monitor/pom.xml b/dbsyncer-monitor/pom.xml index 8244c477..cd96be56 100644 --- a/dbsyncer-monitor/pom.xml +++ b/dbsyncer-monitor/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-monitor diff --git a/dbsyncer-parser/pom.xml b/dbsyncer-parser/pom.xml index bc888753..f440ba92 100644 --- a/dbsyncer-parser/pom.xml +++ b/dbsyncer-parser/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-parser diff --git a/dbsyncer-plugin/pom.xml b/dbsyncer-plugin/pom.xml index 9e675ea6..b8540cba 100644 --- a/dbsyncer-plugin/pom.xml +++ b/dbsyncer-plugin/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-plugin diff --git a/dbsyncer-storage/pom.xml b/dbsyncer-storage/pom.xml index 4c5897ae..8cd2d5f8 100644 --- a/dbsyncer-storage/pom.xml +++ b/dbsyncer-storage/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-storage diff --git a/dbsyncer-web/pom.xml b/dbsyncer-web/pom.xml index 391f867c..bffcee75 100644 --- a/dbsyncer-web/pom.xml +++ b/dbsyncer-web/pom.xml @@ -5,7 +5,7 @@ dbsyncer org.ghi - 1.1.2-Alpha + 1.1.3-Beta 4.0.0 dbsyncer-web diff --git a/dbsyncer-web/src/main/resources/application.properties b/dbsyncer-web/src/main/resources/application.properties index 0295ca2d..28fd52b3 100644 --- a/dbsyncer-web/src/main/resources/application.properties +++ b/dbsyncer-web/src/main/resources/application.properties @@ -23,7 +23,7 @@ management.endpoints.web.exposure.include=* management.endpoint.health.show-details=always management.health.elasticsearch.enabled=false info.app.name=DBSyncer -info.app.version=1.1.2-Alpha +info.app.version=1.1.3-Beta info.app.copyright=©2021 ${info.app.name}(${info.app.version}) #All < Trace < Debug < Info < Warn < Error < Fatal < OFF diff --git a/pom.xml b/pom.xml index 63abf411..0bd22164 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.ghi dbsyncer - 1.1.2-Alpha + 1.1.3-Beta pom dbsyncer https://gitee.com/ghi/dbsyncer diff --git a/version.cmd b/version.cmd index bf75de09..370943f9 100644 --- a/version.cmd +++ b/version.cmd @@ -1,6 +1,6 @@ @echo off -set APP_VERSION=1.1.2-Alpha +set APP_VERSION=1.1.3-Beta echo "Clean Project ..." call mvn clean -f pom.xml -- Gitee From 47c74cd1c75e6f643df580aa9f7f541db4d5f1c6 Mon Sep 17 00:00:00 2001 From: AE86 <836391306@qq.com> Date: Sat, 25 Sep 2021 23:17:52 +0800 Subject: [PATCH 6/6] fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cc97250..c5b9c8cd 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ DBSyncer是一款开源的数据同步中间件，提供Mysql、Oracle、SqlServ 连接器 数据源 目标源 - 支持版本 + 支持版本(包含以下) Mysql -- Gitee