diff --git a/dlink-admin/pom.xml b/dlink-admin/pom.xml index f6ace4ffbd..4fc4de4d82 100644 --- a/dlink-admin/pom.xml +++ b/dlink-admin/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-admin/src/main/resources/banner.txt b/dlink-admin/src/main/resources/banner.txt index 5f5100d8a6..352d4b18a6 100644 --- a/dlink-admin/src/main/resources/banner.txt +++ b/dlink-admin/src/main/resources/banner.txt @@ -9,6 +9,6 @@ \__.' -Version: 0.6.7-SNAPSHOT +Version: 0.6.7 Github: https://github.com/DataLinkDC/dlink -公众号: DataLink数据中台 +公众号: Dinky 开源 diff --git a/dlink-alert/dlink-alert-base/pom.xml b/dlink-alert/dlink-alert-base/pom.xml index b3d97356e5..8f680afc01 100644 --- a/dlink-alert/dlink-alert-base/pom.xml +++ b/dlink-alert/dlink-alert-base/pom.xml @@ -22,7 +22,7 @@ dlink-alert com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-alert/dlink-alert-dingtalk/pom.xml b/dlink-alert/dlink-alert-dingtalk/pom.xml index 1360da8cf9..f75f65fe91 100644 --- a/dlink-alert/dlink-alert-dingtalk/pom.xml +++ b/dlink-alert/dlink-alert-dingtalk/pom.xml @@ -22,7 +22,7 @@ dlink-alert com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-alert/dlink-alert-email/pom.xml b/dlink-alert/dlink-alert-email/pom.xml index 30fb81d3a4..023d94ebd0 100644 --- a/dlink-alert/dlink-alert-email/pom.xml +++ b/dlink-alert/dlink-alert-email/pom.xml @@ -22,7 +22,7 @@ dlink-alert com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 dlink-alert-email diff --git a/dlink-alert/dlink-alert-feishu/pom.xml b/dlink-alert/dlink-alert-feishu/pom.xml index 8982d50795..fa4be7143d 100644 --- a/dlink-alert/dlink-alert-feishu/pom.xml +++ b/dlink-alert/dlink-alert-feishu/pom.xml @@ -22,7 +22,7 @@ dlink-alert com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 dlink-alert-feishu diff --git a/dlink-alert/dlink-alert-wechat/pom.xml b/dlink-alert/dlink-alert-wechat/pom.xml index fd432f869d..70e27efe7c 100644 --- a/dlink-alert/dlink-alert-wechat/pom.xml +++ b/dlink-alert/dlink-alert-wechat/pom.xml @@ -22,7 +22,7 @@ dlink-alert com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-alert/pom.xml b/dlink-alert/pom.xml index 50aa7031b1..7373c7cea4 100644 --- a/dlink-alert/pom.xml +++ b/dlink-alert/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-app/dlink-app-1.11/pom.xml b/dlink-app/dlink-app-1.11/pom.xml index d2ed4862a7..522f1db64d 100644 --- a/dlink-app/dlink-app-1.11/pom.xml +++ b/dlink-app/dlink-app-1.11/pom.xml @@ -22,7 +22,7 @@ dlink-app com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-app/dlink-app-1.12/pom.xml b/dlink-app/dlink-app-1.12/pom.xml index 75d9e55092..58ef6e3605 100644 --- a/dlink-app/dlink-app-1.12/pom.xml +++ b/dlink-app/dlink-app-1.12/pom.xml @@ -22,7 +22,7 @@ dlink-app com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-app/dlink-app-1.13/pom.xml b/dlink-app/dlink-app-1.13/pom.xml index 523c087a73..5ed691ef6b 100644 --- a/dlink-app/dlink-app-1.13/pom.xml +++ b/dlink-app/dlink-app-1.13/pom.xml @@ -22,7 +22,7 @@ dlink-app com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-app/dlink-app-1.14/pom.xml b/dlink-app/dlink-app-1.14/pom.xml index 0ac89dd7bd..975936fb68 100644 --- a/dlink-app/dlink-app-1.14/pom.xml +++ b/dlink-app/dlink-app-1.14/pom.xml @@ -22,7 +22,7 @@ dlink-app com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-app/dlink-app-1.15/pom.xml b/dlink-app/dlink-app-1.15/pom.xml index 044466e183..b3e1499762 100644 --- a/dlink-app/dlink-app-1.15/pom.xml +++ b/dlink-app/dlink-app-1.15/pom.xml @@ -22,7 +22,7 @@ dlink-app com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-app/dlink-app-base/pom.xml b/dlink-app/dlink-app-base/pom.xml index c4b828f79f..92178f8cf6 100644 --- a/dlink-app/dlink-app-base/pom.xml +++ b/dlink-app/dlink-app-base/pom.xml @@ -22,7 +22,7 @@ dlink-app com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-app/pom.xml b/dlink-app/pom.xml index 88af55ca06..5de1ce932b 100644 --- a/dlink-app/pom.xml +++ b/dlink-app/pom.xml @@ -5,7 +5,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-assembly/pom.xml b/dlink-assembly/pom.xml index 0aeaf2c4c9..abcd7e1d9b 100644 --- a/dlink-assembly/pom.xml +++ b/dlink-assembly/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 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 f1197a7863..54bb930292 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.6.7-SNAPSHOT + 0.6.7 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 ee653fac37..54881fa662 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 @@ -22,7 +22,7 @@ dlink-catalog-mysql com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 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 e96939d1c8..2b6c432014 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.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-catalog/dlink-catalog-mysql/pom.xml b/dlink-catalog/dlink-catalog-mysql/pom.xml index 2ea7ccd361..bb681fb3da 100644 --- a/dlink-catalog/dlink-catalog-mysql/pom.xml +++ b/dlink-catalog/dlink-catalog-mysql/pom.xml @@ -22,7 +22,7 @@ dlink-catalog com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-catalog/pom.xml b/dlink-catalog/pom.xml index a631023ed7..50462a6182 100644 --- a/dlink-catalog/pom.xml +++ b/dlink-catalog/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-client/dlink-client-1.11/pom.xml b/dlink-client/dlink-client-1.11/pom.xml index 8ee2fb92f4..7a41b13bb2 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.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-client/dlink-client-1.12/pom.xml b/dlink-client/dlink-client-1.12/pom.xml index 36738f9417..7bdff04315 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.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-client/dlink-client-1.13/pom.xml b/dlink-client/dlink-client-1.13/pom.xml index c4ef0d2d34..c9699ea2a7 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.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-client/dlink-client-1.14/pom.xml b/dlink-client/dlink-client-1.14/pom.xml index 4da64427bb..302b08c2a1 100644 --- a/dlink-client/dlink-client-1.14/pom.xml +++ b/dlink-client/dlink-client-1.14/pom.xml @@ -22,7 +22,7 @@ dlink-client com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-client/dlink-client-1.14/src/main/java/com/dlink/cdc/sql/SQLSinkBuilder.java b/dlink-client/dlink-client-1.14/src/main/java/com/dlink/cdc/sql/SQLSinkBuilder.java index 856ca511d2..e0160395eb 100644 --- a/dlink-client/dlink-client-1.14/src/main/java/com/dlink/cdc/sql/SQLSinkBuilder.java +++ b/dlink-client/dlink-client-1.14/src/main/java/com/dlink/cdc/sql/SQLSinkBuilder.java @@ -49,6 +49,7 @@ import org.apache.flink.table.types.logical.BigIntType; import org.apache.flink.table.types.logical.DateType; import org.apache.flink.table.types.logical.DecimalType; +import org.apache.flink.table.types.logical.FloatType; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.TimestampType; import org.apache.flink.table.types.logical.VarBinaryType; @@ -61,6 +62,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; import java.time.ZoneId; import java.util.ArrayList; import java.util.HashMap; @@ -95,67 +97,67 @@ public void addSink(StreamExecutionEnvironment env, DataStream rowDataD } private DataStream buildRow( - DataStream filterOperator, - List columnNameList, - List columnTypeList, - String schemaTableName) { + DataStream filterOperator, + List columnNameList, + List columnTypeList, + String schemaTableName) { final String[] columnNames = columnNameList.toArray(new String[columnNameList.size()]); final LogicalType[] columnTypes = columnTypeList.toArray(new LogicalType[columnTypeList.size()]); TypeInformation[] typeInformations = TypeConversions.fromDataTypeToLegacyInfo(TypeConversions.fromLogicalToDataType(columnTypes)); RowTypeInfo rowTypeInfo = new RowTypeInfo(typeInformations, columnNames); return filterOperator - .flatMap(new FlatMapFunction() { - @Override - public void flatMap(Map value, Collector out) throws Exception { - try { - switch (value.get("op").toString()) { - case "r": - case "c": - Row irow = Row.withPositions(RowKind.INSERT, columnNameList.size()); - Map idata = (Map) value.get("after"); - for (int i = 0; i < columnNameList.size(); i++) { - irow.setField(i, convertValue(idata.get(columnNameList.get(i)), columnTypeList.get(i))); - } - out.collect(irow); - break; - case "d": - Row drow = Row.withPositions(RowKind.DELETE, columnNameList.size()); - Map ddata = (Map) value.get("before"); - for (int i = 0; i < columnNameList.size(); i++) { - drow.setField(i, convertValue(ddata.get(columnNameList.get(i)), columnTypeList.get(i))); - } - out.collect(drow); - break; - case "u": - Row ubrow = Row.withPositions(RowKind.UPDATE_BEFORE, columnNameList.size()); - Map ubdata = (Map) value.get("before"); - for (int i = 0; i < columnNameList.size(); i++) { - ubrow.setField(i, convertValue(ubdata.get(columnNameList.get(i)), columnTypeList.get(i))); - } - out.collect(ubrow); - Row uarow = Row.withPositions(RowKind.UPDATE_AFTER, columnNameList.size()); - Map uadata = (Map) value.get("after"); - for (int i = 0; i < columnNameList.size(); i++) { - uarow.setField(i, convertValue(uadata.get(columnNameList.get(i)), columnTypeList.get(i))); - } - out.collect(uarow); - break; - default: - } - } catch (Exception e) { - logger.error("SchameTable: {} - Row: {} - Exception: {}", schemaTableName, JSONUtil.toJsonString(value), e.getCause().getMessage()); - throw e; + .flatMap(new FlatMapFunction() { + @Override + public void flatMap(Map value, Collector out) throws Exception { + try { + switch (value.get("op").toString()) { + case "r": + case "c": + Row irow = Row.withPositions(RowKind.INSERT, columnNameList.size()); + Map idata = (Map) value.get("after"); + for (int i = 0; i < columnNameList.size(); i++) { + irow.setField(i, convertValue(idata.get(columnNameList.get(i)), columnTypeList.get(i))); + } + out.collect(irow); + break; + case "d": + Row drow = Row.withPositions(RowKind.DELETE, columnNameList.size()); + Map ddata = (Map) value.get("before"); + for (int i = 0; i < columnNameList.size(); i++) { + drow.setField(i, convertValue(ddata.get(columnNameList.get(i)), columnTypeList.get(i))); + } + out.collect(drow); + break; + case "u": + Row ubrow = Row.withPositions(RowKind.UPDATE_BEFORE, columnNameList.size()); + Map ubdata = (Map) value.get("before"); + for (int i = 0; i < columnNameList.size(); i++) { + ubrow.setField(i, convertValue(ubdata.get(columnNameList.get(i)), columnTypeList.get(i))); + } + out.collect(ubrow); + Row uarow = Row.withPositions(RowKind.UPDATE_AFTER, columnNameList.size()); + Map uadata = (Map) value.get("after"); + for (int i = 0; i < columnNameList.size(); i++) { + uarow.setField(i, convertValue(uadata.get(columnNameList.get(i)), columnTypeList.get(i))); + } + out.collect(uarow); + break; + default: } + } catch (Exception e) { + logger.error("SchameTable: {} - Row: {} - Exception: {}", schemaTableName, JSONUtil.toJsonString(value), e.getCause().getMessage()); + throw e; } - }, rowTypeInfo); + } + }, rowTypeInfo); } private void addTableSink( - int indexSink, - CustomTableEnvironment customTableEnvironment, - DataStream rowDataDataStream, - Table table, - List columnNameList) { + int indexSink, + CustomTableEnvironment customTableEnvironment, + DataStream rowDataDataStream, + Table table, + List columnNameList) { String sinkSchemaName = getSinkSchemaName(table); String tableName = getSinkTableName(table); String sinkTableName = tableName + "_" + indexSink; @@ -202,10 +204,10 @@ public SinkBuilder create(FlinkCDCConfig config) { @Override public DataStreamSource build( - CDCBuilder cdcBuilder, - StreamExecutionEnvironment env, - CustomTableEnvironment customTableEnvironment, - DataStreamSource dataStreamSource) { + CDCBuilder cdcBuilder, + StreamExecutionEnvironment env, + CustomTableEnvironment customTableEnvironment, + DataStreamSource dataStreamSource) { final String timeZone = config.getSink().get("timezone"); config.getSink().remove("timezone"); if (Asserts.isNotNullString(timeZone)) { @@ -269,26 +271,37 @@ public void processElement(Map map, ProcessFunction.Context ctx, Colle return dataStreamSource; } + @Override protected Object convertValue(Object value, LogicalType logicalType) { if (value == null) { return null; } if (logicalType instanceof DateType) { if (value instanceof Integer) { - return Instant.ofEpochMilli(((Integer) value).longValue()).atZone(sinkTimeZone).toLocalDate(); - } else { + return LocalDate.ofEpochDay((Integer) value); + } else if (value instanceof Long) { return Instant.ofEpochMilli((long) value).atZone(sinkTimeZone).toLocalDate(); + } else { + return Instant.parse(value.toString()).atZone(sinkTimeZone).toLocalDate(); } } else if (logicalType instanceof TimestampType) { if (value instanceof Integer) { return Instant.ofEpochMilli(((Integer) value).longValue()).atZone(sinkTimeZone).toLocalDateTime(); - } else if (value instanceof String) { - return Instant.parse((String) value).atZone(sinkTimeZone).toLocalDateTime(); - } else { + } else if (value instanceof Long) { return Instant.ofEpochMilli((long) value).atZone(sinkTimeZone).toLocalDateTime(); + } else { + return Instant.parse(value.toString()).atZone(sinkTimeZone).toLocalDateTime(); } } else if (logicalType instanceof DecimalType) { - return new BigDecimal((String) value); + return new BigDecimal(value.toString()); + } else if (logicalType instanceof FloatType) { + if (value instanceof Float) { + return value; + } else if (value instanceof Double) { + return ((Double) value).floatValue(); + } else { + return Float.parseFloat(value.toString()); + } } else if (logicalType instanceof BigIntType) { if (value instanceof Integer) { return ((Integer) value).longValue(); @@ -298,7 +311,7 @@ protected Object convertValue(Object value, LogicalType logicalType) { } else if (logicalType instanceof VarBinaryType) { // VARBINARY AND BINARY is converted to String with encoding base64 in FlinkCDC. if (value instanceof String) { - return DatatypeConverter.parseBase64Binary((String) value); + return DatatypeConverter.parseBase64Binary(value.toString()); } else { return value; } diff --git a/dlink-client/dlink-client-1.15/pom.xml b/dlink-client/dlink-client-1.15/pom.xml index 0232a3224c..73fca89893 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.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-client/dlink-client-base/pom.xml b/dlink-client/dlink-client-base/pom.xml index d6c8914627..846744a1b0 100644 --- a/dlink-client/dlink-client-base/pom.xml +++ b/dlink-client/dlink-client-base/pom.xml @@ -22,7 +22,7 @@ dlink-client com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-client/dlink-client-base/src/main/java/com/dlink/model/FlinkCDCConfig.java b/dlink-client/dlink-client-base/src/main/java/com/dlink/model/FlinkCDCConfig.java index b06e2ea776..533c48125a 100644 --- a/dlink-client/dlink-client-base/src/main/java/com/dlink/model/FlinkCDCConfig.java +++ b/dlink-client/dlink-client-base/src/main/java/com/dlink/model/FlinkCDCConfig.java @@ -180,6 +180,7 @@ private boolean skip(String key) { case "table.upper": case "table.lower": case "column.replace.line-break": + case "timezone": return true; default: return false; diff --git a/dlink-client/dlink-client-hadoop/pom.xml b/dlink-client/dlink-client-hadoop/pom.xml index d5755f42df..230a8a39b5 100644 --- a/dlink-client/dlink-client-hadoop/pom.xml +++ b/dlink-client/dlink-client-hadoop/pom.xml @@ -22,7 +22,7 @@ dlink-client com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-client/pom.xml b/dlink-client/pom.xml index 1163c2da3b..691312c0ba 100644 --- a/dlink-client/pom.xml +++ b/dlink-client/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-common/pom.xml b/dlink-common/pom.xml index 59daad29aa..5d02b641a7 100644 --- a/dlink-common/pom.xml +++ b/dlink-common/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-connectors/dlink-connector-doris-1.13/pom.xml b/dlink-connectors/dlink-connector-doris-1.13/pom.xml index 57e6d92c7f..37ee68132c 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.6.7-SNAPSHOT + 0.6.7 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 64f63b61e2..e138b05d0a 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.6.7-SNAPSHOT + 0.6.7 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 02127a7d8d..8626e7a860 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.6.7-SNAPSHOT + 0.6.7 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 161fed291c..3b81c0051a 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.6.7-SNAPSHOT + 0.6.7 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 5621c67297..e1f100824c 100644 --- a/dlink-connectors/dlink-connector-jdbc-1.14/pom.xml +++ b/dlink-connectors/dlink-connector-jdbc-1.14/pom.xml @@ -22,7 +22,7 @@ dlink-connectors com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml b/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml index b17ccad2fa..fc7e5cd3dc 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.6.7-SNAPSHOT + 0.6.7 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 97dc7f18a6..6dbd22c7da 100644 --- a/dlink-connectors/dlink-connector-phoenix-1.14/pom.xml +++ b/dlink-connectors/dlink-connector-phoenix-1.14/pom.xml @@ -22,7 +22,7 @@ dlink-connectors com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-connectors/dlink-connector-pulsar-1.14/pom.xml b/dlink-connectors/dlink-connector-pulsar-1.14/pom.xml index 4bfb62be3f..188aea8d8d 100644 --- a/dlink-connectors/dlink-connector-pulsar-1.14/pom.xml +++ b/dlink-connectors/dlink-connector-pulsar-1.14/pom.xml @@ -22,7 +22,7 @@ dlink-connectors com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 @@ -44,7 +44,7 @@ com.dlink dlink-common - 0.6.7-SNAPSHOT + 0.6.7 compile diff --git a/dlink-connectors/pom.xml b/dlink-connectors/pom.xml index 889169fd7f..6e1311daa1 100644 --- a/dlink-connectors/pom.xml +++ b/dlink-connectors/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 pom diff --git a/dlink-core/pom.xml b/dlink-core/pom.xml index 6494253318..20c7ae0e3e 100644 --- a/dlink-core/pom.xml +++ b/dlink-core/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 jar diff --git a/dlink-daemon/pom.xml b/dlink-daemon/pom.xml index b2ed01e76c..8acb8462b7 100644 --- a/dlink-daemon/pom.xml +++ b/dlink-daemon/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-doc/sql/dlink_history.sql b/dlink-doc/sql/dlink_history.sql index bd5bf8831c..79c9dfc743 100644 --- a/dlink-doc/sql/dlink_history.sql +++ b/dlink-doc/sql/dlink_history.sql @@ -692,7 +692,7 @@ CREATE TABLE `dlink_task_version` ( --- 0.7-SNAPSHOT 2022-08-02 +-- 0.6.7-SNAPSHOT 2022-08-02 -- ----------------------- -- DROP TABLE IF EXISTS `dlink_fragment`; CREATE TABLE `dlink_fragment` ( diff --git a/dlink-executor/pom.xml b/dlink-executor/pom.xml index 546c948a5e..ba6927643e 100644 --- a/dlink-executor/pom.xml +++ b/dlink-executor/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-extends/pom.xml b/dlink-extends/pom.xml index b08ba4bf53..22322f81a1 100644 --- a/dlink-extends/pom.xml +++ b/dlink-extends/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-flink/dlink-flink-1.11/pom.xml b/dlink-flink/dlink-flink-1.11/pom.xml index 08fd0af8cb..6189810862 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.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-flink/dlink-flink-1.12/pom.xml b/dlink-flink/dlink-flink-1.12/pom.xml index ca7bb3c917..d7223d9b42 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.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-flink/dlink-flink-1.13/pom.xml b/dlink-flink/dlink-flink-1.13/pom.xml index ac7eb82ae9..1b4d1534d1 100644 --- a/dlink-flink/dlink-flink-1.13/pom.xml +++ b/dlink-flink/dlink-flink-1.13/pom.xml @@ -22,7 +22,7 @@ dlink-flink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-flink/dlink-flink-1.14/pom.xml b/dlink-flink/dlink-flink-1.14/pom.xml index 1d02cd0513..d3e9f05845 100644 --- a/dlink-flink/dlink-flink-1.14/pom.xml +++ b/dlink-flink/dlink-flink-1.14/pom.xml @@ -22,7 +22,7 @@ dlink-flink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-flink/dlink-flink-1.15/pom.xml b/dlink-flink/dlink-flink-1.15/pom.xml index c8b2603806..e72d601d45 100644 --- a/dlink-flink/dlink-flink-1.15/pom.xml +++ b/dlink-flink/dlink-flink-1.15/pom.xml @@ -22,7 +22,7 @@ dlink-flink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-flink/pom.xml b/dlink-flink/pom.xml index 52b93ef1a5..924f803c2e 100644 --- a/dlink-flink/pom.xml +++ b/dlink-flink/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-function/pom.xml b/dlink-function/pom.xml index 5f3594dc77..837aac8c45 100644 --- a/dlink-function/pom.xml +++ b/dlink-function/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-gateway/pom.xml b/dlink-gateway/pom.xml index 4131b7bf24..e9fb64f903 100644 --- a/dlink-gateway/pom.xml +++ b/dlink-gateway/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java b/dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java index 2e4c96e466..14d05b3ef5 100644 --- a/dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java +++ b/dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java @@ -75,12 +75,21 @@ public GatewayResult submitJar() { } ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(userJarParas, appConfig.getUserJarMainAppClass()); KubernetesClusterDescriptor kubernetesClusterDescriptor = new KubernetesClusterDescriptor(configuration, client); - ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder() - .setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) - .setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) - .setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); + + ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder(); + if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) { + clusterSpecificationBuilder.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()); + } + if (configuration.contains(TaskManagerOptions.TOTAL_PROCESS_MEMORY)) { + clusterSpecificationBuilder.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()); + } + if (configuration.contains(TaskManagerOptions.NUM_TASK_SLOTS)) { + clusterSpecificationBuilder.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); + } + try { - ClusterClientProvider clusterClientProvider = kubernetesClusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration); + ClusterClientProvider clusterClientProvider = kubernetesClusterDescriptor.deployApplicationCluster( + clusterSpecificationBuilder.createClusterSpecification(), applicationConfiguration); ClusterClient clusterClient = clusterClientProvider.getClusterClient(); Collection jobStatusMessages = clusterClient.listJobs().get(); int counts = SystemConfiguration.getInstances().getJobIdWait(); diff --git a/dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java b/dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java index a68034d40f..8230d3bcf6 100644 --- a/dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java +++ b/dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java @@ -87,13 +87,21 @@ public GatewayResult submitJar() { ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(userJarParas, appConfig.getUserJarMainAppClass()); YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor( configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true); - ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder() - .setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) - .setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) - .setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); + + ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder(); + if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) { + clusterSpecificationBuilder.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()); + } + if (configuration.contains(TaskManagerOptions.TOTAL_PROCESS_MEMORY)) { + clusterSpecificationBuilder.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()); + } + if (configuration.contains(TaskManagerOptions.NUM_TASK_SLOTS)) { + clusterSpecificationBuilder.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); + } + try { ClusterClientProvider clusterClientProvider = yarnClusterDescriptor.deployApplicationCluster( - clusterSpecification, + clusterSpecificationBuilder.createClusterSpecification(), applicationConfiguration); ClusterClient clusterClient = clusterClientProvider.getClusterClient(); Collection jobStatusMessages = clusterClient.listJobs().get(); diff --git a/dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java b/dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java index ee1555a1e2..787939afbf 100644 --- a/dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java +++ b/dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java @@ -70,13 +70,22 @@ public GatewayResult submitJobGraph(JobGraph jobGraph) { } YarnResult result = YarnResult.build(getType()); YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor( - configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true); - ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder() - .setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) - .setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) - .setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); + configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true); + + ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder(); + if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) { + clusterSpecificationBuilder.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()); + } + if (configuration.contains(TaskManagerOptions.TOTAL_PROCESS_MEMORY)) { + clusterSpecificationBuilder.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()); + } + if (configuration.contains(TaskManagerOptions.NUM_TASK_SLOTS)) { + clusterSpecificationBuilder.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); + } + try { - ClusterClientProvider clusterClientProvider = yarnClusterDescriptor.deployJobCluster(clusterSpecification, jobGraph, true); + ClusterClientProvider clusterClientProvider = yarnClusterDescriptor.deployJobCluster( + clusterSpecificationBuilder.createClusterSpecification(), jobGraph, true); ClusterClient clusterClient = clusterClientProvider.getClusterClient(); ApplicationId applicationId = clusterClient.getClusterId(); result.setAppId(applicationId.toString()); diff --git a/dlink-metadata/dlink-metadata-base/pom.xml b/dlink-metadata/dlink-metadata-base/pom.xml index ad9abbe936..aa576a9f2e 100644 --- a/dlink-metadata/dlink-metadata-base/pom.xml +++ b/dlink-metadata/dlink-metadata-base/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-clickhouse/pom.xml b/dlink-metadata/dlink-metadata-clickhouse/pom.xml index c27c9fd220..021fecd473 100644 --- a/dlink-metadata/dlink-metadata-clickhouse/pom.xml +++ b/dlink-metadata/dlink-metadata-clickhouse/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-doris/pom.xml b/dlink-metadata/dlink-metadata-doris/pom.xml index b09ddec78a..42331eafe5 100644 --- a/dlink-metadata/dlink-metadata-doris/pom.xml +++ b/dlink-metadata/dlink-metadata-doris/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-hive/pom.xml b/dlink-metadata/dlink-metadata-hive/pom.xml index 91782e0f3f..870efb2939 100644 --- a/dlink-metadata/dlink-metadata-hive/pom.xml +++ b/dlink-metadata/dlink-metadata-hive/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-mysql/pom.xml b/dlink-metadata/dlink-metadata-mysql/pom.xml index 1fe11ad537..94778075c7 100644 --- a/dlink-metadata/dlink-metadata-mysql/pom.xml +++ b/dlink-metadata/dlink-metadata-mysql/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-oracle/pom.xml b/dlink-metadata/dlink-metadata-oracle/pom.xml index fcb9e1ea21..ae54a0c61a 100644 --- a/dlink-metadata/dlink-metadata-oracle/pom.xml +++ b/dlink-metadata/dlink-metadata-oracle/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-phoenix/pom.xml b/dlink-metadata/dlink-metadata-phoenix/pom.xml index e80bd9feb5..793f8058cc 100644 --- a/dlink-metadata/dlink-metadata-phoenix/pom.xml +++ b/dlink-metadata/dlink-metadata-phoenix/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-postgresql/pom.xml b/dlink-metadata/dlink-metadata-postgresql/pom.xml index 302e794b8d..3ec3f42dab 100644 --- a/dlink-metadata/dlink-metadata-postgresql/pom.xml +++ b/dlink-metadata/dlink-metadata-postgresql/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-sqlserver/pom.xml b/dlink-metadata/dlink-metadata-sqlserver/pom.xml index 09a8dc6ac7..177dd09367 100644 --- a/dlink-metadata/dlink-metadata-sqlserver/pom.xml +++ b/dlink-metadata/dlink-metadata-sqlserver/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/dlink-metadata-starrocks/pom.xml b/dlink-metadata/dlink-metadata-starrocks/pom.xml index 34800ca2cb..0eab5b4e63 100644 --- a/dlink-metadata/dlink-metadata-starrocks/pom.xml +++ b/dlink-metadata/dlink-metadata-starrocks/pom.xml @@ -22,7 +22,7 @@ dlink-metadata com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-metadata/pom.xml b/dlink-metadata/pom.xml index a5d19165d0..d2a2997df5 100644 --- a/dlink-metadata/pom.xml +++ b/dlink-metadata/pom.xml @@ -22,7 +22,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 diff --git a/dlink-web/pom.xml b/dlink-web/pom.xml index e84345662a..ee7370560a 100644 --- a/dlink-web/pom.xml +++ b/dlink-web/pom.xml @@ -5,7 +5,7 @@ dlink com.dlink - 0.6.7-SNAPSHOT + 0.6.7 4.0.0 pom diff --git a/dlink-web/public/dinky.svg b/dlink-web/public/dinky.svg index 78579c899a..b4d5df8343 100644 --- a/dlink-web/public/dinky.svg +++ b/dlink-web/public/dinky.svg @@ -1 +1,1400 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlink-web/public/dinky2.svg b/dlink-web/public/dinky2.svg new file mode 100644 index 0000000000..78579c899a --- /dev/null +++ b/dlink-web/public/dinky2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dlink-web/src/components/Common/Version.ts b/dlink-web/src/components/Common/Version.ts new file mode 100644 index 0000000000..6c73533ecb --- /dev/null +++ b/dlink-web/src/components/Common/Version.ts @@ -0,0 +1,20 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +export const VERSION = '0.6.7'; diff --git a/dlink-web/src/components/Studio/StudioHome/index.tsx b/dlink-web/src/components/Studio/StudioHome/index.tsx index 204d347ce6..6a8478717f 100644 --- a/dlink-web/src/components/Studio/StudioHome/index.tsx +++ b/dlink-web/src/components/Studio/StudioHome/index.tsx @@ -17,12 +17,12 @@ * */ - import {Typography,Divider} from 'antd'; import React from 'react'; import {connect} from 'umi'; import {StateType} from '@/pages/DataStudio/model'; import {Scrollbars} from 'react-custom-scrollbars'; +import {VERSION} from "@/components/Common/Version"; const {Title, Paragraph, Text} = Typography; @@ -32,7 +32,7 @@ const StudioHome = (props: any) => { return ( - 欢迎使用 Dinky v0.6.7-SNAPSHOT + 欢迎使用 Dinky v{VERSION}
实时即未来,Dinky 为 Apache Flink 而生,让 Flink SQL 纵享丝滑,并致力于实时计算平台建设。
@@ -81,8 +81,5 @@ const StudioHome = (props: any) => { }; export default connect(({Studio}: { Studio: StateType }) => ({ - current: Studio.current, - sql: Studio.sql, - tabs: Studio.tabs, toolHeight: Studio.toolHeight, }))(StudioHome); diff --git a/dlink-web/src/locales/zh-CN/pages.ts b/dlink-web/src/locales/zh-CN/pages.ts index 2e3fbbd388..ac8b7afa10 100644 --- a/dlink-web/src/locales/zh-CN/pages.ts +++ b/dlink-web/src/locales/zh-CN/pages.ts @@ -1,5 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + export default { - 'pages.layouts.userLayout.title': 'Dinky 一站式实时计算平台', + 'pages.layouts.userLayout.title': 'Dinky 实时计算平台', 'pages.login.accountLogin.tab': '账户密码登录', 'pages.login.accountLogin.errorMessage': '错误的用户名和密码(admin/admin)', 'pages.login.failure': '登录失败,请重试!', @@ -29,7 +48,7 @@ export default { 'pages.welcome.link': '欢迎加入', 'pages.welcome.star': '欢迎 Star ', 'pages.welcome.advancedLayout': 'Github', - 'pages.welcome.alertMessage': '实时计算平台 Dinky 即将发布,目前为体验版,版本号为 0.6.7-SNAPSHOT。', + 'pages.welcome.alertMessage': '实时计算平台 Dinky 即将发布,目前为体验版,版本号为 ', 'pages.admin.subPage.title': ' 这个页面只有 admin 权限才能查看', 'pages.admin.subPage.alertMessage': 'umi ui 现已发布,欢迎使用 npm run ui 启动体验。', 'pages.searchTable.createForm.newRule': '新建规则', diff --git a/dlink-web/src/pages/Welcome.tsx b/dlink-web/src/pages/Welcome.tsx index eddde73060..0240e9224c 100644 --- a/dlink-web/src/pages/Welcome.tsx +++ b/dlink-web/src/pages/Welcome.tsx @@ -17,13 +17,14 @@ * */ - import React from 'react'; -import { Card, Alert, Typography,Timeline } from 'antd'; -import { useIntl, FormattedMessage } from 'umi'; +import {Alert, Card, Timeline, Typography} from 'antd'; +import {FormattedMessage, useIntl} from 'umi'; import styles from './Welcome.less'; -const { Text, Link,Paragraph } = Typography; -const CodePreview: React.FC = ({ children }) => ( +import {VERSION} from "@/components/Common/Version"; + +const {Text, Link, Paragraph} = Typography; +const CodePreview: React.FC = ({children}) => (
     
       {children}
@@ -39,8 +40,8 @@ export default (): React.ReactNode => {
          {
           }}
         />
         
-          {' '}
-          
+          {' '}
+          
         
         
-        
-          {' '}
-          
-        
+          
+            {' '}
+            
+          
         
-        微信公众号:Datalink数据中台
+        微信公众号:Dinky 开源
         
-          {' '}
+          {' '}
           
-            
+            
           
         
         
-        
-          
-        
+          
+            
+          
         
-        

+

0.7.0 敬请期待 -

+

  • @@ -107,7 +108,7 @@ export default (): React.ReactNode => {
} reverse={true}> 0.1.0 2021-06-06 -

+

  • @@ -126,7 +127,7 @@ export default (): React.ReactNode => { 0.2.0 2021-06-08 -

    +

    • @@ -136,7 +137,8 @@ export default (): React.ReactNode => { 支持以 SPI 的方式扩展任意 Connector,同 Flink 官网
    • - 提供了 dlink-connector-jdbc,额外支持 Oracle 和 ClickHouse 读写,该扩展包可直接上传 Flink 集群的 lib 进行远程使用,无需重新编译 + 提供了 dlink-connector-jdbc,额外支持 Oracle 和 ClickHouse 读写,该扩展包可直接上传 Flink 集群的 lib + 进行远程使用,无需重新编译
    • 提供了 dlink-client-1.12,支持 Flink 1.12.0+ 多集群的远程使用与本地隔离使用,1.10、1.11 和 1.13 集群可能存在问题 @@ -157,7 +159,7 @@ export default (): React.ReactNode => { 0.2.1 2021-06-11 -

      +

      • @@ -191,7 +193,7 @@ export default (): React.ReactNode => { 0.2.2 2021-06-17 -

        +

        • @@ -243,7 +245,7 @@ export default (): React.ReactNode => { 0.2.3 2021-06-21 -

          +

          • @@ -274,7 +276,7 @@ export default (): React.ReactNode => { 0.3.0 2021-07-27 -

            +

            • @@ -308,7 +310,7 @@ export default (): React.ReactNode => { 0.3.1 2021-08-25 -

              +

              • @@ -336,7 +338,7 @@ export default (): React.ReactNode => { 0.3.2 2021-10-22 -

                +

                • @@ -376,7 +378,7 @@ export default (): React.ReactNode => { 0.4.0 2021-12-02 -

                  +

                  • @@ -473,7 +475,7 @@ export default (): React.ReactNode => { 0.5.0 2022-01-16 -

                    +

                    • @@ -588,7 +590,7 @@ export default (): React.ReactNode => { 0.5.1 2022-01-24 -

                      +

                      • @@ -649,7 +651,7 @@ export default (): React.ReactNode => { 0.6.0 2022-03-20 -

                        +

                        • @@ -809,7 +811,7 @@ export default (): React.ReactNode => { 0.6.1 2022-04-01 -

                          +

                          • @@ -879,7 +881,7 @@ export default (): React.ReactNode => { 0.6.2 2022-04-17 -

                            +

                            • @@ -970,7 +972,7 @@ export default (): React.ReactNode => { 0.6.3 2022-05-09 -

                              +

                              • @@ -1052,7 +1054,7 @@ export default (): React.ReactNode => { 0.6.4 2022-06-05 -

                                +

                                • @@ -1146,7 +1148,7 @@ export default (): React.ReactNode => { 0.6.5 2022-07-03 -

                                  +

                                  • @@ -1267,7 +1269,7 @@ export default (): React.ReactNode => { 0.6.6 2022-07-23 -

                                    +

                                    • @@ -1363,6 +1365,274 @@ export default (): React.ReactNode => {
                                    + 0.6.7 2022-09-06 +

                                    + +
                                      +
                                    • + 添加多租户的实现 +
                                    • +
                                    • + 一键上线和下线作业 +
                                    • +
                                    • + 添加全局变量管理 +
                                    • +
                                    • + 添加命名空间与密码的表单 +
                                    • +
                                    • + 登录时选择多租户 +
                                    • +
                                    • + 多租户前端业务管理实现 +
                                    • +
                                    • + 添加 github 工作流来检查代码风格、测试类和打包 +
                                    • +
                                    • + 添加 druid 连接池来解决 jdbc 多连接问题 +
                                    • +
                                    • + 修改 Flink 默认版本为 1.14 +
                                    • +
                                    • + 新增全局变量管理实现 +
                                    • +
                                    • + 新增 SqlServer 整库同步 +
                                    • +
                                    • + 新增全局变量在 Flinksql 中生效 +
                                    • +
                                    • + 新增字段血缘分析从 Flink 逻辑计划获取 +
                                    • +
                                    • + 新增 postgresql 整库同步 +
                                    • +
                                    • + 修改 checkstyle 为必须的工作 +
                                    • +
                                    • + 新增 swagger api 文档 +
                                    • +
                                    • + cdcsource 增加多目标库同步功能 +
                                    • +
                                    • + 新增文件上传 +
                                    • +
                                    • + Jar 和集群配置管理新增文件上传 +
                                    • +
                                    • + 新增 StarRocks 数据源 +
                                    • +
                                    • + 新增任务监控失败重复的容错时间 +
                                    • +
                                    • + 修改任务监控代码重复判断的问题 +
                                    • +
                                    • + 修复邮件报警参数问题 +
                                    • +
                                    • + 修复获取作业实例信息可能获取到错误的结果问题 +
                                    • +
                                    • + 修复 doris 连接器批量写入时发生异常导致写入失败 +
                                    • +
                                    • + 修复 SQLSinkBuilder.buildRow 的错误 +
                                    • +
                                    • + 修复 Flink1.14 执行缺失依赖的问题 +
                                    • +
                                    • + 修复 savepoint 接口获取前端集群表单的 taskId 为空的问题 +
                                    • +
                                    • + 修复 yarn per-job 无法自动释放资源的问题 +
                                    • +
                                    • + 修复多租户新增角色和删除角色的问题 +
                                    • +
                                    • + 修复 dlink-conector-pulsar-1.14 找不到 SubscriptionType 的报错 +
                                    • +
                                    • + 修复 flink1.14 savepoint 时的 jackjson 问题 +
                                    • +
                                    • + 修复元数据字段类型转换的问题 +
                                    • +
                                    • + 修复整库同步 KafkaSinkBuilder 未序列化导致报错 +
                                    • +
                                    • + 修复注册中心文档管理的查询条件错误 +
                                    • +
                                    • + 修复 yarn perjob/application 和 k8s application 集群配置未生效 +
                                    • +
                                    • + 修复 k8s application 模式提交失败,优化增加获取 JobId 等待时间 +
                                    • +
                                    • + 修复日志 banner 的错误 +
                                    • +
                                    • + 修复 UDF 和 UDTAF 在 Flink 1.14 的错误 +
                                    • +
                                    • + 优化前端和文档 +
                                    • +
                                    • + 优化作业被删除后作业版本未被删除 +
                                    • +
                                    • + 优化作业树在导入作业后溢出的问题 +
                                    • +
                                    • + 优化数据开发的进程列表 +
                                    • +
                                    • + 优化整库同步分流逻辑 +
                                    • +
                                    • + 优化git提交忽略的文件类型 +
                                    • +
                                    • + 优化中文和英文 Readme +
                                    • +
                                    • + 移除一些接口的敏感信息 +
                                    • +
                                    • + 优化多租户 +
                                    • +
                                    • + 添加 Maven Wrapper +
                                    • +
                                    • + 优化整库同步的时区问题 +
                                    • +
                                    • + 优化 sql 默认分隔符统一为 ;\n +
                                    • +
                                    • + 优化代码风格的错误 +
                                    • +
                                    • + 添加.DS_Store到git的忽略文件类型 +
                                    • +
                                    • + 优化多租户角色穿梭框和前端回显 +
                                    • +
                                    • + 优化用户关联角色渲染 +
                                    • +
                                    • + 优化 dlink-admin 的代码风格 +
                                    • +
                                    • + 优化 dlink-alert 的代码风格 +
                                    • +
                                    • + 优化 dlink-common 的代码风格 +
                                    • +
                                    • + 优化 dlink-catalog 的代码风格 +
                                    • +
                                    • + 优化 dlink-client 的代码风格 +
                                    • +
                                    • + 优化 dlink-app 的代码风格 +
                                    • +
                                    • + 优化数据源连接池和链接创建 +
                                    • +
                                    • + 优化 dlink-connectors 的代码风格 +
                                    • +
                                    • + 优化 dlink-core 的代码风格 +
                                    • +
                                    • + 优化 dlink-daemon 的代码风格 +
                                    • +
                                    • + 优化 dlink-executor 的代码风格 +
                                    • +
                                    • + 优化 dlink-function 和 dlink-gateway 的代码风格 +
                                    • +
                                    • + 优化 dlink-metadata 的代码风格 +
                                    • +
                                    • + 添加协议头到pom文件 +
                                    • +
                                    • + 优化项目打包和启动文件 +
                                    • +
                                    • + dlink-client-hadoop 打包增加 ServicesResourceTransformer +
                                    • +
                                    • + 优化配置文件和静态资源目录打包 +
                                    • +
                                    • + 配置全局 checkstyle 验证 +
                                    • +
                                    • + 添加 sqlserver 的 date 类型转换 +
                                    • +
                                    • + 优化 PG 数据库 schema_name 查询 sql +
                                    • +
                                    • + Doris 支持更多语法 +
                                    • +
                                    • + 优化整库同步 DorisSink +
                                    • +
                                    • + 优化前端的展示与提示 +
                                    • +
                                    • + 优化数据开发作业目录默认折叠 +
                                    • +
                                    • + 合并官网文档仓库源码至主仓库的 docs 目录下 +
                                    • +
                                    • + 添加 Flink 1.15 文档 +
                                    • +
                                    • + 整库同步文档修复 +
                                    • +
                                    • + 添加导入导出作业的文档 +
                                    • +
                                    • + 优化多个文档 +
                                    • +
                                    • + 更新主页和基础信息的文档 +
                                    • +
                                    • + 新增flink扩展redis的实践分享 +
                                    • +
                                    • + 优化部署文档 +
                                    • +
                                    +
                                    +
                                    diff --git a/dlink-web/src/pages/user/Login/index.less b/dlink-web/src/pages/user/Login/index.less index a6d213a0e8..acf5bd523f 100644 --- a/dlink-web/src/pages/user/Login/index.less +++ b/dlink-web/src/pages/user/Login/index.less @@ -61,15 +61,15 @@ } .header { - height: 44px; - line-height: 44px; + height: 144px; + line-height: 144px; a { text-decoration: none; } } .logo { - height: 44px; + height: 144px; margin-right: 16px; vertical-align: top; } @@ -79,7 +79,7 @@ top: 2px; color: @heading-color; font-weight: 600; - font-size: 33px; + font-size: 55px; font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif; } diff --git a/pom.xml b/pom.xml index 506700364d..1d8b38e122 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.dlink dlink pom - 0.6.7-SNAPSHOT + 0.6.7 dlink-flink