diff --git a/.github/workflows/backend.yaml b/.github/workflows/backend.yaml index 946d288270..213cdfa823 100644 --- a/.github/workflows/backend.yaml +++ b/.github/workflows/backend.yaml @@ -22,6 +22,7 @@ on: pull_request: branches: - dev + - 0.7 paths-ignore: - 'docs/**' - '**/*.md' diff --git a/dlink-admin/pom.xml b/dlink-admin/pom.xml index a16d262acf..7f72fa4d4c 100644 --- a/dlink-admin/pom.xml +++ b/dlink-admin/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-admin diff --git a/dlink-admin/src/main/java/com/dlink/service/impl/ClusterConfigurationServiceImpl.java b/dlink-admin/src/main/java/com/dlink/service/impl/ClusterConfigurationServiceImpl.java index 38ba9caf79..a298b52a0c 100644 --- a/dlink-admin/src/main/java/com/dlink/service/impl/ClusterConfigurationServiceImpl.java +++ b/dlink-admin/src/main/java/com/dlink/service/impl/ClusterConfigurationServiceImpl.java @@ -55,7 +55,9 @@ * @since 2021/11/6 20:54 */ @Service -public class ClusterConfigurationServiceImpl extends SuperServiceImpl implements ClusterConfigurationService { +public class ClusterConfigurationServiceImpl extends SuperServiceImpl + implements + ClusterConfigurationService { @Value("classpath:DinkyFlinkDockerfile") org.springframework.core.io.Resource dockerfileResource; @@ -99,24 +101,32 @@ public TestResult testGateway(ClusterConfiguration clusterConfiguration) { gatewayConfig.setType(GatewayType.KUBERNETES_APPLICATION); Map kubernetesConfig = (Map) config.get("kubernetesConfig"); if (kubernetesConfig.containsKey("kubernetes.namespace")) { - gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.namespace", kubernetesConfig.get("kubernetes.namespace").toString()); + gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.namespace", + kubernetesConfig.get("kubernetes.namespace").toString()); } if (kubernetesConfig.containsKey("kubernetes.cluster-id")) { - gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", kubernetesConfig.get("kubernetes.cluster-id").toString()); + gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", + kubernetesConfig.get("kubernetes.cluster-id").toString()); } else { - //初始化FlinkKubeClient需要CLUSTER_ID,先用UUID代替，后面使用job名称来作为CLUSTER_ID - gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", UUID.randomUUID().toString()); + // 初始化FlinkKubeClient需要CLUSTER_ID,先用UUID代替，后面使用job名称来作为CLUSTER_ID + gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.cluster-id", + UUID.randomUUID().toString()); } if (kubernetesConfig.containsKey("kubernetes.container.image")) { - gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.container.image", kubernetesConfig.get("kubernetes.container.image").toString()); + gatewayConfig.getFlinkConfig().getConfiguration().put("kubernetes.container.image", + kubernetesConfig.get("kubernetes.container.image").toString()); } - String fileDir = FileUtil.isDirectory(PathConstant.WORK_DIR + "/dlink-doc") ? PathConstant.WORK_DIR + "/dlink-doc" : PathConstant.WORK_DIR; + String fileDir = FileUtil.isDirectory(PathConstant.WORK_DIR + "/dlink-doc") + ? PathConstant.WORK_DIR + "/dlink-doc" + : PathConstant.WORK_DIR; File dockerFile = null; try { - dockerFile = FileUtil.writeUtf8String(FileUtil.readUtf8String(dockerfileResource.getFile()), fileDir + "/DinkyFlinkDockerfile"); - Docker docker = Docker.build((Map) getClusterConfigById(clusterConfiguration.getId()).getConfig().get("dockerConfig")); - if (docker != null && StringUtils.isNotBlank(docker.getInstance())) { - new DockerClientUtils(docker,dockerFile).initImage(); + dockerFile = FileUtil.writeUtf8String(FileUtil.readUtf8String(dockerfileResource.getFile()), + fileDir + "/DinkyFlinkDockerfile"); + Docker docker = Docker.build((Map) clusterConfiguration.getConfig().get("dockerConfig")); + if (docker != null && StringUtils.isNotBlank(docker.getInstance()) + && clusterConfiguration.getId() != null) { + new DockerClientUtils(docker, dockerFile).initImage(); } } catch (Exception e) { throw new RuntimeException(e); diff --git a/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java b/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java index 4b7d6d8874..b4f87d7001 100644 --- a/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java +++ b/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java @@ -242,11 +242,11 @@ public JobResult submitTask(Integer id) { process.start(); if (!config.isJarTask()) { JobResult jobResult = jobManager.executeSql(task.getStatement()); - process.finish("Submit Flink SQL succeed."); + process.finish("Submit Flink SQL finished."); return jobResult; } else { JobResult jobResult = jobManager.executeJar(); - process.finish("Submit Flink Jar succeed."); + process.finish("Submit Flink Jar finished."); return jobResult; } } diff --git a/dlink-alert/dlink-alert-base/pom.xml b/dlink-alert/dlink-alert-base/pom.xml index 8959969ab4..203f7cef12 100644 --- a/dlink-alert/dlink-alert-base/pom.xml +++ b/dlink-alert/dlink-alert-base/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-alert - 0.7.0 + 0.7.1 dlink-alert-base diff --git a/dlink-alert/dlink-alert-dingtalk/pom.xml b/dlink-alert/dlink-alert-dingtalk/pom.xml index bbdea0e71d..1e1c619cf2 100644 --- a/dlink-alert/dlink-alert-dingtalk/pom.xml +++ b/dlink-alert/dlink-alert-dingtalk/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-alert - 0.7.0 + 0.7.1 dlink-alert-dingtalk diff --git a/dlink-alert/dlink-alert-email/pom.xml b/dlink-alert/dlink-alert-email/pom.xml index 6d31ddaa88..8b7eab303b 100644 --- a/dlink-alert/dlink-alert-email/pom.xml +++ b/dlink-alert/dlink-alert-email/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-alert - 0.7.0 + 0.7.1 dlink-alert-email jar diff --git a/dlink-alert/dlink-alert-feishu/pom.xml b/dlink-alert/dlink-alert-feishu/pom.xml index 3180219ce5..7d8bee521a 100644 --- a/dlink-alert/dlink-alert-feishu/pom.xml +++ b/dlink-alert/dlink-alert-feishu/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-alert - 0.7.0 + 0.7.1 dlink-alert-feishu jar diff --git a/dlink-alert/dlink-alert-wechat/pom.xml b/dlink-alert/dlink-alert-wechat/pom.xml index 43cc0667bd..1c8220e329 100644 --- a/dlink-alert/dlink-alert-wechat/pom.xml +++ b/dlink-alert/dlink-alert-wechat/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-alert - 0.7.0 + 0.7.1 dlink-alert-wechat diff --git a/dlink-alert/pom.xml b/dlink-alert/pom.xml index d7a96b727c..4ff7ae8697 100644 --- a/dlink-alert/pom.xml +++ b/dlink-alert/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-alert diff --git a/dlink-app/dlink-app-1.11/pom.xml b/dlink-app/dlink-app-1.11/pom.xml index 77a1e80f68..65ec8d870d 100644 --- a/dlink-app/dlink-app-1.11/pom.xml +++ b/dlink-app/dlink-app-1.11/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-app - 0.7.0 + 0.7.1 dlink-app-1.11 diff --git a/dlink-app/dlink-app-1.12/pom.xml b/dlink-app/dlink-app-1.12/pom.xml index 86419e2339..2d403e9e46 100644 --- a/dlink-app/dlink-app-1.12/pom.xml +++ b/dlink-app/dlink-app-1.12/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-app - 0.7.0 + 0.7.1 dlink-app-1.12 diff --git a/dlink-app/dlink-app-1.13/pom.xml b/dlink-app/dlink-app-1.13/pom.xml index f396fbb1db..e4c04a69af 100644 --- a/dlink-app/dlink-app-1.13/pom.xml +++ b/dlink-app/dlink-app-1.13/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-app - 0.7.0 + 0.7.1 dlink-app-1.13 diff --git a/dlink-app/dlink-app-1.14/pom.xml b/dlink-app/dlink-app-1.14/pom.xml index 3d15de99df..5320e3afd4 100644 --- a/dlink-app/dlink-app-1.14/pom.xml +++ b/dlink-app/dlink-app-1.14/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-app - 0.7.0 + 0.7.1 dlink-app-1.14 diff --git a/dlink-app/dlink-app-1.15/pom.xml b/dlink-app/dlink-app-1.15/pom.xml index f99cfc32b4..13b629bc4a 100644 --- a/dlink-app/dlink-app-1.15/pom.xml +++ b/dlink-app/dlink-app-1.15/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-app - 0.7.0 + 0.7.1 dlink-app-1.15 diff --git a/dlink-app/dlink-app-1.16/pom.xml b/dlink-app/dlink-app-1.16/pom.xml index 0b4b176092..1ea8a04da9 100644 --- a/dlink-app/dlink-app-1.16/pom.xml +++ b/dlink-app/dlink-app-1.16/pom.xml @@ -5,7 +5,7 @@ com.dlink dlink-app - 0.7.0 + 0.7.1 dlink-app-1.16 diff --git a/dlink-app/dlink-app-base/pom.xml b/dlink-app/dlink-app-base/pom.xml index 1a0abfe66f..2545ac7b96 100644 --- a/dlink-app/dlink-app-base/pom.xml +++ b/dlink-app/dlink-app-base/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-app - 0.7.0 + 0.7.1 dlink-app-base diff --git a/dlink-app/pom.xml b/dlink-app/pom.xml index 77489ec623..600c81df91 100644 --- a/dlink-app/pom.xml +++ b/dlink-app/pom.xml @@ -5,7 +5,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-app diff --git a/dlink-assembly/pom.xml b/dlink-assembly/pom.xml index b285f86ea6..ace81b57f1 100644 --- a/dlink-assembly/pom.xml +++ b/dlink-assembly/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-assembly diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml index f30ff0c435..43a6f9b6fd 100644 --- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml +++ b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml @@ -22,7 +22,7 @@ dlink-catalog-mysql com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.14/pom.xml b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.14/pom.xml index 01c895f816..27db862504 100644 --- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.14/pom.xml +++ b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.14/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-catalog-mysql - 0.7.0 + 0.7.1 dlink-catalog-mysql-1.14 diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml index b814e9de2b..b3b6d8cb03 100644 --- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml +++ b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml @@ -22,7 +22,7 @@ dlink-catalog-mysql com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml index e120f6b231..e7cc970e9d 100644 --- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml +++ b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml @@ -5,7 +5,7 @@ dlink-catalog-mysql com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-catalog/dlink-catalog-mysql/pom.xml b/dlink-catalog/dlink-catalog-mysql/pom.xml index 89ccda9c63..a0fd58ac1f 100644 --- a/dlink-catalog/dlink-catalog-mysql/pom.xml +++ b/dlink-catalog/dlink-catalog-mysql/pom.xml @@ -22,7 +22,7 @@ com.dlink dlink-catalog - 0.7.0 + 0.7.1 dlink-catalog-mysql diff --git a/dlink-catalog/pom.xml b/dlink-catalog/pom.xml index 6ba8b19eeb..8c1b1341b4 100644 --- a/dlink-catalog/pom.xml +++ b/dlink-catalog/pom.xml @@ -22,7 +22,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-catalog pom diff --git a/dlink-client/dlink-client-1.11/pom.xml b/dlink-client/dlink-client-1.11/pom.xml index 99f0745fa1..f0f703cc3e 100644 --- a/dlink-client/dlink-client-1.11/pom.xml +++ b/dlink-client/dlink-client-1.11/pom.xml @@ -22,7 +22,7 @@ dlink-client com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-client/dlink-client-1.12/pom.xml b/dlink-client/dlink-client-1.12/pom.xml index a28b80bba1..a9d0444a10 100644 --- a/dlink-client/dlink-client-1.12/pom.xml +++ b/dlink-client/dlink-client-1.12/pom.xml @@ -22,7 +22,7 @@ dlink-client com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-client/dlink-client-1.13/pom.xml b/dlink-client/dlink-client-1.13/pom.xml index d94f612308..86fda83ea3 100644 --- a/dlink-client/dlink-client-1.13/pom.xml +++ b/dlink-client/dlink-client-1.13/pom.xml @@ -22,7 +22,7 @@ dlink-client com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-client/dlink-client-1.14/pom.xml b/dlink-client/dlink-client-1.14/pom.xml index a8691ecbad..f5e3b752b2 100644 --- a/dlink-client/dlink-client-1.14/pom.xml +++ b/dlink-client/dlink-client-1.14/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-client - 0.7.0 + 0.7.1 dlink-client-1.14 diff --git a/dlink-client/dlink-client-1.15/pom.xml b/dlink-client/dlink-client-1.15/pom.xml index 146d7dc6a6..bd98268630 100644 --- a/dlink-client/dlink-client-1.15/pom.xml +++ b/dlink-client/dlink-client-1.15/pom.xml @@ -22,7 +22,7 @@ dlink-client com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-client/dlink-client-1.16/pom.xml b/dlink-client/dlink-client-1.16/pom.xml index b16484e19c..8bc0024f96 100644 --- a/dlink-client/dlink-client-1.16/pom.xml +++ b/dlink-client/dlink-client-1.16/pom.xml @@ -5,7 +5,7 @@ com.dlink dlink-client - 0.7.0 + 0.7.1 dlink-client-1.16 diff --git a/dlink-client/dlink-client-base/pom.xml b/dlink-client/dlink-client-base/pom.xml index 08c7cc2c56..884ee246c4 100644 --- a/dlink-client/dlink-client-base/pom.xml +++ b/dlink-client/dlink-client-base/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-client - 0.7.0 + 0.7.1 dlink-client-base diff --git a/dlink-client/dlink-client-hadoop/pom.xml b/dlink-client/dlink-client-hadoop/pom.xml index 896b26dbcf..3d74b00051 100644 --- a/dlink-client/dlink-client-hadoop/pom.xml +++ b/dlink-client/dlink-client-hadoop/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-client - 0.7.0 + 0.7.1 dlink-client-hadoop diff --git a/dlink-client/pom.xml b/dlink-client/pom.xml index 7647d42176..e63642b9ba 100644 --- a/dlink-client/pom.xml +++ b/dlink-client/pom.xml @@ -22,7 +22,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-client pom diff --git a/dlink-common/pom.xml b/dlink-common/pom.xml index cf8036d42e..f3ac2033a9 100644 --- a/dlink-common/pom.xml +++ b/dlink-common/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-common diff --git a/dlink-connectors/dlink-connector-doris-1.13/pom.xml b/dlink-connectors/dlink-connector-doris-1.13/pom.xml index 1ac9a12701..f38220c067 100644 --- a/dlink-connectors/dlink-connector-doris-1.13/pom.xml +++ b/dlink-connectors/dlink-connector-doris-1.13/pom.xml @@ -22,7 +22,7 @@ dlink-connectors com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml index 3483b88184..d9b0a4ff26 100644 --- a/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml +++ b/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml @@ -22,7 +22,7 @@ dlink-connectors com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml index 945a6a3216..10d1cec061 100644 --- a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml +++ b/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml @@ -22,7 +22,7 @@ dlink-connectors com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml index a8f0bab460..2a2fae1713 100644 --- a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml +++ b/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml @@ -22,7 +22,7 @@ dlink-connectors com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-connectors/dlink-connector-jdbc-1.14/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.14/pom.xml index 81d4b67c7f..dff888fb09 100644 --- a/dlink-connectors/dlink-connector-jdbc-1.14/pom.xml +++ b/dlink-connectors/dlink-connector-jdbc-1.14/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-connectors - 0.7.0 + 0.7.1 dlink-connector-jdbc-1.14 diff --git a/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml b/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml index 5e928a125a..6887d1c5d1 100644 --- a/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml +++ b/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml @@ -22,7 +22,7 @@ dlink-connectors com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-connectors/dlink-connector-phoenix-1.14/pom.xml b/dlink-connectors/dlink-connector-phoenix-1.14/pom.xml index 24826febf2..d50d9801fb 100644 --- a/dlink-connectors/dlink-connector-phoenix-1.14/pom.xml +++ b/dlink-connectors/dlink-connector-phoenix-1.14/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-connectors - 0.7.0 + 0.7.1 dlink-connector-phoenix-1.14 diff --git a/dlink-connectors/dlink-connector-pulsar-1.14/pom.xml b/dlink-connectors/dlink-connector-pulsar-1.14/pom.xml index 432373d45e..a3ad7834db 100644 --- a/dlink-connectors/dlink-connector-pulsar-1.14/pom.xml +++ b/dlink-connectors/dlink-connector-pulsar-1.14/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-connectors - 0.7.0 + 0.7.1 dlink-connector-pulsar-1.14 @@ -39,7 +39,7 @@ com.dlink dlink-common - 0.7.0 + 0.7.1 compile diff --git a/dlink-connectors/pom.xml b/dlink-connectors/pom.xml index f79ae7b2ac..6e4fdb386b 100644 --- a/dlink-connectors/pom.xml +++ b/dlink-connectors/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-connectors diff --git a/dlink-core/pom.xml b/dlink-core/pom.xml index d7af034001..f6e236c10d 100644 --- a/dlink-core/pom.xml +++ b/dlink-core/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-core jar diff --git a/dlink-core/src/main/java/com/dlink/job/JobManager.java b/dlink-core/src/main/java/com/dlink/job/JobManager.java index da0e33eb7b..ab777cedec 100644 --- a/dlink-core/src/main/java/com/dlink/job/JobManager.java +++ b/dlink-core/src/main/java/com/dlink/job/JobManager.java @@ -542,6 +542,13 @@ public JobResult executeSql(String statement) { job.setJobId(gatewayResult.getAppId()); job.setJids(gatewayResult.getJids()); job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL())); + + if (gatewayResult.isSucess()){ + job.setStatus(Job.JobStatus.SUCCESS); + }else { + job.setStatus(Job.JobStatus.FAILED); + job.setError(gatewayResult.getError()); + } } else { for (StatementParam item : jobParam.getExecute()) { executor.executeSql(item.getValue()); @@ -566,11 +573,15 @@ public JobResult executeSql(String statement) { .getResult(null); job.setResult(result); } + job.setStatus(Job.JobStatus.SUCCESS); } } job.setEndTime(LocalDateTime.now()); - job.setStatus(Job.JobStatus.SUCCESS); - success(); + if (job.getStatus().name().equals(Job.JobStatus.FAILED.name())){ + failed(); + }else { + success(); + } } catch (Exception e) { String error = LogUtil.getError("Exception in executing FlinkSQL:\n" + currentSql, e); job.setEndTime(LocalDateTime.now()); @@ -728,8 +739,16 @@ public JobResult executeJar() { job.setJids(gatewayResult.getJids()); job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL())); job.setEndTime(LocalDateTime.now()); - job.setStatus(Job.JobStatus.SUCCESS); - success(); + + if (gatewayResult.isSucess()){ + job.setStatus(Job.JobStatus.SUCCESS); + success(); + }else { + job.setError(gatewayResult.getError()); + job.setStatus(Job.JobStatus.FAILED); + failed(); + } + } catch (Exception e) { String error = LogUtil.getError( "Exception in executing Jar：\n" + config.getGatewayConfig().getAppConfig().getUserJarPath(), e); diff --git a/dlink-daemon/pom.xml b/dlink-daemon/pom.xml index c4d7ec16c8..5614521b0c 100644 --- a/dlink-daemon/pom.xml +++ b/dlink-daemon/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-daemon diff --git a/dlink-doc/sql/dinky.sql b/dlink-doc/sql/dinky.sql index 15d710d7e3..35378556de 100644 --- a/dlink-doc/sql/dinky.sql +++ b/dlink-doc/sql/dinky.sql @@ -25,16 +25,16 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- DROP TABLE IF EXISTS `dlink_alert_group`; CREATE TABLE `dlink_alert_group` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'alert group name', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `alert_instance_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'Alert instance IDS', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', - `enabled` tinyint DEFAULT '1' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_alert_instance_un` (`name`,`tenant_id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'alert group name', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `alert_instance_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'Alert instance IDS', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', + `enabled` tinyint DEFAULT '1' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_alert_instance_un` (`name`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='Alert group'; -- ---------------------------- @@ -42,17 +42,17 @@ CREATE TABLE `dlink_alert_group` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_alert_history`; CREATE TABLE `dlink_alert_history` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `alert_group_id` int DEFAULT NULL COMMENT 'Alert group ID', - `job_instance_id` int DEFAULT NULL COMMENT 'job instance ID', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'alert title', - `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'content description', - `status` int DEFAULT NULL COMMENT 'alert status', - `log` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'log', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `alert_group_id` int DEFAULT NULL COMMENT 'Alert group ID', + `job_instance_id` int DEFAULT NULL COMMENT 'job instance ID', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'alert title', + `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'content description', + `status` int DEFAULT NULL COMMENT 'alert status', + `log` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'log', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='Alert history'; -- ---------------------------- @@ -60,16 +60,16 @@ CREATE TABLE `dlink_alert_history` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_alert_instance`; CREATE TABLE `dlink_alert_instance` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'alert instance name', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'alert instance type such as: DingTalk,Wechat(Webhook,app) Feishu ,email', - `params` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'configuration', - `enabled` tinyint DEFAULT '1' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_alert_instance_un` (`name`,`tenant_id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'alert instance name', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'alert instance type such as: DingTalk,Wechat(Webhook,app) Feishu ,email', + `params` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'configuration', + `enabled` tinyint DEFAULT '1' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_alert_instance_un` (`name`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='Alert instance'; -- ---------------------------- @@ -77,18 +77,18 @@ CREATE TABLE `dlink_alert_instance` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_catalogue`; CREATE TABLE `dlink_catalogue` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `task_id` int DEFAULT NULL COMMENT 'Job ID', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Job Name', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job Type', - `parent_id` int NOT NULL DEFAULT '0' COMMENT 'parent ID', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', - `is_leaf` tinyint(1) NOT NULL COMMENT 'is leaf node', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_catalogue_un` (`name`,`parent_id`,`tenant_id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `task_id` int DEFAULT NULL COMMENT 'Job ID', + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Job Name', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job Type', + `parent_id` int NOT NULL DEFAULT '0' COMMENT 'parent ID', + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', + `is_leaf` tinyint(1) NOT NULL COMMENT 'is leaf node', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_catalogue_un` (`name`,`parent_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='catalogue'; -- ---------------------------- @@ -96,24 +96,24 @@ CREATE TABLE `dlink_catalogue` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_cluster`; CREATE TABLE `dlink_cluster` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'cluster instance name', - `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'cluster instance alias', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'cluster types', - `hosts` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'cluster hosts', - `job_manager_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job Manager Host', - `version` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'version', - `status` int DEFAULT NULL COMMENT 'cluster status', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', - `auto_registers` tinyint(1) DEFAULT '0' COMMENT 'is auto registration', - `cluster_configuration_id` int DEFAULT NULL COMMENT 'cluster configuration id', - `task_id` int DEFAULT NULL COMMENT 'task ID', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_cluster_un` (`name`,`tenant_id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'cluster instance name', + `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'cluster instance alias', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'cluster types', + `hosts` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'cluster hosts', + `job_manager_host` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job Manager Host', + `version` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'version', + `status` int DEFAULT NULL COMMENT 'cluster status', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', + `auto_registers` tinyint(1) DEFAULT '0' COMMENT 'is auto registration', + `cluster_configuration_id` int DEFAULT NULL COMMENT 'cluster configuration id', + `task_id` int DEFAULT NULL COMMENT 'task ID', + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_cluster_un` (`name`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='cluster instance management'; -- ---------------------------- @@ -121,19 +121,19 @@ CREATE TABLE `dlink_cluster` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_cluster_configuration`; CREATE TABLE `dlink_cluster_configuration` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'cluster configuration name', - `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'cluster configuration alias', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'cluster type', - `config_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'json of configuration', - `is_available` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is available', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`), - UNIQUE KEY `dlink_cluster_configuration_un` (`name`,`tenant_id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'cluster configuration name', + `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'cluster configuration alias', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'cluster type', + `config_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'json of configuration', + `is_available` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is available', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`), + UNIQUE KEY `dlink_cluster_configuration_un` (`name`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='cluster configuration management'; -- ---------------------------- @@ -141,29 +141,29 @@ CREATE TABLE `dlink_cluster_configuration` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_database`; CREATE TABLE `dlink_database` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database name', - `alias` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database alias', - `group_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'Default' COMMENT 'database belong group name', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database type', - `ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'database ip', - `port` int DEFAULT NULL COMMENT 'database port', - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'database url', - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'username', - `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'password', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', - `flink_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'Flink configuration', - `flink_template` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'Flink template', - `db_version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'version，such as: 11g of oracle ，2.2.3 of hbase', - `status` tinyint(1) DEFAULT NULL COMMENT 'heartbeat status', - `health_time` datetime DEFAULT NULL COMMENT 'last heartbeat time of trigger', - `heartbeat_time` datetime DEFAULT NULL COMMENT 'last heartbeat time', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_database_un` (`name`,`tenant_id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database name', + `alias` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database alias', + `group_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'Default' COMMENT 'database belong group name', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database type', + `ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'database ip', + `port` int DEFAULT NULL COMMENT 'database port', + `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'database url', + `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'username', + `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'password', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', + `flink_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'Flink configuration', + `flink_template` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'Flink template', + `db_version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'version，such as: 11g of oracle ，2.2.3 of hbase', + `status` tinyint(1) DEFAULT NULL COMMENT 'heartbeat status', + `health_time` datetime DEFAULT NULL COMMENT 'last heartbeat time of trigger', + `heartbeat_time` datetime DEFAULT NULL COMMENT 'last heartbeat time', + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_database_un` (`name`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='database management'; -- ---------------------------- @@ -171,19 +171,19 @@ CREATE TABLE `dlink_database` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_flink_document`; CREATE TABLE `dlink_flink_document` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `category` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document category', - `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document type', - `subtype` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document subtype', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document name', - `description` longtext COLLATE utf8mb4_general_ci, - `fill_value` longtext COLLATE utf8mb4_general_ci COMMENT 'fill value', - `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document version such as:(flink1.12,flink1.13,flink1.14,flink1.15)', - `like_num` int DEFAULT '0' COMMENT 'like number', - `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update_time', - PRIMARY KEY (`id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `category` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document category', + `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document type', + `subtype` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document subtype', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document name', + `description` longtext COLLATE utf8mb4_general_ci, + `fill_value` longtext COLLATE utf8mb4_general_ci COMMENT 'fill value', + `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'document version such as:(flink1.12,flink1.13,flink1.14,flink1.15)', + `like_num` int DEFAULT '0' COMMENT 'like number', + `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update_time', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='flink document management'; -- ---------------------------- -- Records of dlink_flink_document @@ -413,26 +413,26 @@ INSERT INTO `dlink_flink_document` VALUES (217, 'Function', 'UDF', '表值聚合 -- ---------------------------- DROP TABLE IF EXISTS `dlink_history`; CREATE TABLE `dlink_history` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `cluster_id` int NOT NULL DEFAULT '0' COMMENT 'cluster ID', - `cluster_configuration_id` int DEFAULT NULL COMMENT 'cluster configuration id', - `session` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'session', - `job_id` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job ID', - `job_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job Name', - `job_manager_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'JJobManager Address', - `status` int NOT NULL DEFAULT '0' COMMENT 'status', - `type` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'job type', - `statement` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'statement set', - `error` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'error message', - `result` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'result set', - `config_json` json DEFAULT NULL COMMENT 'config json', - `start_time` datetime DEFAULT NULL COMMENT 'job start time', - `end_time` datetime DEFAULT NULL COMMENT 'job end time', - `task_id` int DEFAULT NULL COMMENT 'task ID', - PRIMARY KEY (`id`) USING BTREE, - KEY `task_index` (`task_id`) USING BTREE, - KEY `cluster_index` (`cluster_id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `cluster_id` int NOT NULL DEFAULT '0' COMMENT 'cluster ID', + `cluster_configuration_id` int DEFAULT NULL COMMENT 'cluster configuration id', + `session` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'session', + `job_id` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job ID', + `job_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job Name', + `job_manager_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'JJobManager Address', + `status` int NOT NULL DEFAULT '0' COMMENT 'status', + `type` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'job type', + `statement` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'statement set', + `error` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'error message', + `result` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'result set', + `config_json` json DEFAULT NULL COMMENT 'config json', + `start_time` datetime DEFAULT NULL COMMENT 'job start time', + `end_time` datetime DEFAULT NULL COMMENT 'job end time', + `task_id` int DEFAULT NULL COMMENT 'task ID', + PRIMARY KEY (`id`) USING BTREE, + KEY `task_index` (`task_id`) USING BTREE, + KEY `cluster_index` (`cluster_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='execution history'; -- ---------------------------- @@ -440,20 +440,20 @@ CREATE TABLE `dlink_history` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_jar`; CREATE TABLE `dlink_jar` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'jar name', - `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'jar alias', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'jar type', - `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'file path', - `main_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'application of main class', - `paras` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'main class of args', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`), - UNIQUE KEY `dlink_jar_un` (`tenant_id`,`name`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'jar name', + `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'jar alias', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'jar type', + `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'file path', + `main_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'application of main class', + `paras` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'main class of args', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`), + UNIQUE KEY `dlink_jar_un` (`tenant_id`,`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='jar management'; -- ---------------------------- @@ -461,18 +461,18 @@ CREATE TABLE `dlink_jar` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_job_history`; CREATE TABLE `dlink_job_history` ( - `id` int NOT NULL COMMENT 'id', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `job_json` json DEFAULT NULL COMMENT 'Job information json', - `exceptions_json` json DEFAULT NULL COMMENT 'error message json', - `checkpoints_json` json DEFAULT NULL COMMENT 'checkpoints json', - `checkpoints_config_json` json DEFAULT NULL COMMENT 'checkpoints configuration json', - `config_json` json DEFAULT NULL COMMENT 'configuration', - `jar_json` json DEFAULT NULL COMMENT 'Jar configuration', - `cluster_json` json DEFAULT NULL COMMENT 'cluster instance configuration', - `cluster_configuration_json` json DEFAULT NULL COMMENT 'cluster config', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE + `id` int NOT NULL COMMENT 'id', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `job_json` json DEFAULT NULL COMMENT 'Job information json', + `exceptions_json` json DEFAULT NULL COMMENT 'error message json', + `checkpoints_json` json DEFAULT NULL COMMENT 'checkpoints json', + `checkpoints_config_json` json DEFAULT NULL COMMENT 'checkpoints configuration json', + `config_json` json DEFAULT NULL COMMENT 'configuration', + `jar_json` json DEFAULT NULL COMMENT 'Jar configuration', + `cluster_json` json DEFAULT NULL COMMENT 'cluster instance configuration', + `cluster_configuration_json` json DEFAULT NULL COMMENT 'cluster config', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='Job history details'; -- ---------------------------- @@ -480,24 +480,24 @@ CREATE TABLE `dlink_job_history` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_job_instance`; CREATE TABLE `dlink_job_instance` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'job instance name', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `task_id` int DEFAULT NULL COMMENT 'task ID', - `step` int DEFAULT NULL COMMENT 'job lifecycle', - `cluster_id` int DEFAULT NULL COMMENT 'cluster ID', - `jid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Flink JobId', - `status` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'job instance status', - `history_id` int DEFAULT NULL COMMENT 'execution history ID', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - `finish_time` datetime DEFAULT NULL COMMENT 'finish time', - `duration` bigint DEFAULT NULL COMMENT 'job duration', - `error` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'error logs', - `failed_restart_count` int DEFAULT NULL COMMENT 'failed restart count', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_job_instance_un` (`tenant_id`,`name`,`task_id`,`history_id`), - KEY `dlink_job_instance_task_id_IDX` (`task_id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'job instance name', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `task_id` int DEFAULT NULL COMMENT 'task ID', + `step` int DEFAULT NULL COMMENT 'job lifecycle', + `cluster_id` int DEFAULT NULL COMMENT 'cluster ID', + `jid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Flink JobId', + `status` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'job instance status', + `history_id` int DEFAULT NULL COMMENT 'execution history ID', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + `finish_time` datetime DEFAULT NULL COMMENT 'finish time', + `duration` bigint DEFAULT NULL COMMENT 'job duration', + `error` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'error logs', + `failed_restart_count` int DEFAULT NULL COMMENT 'failed restart count', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_job_instance_un` (`tenant_id`,`name`,`task_id`,`history_id`), + KEY `dlink_job_instance_task_id_IDX` (`task_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='job instance'; -- ---------------------------- @@ -505,14 +505,14 @@ CREATE TABLE `dlink_job_instance` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_savepoints`; CREATE TABLE `dlink_savepoints` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `task_id` int NOT NULL COMMENT 'task ID', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'task name', - `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'savepoint type', - `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'savepoint path', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - PRIMARY KEY (`id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `task_id` int NOT NULL COMMENT 'task ID', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'task name', + `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'savepoint type', + `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'savepoint path', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='job savepoint management'; -- ---------------------------- @@ -520,18 +520,18 @@ CREATE TABLE `dlink_savepoints` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_schema_history`; CREATE TABLE `dlink_schema_history` ( - `installed_rank` int NOT NULL, - `version` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `script` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `checksum` int DEFAULT NULL, - `installed_by` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `execution_time` int NOT NULL, - `success` tinyint(1) NOT NULL, - PRIMARY KEY (`installed_rank`) USING BTREE, - KEY `dlink_schema_history_s_idx` (`success`) USING BTREE + `installed_rank` int NOT NULL, + `version` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, + `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `script` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `checksum` int DEFAULT NULL, + `installed_by` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `execution_time` int NOT NULL, + `success` tinyint(1) NOT NULL, + PRIMARY KEY (`installed_rank`) USING BTREE, + KEY `dlink_schema_history_s_idx` (`success`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; -- ---------------------------- @@ -539,12 +539,12 @@ CREATE TABLE `dlink_schema_history` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_sys_config`; CREATE TABLE `dlink_sys_config` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'configuration name', - `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'configuration value', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'configuration name', + `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'configuration value', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='system configuration'; -- ---------------------------- @@ -552,35 +552,35 @@ CREATE TABLE `dlink_sys_config` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_task`; CREATE TABLE `dlink_task` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Job name', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job alias', - `dialect` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'dialect', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job type', - `check_point` int DEFAULT NULL COMMENT 'CheckPoint trigger seconds', - `save_point_strategy` int DEFAULT NULL COMMENT 'SavePoint strategy', - `save_point_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'SavePointPath', - `parallelism` int DEFAULT NULL COMMENT 'parallelism', - `fragment` tinyint(1) DEFAULT '0' COMMENT 'fragment', - `statement_set` tinyint(1) DEFAULT '0' COMMENT 'enable statement set', - `batch_model` tinyint(1) DEFAULT '0' COMMENT 'use batch model', - `cluster_id` int DEFAULT NULL COMMENT 'Flink cluster ID', - `cluster_configuration_id` int DEFAULT NULL COMMENT 'cluster configuration ID', - `database_id` int DEFAULT NULL COMMENT 'database ID', - `jar_id` int DEFAULT NULL COMMENT 'Jar ID', - `env_id` int DEFAULT NULL COMMENT 'env id', - `alert_group_id` bigint DEFAULT NULL COMMENT 'alert group id', - `config_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'configuration json', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job Note', - `step` int DEFAULT NULL COMMENT 'Job lifecycle', - `job_instance_id` bigint DEFAULT NULL COMMENT 'job instance id', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - `version_id` int DEFAULT NULL COMMENT 'version id', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_task_un` (`name`,`tenant_id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Job name', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job alias', + `dialect` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'dialect', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job type', + `check_point` int DEFAULT NULL COMMENT 'CheckPoint trigger seconds', + `save_point_strategy` int DEFAULT NULL COMMENT 'SavePoint strategy', + `save_point_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'SavePointPath', + `parallelism` int DEFAULT NULL COMMENT 'parallelism', + `fragment` tinyint(1) DEFAULT '0' COMMENT 'fragment', + `statement_set` tinyint(1) DEFAULT '0' COMMENT 'enable statement set', + `batch_model` tinyint(1) DEFAULT '0' COMMENT 'use batch model', + `cluster_id` int DEFAULT NULL COMMENT 'Flink cluster ID', + `cluster_configuration_id` int DEFAULT NULL COMMENT 'cluster configuration ID', + `database_id` int DEFAULT NULL COMMENT 'database ID', + `jar_id` int DEFAULT NULL COMMENT 'Jar ID', + `env_id` int DEFAULT NULL COMMENT 'env id', + `alert_group_id` bigint DEFAULT NULL COMMENT 'alert group id', + `config_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'configuration json', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Job Note', + `step` int DEFAULT NULL COMMENT 'Job lifecycle', + `job_instance_id` bigint DEFAULT NULL COMMENT 'job instance id', + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + `version_id` int DEFAULT NULL COMMENT 'version id', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_task_un` (`name`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='Task'; -- ---------------------------- @@ -588,11 +588,11 @@ CREATE TABLE `dlink_task` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_task_statement`; CREATE TABLE `dlink_task_statement` ( - `id` int NOT NULL COMMENT 'ID', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `statement` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'statement set', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_task_statement_un` (`tenant_id`,`id`) + `id` int NOT NULL COMMENT 'ID', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `statement` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'statement set', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_task_statement_un` (`tenant_id`,`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='statement'; -- ---------------------------- @@ -600,19 +600,19 @@ CREATE TABLE `dlink_task_statement` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_task_version`; CREATE TABLE `dlink_task_version` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `task_id` int NOT NULL COMMENT 'task ID ', - `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', - `version_id` int NOT NULL COMMENT 'version ID ', - `statement` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'flink sql statement', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'version name', - `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'alisa', - `dialect` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'dialect', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type', - `task_configure` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'task configuration', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_task_version_un` (`task_id`,`tenant_id`,`version_id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `task_id` int NOT NULL COMMENT 'task ID ', + `tenant_id` int NOT NULL DEFAULT '1' COMMENT 'tenant id', + `version_id` int NOT NULL COMMENT 'version ID ', + `statement` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'flink sql statement', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'version name', + `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'alisa', + `dialect` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'dialect', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type', + `task_configure` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'task configuration', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_task_version_un` (`task_id`,`tenant_id`,`version_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='job history version'; @@ -621,18 +621,18 @@ CREATE TABLE `dlink_task_version` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_upload_file_record`; CREATE TABLE `dlink_upload_file_record` ( - `id` tinyint NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'upload file name', - `enabled` tinyint(1) DEFAULT NULL COMMENT 'is enable', - `file_type` tinyint DEFAULT '-1' COMMENT 'upload file type ，such as：hadoop-conf(1)、flink-conf(2)、flink-lib(3)、user-jar(4)、dlink-jar(5)，default is -1 ', - `target` tinyint NOT NULL COMMENT 'upload file of target ，such as：local(1)、hdfs(2)', - `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'file name', - `file_parent_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'file parent path', - `file_absolute_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'fila absolute path', - `is_file` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is file', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE + `id` tinyint NOT NULL AUTO_INCREMENT COMMENT 'id', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'upload file name', + `enabled` tinyint(1) DEFAULT NULL COMMENT 'is enable', + `file_type` tinyint DEFAULT '-1' COMMENT 'upload file type ，such as：hadoop-conf(1)、flink-conf(2)、flink-lib(3)、user-jar(4)、dlink-jar(5)，default is -1 ', + `target` tinyint NOT NULL COMMENT 'upload file of target ，such as：local(1)、hdfs(2)', + `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'file name', + `file_parent_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'file parent path', + `file_absolute_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'fila absolute path', + `is_file` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is file', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='file upload history'; @@ -641,18 +641,18 @@ CREATE TABLE `dlink_upload_file_record` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_user`; CREATE TABLE `dlink_user` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'username', - `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'password', - `nickname` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'nickname', - `worknum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'worknum', - `avatar` blob COMMENT 'avatar', - `mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'mobile phone', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', - `is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is delete', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'username', + `password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'password', + `nickname` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'nickname', + `worknum` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'worknum', + `avatar` blob COMMENT 'avatar', + `mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'mobile phone', + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', + `is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is delete', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='user'; -- ---------------------------- -- Records of dlink_user @@ -667,17 +667,17 @@ VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Admin', NULL, NULL, NUL -- ---------------------------- DROP TABLE IF EXISTS `dlink_fragment`; CREATE TABLE `dlink_fragment` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(50) NOT NULL COMMENT 'fragment name', - `alias` varchar(50) DEFAULT NULL COMMENT 'alias', - `tenant_id` int(11) NOT NULL DEFAULT '1' COMMENT 'tenant id', - `fragment_value` text NOT NULL COMMENT 'fragment value', - `note` text COMMENT 'note', - `enabled` tinyint(4) DEFAULT '1' COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `un_idx1` (`name`,`tenant_id`) USING BTREE + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', + `name` varchar(50) NOT NULL COMMENT 'fragment name', + `alias` varchar(50) DEFAULT NULL COMMENT 'alias', + `tenant_id` int(11) NOT NULL DEFAULT '1' COMMENT 'tenant id', + `fragment_value` text NOT NULL COMMENT 'fragment value', + `note` text COMMENT 'note', + `enabled` tinyint(4) DEFAULT '1' COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `un_idx1` (`name`,`tenant_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='fragment management'; @@ -688,16 +688,16 @@ CREATE TABLE `dlink_fragment` ( -- ---------------------------- DROP TABLE IF EXISTS `metadata_column`; CREATE TABLE `metadata_column` ( - `column_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column name', - `column_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column type, such as : Physical , Metadata , Computed , WATERMARK', - `data_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'data type', - `expr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'expression', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column description', - `table_id` int NOT NULL COMMENT 'table id', - `primary` bit(1) DEFAULT NULL COMMENT 'table primary key', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', - PRIMARY KEY (`table_id`,`column_name`) USING BTREE + `column_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column name', + `column_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column type, such as : Physical , Metadata , Computed , WATERMARK', + `data_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'data type', + `expr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'expression', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column description', + `table_id` int NOT NULL COMMENT 'table id', + `primary` bit(1) DEFAULT NULL COMMENT 'table primary key', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', + PRIMARY KEY (`table_id`,`column_name`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='column informations'; -- ---------------------------- @@ -705,12 +705,12 @@ CREATE TABLE `metadata_column` ( -- ---------------------------- DROP TABLE IF EXISTS `metadata_database`; CREATE TABLE `metadata_database` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `database_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database name', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'database description', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', - PRIMARY KEY (`id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `database_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database name', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'database description', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='metadata of database information'; -- ---------------------------- @@ -718,12 +718,12 @@ CREATE TABLE `metadata_database` ( -- ---------------------------- DROP TABLE IF EXISTS `metadata_database_property`; CREATE TABLE `metadata_database_property` ( - `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'key', - `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'value', - `database_id` int NOT NULL COMMENT 'database id', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', - PRIMARY KEY (`key`,`database_id`) USING BTREE + `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'key', + `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'value', + `database_id` int NOT NULL COMMENT 'database id', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', + PRIMARY KEY (`key`,`database_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='metadata of database configurations'; -- ---------------------------- @@ -731,14 +731,14 @@ CREATE TABLE `metadata_database_property` ( -- ---------------------------- DROP TABLE IF EXISTS `metadata_function`; CREATE TABLE `metadata_function` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', - `function_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'function name', - `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'class name', - `database_id` int NOT NULL COMMENT 'database id', - `function_language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'function language', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', - PRIMARY KEY (`id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `function_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'function name', + `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'class name', + `database_id` int NOT NULL COMMENT 'database id', + `function_language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'function language', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='UDF informations'; -- ---------------------------- @@ -746,14 +746,14 @@ CREATE TABLE `metadata_function` ( -- ---------------------------- DROP TABLE IF EXISTS `metadata_table`; CREATE TABLE `metadata_table` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', - `table_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'table name', - `table_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'type，such as：database,table,view', - `database_id` int NOT NULL COMMENT 'database id', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'table description', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', - PRIMARY KEY (`id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `table_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'table name', + `table_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'type，such as：database,table,view', + `database_id` int NOT NULL COMMENT 'database id', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'table description', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='metadata of table information'; -- ---------------------------- @@ -761,12 +761,12 @@ CREATE TABLE `metadata_table` ( -- ---------------------------- DROP TABLE IF EXISTS `metadata_table_property`; CREATE TABLE `metadata_table_property` ( - `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'key', - `value` MEDIUMTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'value', - `table_id` int NOT NULL COMMENT 'table id', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create tiime', - PRIMARY KEY (`key`,`table_id`) USING BTREE + `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'key', + `value` MEDIUMTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'value', + `table_id` int NOT NULL COMMENT 'table id', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create tiime', + PRIMARY KEY (`key`,`table_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='metadata of table configurations'; -- ----------------------------------------------------------------------------- Metadata related data table the end ------------------------------------------------------------------------------------------- @@ -779,13 +779,13 @@ CREATE TABLE `metadata_table_property` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_tenant`; CREATE TABLE `dlink_tenant` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'tenant code', - `is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is delete', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'tenant code', + `is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is delete', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='tenant'; -- ---------------------------- -- Records of dlink_tenant @@ -799,15 +799,15 @@ VALUES (1, 'DefaultTenant', 0, 'DefaultTenant', current_time, current_time); -- ---------------------------- DROP TABLE IF EXISTS `dlink_namespace`; CREATE TABLE `dlink_namespace` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_id` int NOT NULL COMMENT 'tenant id', - `namespace_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'namespace code', - `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_namespace_un` (`namespace_code`,`tenant_id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_id` int NOT NULL COMMENT 'tenant id', + `namespace_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'namespace code', + `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is enable', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_namespace_un` (`namespace_code`,`tenant_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='namespace'; -- ---------------------------- -- Records of dlink_namespace @@ -821,16 +821,16 @@ VALUES (1, 1, 'DefaultNameSpace', 1, 'DefaultNameSpace', current_time, current_t -- ---------------------------- DROP TABLE IF EXISTS `dlink_role`; CREATE TABLE `dlink_role` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `tenant_id` int NOT NULL COMMENT 'tenant id', - `role_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'role code', - `role_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'role name', - `is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is delete', - `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_role_un` (`role_code`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `tenant_id` int NOT NULL COMMENT 'tenant id', + `role_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'role code', + `role_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'role name', + `is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'is delete', + `note` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'note', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_role_un` (`role_code`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='role'; -- ---------------------------- -- Records of dlink_role @@ -843,13 +843,13 @@ VALUES (1, 1, 'SuperAdmin', 'SuperAdmin', 0, 'SuperAdmin of Role', current_time, -- ---------------------------- DROP TABLE IF EXISTS `dlink_role_namespace`; CREATE TABLE `dlink_role_namespace` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `role_id` int NOT NULL COMMENT 'user id', - `namespace_id` int NOT NULL COMMENT 'namespace id', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_role_namespace_un` (`role_id`,`namespace_id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `role_id` int NOT NULL COMMENT 'user id', + `namespace_id` int NOT NULL COMMENT 'namespace id', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_role_namespace_un` (`role_id`,`namespace_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='Role and namespace relationship'; -- ---------------------------- -- Records of dlink_role_namespace @@ -863,13 +863,13 @@ VALUES (1, 1, 1, current_time, current_time); -- ---------------------------- DROP TABLE IF EXISTS `dlink_user_role`; CREATE TABLE `dlink_user_role` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `user_id` int NOT NULL COMMENT 'user id', - `role_id` int NOT NULL COMMENT 'role id', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_user_role_un` (`user_id`,`role_id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `user_id` int NOT NULL COMMENT 'user id', + `role_id` int NOT NULL COMMENT 'role id', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_user_role_un` (`user_id`,`role_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='Relationship between users and roles'; -- ---------------------------- -- Records of dlink_user_role @@ -882,13 +882,13 @@ VALUES (1, 1, 1, current_time, current_time); -- ---------------------------- DROP TABLE IF EXISTS `dlink_user_tenant`; CREATE TABLE `dlink_user_tenant` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', - `user_id` int NOT NULL COMMENT 'user id', - `tenant_id` int NOT NULL COMMENT 'tenant id', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `dlink_user_role_un` (`user_id`,`tenant_id`) USING BTREE + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `user_id` int NOT NULL COMMENT 'user id', + `tenant_id` int NOT NULL COMMENT 'tenant id', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `dlink_user_role_un` (`user_id`,`tenant_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='Relationship between users and tenants'; -- ---------------------------- -- Records of dlink_user_tenant @@ -904,24 +904,24 @@ VALUES (1, 1, 1, current_time, current_time); -- ---------------------------- DROP TABLE IF EXISTS `dlink_udf`; CREATE TABLE `dlink_udf` ( - `id` int NOT NULL AUTO_INCREMENT, - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'udf name', - `class_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Complete class name', - `source_code` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'source code', - `compiler_code` binary(255) DEFAULT NULL COMMENT 'compiler product', - `version_id` int DEFAULT NULL COMMENT 'version', - `version_description` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'version description', - `is_default` tinyint(1) DEFAULT NULL COMMENT 'Is it default', - `document_id` int DEFAULT NULL COMMENT 'corresponding to the document id', - `from_version_id` int DEFAULT NULL COMMENT 'Based on udf version id', - `code_md5` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'source code of md5', - `dialect` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'dialect', - `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type', - `step` int DEFAULT NULL COMMENT 'job lifecycle step', - `enable` tinyint(1) DEFAULT NULL COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) + `id` int NOT NULL AUTO_INCREMENT, + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'udf name', + `class_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Complete class name', + `source_code` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'source code', + `compiler_code` binary(255) DEFAULT NULL COMMENT 'compiler product', + `version_id` int DEFAULT NULL COMMENT 'version', + `version_description` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'version description', + `is_default` tinyint(1) DEFAULT NULL COMMENT 'Is it default', + `document_id` int DEFAULT NULL COMMENT 'corresponding to the document id', + `from_version_id` int DEFAULT NULL COMMENT 'Based on udf version id', + `code_md5` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'source code of md5', + `dialect` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'dialect', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type', + `step` int DEFAULT NULL COMMENT 'job lifecycle step', + `enable` tinyint(1) DEFAULT NULL COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='udf'; -- ---------------------------- @@ -929,15 +929,15 @@ CREATE TABLE `dlink_udf` ( -- ---------------------------- DROP TABLE IF EXISTS `dlink_udf_template`; CREATE TABLE `dlink_udf_template` ( - `id` int NOT NULL AUTO_INCREMENT, - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '模板名称', - `code_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '代码类型', - `function_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '函数类型', - `template_code` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '模板代码', - `enabled` tinyint(1) DEFAULT NULL COMMENT 'is enable', - `create_time` datetime DEFAULT NULL COMMENT 'create time', - `update_time` datetime DEFAULT NULL COMMENT 'update time', - PRIMARY KEY (`id`) + `id` int NOT NULL AUTO_INCREMENT, + `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '模板名称', + `code_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '代码类型', + `function_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '函数类型', + `template_code` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '模板代码', + `enabled` tinyint(1) DEFAULT NULL COMMENT 'is enable', + `create_time` datetime DEFAULT NULL COMMENT 'create time', + `update_time` datetime DEFAULT NULL COMMENT 'update time', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='udf template'; -- ---------------------------- diff --git a/dlink-executor/pom.xml b/dlink-executor/pom.xml index 4661f1021d..02750e08b8 100644 --- a/dlink-executor/pom.xml +++ b/dlink-executor/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-executor diff --git a/dlink-extends/pom.xml b/dlink-extends/pom.xml index 5c49b9a3bb..e45d7ef217 100644 --- a/dlink-extends/pom.xml +++ b/dlink-extends/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-extends diff --git a/dlink-flink/dlink-flink-1.11/pom.xml b/dlink-flink/dlink-flink-1.11/pom.xml index 27e660aa8b..e190dfea67 100644 --- a/dlink-flink/dlink-flink-1.11/pom.xml +++ b/dlink-flink/dlink-flink-1.11/pom.xml @@ -22,7 +22,7 @@ dlink-flink com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-flink/dlink-flink-1.12/pom.xml b/dlink-flink/dlink-flink-1.12/pom.xml index 66243b331a..7eca3a81d0 100644 --- a/dlink-flink/dlink-flink-1.12/pom.xml +++ b/dlink-flink/dlink-flink-1.12/pom.xml @@ -22,7 +22,7 @@ dlink-flink com.dlink - 0.7.0 + 0.7.1 4.0.0 diff --git a/dlink-flink/dlink-flink-1.13/pom.xml b/dlink-flink/dlink-flink-1.13/pom.xml index 49c7c46e25..8d9fce93e8 100644 --- a/dlink-flink/dlink-flink-1.13/pom.xml +++ b/dlink-flink/dlink-flink-1.13/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-flink - 0.7.0 + 0.7.1 dlink-flink-1.13 diff --git a/dlink-flink/dlink-flink-1.14/pom.xml b/dlink-flink/dlink-flink-1.14/pom.xml index 752439c911..f86dd48c6d 100644 --- a/dlink-flink/dlink-flink-1.14/pom.xml +++ b/dlink-flink/dlink-flink-1.14/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-flink - 0.7.0 + 0.7.1 dlink-flink-1.14 diff --git a/dlink-flink/dlink-flink-1.15/pom.xml b/dlink-flink/dlink-flink-1.15/pom.xml index f0b4687227..f5c0dbf497 100644 --- a/dlink-flink/dlink-flink-1.15/pom.xml +++ b/dlink-flink/dlink-flink-1.15/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-flink - 0.7.0 + 0.7.1 dlink-flink-1.15 diff --git a/dlink-flink/dlink-flink-1.16/pom.xml b/dlink-flink/dlink-flink-1.16/pom.xml index 43f5f76fb7..ba2bae9ea3 100644 --- a/dlink-flink/dlink-flink-1.16/pom.xml +++ b/dlink-flink/dlink-flink-1.16/pom.xml @@ -5,7 +5,7 @@ com.dlink dlink-flink - 0.7.0 + 0.7.1 dlink-flink-1.16 diff --git a/dlink-flink/pom.xml b/dlink-flink/pom.xml index a0acc877a9..b65b2b4d68 100644 --- a/dlink-flink/pom.xml +++ b/dlink-flink/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-flink diff --git a/dlink-function/pom.xml b/dlink-function/pom.xml index c6d97f30be..7412cc19c6 100644 --- a/dlink-function/pom.xml +++ b/dlink-function/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-function diff --git a/dlink-gateway/pom.xml b/dlink-gateway/pom.xml index 25640f9f7b..4ae3fa0271 100644 --- a/dlink-gateway/pom.xml +++ b/dlink-gateway/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-gateway diff --git a/dlink-gateway/src/main/java/com/dlink/gateway/result/AbstractGatewayResult.java b/dlink-gateway/src/main/java/com/dlink/gateway/result/AbstractGatewayResult.java index bc5e822937..e465601502 100644 --- a/dlink-gateway/src/main/java/com/dlink/gateway/result/AbstractGatewayResult.java +++ b/dlink-gateway/src/main/java/com/dlink/gateway/result/AbstractGatewayResult.java @@ -64,4 +64,14 @@ public void fail(String error) { this.endTime = LocalDateTime.now(); this.exceptionMsg = error; } + + @Override + public boolean isSucess() { + return isSuccess; + } + + @Override + public String getError() { + return exceptionMsg; + } } diff --git a/dlink-gateway/src/main/java/com/dlink/gateway/result/GatewayResult.java b/dlink-gateway/src/main/java/com/dlink/gateway/result/GatewayResult.java index 9eade6bc9b..b37fe033d2 100644 --- a/dlink-gateway/src/main/java/com/dlink/gateway/result/GatewayResult.java +++ b/dlink-gateway/src/main/java/com/dlink/gateway/result/GatewayResult.java @@ -34,4 +34,8 @@ public interface GatewayResult { String getWebURL(); List getJids(); + + String getError(); + + boolean isSucess(); } diff --git a/dlink-metadata/dlink-metadata-base/pom.xml b/dlink-metadata/dlink-metadata-base/pom.xml index f10ba77dab..3a000407c0 100644 --- a/dlink-metadata/dlink-metadata-base/pom.xml +++ b/dlink-metadata/dlink-metadata-base/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-base diff --git a/dlink-metadata/dlink-metadata-clickhouse/pom.xml b/dlink-metadata/dlink-metadata-clickhouse/pom.xml index 2bd974adea..19ef9138a6 100644 --- a/dlink-metadata/dlink-metadata-clickhouse/pom.xml +++ b/dlink-metadata/dlink-metadata-clickhouse/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-clickhouse diff --git a/dlink-metadata/dlink-metadata-doris/pom.xml b/dlink-metadata/dlink-metadata-doris/pom.xml index e9a1a16c4d..8240cc121c 100644 --- a/dlink-metadata/dlink-metadata-doris/pom.xml +++ b/dlink-metadata/dlink-metadata-doris/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-doris diff --git a/dlink-metadata/dlink-metadata-hive/pom.xml b/dlink-metadata/dlink-metadata-hive/pom.xml index a15a7f1ca8..234ea814eb 100644 --- a/dlink-metadata/dlink-metadata-hive/pom.xml +++ b/dlink-metadata/dlink-metadata-hive/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-hive diff --git a/dlink-metadata/dlink-metadata-mysql/pom.xml b/dlink-metadata/dlink-metadata-mysql/pom.xml index 710e7eff03..4ebc5e2e3e 100644 --- a/dlink-metadata/dlink-metadata-mysql/pom.xml +++ b/dlink-metadata/dlink-metadata-mysql/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-mysql diff --git a/dlink-metadata/dlink-metadata-oracle/pom.xml b/dlink-metadata/dlink-metadata-oracle/pom.xml index efaa22041e..f36642c1e4 100644 --- a/dlink-metadata/dlink-metadata-oracle/pom.xml +++ b/dlink-metadata/dlink-metadata-oracle/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-oracle diff --git a/dlink-metadata/dlink-metadata-phoenix/pom.xml b/dlink-metadata/dlink-metadata-phoenix/pom.xml index 6e869c78ab..804ef7febe 100644 --- a/dlink-metadata/dlink-metadata-phoenix/pom.xml +++ b/dlink-metadata/dlink-metadata-phoenix/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-phoenix diff --git a/dlink-metadata/dlink-metadata-postgresql/pom.xml b/dlink-metadata/dlink-metadata-postgresql/pom.xml index fb754aa194..639178bdf4 100644 --- a/dlink-metadata/dlink-metadata-postgresql/pom.xml +++ b/dlink-metadata/dlink-metadata-postgresql/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-postgresql diff --git a/dlink-metadata/dlink-metadata-postgresql/src/main/java/com/dlink/metadata/convert/PostgreSqlTypeConvert.java b/dlink-metadata/dlink-metadata-postgresql/src/main/java/com/dlink/metadata/convert/PostgreSqlTypeConvert.java index 1eed9ac6b3..deabb3e03a 100644 --- a/dlink-metadata/dlink-metadata-postgresql/src/main/java/com/dlink/metadata/convert/PostgreSqlTypeConvert.java +++ b/dlink-metadata/dlink-metadata-postgresql/src/main/java/com/dlink/metadata/convert/PostgreSqlTypeConvert.java @@ -51,7 +51,7 @@ public ColumnType convert(Column column) { } else { columnType = ColumnType.INT; } - } else if (t.contains("bigint") || t.contains("bigserial")) { + } else if (t.contains("bigint") || t.contains("int8") || t.contains("bigserial")) { if (isNullable) { columnType = ColumnType.JAVA_LANG_LONG; } else { diff --git a/dlink-metadata/dlink-metadata-presto/pom.xml b/dlink-metadata/dlink-metadata-presto/pom.xml index f17d15ee76..4a04abba69 100644 --- a/dlink-metadata/dlink-metadata-presto/pom.xml +++ b/dlink-metadata/dlink-metadata-presto/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-presto diff --git a/dlink-metadata/dlink-metadata-sqlserver/pom.xml b/dlink-metadata/dlink-metadata-sqlserver/pom.xml index 7480961ce2..c2b8eca256 100644 --- a/dlink-metadata/dlink-metadata-sqlserver/pom.xml +++ b/dlink-metadata/dlink-metadata-sqlserver/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-sqlserver diff --git a/dlink-metadata/dlink-metadata-starrocks/pom.xml b/dlink-metadata/dlink-metadata-starrocks/pom.xml index bc2aae3b32..12145531d7 100644 --- a/dlink-metadata/dlink-metadata-starrocks/pom.xml +++ b/dlink-metadata/dlink-metadata-starrocks/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink-metadata - 0.7.0 + 0.7.1 dlink-metadata-starrocks diff --git a/dlink-metadata/pom.xml b/dlink-metadata/pom.xml index e183ffe6c8..ff19340d75 100644 --- a/dlink-metadata/pom.xml +++ b/dlink-metadata/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-metadata diff --git a/dlink-process/pom.xml b/dlink-process/pom.xml index a4b4d190eb..87a0b49a45 100644 --- a/dlink-process/pom.xml +++ b/dlink-process/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-process diff --git a/dlink-scheduler/pom.xml b/dlink-scheduler/pom.xml index 5cb1c2fbe5..d778fd7a0f 100644 --- a/dlink-scheduler/pom.xml +++ b/dlink-scheduler/pom.xml @@ -21,7 +21,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-scheduler diff --git a/dlink-web/pom.xml b/dlink-web/pom.xml index 8f68a46a24..e11f1d1c3a 100644 --- a/dlink-web/pom.xml +++ b/dlink-web/pom.xml @@ -5,7 +5,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 dlink-web diff --git a/dlink-web/src/components/Common/CodeShow.tsx b/dlink-web/src/components/Common/CodeShow.tsx index f8e95d7f80..0755515fc0 100644 --- a/dlink-web/src/components/Common/CodeShow.tsx +++ b/dlink-web/src/components/Common/CodeShow.tsx @@ -27,6 +27,7 @@ export type CodeShowFormProps = { theme?: string; options?: any; code: string; + editorDidMountHandle: any; }; const CodeShow = (props: CodeShowFormProps) => { @@ -44,6 +45,7 @@ const CodeShow = (props: CodeShowFormProps) => { automaticLayout: true, }, code, + editorDidMountHandle, } = props; return (<> @@ -54,6 +56,7 @@ const CodeShow = (props: CodeShowFormProps) => { value={code} options={options} theme='vs-dark' + editorDidMount={editorDidMountHandle} /> ) }; diff --git a/dlink-web/src/components/Common/Version.ts b/dlink-web/src/components/Common/Version.ts index 5ee6b512dd..e7cd7f17d6 100644 --- a/dlink-web/src/components/Common/Version.ts +++ b/dlink-web/src/components/Common/Version.ts @@ -17,4 +17,4 @@ * */ -export const VERSION = '0.7.0'; +export const VERSION = '0.7.1'; diff --git a/dlink-web/src/components/Studio/StudioConsole/StudioMsg/index.tsx b/dlink-web/src/components/Studio/StudioConsole/StudioMsg/index.tsx index fd5b8365af..41e7edefe3 100644 --- a/dlink-web/src/components/Studio/StudioConsole/StudioMsg/index.tsx +++ b/dlink-web/src/components/Studio/StudioConsole/StudioMsg/index.tsx @@ -22,6 +22,8 @@ import {connect} from "umi"; import React, {useEffect, useState} from "react"; import CodeShow from "@/components/Common/CodeShow"; import {getConsoleInfo} from "@/pages/SettingCenter/ProcessList/service"; +import { clearConsole } from "../../StudioEvent/DDL"; +import {l} from "@/utils/intl"; const StudioMsg = (props: any) => { @@ -45,9 +47,25 @@ const StudioMsg = (props: any) => { } } + const editorDidMountHandle = (editor: any, monaco: any) => { + editor.addAction({ + id: 'btn-studio-msg-clear', // menu id + label: l('pages.datastudio.editor.clearConsole'), // menu name + contextMenuGroupId: '9_cutcopypaste', // menu group + run: () => { + clearConsole().then((result) => { + setConsoleInfo("") + refreshConsoleInfo() + }); + }, // 点击后执行的操作 + }) + }; + + + return ( <> - + ); }; diff --git a/pom.xml b/pom.xml index d63c0344d4..5d389acb59 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.dlink dlink - 0.7.0 + 0.7.1 pom Dinky : @@ -77,7 +77,7 @@ 1.31.0 3.3.2 - 4.4.1 + 4.5.13 3.3.0 3.4.2 3.2.0