From 14ee86bcd130fbb2acb04f97c5d9dba596b7610c Mon Sep 17 00:00:00 2001 From: inrgihc Date: Sun, 17 Sep 2023 00:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbswitch-admin-ui/src/views/about/me.vue | 17 ++- .../src/views/connection/driver.vue | 1 + .../src/views/connection/list.vue | 134 +++++++++++++----- .../src/views/task/assignment.vue | 123 +++++++++++----- dbswitch-admin-ui/src/views/task/create.vue | 46 ++++-- dbswitch-admin-ui/src/views/task/schedule.vue | 33 +++-- dbswitch-admin-ui/src/views/task/update.vue | 66 +++++++-- .../converter/AssignmentDetailConverter.java | 1 + .../privateapi/AssignmentController.java | 9 +- .../privateapi/ConnectionController.java | 8 +- .../request/AssignmentSearchRequest.java | 22 +++ .../request/DbConnectionSearchRequest.java | 2 + .../response/AssignmentDetailResponse.java | 3 + .../admin/service/AssignmentService.java | 7 +- .../admin/service/ConnectionService.java | 5 +- dbswitch-admin/src/main/resources/index.html | 2 +- .../app.9dc9b6fb7573c2e9456fa7a832cf0a9a.css | 2 + .../app.d32de86bf73d91875b8703ccf4df784b.css | 2 - ...p.d32de86bf73d91875b8703ccf4df784b.css.map | 1 - .../static/js/10.52c9cb61b5477d06570b.js | 2 + .../static/js/10.b9e09bc05c7d8239e93b.js | 2 - .../static/js/11.4f4f786a1368f729ad67.js | 2 + ...b7e0cba3.js => 12.e325228628d3c50a96e7.js} | 4 +- .../static/js/13.1a23a103b05b99d58001.js | 2 - .../static/js/13.e070a44a625afa974861.js | 2 + .../static/js/14.cf28f7dc3d2e1f1276e9.js | 2 - ...5e2703c1.js => 14.ebafac48d154df9f8737.js} | 4 +- .../static/js/15.29f439cdda1d78880f9c.js | 2 + .../static/js/15.c8f8271138d0a2e8e5cc.js | 2 - .../static/js/16.8aeafd6e382957be1c15.js | 2 + .../static/js/16.aeaac7f46732356168a8.js | 2 - .../static/js/17.830d0c7cf66ae4ca86c3.js | 2 + .../static/js/17.953b93ad4217ddda621f.js | 2 - ...5633541cd.js => 2.5d584a7e3f04041f0d4a.js} | 4 +- .../static/js/app.40072d5dbf0657cecde3.js | 2 + .../static/js/app.a7a6316fe14fe86c7a6f.js | 2 - .../js/manifest.0fda45902a101132fbc2.js | 2 + .../js/manifest.77cf875651e80e93b9d5.js | 2 - 38 files changed, 373 insertions(+), 155 deletions(-) create mode 100644 dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/model/request/AssignmentSearchRequest.java create mode 100644 dbswitch-admin/src/main/resources/static/css/app.9dc9b6fb7573c2e9456fa7a832cf0a9a.css delete mode 100644 dbswitch-admin/src/main/resources/static/css/app.d32de86bf73d91875b8703ccf4df784b.css delete mode 100644 dbswitch-admin/src/main/resources/static/css/app.d32de86bf73d91875b8703ccf4df784b.css.map create mode 100644 dbswitch-admin/src/main/resources/static/js/10.52c9cb61b5477d06570b.js delete mode 100644 dbswitch-admin/src/main/resources/static/js/10.b9e09bc05c7d8239e93b.js create mode 100644 dbswitch-admin/src/main/resources/static/js/11.4f4f786a1368f729ad67.js rename dbswitch-admin/src/main/resources/static/js/{11.c61c0ebee350b7e0cba3.js => 12.e325228628d3c50a96e7.js} (97%) delete mode 100644 dbswitch-admin/src/main/resources/static/js/13.1a23a103b05b99d58001.js create mode 100644 dbswitch-admin/src/main/resources/static/js/13.e070a44a625afa974861.js delete mode 100644 dbswitch-admin/src/main/resources/static/js/14.cf28f7dc3d2e1f1276e9.js rename dbswitch-admin/src/main/resources/static/js/{12.e59d78e330bd5e2703c1.js => 14.ebafac48d154df9f8737.js} (95%) create mode 100644 dbswitch-admin/src/main/resources/static/js/15.29f439cdda1d78880f9c.js delete mode 100644 dbswitch-admin/src/main/resources/static/js/15.c8f8271138d0a2e8e5cc.js create mode 100644 dbswitch-admin/src/main/resources/static/js/16.8aeafd6e382957be1c15.js delete mode 100644 dbswitch-admin/src/main/resources/static/js/16.aeaac7f46732356168a8.js create mode 100644 dbswitch-admin/src/main/resources/static/js/17.830d0c7cf66ae4ca86c3.js delete mode 100644 dbswitch-admin/src/main/resources/static/js/17.953b93ad4217ddda621f.js rename dbswitch-admin/src/main/resources/static/js/{2.e8530496bfc5633541cd.js => 2.5d584a7e3f04041f0d4a.js} (64%) create mode 100644 dbswitch-admin/src/main/resources/static/js/app.40072d5dbf0657cecde3.js delete mode 100644 dbswitch-admin/src/main/resources/static/js/app.a7a6316fe14fe86c7a6f.js create mode 100644 dbswitch-admin/src/main/resources/static/js/manifest.0fda45902a101132fbc2.js delete mode 100644 dbswitch-admin/src/main/resources/static/js/manifest.77cf875651e80e93b9d5.js diff --git a/dbswitch-admin-ui/src/views/about/me.vue b/dbswitch-admin-ui/src/views/about/me.vue index 7ab193c0..eb500aef 100644 --- a/dbswitch-admin-ui/src/views/about/me.vue +++ b/dbswitch-admin-ui/src/views/about/me.vue @@ -32,7 +32,7 @@ 基于JDBC的分批次读取源端数据库数据，并基于insert/copy方式将数据分批写入目的数据库。

- 支持有主键表的 增量变更同步 （变化数据计算Change Data Calculate）功能。 + 支持有主键表的"变化量"同步 （变化数据计算Change Data Calculate）功能。

@@ -49,7 +49,7 @@

- dbswitch提供异构关系数据库间的数据迁移同步，支持绝大多数关系型数据库，包括： + dbswitch提供异构关系数据库间的数据迁移同步，支持多种数据库，包括：

  • 甲骨文的Oracle @@ -75,13 +75,17 @@
  • 国产翰高数据库HighGo
  • 国产神通数据库Oscar -
    • +
  • 国产南大通用数据库GBase8a -
    • -
  • Apache Hive(只支持为源端) +
    • +
  • Apache Hive(基于JdbcStorageHandler)
  • SQLite3
    • +
  • OpenGuass +
    • +
  • MongoDB +
@@ -113,10 +117,13 @@ ├── dbswitch-product-oscar // -> oscar方言实现类 ├── dbswitch-product-gbase // -> gbase方言实现类 ├── dbswitch-product-mariadb // -> mariadb方言实现类 + ├── dbswitch-product-openguass// -> openguass方言实现类 ├── dbswitch-product-db2 // -> db2方言实现类 ├── dbswitch-product-sybase // -> sybase方言实现类 ├── dbswitch-product-hive // -> hive方言实现类 ├── dbswitch-product-sqlite // -> sqlite方言实现类 + ├── dbswitch-product-openguass// -> openguass方言实现类 + ├── dbswitch-product-mongodb // -> mongodb方言实现类 ├── dbswitch-data // 工具入口模块，读取配置文件中的参数执行异构迁移同步 ├── dbswitch-admin // 在以上模块的基础上引入Quartz的调度服务与接口 ├── dbswitch-admin-ui // 基于Vue2的前段WEB交互页面 diff --git a/dbswitch-admin-ui/src/views/connection/driver.vue b/dbswitch-admin-ui/src/views/connection/driver.vue index 0fb153c2..e275f99c 100644 --- a/dbswitch-admin-ui/src/views/connection/driver.vue +++ b/dbswitch-admin-ui/src/views/connection/driver.vue @@ -88,6 +88,7 @@ export default { }).then(res => { if (0 === res.data.code) { this.connectionTypes = res.data.data; + this.handleChooseClick('MYSQL',0); } else { if (res.data.message) { alert("初始化数据库类型信息失败:" + res.data.message); diff --git a/dbswitch-admin-ui/src/views/connection/list.vue b/dbswitch-admin-ui/src/views/connection/list.vue index f7e88917..043bb58a 100644 --- a/dbswitch-admin-ui/src/views/connection/list.vue +++ b/dbswitch-admin-ui/src/views/connection/list.vue @@ -1,13 +1,24 @@