diff --git a/.github/workflows/release-manual-docker-seatunnel.yml b/.github/workflows/release-manual-docker-seatunnel.yml index b1c4158a5..5cd188aee 100644 --- a/.github/workflows/release-manual-docker-seatunnel.yml +++ b/.github/workflows/release-manual-docker-seatunnel.yml @@ -22,9 +22,10 @@ on: seatunnelVersion: description: 'seatunnel version' required: true - default: '2.3.6' + default: '2.3.7' type: choice options: + - 2.3.7 - 2.3.6 flinkVersion: description: 'flink version' diff --git a/README.md b/README.md index f914dbe6b..65d8e917c 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Scaleph is driven by personal interest and evolves actively through faithful dev * Data Integration * Web-ui click-and-drag data integration ways backended by [Apache SeaTunnel](https://seatunnel.apache.org/) on Flink engine. - * Support the latest 2.3.6 V2 out-of-the-box connectors and transforms. + * Support the latest 2.3.7 V2 out-of-the-box connectors and transforms. * DataSource management. diff --git a/pom.xml b/pom.xml index 506d1c624..1688cf353 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 4.10.0 32.1.3-jre 8.3.8 - 0.0.9 + 0.0.10 1.0.13 1.0.2 3.3.4 diff --git a/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/resource/handler/FlinkImageMapping.java b/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/resource/handler/FlinkImageMapping.java index a04618e9d..7ffbf4744 100644 --- a/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/resource/handler/FlinkImageMapping.java +++ b/scaleph-application/scaleph-application-flink/src/main/java/cn/sliew/scaleph/application/flink/resource/handler/FlinkImageMapping.java @@ -38,7 +38,7 @@ public enum FlinkImageMapping { SQL_1_17(FlinkJobType.SQL, OperatorFlinkVersion.v1_17, FlinkVersionMapping.V_1_17, "ghcr.io/flowerfine/scaleph-sql-template:1.17"), SQL_1_18(FlinkJobType.SQL, OperatorFlinkVersion.v1_18, FlinkVersionMapping.V_1_18, "ghcr.io/flowerfine/scaleph-sql-template:1.18"), - SEATUNNEL_1_16(FlinkJobType.SEATUNNEL, OperatorFlinkVersion.v1_16, FlinkVersionMapping.V_1_16, "ghcr.io/flowerfine/scaleph-seatunnel:2.3.6-flink-1.16"), + SEATUNNEL_1_16(FlinkJobType.SEATUNNEL, OperatorFlinkVersion.v1_16, FlinkVersionMapping.V_1_16, "ghcr.io/flowerfine/scaleph-seatunnel:2.3.7-flink-1.16"), FLINK_CDC_1_18(FlinkJobType.FLINK_CDC, OperatorFlinkVersion.v1_18, FlinkVersionMapping.V_1_18, "ghcr.io/flowerfine/scaleph-flink-cdc:3.0.0-flink-1.18"), ; diff --git a/scaleph-common/src/main/java/cn/sliew/scaleph/common/dict/seatunnel/SeaTunnelVersion.java b/scaleph-common/src/main/java/cn/sliew/scaleph/common/dict/seatunnel/SeaTunnelVersion.java index 184fcb1aa..2b8717bd3 100644 --- a/scaleph-common/src/main/java/cn/sliew/scaleph/common/dict/seatunnel/SeaTunnelVersion.java +++ b/scaleph-common/src/main/java/cn/sliew/scaleph/common/dict/seatunnel/SeaTunnelVersion.java @@ -32,6 +32,7 @@ public enum SeaTunnelVersion implements DictInstance { V_2_3_4("2.3.4", "2.3.4"), V_2_3_5("2.3.5", "2.3.5"), V_2_3_6("2.3.6", "2.3.6"), + V_2_3_7("2.3.7", "2.3.7"), ; @JsonCreator diff --git a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/service/DataSourceResource.java b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/service/DataSourceResource.java new file mode 100644 index 000000000..3c4dedf7f --- /dev/null +++ b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/service/DataSourceResource.java @@ -0,0 +1,26 @@ +/* + * 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. + */ + +package cn.sliew.scaleph.ds.service; + +import cn.sliew.carp.module.datasource.service.dto.DsInfoDTO; +import cn.sliew.scaleph.resource.service.ResourceDescriptor; + +public interface DataSourceResource extends ResourceDescriptor { + +} diff --git a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/service/impl/DataSourceResourceImpl.java b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/service/impl/DataSourceResourceImpl.java new file mode 100644 index 000000000..739da366b --- /dev/null +++ b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/service/impl/DataSourceResourceImpl.java @@ -0,0 +1,59 @@ +/* + * 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. + */ + +package cn.sliew.scaleph.ds.service.impl; + +import cn.sliew.carp.framework.common.dict.datasource.DataSourceType; +import cn.sliew.carp.framework.common.model.PageResult; +import cn.sliew.carp.module.datasource.service.CarpDsInfoService; +import cn.sliew.carp.module.datasource.service.dto.DsInfoDTO; +import cn.sliew.carp.module.datasource.service.param.DsInfoListParam; +import cn.sliew.scaleph.common.util.BeanUtil; +import cn.sliew.scaleph.ds.service.DataSourceResource; +import cn.sliew.scaleph.resource.service.enums.ResourceType; +import cn.sliew.scaleph.resource.service.param.ResourceListParam; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class DataSourceResourceImpl implements DataSourceResource { + + @Autowired + private CarpDsInfoService carpDsInfoService; + + @Override + public ResourceType getResourceType() { + return ResourceType.DATASOURCE; + } + + @Override + public Page list(ResourceListParam param) { + DsInfoListParam target = BeanUtil.copy(param, new DsInfoListParam()); + target.setDsType(DataSourceType.of(param.getLabel())); + PageResult pageResult = carpDsInfoService.list(target); + Page page = new Page<>(pageResult.getCurrent(), pageResult.getSize(), pageResult.getTotal()); + page.setRecords(pageResult.getRecords()); + return page; + } + + @Override + public DsInfoDTO getRaw(Long id) { + return carpDsInfoService.selectOne(id, true); + } +} diff --git a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/ResourceListParam.java b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/ResourceListParam.java index 40cfe94ef..862dcbb7e 100644 --- a/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/ResourceListParam.java +++ b/scaleph-resource/src/main/java/cn/sliew/scaleph/resource/service/param/ResourceListParam.java @@ -18,13 +18,13 @@ package cn.sliew.scaleph.resource.service.param; -import cn.sliew.scaleph.system.model.PaginationParam; +import cn.sliew.carp.framework.common.model.PageParam; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -public class ResourceListParam extends PaginationParam { +public class ResourceListParam extends PageParam { private String label; diff --git a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/json.tsx b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/json.tsx index 2e0945060..093feecfc 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/json.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/json.tsx @@ -1,9 +1,12 @@ import React, {useEffect, useRef, useState} from 'react'; import {Drawer} from "antd"; import {useGraphStore} from '@antv/xflow'; -import Editor, {useMonaco} from "@monaco-editor/react"; +import Editor, {loader, useMonaco} from "@monaco-editor/react"; +import * as monaco from "monaco-editor"; import {ModalFormProps} from "@/typings"; +loader.config({monaco}) + const JSONDebugModal: React.FC> = ({visible, onVisibleChange, onCancel}) => { const nodes = useGraphStore((state) => state.nodes); const edges = useGraphStore((state) => state.edges); diff --git a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/seatunnel.tsx b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/seatunnel.tsx index ad6f46bf0..00f304c49 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/seatunnel.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/menubar/seatunnel.tsx @@ -6,6 +6,8 @@ import {ModalFormProps} from "@/typings"; import {WsArtifactSeaTunnel} from "@/services/project/typings"; import {WsArtifactSeaTunnelService} from "@/services/project/WsArtifactSeaTunnelService"; +loader.config({monaco}) + const SeaTunnelConfModal: React.FC> = ({ visible, onVisibleChange, @@ -21,7 +23,7 @@ const SeaTunnelConfModal: React.FC> = ({ monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true); // or make sure that it exists by other ways if (monaco) { - loader.config({ monaco }) + // console.log("here is the monaco instance:", monaco); } }, [monaco]); diff --git a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/canvas-node.tsx b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/canvas-node.tsx index 89c2033be..283bc7001 100644 --- a/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/canvas-node.tsx +++ b/scaleph-ui-react/src/pages/Project/Workspace/DataIntegration/SeaTunnel/Dag/components/node/canvas-node.tsx @@ -64,7 +64,7 @@ const SeaTunnelConnectorDagNode = ({node}: { node: Node }) => { > {node.data.label} - + diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/EditorRightResult/EditorRightResultTable.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/EditorRightResult/EditorRightResultTable.tsx index 8f2529ef4..94b92d1d0 100644 --- a/scaleph-ui-react2/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/EditorRightResult/EditorRightResultTable.tsx +++ b/scaleph-ui-react2/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/EditorRightResult/EditorRightResultTable.tsx @@ -1,8 +1,8 @@ -import { compareStrings } from '@/pages/Project/Workspace/Artifact/Sql/CodeEditor/components/sort'; -import { Editor } from '@monaco-editor/react'; -import { ArtColumn, BaseTable, features, useTablePipeline } from 'ali-react-table'; -import { Button, message, Modal, Typography, Table } from 'antd'; -import React, { useEffect, useMemo, useState, useRef } from 'react'; +import React, {useEffect, useMemo, useState} from 'react'; +import {Button, message, Modal, Table, Typography} from 'antd'; +import {Editor, loader} from '@monaco-editor/react'; +import * as monaco from "monaco-editor"; +import {features, useTablePipeline} from 'ali-react-table'; import styles from './index.less'; interface IViewTableCellData { @@ -10,6 +10,8 @@ interface IViewTableCellData { value: any; } +loader.config({monaco}) + const EditorRightResultTable: React.FC = ({ result, lastOneData, verticalSplitSizes }: any) => { const { Paragraph, Text } = Typography; const [viewTableCellData, setViewTableCellData] = useState(null); diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceStatusYaml.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceStatusYaml.tsx index a178ceb12..d8ac858d0 100644 --- a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceStatusYaml.tsx +++ b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceStatusYaml.tsx @@ -1,8 +1,11 @@ import React, {useEffect, useRef} from "react"; +import {connect} from "umi"; import Editor, {Monaco, loader, useMonaco} from "@monaco-editor/react"; +import * as monaco from "monaco-editor"; import {Props} from '@/app.d'; import {WsFlinkKubernetesTemplate} from "@/services/project/typings"; -import {connect} from "umi"; + +loader.config({monaco}) const DorisInstanceDetailYAMLStatus: React.FC> = (props: any) => { const editorRef = useRef(null); @@ -12,7 +15,6 @@ const DorisInstanceDetailYAMLStatus: React.FC> // do conditional chaining monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true); if (monaco) { - loader.config({monaco}) } }, [monaco]); diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceYaml.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceYaml.tsx index af9d88769..d85d3f0c8 100644 --- a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceYaml.tsx +++ b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Detail/YAML/DorisInstanceYaml.tsx @@ -1,8 +1,11 @@ import React, {useEffect, useRef} from "react"; -import Editor, {Monaco, useMonaco} from "@monaco-editor/react"; +import {connect} from "umi"; +import Editor, {loader, Monaco, useMonaco} from "@monaco-editor/react"; +import * as monaco from "monaco-editor"; import {Props} from '@/app.d'; import {WsFlinkKubernetesTemplate} from "@/services/project/typings"; -import {connect} from "umi"; + +loader.config({monaco}) const DorisInstanceDetailYAMLInstance: React.FC> = (props: any) => { const editorRef = useRef(null); diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Steps/YAMLStepForm.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Steps/YAMLStepForm.tsx index 807aee7b1..254518910 100644 --- a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Steps/YAMLStepForm.tsx +++ b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorInstance/Steps/YAMLStepForm.tsx @@ -1,7 +1,10 @@ import React, {useEffect, useRef} from "react"; -import {ProCard} from "@ant-design/pro-components"; -import Editor, {Monaco, useMonaco} from "@monaco-editor/react"; import {connect} from "umi"; +import {ProCard} from "@ant-design/pro-components"; +import Editor, {loader, Monaco, useMonaco} from "@monaco-editor/react"; +import * as monaco from "monaco-editor"; + +loader.config({monaco}) const DorisInstanceYAML: React.FC = (props: any) => { const editorRef = useRef(null); diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorTemplate/Detail/index.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorTemplate/Detail/index.tsx index 10f62d19b..be9dba02a 100644 --- a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorTemplate/Detail/index.tsx +++ b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorTemplate/Detail/index.tsx @@ -1,12 +1,15 @@ -import {useIntl, useLocation} from "umi"; import React, {useEffect, useRef, useState} from "react"; -import {WsDorisOperatorTemplate} from "@/services/project/typings"; -import {PageContainer, ProCard, StatisticCard} from "@ant-design/pro-components"; import {Divider, Space, Statistic} from "antd"; +import {useIntl, useLocation} from "umi"; +import {PageContainer, ProCard, StatisticCard} from "@ant-design/pro-components"; import RcResizeObserver from 'rc-resize-observer'; -import Editor, {Monaco, useMonaco} from "@monaco-editor/react"; -import {WsDorisOperatorTemplateService} from "@/services/project/WsDorisOperatorTemplateService"; +import Editor, {loader, Monaco, useMonaco} from "@monaco-editor/react"; +import * as monaco from "monaco-editor"; import YAML from "yaml"; +import {WsDorisOperatorTemplateService} from "@/services/project/WsDorisOperatorTemplateService"; +import {WsDorisOperatorTemplate} from "@/services/project/typings"; + +loader.config({monaco}) const DorisTemplateDetailWeb: React.FC = () => { const intl = useIntl(); diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorTemplate/Steps/YAMLStepForm.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorTemplate/Steps/YAMLStepForm.tsx index c02566c83..309984ca3 100644 --- a/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorTemplate/Steps/YAMLStepForm.tsx +++ b/scaleph-ui-react2/src/pages/Project/Workspace/Doris/OperatorTemplate/Steps/YAMLStepForm.tsx @@ -1,7 +1,10 @@ import React, {useEffect, useRef} from "react"; import {ProCard} from "@ant-design/pro-components"; -import Editor, {Monaco, useMonaco} from "@monaco-editor/react"; import {connect} from "umi"; +import Editor, {loader, Monaco, useMonaco} from "@monaco-editor/react"; +import * as monaco from "monaco-editor"; + +loader.config({monaco}) const DorisTemplateYAML: React.FC = (props: any) => { const editorRef = useRef(null); diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Kubernetes/Deployment/Steps/New/YAMLStepForm.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Kubernetes/Deployment/Steps/New/YAMLStepForm.tsx index 3a4ab06e0..23bdf61da 100644 --- a/scaleph-ui-react2/src/pages/Project/Workspace/Kubernetes/Deployment/Steps/New/YAMLStepForm.tsx +++ b/scaleph-ui-react2/src/pages/Project/Workspace/Kubernetes/Deployment/Steps/New/YAMLStepForm.tsx @@ -1,10 +1,13 @@ import {connect} from "umi"; import React, {useEffect, useRef, useState} from "react"; import {ProCard} from "@ant-design/pro-components"; -import Editor, {Monaco, useMonaco} from "@monaco-editor/react"; +import Editor, {loader, Monaco, useMonaco} from "@monaco-editor/react"; +import * as monaco from "monaco-editor"; import YAML from "yaml"; import {WsFlinkKubernetesDeploymentService} from "@/services/project/WsFlinkKubernetesDeploymentService"; +loader.config({monaco}) + const DeploymentYAMLStepForm: React.FC = (props: any) => { const editorRef = useRef(null); const monaco = useMonaco(); diff --git a/scaleph-ui-react2/src/pages/Project/Workspace/Kubernetes/Template/Steps/New/YAML/TemplateEditor.tsx b/scaleph-ui-react2/src/pages/Project/Workspace/Kubernetes/Template/Steps/New/YAML/TemplateEditor.tsx index f22b1f8b4..b8a8e12c4 100644 --- a/scaleph-ui-react2/src/pages/Project/Workspace/Kubernetes/Template/Steps/New/YAML/TemplateEditor.tsx +++ b/scaleph-ui-react2/src/pages/Project/Workspace/Kubernetes/Template/Steps/New/YAML/TemplateEditor.tsx @@ -1,8 +1,11 @@ import React, {useEffect, useRef} from "react"; -import Editor, {Monaco, useMonaco} from "@monaco-editor/react"; +import {connect} from "umi"; +import Editor, {loader, Monaco, useMonaco} from "@monaco-editor/react"; +import * as monaco from "monaco-editor"; import {Props} from '@/app'; import {WsFlinkKubernetesTemplate} from "@/services/project/typings"; -import {connect} from "umi"; + +loader.config({monaco}) const FlinkKubernetesTemplateYAMLStepEditor: React.FC> = (props: any) => { const editorRef = useRef(null); diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile b/tools/docker/build/scaleph-seatunnel/Dockerfile index b7a8e03f1..bf15fabaa 100644 --- a/tools/docker/build/scaleph-seatunnel/Dockerfile +++ b/tools/docker/build/scaleph-seatunnel/Dockerfile @@ -18,7 +18,7 @@ ARG FLINK_VERSION=1.16 ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION} FROM $BASE_RELEASE_IMAGE as release -ARG SEATUNNEL_VERSION=2.3.6 +ARG SEATUNNEL_VERSION=2.3.7 ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz ENV SEATUNNEL_HOME=/opt/seatunnel diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile_backup b/tools/docker/build/scaleph-seatunnel/Dockerfile_backup index f69818614..cdb60c1fd 100644 --- a/tools/docker/build/scaleph-seatunnel/Dockerfile_backup +++ b/tools/docker/build/scaleph-seatunnel/Dockerfile_backup @@ -18,7 +18,7 @@ ARG FLINK_VERSION=1.15 ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION} FROM maven:3.8-eclipse-temurin-11 as build -ARG SEATUNNEL_VERSION=2.3.3 +ARG SEATUNNEL_VERSION=2.3.7 ENV SEATUNNEL_HOME=/opt/seatunnel diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile_single b/tools/docker/build/scaleph-seatunnel/Dockerfile_single index 6474c835b..abff77bab 100644 --- a/tools/docker/build/scaleph-seatunnel/Dockerfile_single +++ b/tools/docker/build/scaleph-seatunnel/Dockerfile_single @@ -18,7 +18,7 @@ ARG FLINK_VERSION=1.15 ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION} FROM $BASE_RELEASE_IMAGE as release -ARG SEATUNNEL_VERSION=2.3.3 +ARG SEATUNNEL_VERSION=2.3.7 ENV SEATUNNEL_HOME=/opt/seatunnel diff --git a/tools/docker/build/scaleph-seatunnel/install-plugin.sh b/tools/docker/build/scaleph-seatunnel/install-plugin.sh index 9d4ec1edf..b07b92594 100755 --- a/tools/docker/build/scaleph-seatunnel/install-plugin.sh +++ b/tools/docker/build/scaleph-seatunnel/install-plugin.sh @@ -24,7 +24,7 @@ SEATUNNEL_HOME=$(cd $(dirname $0);cd ../;pwd) # connector default version is 2.3.4, you can also choose a custom version. eg: 2.1.2: sh install-plugin.sh 2.1.2 -version=2.3.4 +version=2.3.7 if [ -n "$1" ]; then version="$1" diff --git a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql index 1404b529e..642bd15df 100644 --- a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql +++ b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql @@ -176,25 +176,25 @@ create table ws_artifact_seatunnel ) engine = innodb comment 'artifact seatunnel'; INSERT INTO ws_artifact_seatunnel(id, artifact_id, seatunnel_engine, flink_version, seatunnel_version, dag_id, current, creator, editor) -VALUES (1, 4, 'seatunnel', '1.16.3', '2.3.6', 1, 1, 'sys', 'sys'); +VALUES (1, 4, 'seatunnel', '1.16.3', '2.3.7', 1, 1, 'sys', 'sys'); INSERT INTO ws_artifact_seatunnel(id, artifact_id, seatunnel_engine, flink_version, seatunnel_version, dag_id, current, creator, editor) -VALUES (2, 5, 'seatunnel', '1.16.3', '2.3.6', 2, 1, 'sys', 'sys'); +VALUES (2, 5, 'seatunnel', '1.16.3', '2.3.7', 2, 1, 'sys', 'sys'); INSERT INTO ws_artifact_seatunnel(id, artifact_id, seatunnel_engine, flink_version, seatunnel_version, dag_id, current, creator, editor) -VALUES (3, 11, 'seatunnel', '1.16.3', '2.3.6', 8, 1, 'sys', 'sys'); +VALUES (3, 11, 'seatunnel', '1.16.3', '2.3.7', 8, 1, 'sys', 'sys'); INSERT INTO ws_artifact_seatunnel(id, artifact_id, seatunnel_engine, flink_version, seatunnel_version, dag_id, current, creator, editor) -VALUES (4, 12, 'seatunnel', '1.16.3', '2.3.6', 9, '1', 'sys', 'sys'); +VALUES (4, 12, 'seatunnel', '1.16.3', '2.3.7', 9, '1', 'sys', 'sys'); INSERT INTO `ws_artifact_seatunnel`(`id`, `artifact_id`, `seatunnel_engine`, `flink_version`, `seatunnel_version`, `dag_id`, `current`, `creator`, `editor`) -VALUES (5, 13, 'seatunnel', '1.16.3', '2.3.6', 10, '1', 'sys', 'sys'); +VALUES (5, 13, 'seatunnel', '1.16.3', '2.3.7', 10, '1', 'sys', 'sys'); INSERT INTO `ws_artifact_seatunnel`(`id`, `artifact_id`, `seatunnel_engine`, `flink_version`, `seatunnel_version`, `dag_id`, `current`, `creator`, `editor`) -VALUES (6, 14, 'seatunnel', '1.16.3', '2.3.6', 11, '1', 'sys', 'sys'); +VALUES (6, 14, 'seatunnel', '1.16.3', '2.3.7', 11, '1', 'sys', 'sys'); INSERT INTO `ws_artifact_seatunnel`(`id`, `artifact_id`, `seatunnel_engine`, `flink_version`, `seatunnel_version`, `dag_id`, `current`, `creator`, `editor`) -VALUES (7, 15, 'seatunnel', '1.16.3', '2.3.6', 12, '1', 'sys', 'sys'); +VALUES (7, 15, 'seatunnel', '1.16.3', '2.3.7', 12, '1', 'sys', 'sys'); DROP TABLE IF EXISTS ws_flink_kubernetes_template; CREATE TABLE ws_flink_kubernetes_template