diff --git a/pom.xml b/pom.xml index 85f8518af..666045141 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT pom scaleph Scaleph System diff --git a/scaleph-api/pom.xml b/scaleph-api/pom.xml index b20d6ac57..a876b8055 100644 --- a/scaleph-api/pom.xml +++ b/scaleph-api/pom.xml @@ -22,7 +22,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-api diff --git a/scaleph-application/pom.xml b/scaleph-application/pom.xml index c31c40817..5e1eb84f8 100644 --- a/scaleph-application/pom.xml +++ b/scaleph-application/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-application diff --git a/scaleph-application/scaleph-application-doris/pom.xml b/scaleph-application/scaleph-application-doris/pom.xml index 3f1a495bd..b49a2e14c 100644 --- a/scaleph-application/scaleph-application-doris/pom.xml +++ b/scaleph-application/scaleph-application-doris/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-application - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-application-doris diff --git a/scaleph-application/scaleph-application-flink/pom.xml b/scaleph-application/scaleph-application-flink/pom.xml index 81d29b319..e3f67f9e6 100644 --- a/scaleph-application/scaleph-application-flink/pom.xml +++ b/scaleph-application/scaleph-application-flink/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-application - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-application-flink diff --git a/scaleph-application/scaleph-application-oam/pom.xml b/scaleph-application/scaleph-application-oam/pom.xml index 82baa7c39..c2264840b 100644 --- a/scaleph-application/scaleph-application-oam/pom.xml +++ b/scaleph-application/scaleph-application-oam/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-application - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-application-oam diff --git a/scaleph-common/pom.xml b/scaleph-common/pom.xml index c8fc95f13..3bbfd7822 100644 --- a/scaleph-common/pom.xml +++ b/scaleph-common/pom.xml @@ -22,7 +22,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-common diff --git a/scaleph-config/pom.xml b/scaleph-config/pom.xml index c857bc52e..cf4b5b2dd 100644 --- a/scaleph-config/pom.xml +++ b/scaleph-config/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-config diff --git a/scaleph-dao/pom.xml b/scaleph-dao/pom.xml index 0c62d7b94..90e61a94d 100644 --- a/scaleph-dao/pom.xml +++ b/scaleph-dao/pom.xml @@ -22,7 +22,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-dao diff --git a/scaleph-dataservice/pom.xml b/scaleph-dataservice/pom.xml index 3649ac9f6..0c0c9695c 100644 --- a/scaleph-dataservice/pom.xml +++ b/scaleph-dataservice/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-dataservice diff --git a/scaleph-datasource/pom.xml b/scaleph-datasource/pom.xml index 9ad748217..9435829c3 100644 --- a/scaleph-datasource/pom.xml +++ b/scaleph-datasource/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT scaleph-datasource diff --git a/scaleph-dist/pom.xml b/scaleph-dist/pom.xml index 2ed428192..523edd1b3 100644 --- a/scaleph-dist/pom.xml +++ b/scaleph-dist/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-dist diff --git a/scaleph-engine/pom.xml b/scaleph-engine/pom.xml index 6746b3071..4baaab8e5 100644 --- a/scaleph-engine/pom.xml +++ b/scaleph-engine/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-engine diff --git a/scaleph-engine/scaleph-engine-flink-client/pom.xml b/scaleph-engine/scaleph-engine-flink-client/pom.xml index 534555ddb..7c2185ace 100644 --- a/scaleph-engine/scaleph-engine-flink-client/pom.xml +++ b/scaleph-engine/scaleph-engine-flink-client/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-engine - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-engine-flink-client diff --git a/scaleph-engine/scaleph-engine-sql-gateway/pom.xml b/scaleph-engine/scaleph-engine-sql-gateway/pom.xml index 6a5c16ab2..d5d7ff63a 100644 --- a/scaleph-engine/scaleph-engine-sql-gateway/pom.xml +++ b/scaleph-engine/scaleph-engine-sql-gateway/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-engine - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-engine-sql-gateway diff --git a/scaleph-engine/scaleph-sql-template/pom.xml b/scaleph-engine/scaleph-sql-template/pom.xml index c42d799e2..b3e41646b 100644 --- a/scaleph-engine/scaleph-sql-template/pom.xml +++ b/scaleph-engine/scaleph-sql-template/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-engine - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-sql-template diff --git a/scaleph-file-fetcher/pom.xml b/scaleph-file-fetcher/pom.xml index 954aac224..083bd81dc 100644 --- a/scaleph-file-fetcher/pom.xml +++ b/scaleph-file-fetcher/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-file-fetcher diff --git a/scaleph-kubernetes/pom.xml b/scaleph-kubernetes/pom.xml index 7603093b7..8976f1d65 100644 --- a/scaleph-kubernetes/pom.xml +++ b/scaleph-kubernetes/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-kubernetes diff --git a/scaleph-meta/pom.xml b/scaleph-meta/pom.xml index ef3785f35..3b597d286 100644 --- a/scaleph-meta/pom.xml +++ b/scaleph-meta/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-meta diff --git a/scaleph-plugins/pom.xml b/scaleph-plugins/pom.xml index 81d710c47..606fa9e39 100644 --- a/scaleph-plugins/pom.xml +++ b/scaleph-plugins/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-plugins diff --git a/scaleph-plugins/scaleph-plugin-datasource/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/pom.xml index ea7d60006..04abc0f79 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../../pom.xml scaleph-plugin-datasource diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-api/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-api/pom.xml index ba12a6bb1..6e70987bc 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-api/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-api/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-clickhouse/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-clickhouse/pom.xml index 5ee542eb6..413c3f7b5 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-clickhouse/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-clickhouse/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-doris/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-doris/pom.xml index 72e25eefe..0996fd268 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-doris/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-doris/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-druid/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-druid/pom.xml index 875aa65a4..1c84dd920 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-druid/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-druid/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-elasticsearch/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-elasticsearch/pom.xml index aabdc782c..2adaaf5a5 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-elasticsearch/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-elasticsearch/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-greenplum/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-greenplum/pom.xml index d7a2cfc9d..f6e2f498e 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-greenplum/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-greenplum/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-jdbc/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-jdbc/pom.xml index 3425c0564..4bdebcf6c 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-jdbc/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-jdbc/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-kafka/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-kafka/pom.xml index 77b21c10b..f00a08d20 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-kafka/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-kafka/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-mysql/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-mysql/pom.xml index 5047a6aeb..99c321e79 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-mysql/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-mysql/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-oracle/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-oracle/pom.xml index a831ff024..b7e9f2ed7 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-oracle/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-oracle/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-postgre/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-postgre/pom.xml index be434bf89..f0d39931d 100644 --- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-postgre/pom.xml +++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-postgre/pom.xml @@ -6,7 +6,7 @@ cn.sliew scaleph-plugin-datasource - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-plugins/scaleph-plugin-flinkcdc/pom.xml b/scaleph-plugins/scaleph-plugin-flinkcdc/pom.xml index 750ea9934..76db08659 100644 --- a/scaleph-plugins/scaleph-plugin-flinkcdc/pom.xml +++ b/scaleph-plugins/scaleph-plugin-flinkcdc/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-plugins - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT scaleph-plugin-flinkcdc diff --git a/scaleph-plugins/scaleph-plugin-framework/pom.xml b/scaleph-plugins/scaleph-plugin-framework/pom.xml index 10b0294b0..2f6397931 100644 --- a/scaleph-plugins/scaleph-plugin-framework/pom.xml +++ b/scaleph-plugins/scaleph-plugin-framework/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-plugins - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-plugin-framework diff --git a/scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml b/scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml index 9ec48be51..53f31c522 100644 --- a/scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml +++ b/scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-plugins - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-plugin-seatunnel-connectors diff --git a/scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml b/scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml index cad363ef5..767c75af8 100644 --- a/scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml +++ b/scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-plugins - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-plugin-seatunnel-native-flink diff --git a/scaleph-resource/pom.xml b/scaleph-resource/pom.xml index 44725c70e..c01dd23de 100644 --- a/scaleph-resource/pom.xml +++ b/scaleph-resource/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-resource diff --git a/scaleph-security/pom.xml b/scaleph-security/pom.xml index b4606419e..c71aa5352 100644 --- a/scaleph-security/pom.xml +++ b/scaleph-security/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-security diff --git a/scaleph-support/pom.xml b/scaleph-support/pom.xml index 44547b50e..451af6434 100644 --- a/scaleph-support/pom.xml +++ b/scaleph-support/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-support diff --git a/scaleph-support/scaleph-cache/pom.xml b/scaleph-support/scaleph-cache/pom.xml index fa782f3f2..55f254eda 100644 --- a/scaleph-support/scaleph-cache/pom.xml +++ b/scaleph-support/scaleph-cache/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-cache diff --git a/scaleph-support/scaleph-dag/pom.xml b/scaleph-support/scaleph-dag/pom.xml index a1f425d0e..6def0501f 100644 --- a/scaleph-support/scaleph-dag/pom.xml +++ b/scaleph-support/scaleph-dag/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT scaleph-dag diff --git a/scaleph-support/scaleph-generator/pom.xml b/scaleph-support/scaleph-generator/pom.xml index dbe45f8f3..77f703288 100644 --- a/scaleph-support/scaleph-generator/pom.xml +++ b/scaleph-support/scaleph-generator/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-generator diff --git a/scaleph-support/scaleph-log/pom.xml b/scaleph-support/scaleph-log/pom.xml index a76d62163..5725feb7e 100644 --- a/scaleph-support/scaleph-log/pom.xml +++ b/scaleph-support/scaleph-log/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-log diff --git a/scaleph-support/scaleph-mail/pom.xml b/scaleph-support/scaleph-mail/pom.xml index ad7fe314a..a36c1b1af 100644 --- a/scaleph-support/scaleph-mail/pom.xml +++ b/scaleph-support/scaleph-mail/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-mail diff --git a/scaleph-support/scaleph-privilege/pom.xml b/scaleph-support/scaleph-privilege/pom.xml index a02a2eebd..e775bb81a 100644 --- a/scaleph-support/scaleph-privilege/pom.xml +++ b/scaleph-support/scaleph-privilege/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-privilege diff --git a/scaleph-support/scaleph-queue/pom.xml b/scaleph-support/scaleph-queue/pom.xml index 06b1ccfad..03d2b303f 100644 --- a/scaleph-support/scaleph-queue/pom.xml +++ b/scaleph-support/scaleph-queue/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-queue diff --git a/scaleph-support/scaleph-storage/pom.xml b/scaleph-support/scaleph-storage/pom.xml index 3d35e8424..67f6fec68 100644 --- a/scaleph-support/scaleph-storage/pom.xml +++ b/scaleph-support/scaleph-storage/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-storage diff --git a/scaleph-support/scaleph-system/pom.xml b/scaleph-support/scaleph-system/pom.xml index b27c1a1d0..f719d901a 100644 --- a/scaleph-support/scaleph-system/pom.xml +++ b/scaleph-support/scaleph-system/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-support - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-system diff --git a/scaleph-ui-react/pom.xml b/scaleph-ui-react/pom.xml index e4a8ce593..1ac7f4bc9 100644 --- a/scaleph-ui-react/pom.xml +++ b/scaleph-ui-react/pom.xml @@ -24,7 +24,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-ui-react diff --git a/scaleph-ui-react2/pom.xml b/scaleph-ui-react2/pom.xml index ee0743f62..4719a9f3c 100644 --- a/scaleph-ui-react2/pom.xml +++ b/scaleph-ui-react2/pom.xml @@ -24,7 +24,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml diff --git a/scaleph-workflow/pom.xml b/scaleph-workflow/pom.xml index 1b9cbc0e2..f15604bed 100644 --- a/scaleph-workflow/pom.xml +++ b/scaleph-workflow/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workflow @@ -32,6 +32,7 @@ scaleph-workflow-api scaleph-workflow-quartz + scaleph-workflow-simple @@ -41,6 +42,11 @@ scaleph-workflow-api ${project.parent.version} + + ${project.parent.groupId} + scaleph-workflow-simple + ${project.parent.version} + \ No newline at end of file diff --git a/scaleph-workflow/scaleph-workflow-api/pom.xml b/scaleph-workflow/scaleph-workflow-api/pom.xml index cba998f09..5c2114bc5 100644 --- a/scaleph-workflow/scaleph-workflow-api/pom.xml +++ b/scaleph-workflow/scaleph-workflow-api/pom.xml @@ -23,20 +23,12 @@ cn.sliew scaleph-workflow - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workflow-api - - ${project.parent.groupId} - scaleph-system - - - ${project.parent.groupId} - scaleph-queue - ${project.parent.groupId} scaleph-dag @@ -63,11 +55,6 @@ pekko-serialization-jackson_${scala.binary.version} - - com.alibaba.cola - cola-component-statemachine - - org.springframework.boot spring-boot-starter-test diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/manager/WorkflowInstanceManager.java b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/manager/WorkflowInstanceManager.java new file mode 100644 index 000000000..d19f46e64 --- /dev/null +++ b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/manager/WorkflowInstanceManager.java @@ -0,0 +1,30 @@ +/* + * 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.workflow.manager; + +public interface WorkflowInstanceManager { + + void deploy(Long id); + + void shutdown(Long id); + + void suspend(Long id); + + void resume(Long id); +} diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/manager/WorkflowTaskInstanceManager.java b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/manager/WorkflowTaskInstanceManager.java new file mode 100644 index 000000000..41d7a96e9 --- /dev/null +++ b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/manager/WorkflowTaskInstanceManager.java @@ -0,0 +1,30 @@ +/* + * 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.workflow.manager; + +public interface WorkflowTaskInstanceManager { + + void deploy(Long id); + + void shutdown(Long id); + + void suspend(Long id); + + void resume(Long id); +} diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/WorkflowInstanceService.java b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/WorkflowInstanceService.java index 0792f8432..e3fbf28ca 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/WorkflowInstanceService.java +++ b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/WorkflowInstanceService.java @@ -38,7 +38,7 @@ public interface WorkflowInstanceService { void updateTaskId(Long id, String taskId); - WorkflowInstanceDTO deploy(WorkflowDefinitionDTO workflowDefinitionDTO); + void deploy(WorkflowDefinitionDTO workflowDefinitionDTO); void shutdown(Long id); diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowInstanceServiceImpl.java b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowInstanceServiceImpl.java index c9c45cb07..83cd41afb 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowInstanceServiceImpl.java +++ b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowInstanceServiceImpl.java @@ -23,12 +23,12 @@ import cn.sliew.scaleph.dao.entity.master.workflow.WorkflowInstance; import cn.sliew.scaleph.dao.entity.master.workflow.WorkflowInstanceVO; import cn.sliew.scaleph.dao.mapper.master.workflow.WorkflowInstanceMapper; +import cn.sliew.scaleph.workflow.manager.WorkflowInstanceManager; import cn.sliew.scaleph.workflow.service.WorkflowInstanceService; import cn.sliew.scaleph.workflow.service.convert.WorkflowInstanceVOConvert; import cn.sliew.scaleph.workflow.service.dto.WorkflowDefinitionDTO; import cn.sliew.scaleph.workflow.service.dto.WorkflowInstanceDTO; import cn.sliew.scaleph.workflow.service.param.WorkflowInstanceListParam; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -46,7 +46,7 @@ public class WorkflowInstanceServiceImpl implements WorkflowInstanceService { @Autowired private WorkflowInstanceMapper workflowInstanceMapper; @Autowired - private WorkflowInstanceStateMachine stateMachine; + private WorkflowInstanceManager workflowInstanceManager; @Override public Page list(WorkflowInstanceListParam param) { @@ -107,28 +107,27 @@ public void updateTaskId(Long id, String taskId) { } @Override - public WorkflowInstanceDTO deploy(WorkflowDefinitionDTO workflowDefinitionDTO) { + public void deploy(WorkflowDefinitionDTO workflowDefinitionDTO) { WorkflowInstance record = new WorkflowInstance(); record.setDagId(workflowDefinitionDTO.getDag().getId()); record.setWorkflowDefinitionId(workflowDefinitionDTO.getId()); record.setState(WorkflowInstanceState.PENDING); workflowInstanceMapper.insert(record); - stateMachine.deploy(get(record.getId())); - return get(record.getId()); + workflowInstanceManager.deploy(record.getId()); } @Override public void shutdown(Long id) { - stateMachine.shutdown(get(id)); + workflowInstanceManager.shutdown(id); } @Override public void suspend(Long id) { - stateMachine.suspend(get(id)); + workflowInstanceManager.suspend(id); } @Override public void resume(Long id) { - stateMachine.resume(get(id)); + workflowInstanceManager.resume(id); } } diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowTaskInstanceServiceImpl.java b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowTaskInstanceServiceImpl.java index 77c4e6bfb..ce28d754e 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowTaskInstanceServiceImpl.java +++ b/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/service/impl/WorkflowTaskInstanceServiceImpl.java @@ -23,13 +23,13 @@ import cn.sliew.scaleph.dao.entity.master.workflow.WorkflowTaskInstance; import cn.sliew.scaleph.dao.entity.master.workflow.WorkflowTaskInstanceVO; import cn.sliew.scaleph.dao.mapper.master.workflow.WorkflowTaskInstanceMapper; +import cn.sliew.scaleph.workflow.manager.WorkflowTaskInstanceManager; import cn.sliew.scaleph.workflow.service.WorkflowTaskInstanceService; import cn.sliew.scaleph.workflow.service.convert.WorkflowTaskInstanceConvert; import cn.sliew.scaleph.workflow.service.convert.WorkflowTaskInstanceVOConvert; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskDefinitionDTO2; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskInstanceDTO; import cn.sliew.scaleph.workflow.service.param.WorkflowTaskInstanceListParam; -import cn.sliew.scaleph.workflow.statemachine.WorkflowTaskInstanceStateMachine; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -54,7 +54,7 @@ public class WorkflowTaskInstanceServiceImpl implements WorkflowTaskInstanceServ @Autowired private WorkflowTaskInstanceMapper workflowTaskInstanceMapper; @Autowired - private WorkflowTaskInstanceStateMachine stateMachine; + private WorkflowTaskInstanceManager workflowTaskInstanceManager; @Override public Page list(WorkflowTaskInstanceListParam param) { @@ -163,21 +163,21 @@ private WorkflowTaskInstanceDTO createWorkflowTaskInstance(Long workflowInstance @Override public void deploy(Long id) { - stateMachine.deploy(get(id)); + workflowTaskInstanceManager.deploy(id); } @Override public void shutdown(Long id) { - stateMachine.shutdown(get(id)); + workflowTaskInstanceManager.shutdown(id); } @Override public void suspend(Long id) { - stateMachine.suspend(get(id)); + workflowTaskInstanceManager.suspend(id); } @Override public void resume(Long id) { - stateMachine.resume(get(id)); + workflowTaskInstanceManager.resume(id); } } diff --git a/scaleph-workflow/scaleph-workflow-quartz/pom.xml b/scaleph-workflow/scaleph-workflow-quartz/pom.xml index c68768048..14233773f 100644 --- a/scaleph-workflow/scaleph-workflow-quartz/pom.xml +++ b/scaleph-workflow/scaleph-workflow-quartz/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-workflow - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workflow-quartz @@ -31,7 +31,7 @@ ${project.parent.groupId} - scaleph-workflow-api + scaleph-workflow-simple diff --git a/scaleph-workflow/scaleph-workflow-simple/pom.xml b/scaleph-workflow/scaleph-workflow-simple/pom.xml new file mode 100644 index 000000000..d066c1011 --- /dev/null +++ b/scaleph-workflow/scaleph-workflow-simple/pom.xml @@ -0,0 +1,46 @@ + + + + + 4.0.0 + + cn.sliew + scaleph-workflow + 2.0.4-SNAPSHOT + ../pom.xml + + scaleph-workflow-simple + + + + ${project.parent.groupId} + scaleph-workflow-api + + + ${project.parent.groupId} + scaleph-queue + + + + com.alibaba.cola + cola-component-statemachine + + + \ No newline at end of file diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/AbstractWorkflowTaskInstanceEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/AbstractWorkflowTaskInstanceEventListener.java similarity index 92% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/AbstractWorkflowTaskInstanceEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/AbstractWorkflowTaskInstanceEventListener.java index 8cb8d9a3e..afe11d4a2 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/AbstractWorkflowTaskInstanceEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/AbstractWorkflowTaskInstanceEventListener.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.taskinstance; +package cn.sliew.scaleph.workflow.simple.listener.taskinstance; import cn.sliew.scaleph.workflow.service.WorkflowTaskInstanceService; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; -import cn.sliew.scaleph.workflow.statemachine.WorkflowTaskInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowTaskInstanceStateMachine; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RScheduledExecutorService; import org.redisson.api.RedissonClient; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceDeployEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceDeployEventListener.java similarity index 97% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceDeployEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceDeployEventListener.java index 80657cf44..ab72264da 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceDeployEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceDeployEventListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.taskinstance; +package cn.sliew.scaleph.workflow.simple.listener.taskinstance; import cn.sliew.milky.common.exception.Rethrower; import cn.sliew.milky.common.filter.ActionListener; @@ -34,7 +34,7 @@ import cn.sliew.scaleph.workflow.service.WorkflowTaskInstanceService; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskDefinitionDTO2; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskInstanceDTO; -import cn.sliew.scaleph.workflow.statemachine.WorkflowTaskInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowTaskInstanceStateMachine; import lombok.extern.slf4j.Slf4j; import org.redisson.api.annotation.RInject; import org.springframework.beans.factory.annotation.Autowired; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceEventDTO.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceEventDTO.java similarity index 96% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceEventDTO.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceEventDTO.java index 193f608c3..b3297584f 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceEventDTO.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceEventDTO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.taskinstance; +package cn.sliew.scaleph.workflow.simple.listener.taskinstance; import cn.sliew.scaleph.common.dict.workflow.WorkflowTaskInstanceEvent; import cn.sliew.scaleph.common.dict.workflow.WorkflowTaskInstanceStage; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceEventListener.java similarity index 95% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceEventListener.java index 9850d239d..0895032c1 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceEventListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.taskinstance; +package cn.sliew.scaleph.workflow.simple.listener.taskinstance; import cn.sliew.scaleph.queue.Message; import cn.sliew.scaleph.queue.MessageHandler; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceFailureEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceFailureEventListener.java similarity index 94% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceFailureEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceFailureEventListener.java index 774a07145..7e66482e0 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceFailureEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceFailureEventListener.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.taskinstance; +package cn.sliew.scaleph.workflow.simple.listener.taskinstance; import cn.sliew.scaleph.queue.MessageListener; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskInstanceDTO; -import cn.sliew.scaleph.workflow.statemachine.WorkflowTaskInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowTaskInstanceStateMachine; import java.io.Serializable; import java.util.Optional; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceSuccessEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceSuccessEventListener.java similarity index 93% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceSuccessEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceSuccessEventListener.java index b9e18a662..666f1fb45 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/taskinstance/WorkflowTaskInstanceSuccessEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/taskinstance/WorkflowTaskInstanceSuccessEventListener.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.taskinstance; +package cn.sliew.scaleph.workflow.simple.listener.taskinstance; import cn.sliew.scaleph.queue.MessageListener; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskInstanceDTO; -import cn.sliew.scaleph.workflow.statemachine.WorkflowTaskInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowTaskInstanceStateMachine; import java.io.Serializable; import java.util.concurrent.CompletableFuture; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/AbstractWorkflowInstanceEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/AbstractWorkflowInstanceEventListener.java similarity index 94% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/AbstractWorkflowInstanceEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/AbstractWorkflowInstanceEventListener.java index a697c9439..04d6fc152 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/AbstractWorkflowInstanceEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/AbstractWorkflowInstanceEventListener.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.scaleph.workflow.service.WorkflowInstanceService; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RScheduledExecutorService; import org.redisson.api.RedissonClient; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceDeployEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceDeployEventListener.java similarity index 96% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceDeployEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceDeployEventListener.java index a3b9499a0..78f966e69 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceDeployEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceDeployEventListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.scaleph.queue.MessageListener; import cn.sliew.scaleph.workflow.service.WorkflowDefinitionService; @@ -26,7 +26,7 @@ import cn.sliew.scaleph.workflow.service.dto.WorkflowInstanceDTO; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskDefinitionDTO2; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskInstanceDTO; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; import com.google.common.graph.Graph; import lombok.extern.slf4j.Slf4j; import org.redisson.api.annotation.RInject; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceEventDTO.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceEventDTO.java similarity index 96% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceEventDTO.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceEventDTO.java index 14288cb26..ea55520fe 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceEventDTO.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceEventDTO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.scaleph.common.dict.workflow.WorkflowInstanceEvent; import cn.sliew.scaleph.common.dict.workflow.WorkflowInstanceState; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceEventListener.java similarity index 95% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceEventListener.java index fe87da42f..5fdfaa3a3 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceEventListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.scaleph.queue.Message; import cn.sliew.scaleph.queue.MessageHandler; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceFailureEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceFailureEventListener.java similarity index 93% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceFailureEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceFailureEventListener.java index 1f3b227dc..f6cfdc32c 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceFailureEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceFailureEventListener.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.scaleph.queue.MessageListener; import cn.sliew.scaleph.workflow.service.WorkflowInstanceService; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; import org.springframework.beans.factory.annotation.Autowired; import java.io.Serializable; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceResumeEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceResumeEventListener.java similarity index 91% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceResumeEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceResumeEventListener.java index 992a45a66..49b4a5de5 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceResumeEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceResumeEventListener.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.milky.common.util.JacksonUtil; import cn.sliew.scaleph.queue.MessageListener; import cn.sliew.scaleph.workflow.service.WorkflowInstanceService; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceShutdownEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceShutdownEventListener.java similarity index 91% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceShutdownEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceShutdownEventListener.java index e1f630388..c4d8d5b3e 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceShutdownEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceShutdownEventListener.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.milky.common.util.JacksonUtil; import cn.sliew.scaleph.queue.MessageListener; import cn.sliew.scaleph.workflow.service.WorkflowInstanceService; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceSuccessEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceSuccessEventListener.java similarity index 92% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceSuccessEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceSuccessEventListener.java index 52da129b9..24d4ad4ae 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceSuccessEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceSuccessEventListener.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.scaleph.queue.MessageListener; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; import java.io.Serializable; import java.util.concurrent.CompletableFuture; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceSuspendEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceSuspendEventListener.java similarity index 91% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceSuspendEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceSuspendEventListener.java index d827e0e6e..46c6d5232 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceSuspendEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceSuspendEventListener.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.milky.common.util.JacksonUtil; import cn.sliew.scaleph.queue.MessageListener; import cn.sliew.scaleph.workflow.service.WorkflowInstanceService; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceTaskChangeEventListener.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceTaskChangeEventListener.java similarity index 97% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceTaskChangeEventListener.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceTaskChangeEventListener.java index 907fefd2e..2135c7b1d 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/listener/workflowinstance/WorkflowInstanceTaskChangeEventListener.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/listener/workflowinstance/WorkflowInstanceTaskChangeEventListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.listener.workflowinstance; +package cn.sliew.scaleph.workflow.simple.listener.workflowinstance; import cn.sliew.scaleph.common.dict.workflow.WorkflowInstanceState; import cn.sliew.scaleph.common.dict.workflow.WorkflowTaskInstanceStage; @@ -26,7 +26,7 @@ import cn.sliew.scaleph.workflow.service.dto.WorkflowInstanceDTO; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskDefinitionDTO2; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskInstanceDTO; -import cn.sliew.scaleph.workflow.statemachine.WorkflowInstanceStateMachine; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; import com.google.common.graph.Graph; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/manager/SimpleWorkflowInstanceManager.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/manager/SimpleWorkflowInstanceManager.java new file mode 100644 index 000000000..3bc8ce38a --- /dev/null +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/manager/SimpleWorkflowInstanceManager.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.workflow.simple.manager; + +import cn.sliew.scaleph.workflow.manager.WorkflowInstanceManager; +import cn.sliew.scaleph.workflow.service.WorkflowInstanceService; +import cn.sliew.scaleph.workflow.service.dto.WorkflowInstanceDTO; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowInstanceStateMachine; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class SimpleWorkflowInstanceManager implements WorkflowInstanceManager { + + @Autowired + private WorkflowInstanceService workflowInstanceService; + @Autowired + private WorkflowInstanceStateMachine stateMachine; + + @Override + public void deploy(Long id) { + stateMachine.deploy(get(id)); + } + + @Override + public void shutdown(Long id) { + stateMachine.shutdown(get(id)); + } + + @Override + public void suspend(Long id) { + stateMachine.suspend(get(id)); + } + + @Override + public void resume(Long id) { + stateMachine.resume(get(id)); + } + + private WorkflowInstanceDTO get(Long id) { + return workflowInstanceService.get(id); + } +} diff --git a/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/manager/SimpleWorkflowTaskInstanceManager.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/manager/SimpleWorkflowTaskInstanceManager.java new file mode 100644 index 000000000..7f30b6533 --- /dev/null +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/manager/SimpleWorkflowTaskInstanceManager.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.workflow.simple.manager; + +import cn.sliew.scaleph.workflow.manager.WorkflowTaskInstanceManager; +import cn.sliew.scaleph.workflow.service.WorkflowTaskInstanceService; +import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskInstanceDTO; +import cn.sliew.scaleph.workflow.simple.statemachine.WorkflowTaskInstanceStateMachine; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class SimpleWorkflowTaskInstanceManager implements WorkflowTaskInstanceManager { + + @Autowired + private WorkflowTaskInstanceService workflowTaskInstanceService; + @Autowired + private WorkflowTaskInstanceStateMachine stateMachine; + + @Override + public void deploy(Long id) { + stateMachine.deploy(get(id)); + } + + @Override + public void shutdown(Long id) { + stateMachine.shutdown(get(id)); + } + + @Override + public void suspend(Long id) { + stateMachine.suspend(get(id)); + } + + @Override + public void resume(Long id) { + stateMachine.resume(get(id)); + } + + private WorkflowTaskInstanceDTO get(Long id) { + return workflowTaskInstanceService.get(id); + } +} diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/statemachine/WorkflowInstanceStateMachine.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/statemachine/WorkflowInstanceStateMachine.java similarity index 98% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/statemachine/WorkflowInstanceStateMachine.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/statemachine/WorkflowInstanceStateMachine.java index 2e7057256..c20a0e720 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/statemachine/WorkflowInstanceStateMachine.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/statemachine/WorkflowInstanceStateMachine.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.statemachine; +package cn.sliew.scaleph.workflow.simple.statemachine; import cn.sliew.milky.common.util.JacksonUtil; import cn.sliew.scaleph.common.dict.workflow.WorkflowInstanceEvent; @@ -25,8 +25,8 @@ import cn.sliew.scaleph.queue.Queue; import cn.sliew.scaleph.queue.QueueFactory; import cn.sliew.scaleph.queue.util.FuryUtil; -import cn.sliew.scaleph.workflow.listener.workflowinstance.*; import cn.sliew.scaleph.workflow.service.dto.WorkflowInstanceDTO; +import cn.sliew.scaleph.workflow.simple.listener.workflowinstance.*; import com.alibaba.cola.statemachine.Action; import com.alibaba.cola.statemachine.StateMachine; import com.alibaba.cola.statemachine.builder.StateMachineBuilder; diff --git a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/statemachine/WorkflowTaskInstanceStateMachine.java b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/statemachine/WorkflowTaskInstanceStateMachine.java similarity index 93% rename from scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/statemachine/WorkflowTaskInstanceStateMachine.java rename to scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/statemachine/WorkflowTaskInstanceStateMachine.java index 518b09496..5576808de 100644 --- a/scaleph-workflow/scaleph-workflow-api/src/main/java/cn/sliew/scaleph/workflow/statemachine/WorkflowTaskInstanceStateMachine.java +++ b/scaleph-workflow/scaleph-workflow-simple/src/main/java/cn/sliew/scaleph/workflow/simple/statemachine/WorkflowTaskInstanceStateMachine.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package cn.sliew.scaleph.workflow.statemachine; +package cn.sliew.scaleph.workflow.simple.statemachine; import cn.sliew.milky.common.util.JacksonUtil; import cn.sliew.scaleph.common.dict.workflow.WorkflowTaskInstanceEvent; @@ -25,10 +25,10 @@ import cn.sliew.scaleph.queue.Queue; import cn.sliew.scaleph.queue.QueueFactory; import cn.sliew.scaleph.queue.util.FuryUtil; -import cn.sliew.scaleph.workflow.listener.taskinstance.WorkflowTaskInstanceDeployEventListener; -import cn.sliew.scaleph.workflow.listener.taskinstance.WorkflowTaskInstanceEventDTO; -import cn.sliew.scaleph.workflow.listener.taskinstance.WorkflowTaskInstanceFailureEventListener; -import cn.sliew.scaleph.workflow.listener.taskinstance.WorkflowTaskInstanceSuccessEventListener; +import cn.sliew.scaleph.workflow.simple.listener.taskinstance.WorkflowTaskInstanceDeployEventListener; +import cn.sliew.scaleph.workflow.simple.listener.taskinstance.WorkflowTaskInstanceEventDTO; +import cn.sliew.scaleph.workflow.simple.listener.taskinstance.WorkflowTaskInstanceFailureEventListener; +import cn.sliew.scaleph.workflow.simple.listener.taskinstance.WorkflowTaskInstanceSuccessEventListener; import cn.sliew.scaleph.workflow.service.dto.WorkflowTaskInstanceDTO; import com.alibaba.cola.statemachine.Action; import com.alibaba.cola.statemachine.StateMachine; diff --git a/scaleph-workspace/pom.xml b/scaleph-workspace/pom.xml index 094a9a667..d324ea20b 100644 --- a/scaleph-workspace/pom.xml +++ b/scaleph-workspace/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workspace diff --git a/scaleph-workspace/scaleph-workspace-flink-cdc/pom.xml b/scaleph-workspace/scaleph-workspace-flink-cdc/pom.xml index 8e355ef4b..b84a38e9a 100644 --- a/scaleph-workspace/scaleph-workspace-flink-cdc/pom.xml +++ b/scaleph-workspace/scaleph-workspace-flink-cdc/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-workspace - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workspace-flink-cdc diff --git a/scaleph-workspace/scaleph-workspace-flink-sql/pom.xml b/scaleph-workspace/scaleph-workspace-flink-sql/pom.xml index 5887fd62f..34dced745 100644 --- a/scaleph-workspace/scaleph-workspace-flink-sql/pom.xml +++ b/scaleph-workspace/scaleph-workspace-flink-sql/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-workspace - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workspace-flink-sql diff --git a/scaleph-workspace/scaleph-workspace-flink/pom.xml b/scaleph-workspace/scaleph-workspace-flink/pom.xml index 405c811af..58e75977f 100644 --- a/scaleph-workspace/scaleph-workspace-flink/pom.xml +++ b/scaleph-workspace/scaleph-workspace-flink/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-workspace - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workspace-flink diff --git a/scaleph-workspace/scaleph-workspace-project/pom.xml b/scaleph-workspace/scaleph-workspace-project/pom.xml index b4ff0c7ca..a0017d670 100644 --- a/scaleph-workspace/scaleph-workspace-project/pom.xml +++ b/scaleph-workspace/scaleph-workspace-project/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-workspace - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workspace-project diff --git a/scaleph-workspace/scaleph-workspace-seatunnel/pom.xml b/scaleph-workspace/scaleph-workspace-seatunnel/pom.xml index 3ed28af34..74e49e3d6 100644 --- a/scaleph-workspace/scaleph-workspace-seatunnel/pom.xml +++ b/scaleph-workspace/scaleph-workspace-seatunnel/pom.xml @@ -23,7 +23,7 @@ cn.sliew scaleph-workspace - 2.0.3-SNAPSHOT + 2.0.4-SNAPSHOT ../pom.xml scaleph-workspace-seatunnel diff --git a/tools/docker/build/scaleph-paimon/Dockerfile b/tools/docker/build/scaleph-paimon/Dockerfile index 3b5cf3e6c..af9d141c5 100644 --- a/tools/docker/build/scaleph-paimon/Dockerfile +++ b/tools/docker/build/scaleph-paimon/Dockerfile @@ -15,33 +15,20 @@ # limitations under the License. ARG FLINK_VERSION=1.18 -ARG FLINK_CDC_VERSION=3.0.1 -ARG PAIMON_VERSION=0.7.0 -FROM eclipse-temurin:11-focal as build -ENV BUILD_HOME=/opt/build -RUN mkdir -p BUILD_HOME +FROM maven:3.8-eclipse-temurin-11 as build -## todo 切换成 pom.xml -## jdbc driver -RUN --mount=type=cache,target=/root/.m2 mvn dependency:get -DgroupId=mysql -DartifactId=mysql-connector-java -Dversion=8.0.28 -Ddest=${BUILD_HOME} -RUN --mount=type=cache,target=/root/.m2 mvn dependency:get -DgroupId=org.postgresql -DartifactId=postgresql -Dversion=42.3.3 -Ddest=${BUILD_HOME} +ENV BUILD_HOME=/opt/build +RUN mkdir -p ${BUILD_HOME} -## flink cdc connectors -RUN --mount=type=cache,target=/root/.m2 mvn dependency:get -DgroupId=com.ververica -DartifactId=flink-connector-mysql-cdc -Dversion=${FLINK_CDC_VERSION} -Ddest=${BUILD_HOME} -RUN --mount=type=cache,target=/root/.m2 mvn dependency:get -DgroupId=com.ververica -DartifactId=flink-connector-postgres-cdc -Dversion=${FLINK_CDC_VERSION} -Ddest=${BUILD_HOME} -RUN --mount=type=cache,target=/root/.m2 mvn dependency:get -DgroupId=com.ververica -DartifactId=flink-sql-connector-mongodb-cdc -Dversion=${FLINK_CDC_VERSION} -Ddest=${BUILD_HOME} +ENV CONF_HOME=/opt/conf +RUN mkdir -p ${CONF_HOME} -## flink connectors -RUN --mount=type=cache,target=/root/.m2 mvn dependency:get -DgroupId=org.apache.flink -DartifactId=flink-sql-connector-kafka -Dversion=3.1.0-1.18 -Ddest=${BUILD_HOME} -RUN --mount=type=cache,target=/root/.m2 mvn dependency:get -DgroupId=org.apache.flink -DartifactId=flink-connector-pulsar -Dversion=4.1.0-1.18 -Ddest=${BUILD_HOME} +# 下载 pom.xml 中 jar 至指定目录 +COPY tools/docker/build/scaleph-paimon/pom.xml ${CONF_HOME} +RUN --mount=type=cache,target=/root/.m2 mvn dependency:copy-dependencies -f ${CONF_HOME}/pom.xml -DexcludeTransitive=true -DoutputDirectory=${BUILD_HOME} -## paimon cdc action -RUN --mount=type=cache,target=/root/.m2 mvn dependency:get -DgroupId=org.apache.paimon -DartifactId=paimon-flink-action -Dversion=${PAIMON_VERSION} -Ddest=${BUILD_HOME} -ARG FLINK_VERSION=1.18 -ARG FLINK_CDC_VERSION=3.0.1 -ARG PAIMON_VERSION=0.7.0 FROM flink:${FLINK_VERSION} as release ENV BUILD_HOME=/opt/build -COPY --from=build /opt/build/*.jar /opt/paimon \ No newline at end of file +COPY --from=build ${BUILD_HOME}/*.jar /opt/paimon \ No newline at end of file diff --git a/tools/docker/build/scaleph-paimon/pom.xml b/tools/docker/build/scaleph-paimon/pom.xml new file mode 100644 index 000000000..0b9891f71 --- /dev/null +++ b/tools/docker/build/scaleph-paimon/pom.xml @@ -0,0 +1,89 @@ + + + + + 4.0.0 + cn.sliew + scaleph + 2.0.4-SNAPSHOT + scaleph + Scaleph System + + + 8.0.28 + 42.3.3 + 5.1.26 + + 1.18.1 + 1.18 + 3.0.1 + 3.1.2 + 4.1.0 + 0.7.0-incubating + + + + + mysql + mysql-connector-java + ${mysql.version} + + + org.postgresql + postgresql + ${postgresql.version} + + + + + com.ververica + flink-connector-mysql-cdc + ${flink-cdc.version} + + + com.ververica + flink-connector-postgres-cdc + ${flink-cdc.version} + + + com.ververica + flink-sql-connector-mongodb-cdc + ${flink-cdc.version} + + + + org.apache.flink + flink-connector-jdbc + ${flink-jdbc.version}-${flink.base.version} + + + org.apache.flink + flink-connector-pulsar + ${flink-pulsar.version}-${flink.base.version} + + + + org.apache.paimon + paimon-flink-action + ${paimon.version} + + + + \ No newline at end of file diff --git a/tools/docker/build/scaleph-seatunnel/install-plugin.sh b/tools/docker/build/scaleph-seatunnel/install-plugin.sh index b66c99477..211140777 100755 --- a/tools/docker/build/scaleph-seatunnel/install-plugin.sh +++ b/tools/docker/build/scaleph-seatunnel/install-plugin.sh @@ -32,9 +32,9 @@ fi echo "Install SeaTunnel plugin dependencis" mkdir -p ${SEATUNNEL_HOME}/plugins/mysql-cdc/lib -${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=mysql -DartifactId=mysql-connector-java -Dversion=8.0.28 -Ddest=${SEATUNNEL_HOME}/plugins/mysql-cdc/lib +${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=mysql -DartifactId=mysql-connector-java -Dversion=8.0.28 -Dtransitive=false -Ddest=${SEATUNNEL_HOME}/plugins/mysql-cdc/lib mkdir -p ${SEATUNNEL_HOME}/plugins/jdbc/lib -${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=mysql -DartifactId=mysql-connector-java -Dversion=8.0.28 -Ddest=${SEATUNNEL_HOME}/plugins/jdbc/lib +${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=mysql -DartifactId=mysql-connector-java -Dversion=8.0.28 -Dtransitive=false -Ddest=${SEATUNNEL_HOME}/plugins/jdbc/lib echo "Install SeaTunnel connectors plugins, usage version is ${version}" @@ -51,7 +51,7 @@ while read line; do if [ "$first_char" != "-" ] && [ "$first_char" != "#" ] && [ ! -z $first_char ] then echo "install connector : " $line - ${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=org.apache.seatunnel -DartifactId=${line} -Dversion=${version} -Ddest=${SEATUNNEL_HOME}/connectors + ${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=org.apache.seatunnel -DartifactId=${line} -Dversion=${version} -Dtransitive=false -Ddest=${SEATUNNEL_HOME}/connectors fi done < ${SEATUNNEL_HOME}/config/plugin_config