Skip to content

Commit 9de7dc3

Browse files
authored
[ISSUE apache#5050] prepare for createTask, verify data (apache#5051)
* fix checkstyle and license * more admin * more admin * more admin * fix license and checkstyle * fix checkstyle * fix region sql type
1 parent eec5bea commit 9de7dc3

File tree

77 files changed

+1770
-667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1770
-667
lines changed

eventmesh-admin-server/conf/eventmesh.sql

+59-28
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
-- specific language governing permissions and limitations
1616
-- under the License.
1717

18-
-- --------------------------------------------------------
19-
-- 主机: 127.0.0.1
20-
-- 服务器版本: 8.0.36 - MySQL Community Server - GPL
21-
-- 服务器操作系统: Win64
22-
-- HeidiSQL 版本: 11.3.0.6295
23-
-- --------------------------------------------------------
24-
2518
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
2619
/*!40101 SET NAMES utf8 */;
2720
/*!50503 SET NAMES utf8mb4 */;
@@ -37,11 +30,12 @@ USE `eventmesh`;
3730
-- 导出 表 eventmesh.event_mesh_data_source 结构
3831
CREATE TABLE IF NOT EXISTS `event_mesh_data_source` (
3932
`id` int unsigned NOT NULL AUTO_INCREMENT,
40-
`dataType` int unsigned NOT NULL,
33+
`dataType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
4134
`description` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
4235
`configuration` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
43-
`createUid` int NOT NULL,
44-
`updateUid` int NOT NULL,
36+
`region` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
37+
`createUid` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
38+
`updateUid` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
4539
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
4640
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
4741
PRIMARY KEY (`id`) USING BTREE
@@ -51,47 +45,51 @@ CREATE TABLE IF NOT EXISTS `event_mesh_data_source` (
5145

5246
-- 导出 表 eventmesh.event_mesh_job_info 结构
5347
CREATE TABLE IF NOT EXISTS `event_mesh_job_info` (
54-
`jobID` int unsigned NOT NULL AUTO_INCREMENT,
55-
`name` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
56-
`transportType` int unsigned DEFAULT NULL COMMENT 'JobTransportType',
57-
`sourceData` int unsigned DEFAULT NULL COMMENT 'data_source表',
58-
`targetData` int unsigned DEFAULT NULL,
59-
`state` tinyint unsigned NOT NULL COMMENT 'JobState',
60-
`jobType` tinyint unsigned NOT NULL COMMENT 'connector,mesh,func,...',
61-
`createUid` int unsigned NOT NULL,
62-
`updateUid` int unsigned NOT NULL,
48+
`id` int unsigned NOT NULL AUTO_INCREMENT,
49+
`jobID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
50+
`desc` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
51+
`taskID` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
52+
`transportType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
53+
`sourceData` int NOT NULL DEFAULT '0',
54+
`targetData` int NOT NULL DEFAULT '0',
55+
`state` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
56+
`jobType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
57+
`fromRegion` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
58+
`createUid` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
59+
`updateUid` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
6360
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
6461
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
65-
PRIMARY KEY (`jobID`) USING BTREE
62+
PRIMARY KEY (`id`) USING BTREE,
63+
UNIQUE KEY `jobID` (`jobID`)
6664
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
6765

6866
-- 数据导出被取消选择。
6967

7068
-- 导出 表 eventmesh.event_mesh_mysql_position 结构
7169
CREATE TABLE IF NOT EXISTS `event_mesh_mysql_position` (
7270
`id` int unsigned NOT NULL AUTO_INCREMENT,
73-
`jobID` int unsigned NOT NULL,
71+
`jobID` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
7472
`serverUUID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
7573
`address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
7674
`position` bigint DEFAULT NULL,
7775
`gtid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
7876
`currentGtid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
7977
`timestamp` bigint DEFAULT NULL,
80-
`journalName` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
78+
`journalName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
8179
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
8280
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
8381
PRIMARY KEY (`id`),
8482
UNIQUE KEY `jobID` (`jobID`)
85-
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
83+
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
8684

8785
-- 数据导出被取消选择。
8886

8987
-- 导出 表 eventmesh.event_mesh_position_reporter_history 结构
9088
CREATE TABLE IF NOT EXISTS `event_mesh_position_reporter_history` (
9189
`id` bigint NOT NULL AUTO_INCREMENT,
92-
`job` int NOT NULL,
90+
`job` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
9391
`record` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
94-
`address` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
92+
`address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
9593
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
9694
PRIMARY KEY (`id`),
9795
KEY `job` (`job`),
@@ -105,8 +103,8 @@ CREATE TABLE IF NOT EXISTS `event_mesh_runtime_heartbeat` (
105103
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
106104
`adminAddr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
107105
`runtimeAddr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
108-
`jobID` int unsigned DEFAULT NULL,
109-
`reportTime` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'runtime本地上报时间',
106+
`jobID` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
107+
`reportTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'runtime本地上报时间',
110108
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
111109
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
112110
PRIMARY KEY (`id`),
@@ -119,7 +117,7 @@ CREATE TABLE IF NOT EXISTS `event_mesh_runtime_heartbeat` (
119117
-- 导出 表 eventmesh.event_mesh_runtime_history 结构
120118
CREATE TABLE IF NOT EXISTS `event_mesh_runtime_history` (
121119
`id` bigint NOT NULL AUTO_INCREMENT,
122-
`job` int NOT NULL,
120+
`job` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
123121
`address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
124122
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
125123
PRIMARY KEY (`id`),
@@ -128,6 +126,39 @@ CREATE TABLE IF NOT EXISTS `event_mesh_runtime_history` (
128126

129127
-- 数据导出被取消选择。
130128

129+
-- 导出 表 eventmesh.event_mesh_task_info 结构
130+
CREATE TABLE IF NOT EXISTS `event_mesh_task_info` (
131+
`id` int unsigned NOT NULL AUTO_INCREMENT,
132+
`taskID` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
133+
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
134+
`desc` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
135+
`state` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'TaskState',
136+
`fromRegion` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
137+
`createUid` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
138+
`updateUid` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
139+
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
140+
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
141+
PRIMARY KEY (`id`) USING BTREE,
142+
UNIQUE KEY `taskID` (`taskID`)
143+
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
144+
145+
-- 数据导出被取消选择。
146+
147+
-- 导出 表 eventmesh.event_mesh_verify 结构
148+
CREATE TABLE IF NOT EXISTS `event_mesh_verify` (
149+
`id` int NOT NULL,
150+
`taskID` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
151+
`recordID` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
152+
`recordSig` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
153+
`connectorName` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
154+
`connectorStage` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
155+
`position` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
156+
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
157+
PRIMARY KEY (`id`)
158+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
159+
160+
-- 数据导出被取消选择。
161+
131162
/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
132163
/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
133164
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
92

10-
http://www.apache.org/licenses/LICENSE-2.0
3+
<!--
4+
* Licensed to the Apache Software Foundation (ASF) under one or more
5+
* contributor license agreements. See the NOTICE file distributed with
6+
* this work for additional information regarding copyright ownership.
7+
* The ASF licenses this file to You under the Apache License, Version 2.0
8+
* (the "License"); you may not use this file except in compliance with
9+
* the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
-->
1120

12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
1821
<!DOCTYPE mapper
1922
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
2023
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
2124
<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshDataSourceMapper">
2225

2326
<resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource">
2427
<id property="id" column="id" jdbcType="INTEGER"/>
25-
<result property="dataType" column="dataType" jdbcType="INTEGER"/>
28+
<result property="dataType" column="dataType" jdbcType="VARCHAR"/>
2629
<result property="description" column="description" jdbcType="VARCHAR"/>
2730
<result property="configuration" column="configuration" jdbcType="VARCHAR"/>
28-
<result property="createUid" column="createUid" jdbcType="INTEGER"/>
29-
<result property="updateUid" column="updateUid" jdbcType="INTEGER"/>
31+
<result property="region" column="region" jdbcType="VARCHAR"/>
32+
<result property="createUid" column="createUid" jdbcType="VARCHAR"/>
33+
<result property="updateUid" column="updateUid" jdbcType="VARCHAR"/>
3034
<result property="createTime" column="createTime" jdbcType="TIMESTAMP"/>
3135
<result property="updateTime" column="updateTime" jdbcType="TIMESTAMP"/>
3236
</resultMap>
3337

3438
<sql id="Base_Column_List">
35-
id,dataType,address,
36-
description,configuration,createUid,
37-
updateUid,createTime,updateTime
39+
id,dataType,description,
40+
configuration,region,createUid,updateUid,
41+
createTime,updateTime
3842
</sql>
3943
</mapper>
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,49 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
92

10-
http://www.apache.org/licenses/LICENSE-2.0
3+
<!--
4+
* Licensed to the Apache Software Foundation (ASF) under one or more
5+
* contributor license agreements. See the NOTICE file distributed with
6+
* this work for additional information regarding copyright ownership.
7+
* The ASF licenses this file to You under the Apache License, Version 2.0
8+
* (the "License"); you may not use this file except in compliance with
9+
* the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
-->
1120

12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
1821
<!DOCTYPE mapper
1922
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
2023
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
2124
<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshJobInfoMapper">
2225

2326
<resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo">
24-
<id property="jobID" column="jobID" jdbcType="INTEGER"/>
25-
<result property="name" column="name" jdbcType="VARCHAR"/>
26-
<result property="transportType" column="transportType" jdbcType="INTEGER"/>
27+
<id property="id" column="id" jdbcType="INTEGER"/>
28+
<result property="jobID" column="jobID" jdbcType="VARCHAR"/>
29+
<result property="desc" column="desc" jdbcType="VARCHAR"/>
30+
<result property="taskID" column="taskID" jdbcType="VARCHAR"/>
31+
<result property="transportType" column="transportType" jdbcType="VARCHAR"/>
2732
<result property="sourceData" column="sourceData" jdbcType="INTEGER"/>
2833
<result property="targetData" column="targetData" jdbcType="INTEGER"/>
29-
<result property="state" column="state" jdbcType="TINYINT"/>
30-
<result property="jobType" column="jobType" jdbcType="TINYINT"/>
31-
<result property="createUid" column="createUid" jdbcType="INTEGER"/>
32-
<result property="updateUid" column="updateUid" jdbcType="INTEGER"/>
34+
<result property="state" column="state" jdbcType="VARCHAR"/>
35+
<result property="jobType" column="jobType" jdbcType="VARCHAR"/>
36+
<result property="fromRegion" column="fromRegion" jdbcType="VARCHAR"/>
37+
<result property="createUid" column="createUid" jdbcType="VARCHAR"/>
38+
<result property="updateUid" column="updateUid" jdbcType="VARCHAR"/>
3339
<result property="createTime" column="createTime" jdbcType="TIMESTAMP"/>
3440
<result property="updateTime" column="updateTime" jdbcType="TIMESTAMP"/>
3541
</resultMap>
3642

3743
<sql id="Base_Column_List">
38-
jobID,name,transportType,
39-
sourceData,targetData,state,
40-
runtimeType,createUid,
41-
updateUid,createTime,updateTime
44+
id,jobID,desc,
45+
taskID,transportType,sourceData,
46+
targetData,state,jobType,
47+
fromRegion,createTime,updateTime
4248
</sql>
4349
</mapper>
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,46 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
92

10-
http://www.apache.org/licenses/LICENSE-2.0
3+
<!--
4+
* Licensed to the Apache Software Foundation (ASF) under one or more
5+
* contributor license agreements. See the NOTICE file distributed with
6+
* this work for additional information regarding copyright ownership.
7+
* The ASF licenses this file to You under the Apache License, Version 2.0
8+
* (the "License"); you may not use this file except in compliance with
9+
* the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
-->
1120

12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
1821
<!DOCTYPE mapper
19-
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
20-
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
22+
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
23+
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
2124
<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshMysqlPositionMapper">
2225

2326
<resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition">
24-
<id property="id" column="id" jdbcType="INTEGER"/>
25-
<result property="jobID" column="jobID" jdbcType="INTEGER"/>
26-
<result property="serverUUID" column="serverUUID" jdbcType="VARCHAR"/>
27-
<result property="address" column="address" jdbcType="VARCHAR"/>
28-
<result property="position" column="position" jdbcType="BIGINT"/>
29-
<result property="gtid" column="gtid" jdbcType="VARCHAR"/>
30-
<result property="currentGtid" column="currentGtid" jdbcType="VARCHAR"/>
31-
<result property="timestamp" column="timestamp" jdbcType="BIGINT"/>
32-
<result property="journalName" column="journalName" jdbcType="VARCHAR"/>
33-
<result property="createTime" column="createTime" jdbcType="TIMESTAMP"/>
34-
<result property="updateTime" column="updateTime" jdbcType="TIMESTAMP"/>
27+
<id property="id" column="id" jdbcType="INTEGER"/>
28+
<result property="jobID" column="jobID" jdbcType="VARCHAR"/>
29+
<result property="serverUUID" column="serverUUID" jdbcType="VARCHAR"/>
30+
<result property="address" column="address" jdbcType="VARCHAR"/>
31+
<result property="position" column="position" jdbcType="BIGINT"/>
32+
<result property="gtid" column="gtid" jdbcType="VARCHAR"/>
33+
<result property="currentGtid" column="currentGtid" jdbcType="VARCHAR"/>
34+
<result property="timestamp" column="timestamp" jdbcType="BIGINT"/>
35+
<result property="journalName" column="journalName" jdbcType="VARCHAR"/>
36+
<result property="createTime" column="createTime" jdbcType="TIMESTAMP"/>
37+
<result property="updateTime" column="updateTime" jdbcType="TIMESTAMP"/>
3538
</resultMap>
3639

3740
<sql id="Base_Column_List">
38-
id
39-
,jobID,serverUUID,address,
40-
position,gtid,currentGtid,timestamp,journalName,
41+
id,jobID,serverUUID,
42+
address,position,gtid,
43+
currentGtid,timestamp,journalName,
4144
createTime,updateTime
4245
</sql>
4346
</mapper>

0 commit comments

Comments
 (0)