Skip to content

D
dlink
Unverified Commit a70e0209 authored by aiwenmo's avatar aiwenmo Committed by GitHub
Browse files
Options

[Feature-996][*] Release v0.6.7 (#997) 

Co-authored-by: 's avatarwenmo <32723967+wenmo@users.noreply.github.com>
parent 3f2d8cd7
Show whitespace changes
Inline Side-by-side
Showing with 1943 additions and 197 deletions
dlink-admin/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-admin/src/main/resources/banner.txt
View file @ a70e0209
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
\__.' \__.'
Version: 0.6.7-SNAPSHOT Version: 0.6.7
Github: https://github.com/DataLinkDC/dlink Github: https://github.com/DataLinkDC/dlink
公众号: DataLink数据中台 公众号: Dinky 开源
dlink-alert/dlink-alert-base/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-alert</artifactId> <artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-alert/dlink-alert-dingtalk/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-alert</artifactId> <artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-alert/dlink-alert-email/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-alert</artifactId> <artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>dlink-alert-email</artifactId> <artifactId>dlink-alert-email</artifactId>
......
dlink-alert/dlink-alert-feishu/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-alert</artifactId> <artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>dlink-alert-feishu</artifactId> <artifactId>dlink-alert-feishu</artifactId>
......
dlink-alert/dlink-alert-wechat/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-alert</artifactId> <artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-alert/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.11/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-app</artifactId> <artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.12/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-app</artifactId> <artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.13/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-app</artifactId> <artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.14/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-app</artifactId> <artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.15/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-app</artifactId> <artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-base/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-app</artifactId> <artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-app/pom.xml
View file @ a70e0209
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-assembly/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-catalog-mysql</artifactId> <artifactId>dlink-catalog-mysql</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.14/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-catalog-mysql</artifactId> <artifactId>dlink-catalog-mysql</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-catalog-mysql</artifactId> <artifactId>dlink-catalog-mysql</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-catalog/dlink-catalog-mysql/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-catalog</artifactId> <artifactId>dlink-catalog</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-catalog/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.11/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-client</artifactId> <artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.12/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-client</artifactId> <artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.13/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-client</artifactId> <artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.14/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-client</artifactId> <artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.14/src/main/java/com/dlink/cdc/sql/SQLSinkBuilder.java
View file @ a70e0209
...@@ -49,6 +49,7 @@ import org.apache.flink.table.operations.Operation; ...@@ -49,6 +49,7 @@ import org.apache.flink.table.operations.Operation;
import org.apache.flink.table.types.logical.BigIntType; import org.apache.flink.table.types.logical.BigIntType;
import org.apache.flink.table.types.logical.DateType; import org.apache.flink.table.types.logical.DateType;
import org.apache.flink.table.types.logical.DecimalType; 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.LogicalType;
import org.apache.flink.table.types.logical.TimestampType; import org.apache.flink.table.types.logical.TimestampType;
import org.apache.flink.table.types.logical.VarBinaryType; import org.apache.flink.table.types.logical.VarBinaryType;
...@@ -61,6 +62,7 @@ import org.apache.flink.util.OutputTag; ...@@ -61,6 +62,7 @@ import org.apache.flink.util.OutputTag;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
...@@ -269,26 +271,37 @@ public class SQLSinkBuilder extends AbstractSinkBuilder implements SinkBuilder, ...@@ -269,26 +271,37 @@ public class SQLSinkBuilder extends AbstractSinkBuilder implements SinkBuilder,
return dataStreamSource; return dataStreamSource;
} }
@Override
protected Object convertValue(Object value, LogicalType logicalType) { protected Object convertValue(Object value, LogicalType logicalType) {
if (value == null) { if (value == null) {
return null; return null;
} }
if (logicalType instanceof DateType) { if (logicalType instanceof DateType) {
if (value instanceof Integer) { if (value instanceof Integer) {
return Instant.ofEpochMilli(((Integer) value).longValue()).atZone(sinkTimeZone).toLocalDate(); return LocalDate.ofEpochDay((Integer) value);
} else { } else if (value instanceof Long) {
return Instant.ofEpochMilli((long) value).atZone(sinkTimeZone).toLocalDate(); return Instant.ofEpochMilli((long) value).atZone(sinkTimeZone).toLocalDate();
} else {
return Instant.parse(value.toString()).atZone(sinkTimeZone).toLocalDate();
} }
} else if (logicalType instanceof TimestampType) { } else if (logicalType instanceof TimestampType) {
if (value instanceof Integer) { if (value instanceof Integer) {
return Instant.ofEpochMilli(((Integer) value).longValue()).atZone(sinkTimeZone).toLocalDateTime(); return Instant.ofEpochMilli(((Integer) value).longValue()).atZone(sinkTimeZone).toLocalDateTime();
} else if (value instanceof String) { } else if (value instanceof Long) {
return Instant.parse((String) value).atZone(sinkTimeZone).toLocalDateTime();
} else {
return Instant.ofEpochMilli((long) value).atZone(sinkTimeZone).toLocalDateTime(); return Instant.ofEpochMilli((long) value).atZone(sinkTimeZone).toLocalDateTime();
} else {
return Instant.parse(value.toString()).atZone(sinkTimeZone).toLocalDateTime();
} }
} else if (logicalType instanceof DecimalType) { } 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) { } else if (logicalType instanceof BigIntType) {
if (value instanceof Integer) { if (value instanceof Integer) {
return ((Integer) value).longValue(); return ((Integer) value).longValue();
...@@ -298,7 +311,7 @@ public class SQLSinkBuilder extends AbstractSinkBuilder implements SinkBuilder, ...@@ -298,7 +311,7 @@ public class SQLSinkBuilder extends AbstractSinkBuilder implements SinkBuilder,
} else if (logicalType instanceof VarBinaryType) { } else if (logicalType instanceof VarBinaryType) {
// VARBINARY AND BINARY is converted to String with encoding base64 in FlinkCDC. // VARBINARY AND BINARY is converted to String with encoding base64 in FlinkCDC.
if (value instanceof String) { if (value instanceof String) {
return DatatypeConverter.parseBase64Binary((String) value); return DatatypeConverter.parseBase64Binary(value.toString());
} else { } else {
return value; return value;
} }
......
dlink-client/dlink-client-1.15/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-client</artifactId> <artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-base/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-client</artifactId> <artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-base/src/main/java/com/dlink/model/FlinkCDCConfig.java
View file @ a70e0209
...@@ -180,6 +180,7 @@ public class FlinkCDCConfig { ...@@ -180,6 +180,7 @@ public class FlinkCDCConfig {
case "table.upper": case "table.upper":
case "table.lower": case "table.lower":
case "column.replace.line-break": case "column.replace.line-break":
case "timezone":
return true; return true;
default: default:
return false; return false;
......
dlink-client/dlink-client-hadoop/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-client</artifactId> <artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-client/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-common/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-doris-1.13/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-connectors</artifactId> <artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-jdbc-1.11/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-connectors</artifactId> <artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-jdbc-1.12/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-connectors</artifactId> <artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-jdbc-1.13/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-connectors</artifactId> <artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-jdbc-1.14/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-connectors</artifactId> <artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-phoenix-1.13/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-connectors</artifactId> <artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-phoenix-1.14/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-connectors</artifactId> <artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-pulsar-1.14/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-connectors</artifactId> <artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<artifactId>dlink-common</artifactId> <artifactId>dlink-common</artifactId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
......
dlink-connectors/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
......
dlink-core/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
......
dlink-daemon/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-doc/sql/dlink_history.sql
View file @ a70e0209
...@@ -692,7 +692,7 @@ CREATE TABLE `dlink_task_version` ( ...@@ -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`; -- DROP TABLE IF EXISTS `dlink_fragment`;
CREATE TABLE `dlink_fragment` ( CREATE TABLE `dlink_fragment` (
......
dlink-executor/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-extends/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.11/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-flink</artifactId> <artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.12/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-flink</artifactId> <artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.13/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-flink</artifactId> <artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.14/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-flink</artifactId> <artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.15/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-flink</artifactId> <artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-flink/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-function/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-gateway/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java
View file @ a70e0209
...@@ -75,12 +75,21 @@ public class KubernetesApplicationGateway extends KubernetesGateway { ...@@ -75,12 +75,21 @@ public class KubernetesApplicationGateway extends KubernetesGateway {
} }
ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(userJarParas, appConfig.getUserJarMainAppClass()); ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(userJarParas, appConfig.getUserJarMainAppClass());
KubernetesClusterDescriptor kubernetesClusterDescriptor = new KubernetesClusterDescriptor(configuration, client); KubernetesClusterDescriptor kubernetesClusterDescriptor = new KubernetesClusterDescriptor(configuration, client);
ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder()
.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder();
.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) {
.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); 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 { try {
ClusterClientProvider<String> clusterClientProvider = kubernetesClusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration); ClusterClientProvider<String> clusterClientProvider = kubernetesClusterDescriptor.deployApplicationCluster(
clusterSpecificationBuilder.createClusterSpecification(), applicationConfiguration);
ClusterClient<String> clusterClient = clusterClientProvider.getClusterClient(); ClusterClient<String> clusterClient = clusterClientProvider.getClusterClient();
Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get(); Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get();
int counts = SystemConfiguration.getInstances().getJobIdWait(); int counts = SystemConfiguration.getInstances().getJobIdWait();
......
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java
View file @ a70e0209
...@@ -87,13 +87,21 @@ public class YarnApplicationGateway extends YarnGateway { ...@@ -87,13 +87,21 @@ public class YarnApplicationGateway extends YarnGateway {
ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(userJarParas, appConfig.getUserJarMainAppClass()); ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(userJarParas, appConfig.getUserJarMainAppClass());
YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor( YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor(
configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true); configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true);
ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder()
.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder();
.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) {
.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); 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 { try {
ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployApplicationCluster( ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployApplicationCluster(
clusterSpecification, clusterSpecificationBuilder.createClusterSpecification(),
applicationConfiguration); applicationConfiguration);
ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient(); ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient();
Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get(); Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get();
......
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java
View file @ a70e0209
...@@ -71,12 +71,21 @@ public class YarnPerJobGateway extends YarnGateway { ...@@ -71,12 +71,21 @@ public class YarnPerJobGateway extends YarnGateway {
YarnResult result = YarnResult.build(getType()); YarnResult result = YarnResult.build(getType());
YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor( YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor(
configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true); configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true);
ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder()
.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder();
.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes()) if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) {
.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification(); 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 { try {
ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployJobCluster(clusterSpecification, jobGraph, true); ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployJobCluster(
clusterSpecificationBuilder.createClusterSpecification(), jobGraph, true);
ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient(); ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient();
ApplicationId applicationId = clusterClient.getClusterId(); ApplicationId applicationId = clusterClient.getClusterId();
result.setAppId(applicationId.toString()); result.setAppId(applicationId.toString());
......
dlink-metadata/dlink-metadata-base/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-clickhouse/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-doris/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-hive/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-mysql/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-oracle/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-phoenix/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-postgresql/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-sqlserver/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-starrocks/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink-metadata</artifactId> <artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-metadata/pom.xml
View file @ a70e0209
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
dlink-web/pom.xml
View file @ a70e0209
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
......
dlink-web/public/dinky.svg
View file @ a70e0209
This source diff could not be displayed because it is too large. You can view the blob instead.
dlink-web/public/dinky2.svg 0 → 100644
View file @ a70e0209
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1641731904214" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10378" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M440.32 552.96c-30.72 0-51.2-20.48-76.8-30.72-76.8-40.96-143.36-92.16-204.8-153.6-20.48-25.6-46.08-46.08-61.44-76.8 20.48-10.24 46.08-5.12 66.56-10.24 5.12 0 10.24 5.12 10.24 5.12 81.92 102.4 174.08 184.32 266.24 266.24z" fill="#1296db" opacity=".29" p-id="10379"></path><path d="M936.96 353.28h-30.72c-40.96 0-81.92-5.12-117.76-35.84-40.96-35.84-92.16-25.6-128 5.12-15.36 15.36-30.72 30.72-40.96 46.08-10.24 5.12-15.36-10.24-20.48-15.36-30.72-35.84-66.56-76.8-102.4-112.64-40.96-35.84-92.16-66.56-143.36-81.92-51.2-10.24-102.4-25.6-148.48-40.96-5.12 0-10.24-5.12-20.48 0l30.72 76.8c0 5.12 0 10.24 5.12 10.24 5.12 25.6 15.36 46.08 25.6 66.56 10.24 25.6 25.6 56.32 40.96 81.92 40.96 71.68 92.16 138.24 148.48 199.68l5.12 5.12c15.36 5.12 10.24 15.36 0 25.6-71.68 102.4-133.12 209.92-184.32 332.8-15.36 25.6-25.6 56.32-35.84 87.04 10.24-10.24 15.36-20.48 20.48-30.72 71.68-117.76 143.36-235.52 271.36-296.96 35.84-15.36 66.56-30.72 102.4-51.2 30.72-15.36 61.44-35.84 81.92-61.44 25.6-20.48 35.84-51.2 46.08-81.92 10.24-35.84 30.72-66.56 61.44-87.04 51.2-25.6 107.52-25.6 163.84-30.72 10.24 0 25.6 5.12 35.84-5.12-25.6-5.12-46.08-5.12-66.56-5.12z" fill="#1296db" p-id="10380"></path><path d="M322.56 399.36c-25.6-40.96-51.2-87.04-76.8-128-5.12-20.48-15.36-40.96-25.6-66.56 0 0-5.12-5.12-5.12-10.24-25.6 0-51.2-5.12-76.8-5.12-5.12 0-10.24-5.12-15.36 0-5.12 5.12 0 10.24 0 15.36 15.36 25.6 30.72 51.2 40.96 76.8l10.24 10.24c51.2 66.56 112.64 122.88 174.08 184.32 30.72 25.6 61.44 56.32 92.16 76.8-40.96-51.2-81.92-97.28-117.76-153.6z" fill="#1296db" opacity=".54" p-id="10381"></path></svg>
\ No newline at end of file
dlink-web/src/components/Common/Version.ts 0 → 100644
View file @ a70e0209
/*
*
* 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';
dlink-web/src/components/Studio/StudioHome/index.tsx
View file @ a70e0209
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
* *
*/ */
import {Typography,Divider} from 'antd'; import {Typography,Divider} from 'antd';
import React from 'react'; import React from 'react';
import {connect} from 'umi'; import {connect} from 'umi';
import {StateType} from '@/pages/DataStudio/model'; import {StateType} from '@/pages/DataStudio/model';
import {Scrollbars} from 'react-custom-scrollbars'; import {Scrollbars} from 'react-custom-scrollbars';
import {VERSION} from "@/components/Common/Version";
const {Title, Paragraph, Text} = Typography; const {Title, Paragraph, Text} = Typography;
...@@ -32,7 +32,7 @@ const StudioHome = (props: any) => { ...@@ -32,7 +32,7 @@ const StudioHome = (props: any) => {
return ( return (
<Scrollbars style={{height: toolHeight}}> <Scrollbars style={{height: toolHeight}}>
<Typography style={{padding:'15px'}}> <Typography style={{padding:'15px'}}>
<Title level={4}>欢迎使用 Dinky v0.6.7-SNAPSHOT</Title> <Title level={4}>欢迎使用 Dinky v{VERSION}</Title>
<Paragraph> <Paragraph>
<blockquote>实时即未来，Dinky 为 Apache Flink 而生，让 Flink SQL 纵享丝滑，并致力于实时计算平台建设。</blockquote> <blockquote>实时即未来，Dinky 为 Apache Flink 而生，让 Flink SQL 纵享丝滑，并致力于实时计算平台建设。</blockquote>
</Paragraph> </Paragraph>
...@@ -81,8 +81,5 @@ const StudioHome = (props: any) => { ...@@ -81,8 +81,5 @@ const StudioHome = (props: any) => {
}; };
export default connect(({Studio}: { Studio: StateType }) => ({ export default connect(({Studio}: { Studio: StateType }) => ({
current: Studio.current,
sql: Studio.sql,
tabs: Studio.tabs,
toolHeight: Studio.toolHeight, toolHeight: Studio.toolHeight,
}))(StudioHome); }))(StudioHome);
dlink-web/src/locales/zh-CN/pages.ts
View file @ a70e0209
/*
*
* 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 { export default {
'pages.layouts.userLayout.title': 'Dinky 一站式实时计算平台', 'pages.layouts.userLayout.title': 'Dinky 实时计算平台',
'pages.login.accountLogin.tab': '账户密码登录', 'pages.login.accountLogin.tab': '账户密码登录',
'pages.login.accountLogin.errorMessage': '错误的用户名和密码（admin/admin)', 'pages.login.accountLogin.errorMessage': '错误的用户名和密码（admin/admin)',
'pages.login.failure': '登录失败，请重试！', 'pages.login.failure': '登录失败，请重试！',
...@@ -29,7 +48,7 @@ export default { ...@@ -29,7 +48,7 @@ export default {
'pages.welcome.link': '欢迎加入', 'pages.welcome.link': '欢迎加入',
'pages.welcome.star': '欢迎 Star ', 'pages.welcome.star': '欢迎 Star ',
'pages.welcome.advancedLayout': 'Github', 'pages.welcome.advancedLayout': 'Github',
'pages.welcome.alertMessage': '实时计算平台 Dinky 即将发布，目前为体验版，版本号为 0.6.7-SNAPSHOT。', 'pages.welcome.alertMessage': '实时计算平台 Dinky 即将发布，目前为体验版，版本号为 ',
'pages.admin.subPage.title': ' 这个页面只有 admin 权限才能查看', 'pages.admin.subPage.title': ' 这个页面只有 admin 权限才能查看',
'pages.admin.subPage.alertMessage': 'umi ui 现已发布，欢迎使用 npm run ui 启动体验。', 'pages.admin.subPage.alertMessage': 'umi ui 现已发布，欢迎使用 npm run ui 启动体验。',
'pages.searchTable.createForm.newRule': '新建规则', 'pages.searchTable.createForm.newRule': '新建规则',
......
dlink-web/src/pages/Welcome.tsx
View file @ a70e0209
...@@ -17,13 +17,14 @@ ...@@ -17,13 +17,14 @@
* *
*/ */
import React from 'react'; import React from 'react';
import { Card, Alert, Typography,Timeline } from 'antd'; import {Alert, Card, Timeline, Typography} from 'antd';
import { useIntl, FormattedMessage } from 'umi'; import {FormattedMessage, useIntl} from 'umi';
import styles from './Welcome.less'; import styles from './Welcome.less';
const { Text, Link,Paragraph } = Typography; import {VERSION} from "@/components/Common/Version";
const CodePreview: React.FC = ({ children }) => (
const {Text, Link, Paragraph} = Typography;
const CodePreview: React.FC = ({children}) => (
<pre className={styles.pre}> <pre className={styles.pre}>
<code> <code>
<Typography.Text copyable>{children}</Typography.Text> <Typography.Text copyable>{children}</Typography.Text>
...@@ -39,8 +40,8 @@ export default (): React.ReactNode => { ...@@ -39,8 +40,8 @@ export default (): React.ReactNode => {
<Alert <Alert
message={intl.formatMessage({ message={intl.formatMessage({
id: 'pages.welcome.alertMessage', id: 'pages.welcome.alertMessage',
defaultMessage: '实时计算平台 Dinky 即将发布，目前为体验版，版本号为 0.6.7-SNAPSHOT。', defaultMessage: '实时计算平台 Dinky 即将发布，目前为体验版，版本号为 ',
})} }) + VERSION + '。'}
type="success" type="success"
showIcon showIcon
banner banner
...@@ -50,40 +51,40 @@ export default (): React.ReactNode => { ...@@ -50,40 +51,40 @@ export default (): React.ReactNode => {
}} }}
/> />
<Typography.Text strong> <Typography.Text strong>
<FormattedMessage id="pages.welcome.Community" defaultMessage="官方社区" />{' '} <FormattedMessage id="pages.welcome.Community" defaultMessage="官方社区"/>{' '}
<FormattedMessage id="pages.welcome.link" defaultMessage="欢迎加入" /> <FormattedMessage id="pages.welcome.link" defaultMessage="欢迎加入"/>
</Typography.Text> </Typography.Text>
<Paragraph> <Paragraph>
<Typography.Text strong> <Typography.Text strong>
<FormattedMessage id="pages.welcome.QQ" defaultMessage="QQ官方社区群" />{' '} <FormattedMessage id="pages.welcome.QQ" defaultMessage="QQ官方社区群"/>{' '}
<FormattedMessage id="pages.welcome.QQcode" defaultMessage="543709668" /> <FormattedMessage id="pages.welcome.QQcode" defaultMessage="543709668"/>
</Typography.Text> </Typography.Text>
</Paragraph> </Paragraph>
<CodePreview>微信公众号：Datalink数据中台</CodePreview> <CodePreview>微信公众号：Dinky 开源</CodePreview>
<Typography.Text <Typography.Text
strong strong
style={{ style={{
marginBottom: 12, marginBottom: 12,
}} }}
> >
<FormattedMessage id="pages.welcome.advancedLayout" defaultMessage="Github" />{' '} <FormattedMessage id="pages.welcome.advancedLayout" defaultMessage="Github"/>{' '}
<a <a
href="https://github.com/DataLinkDC/dlink" href="https://github.com/DataLinkDC/dlink"
rel="noopener noreferrer" rel="noopener noreferrer"
target="__blank" target="__blank"
> >
<FormattedMessage id="pages.welcome.star" defaultMessage="欢迎 Star " /> <FormattedMessage id="pages.welcome.star" defaultMessage="欢迎 Star "/>
</a> </a>
</Typography.Text> </Typography.Text>
<Paragraph> <Paragraph>
<Typography.Text strong> <Typography.Text strong>
<FormattedMessage id="pages.welcome.upgrade" defaultMessage="更新日志" /> <FormattedMessage id="pages.welcome.upgrade" defaultMessage="更新日志"/>
</Typography.Text> </Typography.Text>
</Paragraph> </Paragraph>
<p> </p> <p></p>
<Timeline pending={<><Text code>0.7.0</Text> <Timeline pending={<><Text code>0.7.0</Text>
<Text type="secondary">敬请期待</Text> <Text type="secondary">敬请期待</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -107,7 +108,7 @@ export default (): React.ReactNode => { ...@@ -107,7 +108,7 @@ export default (): React.ReactNode => {
</ul> </ul>
</Paragraph></>} reverse={true}> </Paragraph></>} reverse={true}>
<Timeline.Item><Text code>0.1.0</Text> <Text type="secondary">2021-06-06</Text> <Timeline.Item><Text code>0.1.0</Text> <Text type="secondary">2021-06-06</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -126,7 +127,7 @@ export default (): React.ReactNode => { ...@@ -126,7 +127,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.2.0</Text> <Text type="secondary">2021-06-08</Text> <Timeline.Item><Text code>0.2.0</Text> <Text type="secondary">2021-06-08</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -136,7 +137,8 @@ export default (): React.ReactNode => { ...@@ -136,7 +137,8 @@ export default (): React.ReactNode => {
<Link>支持以 SPI 的方式扩展任意 Connector，同 Flink 官网</Link> <Link>支持以 SPI 的方式扩展任意 Connector，同 Flink 官网</Link>
</li> </li>
<li> <li>
<Link>提供了 dlink-connector-jdbc，额外支持 Oracle 和 ClickHouse 读写，该扩展包可直接上传 Flink 集群的 lib 进行远程使用，无需重新编译</Link> <Link>提供了 dlink-connector-jdbc，额外支持 Oracle 和 ClickHouse 读写，该扩展包可直接上传 Flink 集群的 lib
进行远程使用，无需重新编译</Link>
</li> </li>
<li> <li>
<Link>提供了 dlink-client-1.12，支持 Flink 1.12.0+ 多集群的远程使用与本地隔离使用，1.10、1.11 和 1.13 集群可能存在问题</Link> <Link>提供了 dlink-client-1.12，支持 Flink 1.12.0+ 多集群的远程使用与本地隔离使用，1.10、1.11 和 1.13 集群可能存在问题</Link>
...@@ -157,7 +159,7 @@ export default (): React.ReactNode => { ...@@ -157,7 +159,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.2.1</Text> <Text type="secondary">2021-06-11</Text> <Timeline.Item><Text code>0.2.1</Text> <Text type="secondary">2021-06-11</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -191,7 +193,7 @@ export default (): React.ReactNode => { ...@@ -191,7 +193,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.2.2</Text> <Text type="secondary">2021-06-17</Text> <Timeline.Item><Text code>0.2.2</Text> <Text type="secondary">2021-06-17</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -243,7 +245,7 @@ export default (): React.ReactNode => { ...@@ -243,7 +245,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.2.3</Text> <Text type="secondary">2021-06-21</Text> <Timeline.Item><Text code>0.2.3</Text> <Text type="secondary">2021-06-21</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -274,7 +276,7 @@ export default (): React.ReactNode => { ...@@ -274,7 +276,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.3.0</Text> <Text type="secondary">2021-07-27</Text> <Timeline.Item><Text code>0.3.0</Text> <Text type="secondary">2021-07-27</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -308,7 +310,7 @@ export default (): React.ReactNode => { ...@@ -308,7 +310,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.3.1</Text> <Text type="secondary">2021-08-25</Text> <Timeline.Item><Text code>0.3.1</Text> <Text type="secondary">2021-08-25</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -336,7 +338,7 @@ export default (): React.ReactNode => { ...@@ -336,7 +338,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.3.2</Text> <Text type="secondary">2021-10-22</Text> <Timeline.Item><Text code>0.3.2</Text> <Text type="secondary">2021-10-22</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -376,7 +378,7 @@ export default (): React.ReactNode => { ...@@ -376,7 +378,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.4.0</Text> <Text type="secondary">2021-12-02</Text> <Timeline.Item><Text code>0.4.0</Text> <Text type="secondary">2021-12-02</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -473,7 +475,7 @@ export default (): React.ReactNode => { ...@@ -473,7 +475,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.5.0</Text> <Text type="secondary">2022-01-16</Text> <Timeline.Item><Text code>0.5.0</Text> <Text type="secondary">2022-01-16</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -588,7 +590,7 @@ export default (): React.ReactNode => { ...@@ -588,7 +590,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.5.1</Text> <Text type="secondary">2022-01-24</Text> <Timeline.Item><Text code>0.5.1</Text> <Text type="secondary">2022-01-24</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -649,7 +651,7 @@ export default (): React.ReactNode => { ...@@ -649,7 +651,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.6.0</Text> <Text type="secondary">2022-03-20</Text> <Timeline.Item><Text code>0.6.0</Text> <Text type="secondary">2022-03-20</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -809,7 +811,7 @@ export default (): React.ReactNode => { ...@@ -809,7 +811,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.6.1</Text> <Text type="secondary">2022-04-01</Text> <Timeline.Item><Text code>0.6.1</Text> <Text type="secondary">2022-04-01</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -879,7 +881,7 @@ export default (): React.ReactNode => { ...@@ -879,7 +881,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.6.2</Text> <Text type="secondary">2022-04-17</Text> <Timeline.Item><Text code>0.6.2</Text> <Text type="secondary">2022-04-17</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -970,7 +972,7 @@ export default (): React.ReactNode => { ...@@ -970,7 +972,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.6.3</Text> <Text type="secondary">2022-05-09</Text> <Timeline.Item><Text code>0.6.3</Text> <Text type="secondary">2022-05-09</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -1052,7 +1054,7 @@ export default (): React.ReactNode => { ...@@ -1052,7 +1054,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.6.4</Text> <Text type="secondary">2022-06-05</Text> <Timeline.Item><Text code>0.6.4</Text> <Text type="secondary">2022-06-05</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -1146,7 +1148,7 @@ export default (): React.ReactNode => { ...@@ -1146,7 +1148,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.6.5</Text> <Text type="secondary">2022-07-03</Text> <Timeline.Item><Text code>0.6.5</Text> <Text type="secondary">2022-07-03</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -1267,7 +1269,7 @@ export default (): React.ReactNode => { ...@@ -1267,7 +1269,7 @@ export default (): React.ReactNode => {
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.6.6</Text> <Text type="secondary">2022-07-23</Text> <Timeline.Item><Text code>0.6.6</Text> <Text type="secondary">2022-07-23</Text>
<p> </p> <p></p>
<Paragraph> <Paragraph>
<ul> <ul>
<li> <li>
...@@ -1363,6 +1365,274 @@ export default (): React.ReactNode => { ...@@ -1363,6 +1365,274 @@ export default (): React.ReactNode => {
</ul> </ul>
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
<Timeline.Item><Text code>0.6.7</Text> <Text type="secondary">2022-09-06</Text>
<p></p>
<Paragraph>
<ul>
<li>
<Link>添加多租户的实现</Link>
</li>
<li>
<Link>一键上线和下线作业</Link>
</li>
<li>
<Link>添加全局变量管理</Link>
</li>
<li>
<Link>添加命名空间与密码的表单</Link>
</li>
<li>
<Link>登录时选择多租户</Link>
</li>
<li>
<Link>多租户前端业务管理实现</Link>
</li>
<li>
<Link>添加 github 工作流来检查代码风格、测试类和打包</Link>
</li>
<li>
<Link>添加 druid 连接池来解决 jdbc 多连接问题</Link>
</li>
<li>
<Link>修改 Flink 默认版本为 1.14</Link>
</li>
<li>
<Link>新增全局变量管理实现</Link>
</li>
<li>
<Link>新增 SqlServer 整库同步</Link>
</li>
<li>
<Link>新增全局变量在 Flinksql 中生效</Link>
</li>
<li>
<Link>新增字段血缘分析从 Flink 逻辑计划获取</Link>
</li>
<li>
<Link>新增 postgresql 整库同步</Link>
</li>
<li>
<Link>修改 checkstyle 为必须的工作</Link>
</li>
<li>
<Link>新增 swagger api 文档</Link>
</li>
<li>
<Link>cdcsource 增加多目标库同步功能</Link>
</li>
<li>
<Link>新增文件上传</Link>
</li>
<li>
<Link>Jar 和集群配置管理新增文件上传</Link>
</li>
<li>
<Link>新增 StarRocks 数据源</Link>
</li>
<li>
<Link>新增任务监控失败重复的容错时间</Link>
</li>
<li>
<Link>修改任务监控代码重复判断的问题</Link>
</li>
<li>
<Link>修复邮件报警参数问题</Link>
</li>
<li>
<Link>修复获取作业实例信息可能获取到错误的结果问题</Link>
</li>
<li>
<Link>修复 doris 连接器批量写入时发生异常导致写入失败</Link>
</li>
<li>
<Link>修复 SQLSinkBuilder.buildRow 的错误</Link>
</li>
<li>
<Link>修复 Flink1.14 执行缺失依赖的问题</Link>
</li>
<li>
<Link>修复 savepoint 接口获取前端集群表单的 taskId 为空的问题</Link>
</li>
<li>
<Link>修复 yarn per-job 无法自动释放资源的问题</Link>
</li>
<li>
<Link>修复多租户新增角色和删除角色的问题</Link>
</li>
<li>
<Link>修复 dlink-conector-pulsar-1.14 找不到 SubscriptionType 的报错</Link>
</li>
<li>
<Link>修复 flink1.14 savepoint 时的 jackjson 问题</Link>
</li>
<li>
<Link>修复元数据字段类型转换的问题</Link>
</li>
<li>
<Link>修复整库同步 KafkaSinkBuilder 未序列化导致报错</Link>
</li>
<li>
<Link>修复注册中心文档管理的查询条件错误</Link>
</li>
<li>
<Link>修复 yarn perjob/application 和 k8s application 集群配置未生效</Link>
</li>
<li>
<Link>修复 k8s application 模式提交失败，优化增加获取 JobId 等待时间</Link>
</li>
<li>
<Link>修复日志 banner 的错误</Link>
</li>
<li>
<Link>修复 UDF 和 UDTAF 在 Flink 1.14 的错误</Link>
</li>
<li>
<Link>优化前端和文档</Link>
</li>
<li>
<Link>优化作业被删除后作业版本未被删除</Link>
</li>
<li>
<Link>优化作业树在导入作业后溢出的问题</Link>
</li>
<li>
<Link>优化数据开发的进程列表</Link>
</li>
<li>
<Link>优化整库同步分流逻辑</Link>
</li>
<li>
<Link>优化git提交忽略的文件类型</Link>
</li>
<li>
<Link>优化中文和英文 Readme</Link>
</li>
<li>
<Link>移除一些接口的敏感信息</Link>
</li>
<li>
<Link>优化多租户</Link>
</li>
<li>
<Link>添加 Maven Wrapper</Link>
</li>
<li>
<Link>优化整库同步的时区问题</Link>
</li>
<li>
<Link>优化 sql 默认分隔符统一为 ;\n</Link>
</li>
<li>
<Link>优化代码风格的错误</Link>
</li>
<li>
<Link>添加.DS_Store到git的忽略文件类型</Link>
</li>
<li>
<Link>优化多租户角色穿梭框和前端回显</Link>
</li>
<li>
<Link>优化用户关联角色渲染</Link>
</li>
<li>
<Link>优化 dlink-admin 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-alert 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-common 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-catalog 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-client 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-app 的代码风格</Link>
</li>
<li>
<Link>优化数据源连接池和链接创建</Link>
</li>
<li>
<Link>优化 dlink-connectors 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-core 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-daemon 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-executor 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-function 和 dlink-gateway 的代码风格</Link>
</li>
<li>
<Link>优化 dlink-metadata 的代码风格</Link>
</li>
<li>
<Link>添加协议头到pom文件</Link>
</li>
<li>
<Link>优化项目打包和启动文件</Link>
</li>
<li>
<Link>dlink-client-hadoop 打包增加 ServicesResourceTransformer</Link>
</li>
<li>
<Link>优化配置文件和静态资源目录打包</Link>
</li>
<li>
<Link>配置全局 checkstyle 验证</Link>
</li>
<li>
<Link>添加 sqlserver 的 date 类型转换</Link>
</li>
<li>
<Link>优化 PG 数据库 schema_name 查询 sql </Link>
</li>
<li>
<Link>Doris 支持更多语法</Link>
</li>
<li>
<Link>优化整库同步 DorisSink</Link>
</li>
<li>
<Link>优化前端的展示与提示</Link>
</li>
<li>
<Link>优化数据开发作业目录默认折叠</Link>
</li>
<li>
<Link>合并官网文档仓库源码至主仓库的 docs 目录下</Link>
</li>
<li>
<Link>添加 Flink 1.15 文档</Link>
</li>
<li>
<Link>整库同步文档修复</Link>
</li>
<li>
<Link>添加导入导出作业的文档</Link>
</li>
<li>
<Link>优化多个文档</Link>
</li>
<li>
<Link>更新主页和基础信息的文档</Link>
</li>
<li>
<Link>新增flink扩展redis的实践分享</Link>
</li>
<li>
<Link>优化部署文档</Link>
</li>
</ul>
</Paragraph>
</Timeline.Item>
</Timeline> </Timeline>
</Card> </Card>
</> </>
......
dlink-web/src/pages/user/Login/index.less
View file @ a70e0209
...@@ -61,15 +61,15 @@ ...@@ -61,15 +61,15 @@
} }
.header { .header {
height: 44px; height: 144px;
line-height: 44px; line-height: 144px;
a { a {
text-decoration: none; text-decoration: none;
} }
} }
.logo { .logo {
height: 44px; height: 144px;
margin-right: 16px; margin-right: 16px;
vertical-align: top; vertical-align: top;
} }
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
top: 2px; top: 2px;
color: @heading-color; color: @heading-color;
font-weight: 600; font-weight: 600;
font-size: 33px; font-size: 55px;
font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif; font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
} }
......
pom.xml
View file @ a70e0209
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<groupId>com.dlink</groupId> <groupId>com.dlink</groupId>
<artifactId>dlink</artifactId> <artifactId>dlink</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.6.7-SNAPSHOT</version> <version>0.6.7</version>
<modules> <modules>
<module>dlink-flink</module> <module>dlink-flink</module>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment