You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/01/20 03:09:12 UTC
[incubator-inlong] branch master updated: [INLONG-2193] optimize inlong manager structure (#2195)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 75a21cd [INLONG-2193] optimize inlong manager structure (#2195)
75a21cd is described below
commit 75a21cde54e631f5873f3def68274ae4e460304a
Author: kipshi <48...@users.noreply.github.com>
AuthorDate: Thu Jan 20 11:09:02 2022 +0800
[INLONG-2193] optimize inlong manager structure (#2195)
---
.../manager/common}/dao/EventLogStorage.java | 6 +-
.../common}/dao/ProcessInstanceStorage.java | 10 +-
.../manager/common}/dao/TaskInstanceStorage.java | 12 +-
.../manager/common}/event/EventListener.java | 6 +-
.../common}/event/EventListenerManager.java | 4 +-
.../common}/event/EventListenerNotifier.java | 4 +-
.../common}/event/EventListenerRegister.java | 2 +-
.../manager/common}/event/ListenerResult.java | 2 +-
.../common}/event/LogableEventListener.java | 16 +-
.../manager/common}/event/WorkflowEvent.java | 2 +-
.../event/process/LogableProcessEventListener.java | 6 +-
.../common}/event/process/ProcessEvent.java | 4 +-
.../event/process/ProcessEventListener.java | 4 +-
.../event/process/ProcessEventListenerManager.java | 10 +-
.../process/ProcessEventListenerRegister.java | 10 +-
.../event/process/ProcessEventNotifier.java | 12 +-
.../event/task/LogableTaskEventListener.java | 12 +-
.../manager/common}/event/task/TaskEvent.java | 4 +-
.../common}/event/task/TaskEventListener.java | 4 +-
.../event/task/TaskEventListenerManager.java | 10 +-
.../event/task/TaskEventListenerRegister.java | 10 +-
.../common}/event/task/TaskEventNotifier.java | 12 +-
.../common/exceptions}/FormParseException.java | 2 +-
.../common/exceptions}/FormValidateException.java | 2 +-
.../common/exceptions}/WorkflowException.java | 2 +-
.../exceptions}/WorkflowListenerException.java | 2 +-
.../exceptions}/WorkflowNoRollbackException.java | 2 +-
.../exceptions}/WorkflowRollbackOnceException.java | 2 +-
.../inlong/manager/common}/model/Action.java | 6 +-
.../inlong/manager/common}/model/EventState.java | 4 +-
.../inlong/manager/common}/model/ProcessState.java | 2 +-
.../inlong/manager/common}/model/TaskState.java | 2 +-
.../manager/common}/model/WorkflowConfig.java | 5 +-
.../manager/common}/model/WorkflowContext.java | 18 +-
.../common}/model/definition/ApproverAssign.java | 4 +-
.../model/definition/ConditionNextElement.java | 4 +-
.../manager/common}/model/definition/Element.java | 2 +-
.../manager/common}/model/definition/EndEvent.java | 2 +-
.../manager/common}/model/definition/Form.java | 4 +-
.../common}/model/definition/NextableElement.java | 6 +-
.../manager/common}/model/definition/Process.java | 12 +-
.../model/definition/ProcessDetailHandler.java | 4 +-
.../common}/model/definition/ProcessForm.java | 2 +-
.../common}/model/definition/ServiceTask.java | 8 +-
.../common}/model/definition/SkipResolver.java | 4 +-
.../common}/model/definition/SkippableElement.java | 4 +-
.../common}/model/definition/StartEvent.java | 6 +-
.../manager/common}/model/definition/Task.java | 10 +-
.../manager/common}/model/definition/TaskForm.java | 2 +-
.../manager/common}/model/definition/UserTask.java | 8 +-
.../manager/common}/model/instance/EventLog.java | 2 +-
.../common}/model/instance/ProcessInstance.java | 2 +-
.../common}/model/instance/TaskInstance.java | 2 +-
.../manager/common}/model/view/CountByKey.java | 2 +-
.../manager/common}/model/view/ElementView.java | 4 +-
.../manager/common}/model/view/EventLogQuery.java | 2 +-
.../manager/common}/model/view/EventLogView.java | 2 +-
.../manager/common}/model/view/PageQuery.java | 2 +-
.../manager/common}/model/view/ProcessDetail.java | 2 +-
.../common}/model/view/ProcessListView.java | 6 +-
.../manager/common}/model/view/ProcessQuery.java | 4 +-
.../common}/model/view/ProcessSummaryQuery.java | 2 +-
.../common}/model/view/ProcessSummaryView.java | 2 +-
.../manager/common}/model/view/ProcessView.java | 6 +-
.../manager/common}/model/view/TaskListView.java | 6 +-
.../manager/common}/model/view/TaskQuery.java | 4 +-
.../common}/model/view/TaskSummaryQuery.java | 2 +-
.../common}/model/view/TaskSummaryView.java | 2 +-
.../manager/common}/model/view/TaskView.java | 6 +-
.../manager/common}/model/view/WorkflowView.java | 2 +-
.../common/workflow}/EventListenerService.java | 6 +-
.../common/workflow}/ProcessDefinitionService.java | 4 +-
.../common/workflow}/ProcessDefinitionStorage.java | 4 +-
.../manager/common/workflow}/ProcessService.java | 6 +-
.../manager/common/workflow}/QueryService.java | 24 +-
.../manager/common/workflow}/TaskService.java | 6 +-
.../common/workflow}/TransactionHelper.java | 6 +-
.../common/workflow}/WorkflowContextBuilder.java | 10 +-
.../common/workflow}/WorkflowDataAccessor.java | 8 +-
.../manager/common/workflow}/WorkflowEngine.java | 2 +-
.../workflow}/WorkflowProcessorExecutor.java | 6 +-
.../dao/mapper/ConsumptionEntityMapper.java | 2 +-
.../manager/dao/mapper/EventLogEntityMapper.java | 6 +-
.../dao/mapper/ProcessInstanceEntityMapper.java | 2 +-
.../dao/mapper/TaskInstanceEntityMapper.java | 2 +-
.../resources/mappers/ConsumptionEntityMapper.xml | 2 +-
.../src/main/resources/mappers/EventLogMapper.xml | 8 +-
.../mappers/ProcessInstanceEntityMapper.xml | 12 +-
.../resources/mappers/TaskInstanceEntityMapper.xml | 12 +-
.../manager/service/core/WorkflowEventService.java | 8 +-
.../service/core/impl/ConsumptionServiceImpl.java | 2 +-
.../core/impl/WorkflowApproverServiceImpl.java | 8 +-
.../core/impl/WorkflowEventServiceImpl.java | 14 +-
.../hive/CreateHiveTableForStreamListener.java | 8 +-
.../thirdpart/hive/CreateHiveTableListener.java | 8 +-
.../service/thirdpart/hive/HiveTableOperator.java | 2 +-
.../mq/CreatePulsarGroupForStreamTaskListener.java | 10 +-
.../mq/CreatePulsarGroupTaskListener.java | 10 +-
.../mq/CreatePulsarResourceTaskListener.java | 10 +-
.../mq/CreatePulsarTopicForStreamTaskListener.java | 10 +-
.../thirdpart/mq/CreateTubeGroupTaskListener.java | 10 +-
.../thirdpart/mq/CreateTubeTopicTaskListener.java | 10 +-
.../thirdpart/sort/PushHiveConfigTaskListener.java | 10 +-
.../service/workflow/BaseWorkflowFormType.java | 2 +-
.../service/workflow/BaseWorkflowTaskFormType.java | 2 +-
.../service/workflow/WorkflowDefinition.java | 2 +-
.../service/workflow/WorkflowEngineConfig.java | 18 +-
.../manager/service/workflow/WorkflowResult.java | 6 +-
.../manager/service/workflow/WorkflowService.java | 22 +-
.../service/workflow/WorkflowServiceImpl.java | 40 +-
.../service/workflow/WorkflowTaskExecuteLog.java | 4 +-
.../workflow/WorkflowTaskExecuteLogQuery.java | 2 +-
.../business/BusinessAdminApproveForm.java | 2 +-
.../business/BusinessResourceWorkflowForm.java | 2 +-
.../business/CreateBusinessWorkflowDefinition.java | 8 +-
.../business/NewBusinessWorkflowDefinition.java | 8 +-
.../workflow/business/NewBusinessWorkflowForm.java | 2 +-
.../listener/BusinessCancelProcessListener.java | 10 +-
.../listener/BusinessCompleteProcessListener.java | 10 +-
.../listener/BusinessFailedProcessListener.java | 10 +-
.../listener/BusinessPassTaskListener.java | 10 +-
.../listener/BusinessRejectProcessListener.java | 10 +-
.../listener/InitBusinessInfoListener.java | 10 +-
.../StartCreateResourceProcessListener.java | 10 +-
.../consumption/ConsumptionAdminApproveForm.java | 2 +-
.../NewConsumptionProcessDetailHandler.java | 8 +-
.../NewConsumptionWorkflowDefinition.java | 10 +-
.../consumption/NewConsumptionWorkflowForm.java | 2 +-
.../listener/ConsumptionCancelProcessListener.java | 10 +-
.../ConsumptionCompleteProcessListener.java | 10 +-
.../listener/ConsumptionPassTaskListener.java | 10 +-
.../listener/ConsumptionRejectProcessListener.java | 10 +-
.../stream/CreateStreamWorkflowDefinition.java | 8 +-
.../stream/InitBusinessInfoForStreamListener.java | 10 +-
.../stream/StreamCompleteProcessListener.java | 10 +-
.../stream/StreamFailedProcessListener.java | 10 +-
.../service/workflow/business/BaseConfig.java} | 21 +-
.../service/workflow/business/BaseTest.java | 39 +
.../CreateBusinessWorkflowDefinitionTest.java} | 42 +-
.../src/test/resources/application-test.properties | 71 ++
.../test/resources/sql/apache_inlong_manager.sql | 1048 ++++++++++++++++++++
.../web/config/ControllerExceptionHandler.java | 2 +-
.../manager/web/controller/WorkflowController.java | 18 +-
.../web/controller/WorkflowEventController.java | 8 +-
.../service/workflow/WorkflowServiceTest.java | 8 +-
.../core/impl/EventListenerServiceImpl.java | 28 +-
.../core/impl/MemoryProcessDefinitionStorage.java | 6 +-
.../core/impl/ProcessDefinitionServiceImpl.java | 6 +-
.../workflow/core/impl/ProcessServiceImpl.java | 20 +-
.../workflow/core/impl/QueryServiceImpl.java | 58 +-
.../workflow/core/impl/TaskServiceImpl.java | 12 +-
.../core/impl/WorkflowContextBuilderImpl.java | 20 +-
.../core/impl/WorkflowDataAccessorImpl.java | 10 +-
.../workflow/core/impl/WorkflowEngineImpl.java | 22 +-
.../core/impl/WorkflowEventListenerManager.java | 6 +-
.../workflow/core/impl/WorkflowEventNotifier.java | 4 +-
.../WorkflowInternalEventListenerRegister.java | 8 +-
.../core/impl/WorkflowProcessorExecutorImpl.java | 22 +-
.../AbstractNextableElementProcessor.java | 10 +-
.../core/processor/AbstractTaskProcessor.java | 14 +-
.../workflow/core/processor/EndEventProcessor.java | 24 +-
.../core/processor/ServiceTaskProcessor.java | 26 +-
.../core/processor/SkipAbleElementProcessor.java | 4 +-
.../core/processor/StartEventProcessor.java | 20 +-
.../workflow/core/processor/UserTaskProcessor.java | 22 +-
.../core/processor/WorkflowElementProcessor.java | 4 +-
.../workflow/util/WorkflowFormParserUtils.java | 14 +-
inlong-manager/pom.xml | 1 -
168 files changed, 1827 insertions(+), 684 deletions(-)
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/EventLogStorage.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/EventLogStorage.java
similarity index 85%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/EventLogStorage.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/EventLogStorage.java
index 5328b58..994056a 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/EventLogStorage.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/EventLogStorage.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.dao;
+package org.apache.inlong.manager.common.dao;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/ProcessInstanceStorage.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/ProcessInstanceStorage.java
similarity index 80%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/ProcessInstanceStorage.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/ProcessInstanceStorage.java
index c3f3b5c..e818b5c 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/ProcessInstanceStorage.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/ProcessInstanceStorage.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.dao;
+package org.apache.inlong.manager.common.dao;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.view.CountByKey;
-import org.apache.inlong.manager.workflow.model.view.ProcessQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryQuery;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.view.CountByKey;
+import org.apache.inlong.manager.common.model.view.ProcessQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryQuery;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/TaskInstanceStorage.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/TaskInstanceStorage.java
similarity index 78%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/TaskInstanceStorage.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/TaskInstanceStorage.java
index 8f3e778..a71700e 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/dao/TaskInstanceStorage.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/dao/TaskInstanceStorage.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.dao;
+package org.apache.inlong.manager.common.dao;
import java.util.List;
import org.apache.ibatis.annotations.Param;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
-import org.apache.inlong.manager.workflow.model.view.CountByKey;
-import org.apache.inlong.manager.workflow.model.view.TaskQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.view.CountByKey;
+import org.apache.inlong.manager.common.model.view.TaskQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryQuery;
/**
* Task instance
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListener.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListener.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListener.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListener.java
index ce5bc86..5bda456 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListener.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListener.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
/**
* Process event listener
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerManager.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerManager.java
similarity index 93%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerManager.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerManager.java
index f9a2a13..90143e8 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerManager.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerManager.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerNotifier.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerNotifier.java
similarity index 91%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerNotifier.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerNotifier.java
index 207ff74..0724daa 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerNotifier.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerNotifier.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.WorkflowContext;
/**
* Process event listener notifier
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerRegister.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerRegister.java
similarity index 94%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerRegister.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerRegister.java
index 76896ab..43fbbec 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/EventListenerRegister.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/EventListenerRegister.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
/**
* Event listener register
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/ListenerResult.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/ListenerResult.java
similarity index 97%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/ListenerResult.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/ListenerResult.java
index 5597e21..865596d 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/ListenerResult.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/ListenerResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/LogableEventListener.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/LogableEventListener.java
similarity index 89%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/LogableEventListener.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/LogableEventListener.java
index 720ebbf..24d9d96 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/LogableEventListener.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/LogableEventListener.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
import java.util.Date;
import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.common.util.NetworkUtils;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.EventState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.EventState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
/**
* Event listener with logging function
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/WorkflowEvent.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/WorkflowEvent.java
similarity index 94%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/WorkflowEvent.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/WorkflowEvent.java
index 4802b98..1bd6132 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/WorkflowEvent.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/WorkflowEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event;
+package org.apache.inlong.manager.common.event;
/**
* Workflow event
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/LogableProcessEventListener.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/LogableProcessEventListener.java
similarity index 85%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/LogableProcessEventListener.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/LogableProcessEventListener.java
index abfcb5a..66ad891 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/LogableProcessEventListener.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/LogableProcessEventListener.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
-import org.apache.inlong.manager.workflow.core.event.LogableEventListener;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
+import org.apache.inlong.manager.common.event.LogableEventListener;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
/**
* Listener of logable process event
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEvent.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEvent.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEvent.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEvent.java
index 1356da1..d45cdd5 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEvent.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEvent.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
-import org.apache.inlong.manager.workflow.core.event.WorkflowEvent;
+import org.apache.inlong.manager.common.event.WorkflowEvent;
/**
* Process event type
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListener.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListener.java
similarity index 89%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListener.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListener.java
index df196f5..2a47477 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListener.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListener.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
import com.google.common.collect.Lists;
-import org.apache.inlong.manager.workflow.core.event.EventListener;
+import org.apache.inlong.manager.common.event.EventListener;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListenerManager.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListenerManager.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListenerManager.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListenerManager.java
index 1e5d337..b5976a1 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListenerManager.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListenerManager.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
import java.util.List;
import java.util.Map;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListenerRegister.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListenerRegister.java
similarity index 81%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListenerRegister.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListenerRegister.java
index 566e037..5f2f1b6 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventListenerRegister.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventListenerRegister.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.EventListenerRegister;
-import org.apache.inlong.manager.workflow.model.WorkflowConfig;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.event.EventListenerRegister;
+import org.apache.inlong.manager.common.model.WorkflowConfig;
/**
* Register of process event listener
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventNotifier.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventNotifier.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventNotifier.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventNotifier.java
index e7fba22..fe80db2 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/process/ProcessEventNotifier.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/process/ProcessEventNotifier.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.process;
+package org.apache.inlong.manager.common.event.process;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.EventListenerNotifier;
-import org.apache.inlong.manager.workflow.core.event.LogableEventListener;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Process;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.event.EventListenerNotifier;
+import org.apache.inlong.manager.common.event.LogableEventListener;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Process;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/LogableTaskEventListener.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/LogableTaskEventListener.java
similarity index 82%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/LogableTaskEventListener.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/LogableTaskEventListener.java
index 4c93d46..5e0cbf2 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/LogableTaskEventListener.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/LogableTaskEventListener.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
-import org.apache.inlong.manager.workflow.core.event.LogableEventListener;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.event.LogableEventListener;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
/**
* Listener of logable task event
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEvent.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEvent.java
similarity index 91%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEvent.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEvent.java
index 52f03bb..6359ccd 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEvent.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEvent.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
-import org.apache.inlong.manager.workflow.core.event.WorkflowEvent;
+import org.apache.inlong.manager.common.event.WorkflowEvent;
/**
* Task event
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListener.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListener.java
similarity index 88%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListener.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListener.java
index 9f4d09a..bc3dc12 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListener.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListener.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
import com.google.common.collect.Lists;
-import org.apache.inlong.manager.workflow.core.event.EventListener;
+import org.apache.inlong.manager.common.event.EventListener;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListenerManager.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListenerManager.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListenerManager.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListenerManager.java
index 0e5b707..929aa23 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListenerManager.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListenerManager.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
import java.util.List;
import java.util.Map;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListenerRegister.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListenerRegister.java
similarity index 81%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListenerRegister.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListenerRegister.java
index 8112430..539534e 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventListenerRegister.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventListenerRegister.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.EventListenerRegister;
-import org.apache.inlong.manager.workflow.model.WorkflowConfig;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.event.EventListenerRegister;
+import org.apache.inlong.manager.common.model.WorkflowConfig;
/**
* Register task event listener
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventNotifier.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventNotifier.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventNotifier.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventNotifier.java
index 7004113..114a0e9 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/event/task/TaskEventNotifier.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/event/task/TaskEventNotifier.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core.event.task;
+package org.apache.inlong.manager.common.event.task;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.inlong.manager.workflow.core.event.EventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.EventListenerNotifier;
-import org.apache.inlong.manager.workflow.core.event.LogableEventListener;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Task;
+import org.apache.inlong.manager.common.event.EventListenerManager;
+import org.apache.inlong.manager.common.event.EventListenerNotifier;
+import org.apache.inlong.manager.common.event.LogableEventListener;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Task;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/FormParseException.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/FormParseException.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/FormParseException.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/FormParseException.java
index 7923c7f..711bd50 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/FormParseException.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/FormParseException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
/**
* Process form parsing exception
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/FormValidateException.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/FormValidateException.java
similarity index 94%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/FormValidateException.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/FormValidateException.java
index fb4633c..d16d212 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/FormValidateException.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/FormValidateException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
/**
* Form validation exception
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowException.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowException.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowException.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowException.java
index 9f18859..c6683ae 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowException.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
/**
* Workflow exception
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowListenerException.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowListenerException.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowListenerException.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowListenerException.java
index 9a87ced..39e9317 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowListenerException.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowListenerException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
/**
* Workflow event listener exception
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowNoRollbackException.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowNoRollbackException.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowNoRollbackException.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowNoRollbackException.java
index f178510..36b9aa0 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowNoRollbackException.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowNoRollbackException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
/**
* Mark exceptions that do not need to be rolled back
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowRollbackOnceException.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowRollbackOnceException.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowRollbackOnceException.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowRollbackOnceException.java
index 3948f23..3ad86b6 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/exception/WorkflowRollbackOnceException.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/exceptions/WorkflowRollbackOnceException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.exception;
+package org.apache.inlong.manager.common.exceptions;
/**
* Only roll back the exception once in the embedded thing
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/Action.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/Action.java
similarity index 92%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/Action.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/Action.java
index 2c5905b..d23aaa8 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/Action.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/Action.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model;
+package org.apache.inlong.manager.common.model;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
/**
* operate
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/EventState.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/EventState.java
similarity index 92%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/EventState.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/EventState.java
index 7311226..ab696ba 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/EventState.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/EventState.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model;
+package org.apache.inlong.manager.common.model;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
/**
* Logging event status
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/ProcessState.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/ProcessState.java
similarity index 95%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/ProcessState.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/ProcessState.java
index ebc49d5..e946595 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/ProcessState.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/ProcessState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model;
+package org.apache.inlong.manager.common.model;
/**
* Process state
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/TaskState.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/TaskState.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/TaskState.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/TaskState.java
index d93b775..a2647c1 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/TaskState.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/TaskState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model;
+package org.apache.inlong.manager.common.model;
import com.google.common.collect.ImmutableSet;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/WorkflowConfig.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/WorkflowConfig.java
similarity index 93%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/WorkflowConfig.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/WorkflowConfig.java
index d156f80..f9d564e 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/WorkflowConfig.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/WorkflowConfig.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model;
+package org.apache.inlong.manager.common.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
+
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
import org.springframework.transaction.PlatformTransactionManager;
/**
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/WorkflowContext.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/WorkflowContext.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/WorkflowContext.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/WorkflowContext.java
index 99adeb8..92da930 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/WorkflowContext.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/WorkflowContext.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model;
+package org.apache.inlong.manager.common.model;
import com.google.common.collect.Lists;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ApproverAssign.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ApproverAssign.java
similarity index 91%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ApproverAssign.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ApproverAssign.java
index eb893d8..3d61311 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ApproverAssign.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ApproverAssign.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import java.util.Collections;
import java.util.List;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.WorkflowContext;
/**
* Approver assignment
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ConditionNextElement.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ConditionNextElement.java
similarity index 93%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ConditionNextElement.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ConditionNextElement.java
index d020e8c..0b589e6 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ConditionNextElement.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ConditionNextElement.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import java.util.function.Predicate;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Element.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Element.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Element.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Element.java
index ec6cb51..67efa93 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Element.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Element.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import lombok.Data;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/EndEvent.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/EndEvent.java
similarity index 94%
copy from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/EndEvent.java
copy to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/EndEvent.java
index 6ecaf1d..b299d24 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/EndEvent.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/EndEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
/**
* End event
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Form.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Form.java
similarity index 88%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Form.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Form.java
index 1087ba7..b41b3fe 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Form.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Form.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
-import org.apache.inlong.manager.workflow.exception.FormValidateException;
+import org.apache.inlong.manager.common.exceptions.FormValidateException;
/**
* Form
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/NextableElement.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/NextableElement.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/NextableElement.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/NextableElement.java
index 68ae753..7b286d8 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/NextableElement.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/NextableElement.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.apache.inlong.manager.common.util.Preconditions;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Process.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Process.java
similarity index 92%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Process.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Process.java
index ab62bb7..8e3e005 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Process.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Process.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -23,12 +23,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import lombok.Data;
+import lombok.Getter;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
/**
* Process definition
@@ -43,6 +44,7 @@ public class Process extends Element {
private EndEvent endEvent;
+ @Getter
private Map<String, Task> nameToTaskMap = Maps.newHashMap();
private Class<? extends ProcessForm> formClass;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessDetailHandler.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ProcessDetailHandler.java
similarity index 89%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessDetailHandler.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ProcessDetailHandler.java
index 8d12c36..0bb9870 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessDetailHandler.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ProcessDetailHandler.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
-import org.apache.inlong.manager.workflow.model.view.ProcessDetail;
+import org.apache.inlong.manager.common.model.view.ProcessDetail;
/**
* Process detail processor
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessForm.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ProcessForm.java
similarity index 95%
copy from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessForm.java
copy to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ProcessForm.java
index 7b9c37e..ae91382 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessForm.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ProcessForm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import java.util.Map;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ServiceTask.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ServiceTask.java
similarity index 88%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ServiceTask.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ServiceTask.java
index 6029235..71f3f8d 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ServiceTask.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/ServiceTask.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import com.google.common.collect.ImmutableSet;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.WorkflowContext;
/**
* System task
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/SkipResolver.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/SkipResolver.java
similarity index 89%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/SkipResolver.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/SkipResolver.java
index e577757..27751a2 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/SkipResolver.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/SkipResolver.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.WorkflowContext;
/**
* Whether to skip the arbiter
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/SkippableElement.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/SkippableElement.java
similarity index 89%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/SkippableElement.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/SkippableElement.java
index e32ec06..8dee033 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/SkippableElement.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/SkippableElement.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.WorkflowContext;
/**
* Whether it can be skipped
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/StartEvent.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/StartEvent.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/StartEvent.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/StartEvent.java
index 1d15f42..3a4b75c 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/StartEvent.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/StartEvent.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import com.google.common.collect.ImmutableSet;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import java.util.List;
import java.util.Set;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Task.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Task.java
similarity index 89%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Task.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Task.java
index 1ad512a..2676506 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/Task.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/Task.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import java.util.HashMap;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/TaskForm.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/TaskForm.java
similarity index 93%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/TaskForm.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/TaskForm.java
index fa95b9c..2f7b049 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/TaskForm.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/TaskForm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
/**
* Task form
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/UserTask.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/UserTask.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/UserTask.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/UserTask.java
index dd950cd..51d6094 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/UserTask.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/definition/UserTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.common.model.definition;
import com.google.common.collect.ImmutableSet;
import java.util.Collections;
@@ -25,9 +25,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.WorkflowContext;
/**
* User task
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/EventLog.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/EventLog.java
similarity index 98%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/EventLog.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/EventLog.java
index 8c5ea6f..0ed1cea 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/EventLog.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/EventLog.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.instance;
+package org.apache.inlong.manager.common.model.instance;
import java.util.Date;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/ProcessInstance.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/ProcessInstance.java
similarity index 98%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/ProcessInstance.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/ProcessInstance.java
index 1a89d7d..ecf3769 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/ProcessInstance.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/ProcessInstance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.instance;
+package org.apache.inlong.manager.common.model.instance;
import java.util.Date;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/TaskInstance.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/TaskInstance.java
similarity index 98%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/TaskInstance.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/TaskInstance.java
index f303a36..bff1672 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/instance/TaskInstance.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/instance/TaskInstance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.instance;
+package org.apache.inlong.manager.common.model.instance;
import java.util.Date;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/CountByKey.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/CountByKey.java
similarity index 94%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/CountByKey.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/CountByKey.java
index a47dc72..cf3e319 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/CountByKey.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/CountByKey.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import lombok.Data;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ElementView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ElementView.java
similarity index 95%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ElementView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ElementView.java
index 392e139..8aa177f 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ElementView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ElementView.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import com.google.common.collect.Lists;
-import org.apache.inlong.manager.workflow.model.TaskState;
+import org.apache.inlong.manager.common.model.TaskState;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/EventLogQuery.java
similarity index 98%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogQuery.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/EventLogQuery.java
index 6bbf6cf..6d3175a 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogQuery.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/EventLogQuery.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/EventLogView.java
similarity index 97%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/EventLogView.java
index ec5a058..7d88896 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/EventLogView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/EventLogView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/PageQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/PageQuery.java
similarity index 95%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/PageQuery.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/PageQuery.java
index 7d3ea14..2efa334 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/PageQuery.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/PageQuery.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessDetail.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessDetail.java
similarity index 97%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessDetail.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessDetail.java
index f8e3010..baf9d05 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessDetail.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessDetail.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessListView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessListView.java
similarity index 93%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessListView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessListView.java
index 59a0b0a..13b617e 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessListView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessListView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -26,8 +26,8 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.apache.inlong.manager.workflow.model.ProcessState;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.ProcessState;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
/**
* Process list
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessQuery.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessQuery.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessQuery.java
index 2b84b77..b8d089f 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessQuery.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessQuery.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -26,7 +26,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.apache.inlong.manager.workflow.model.ProcessState;
+import org.apache.inlong.manager.common.model.ProcessState;
import org.springframework.format.annotation.DateTimeFormat;
/**
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessSummaryQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessSummaryQuery.java
similarity index 97%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessSummaryQuery.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessSummaryQuery.java
index 5c59941..48a7ee4 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessSummaryQuery.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessSummaryQuery.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessSummaryView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessSummaryView.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessSummaryView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessSummaryView.java
index b47e6d6..776692c 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessSummaryView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessSummaryView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessView.java
similarity index 93%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessView.java
index 901aae0..835f68f 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/ProcessView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/ProcessView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -25,8 +25,8 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.common.util.JsonUtils;
-import org.apache.inlong.manager.workflow.model.ProcessState;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.ProcessState;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
/**
* Application form information
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskListView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskListView.java
similarity index 94%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskListView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskListView.java
index 51c8b1b..76120fc 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskListView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskListView.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskQuery.java
similarity index 95%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskQuery.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskQuery.java
index 5e26d1f..22ac6a5 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskQuery.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskQuery.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
-import org.apache.inlong.manager.workflow.model.TaskState;
+import org.apache.inlong.manager.common.model.TaskState;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskSummaryQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskSummaryQuery.java
similarity index 97%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskSummaryQuery.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskSummaryQuery.java
index d1d1444..c5b8b85 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskSummaryQuery.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskSummaryQuery.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskSummaryView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskSummaryView.java
similarity index 96%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskSummaryView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskSummaryView.java
index 06d9c33..01c4a97 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskSummaryView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskSummaryView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskView.java
similarity index 95%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskView.java
index 705228e..b4b3a23 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/TaskView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/TaskView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -27,8 +27,8 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.inlong.manager.common.util.JsonUtils;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
/**
* task information
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/WorkflowView.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/WorkflowView.java
similarity index 97%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/WorkflowView.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/WorkflowView.java
index a6b101d..d70e4bb 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/view/WorkflowView.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/model/view/WorkflowView.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.view;
+package org.apache.inlong.manager.common.model.view;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/EventListenerService.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/EventListenerService.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/EventListenerService.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/EventListenerService.java
index 0dfca95..3b6b87c 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/EventListenerService.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/EventListenerService.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
/**
* Event listener service
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessDefinitionService.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessDefinitionService.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessDefinitionService.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessDefinitionService.java
index eff6b8d..2a897b3 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessDefinitionService.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessDefinitionService.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.Process;
/**
* Process definition service
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessDefinitionStorage.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessDefinitionStorage.java
similarity index 91%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessDefinitionStorage.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessDefinitionStorage.java
index 451dcb7..04f70d3 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessDefinitionStorage.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessDefinitionStorage.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.Process;
/**
* Process definition memory
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessService.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessService.java
similarity index 88%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessService.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessService.java
index 63c90ff..d19d220 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/ProcessService.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/ProcessService.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
/**
* Process definition service
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/QueryService.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/QueryService.java
similarity index 77%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/QueryService.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/QueryService.java
index 0b16a1c..67d6133 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/QueryService.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/QueryService.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessDetail;
-import org.apache.inlong.manager.workflow.model.view.ProcessQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryView;
-import org.apache.inlong.manager.workflow.model.view.TaskQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryView;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.model.view.ProcessDetail;
+import org.apache.inlong.manager.common.model.view.ProcessQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryView;
+import org.apache.inlong.manager.common.model.view.TaskQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryView;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/TaskService.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/TaskService.java
similarity index 90%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/TaskService.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/TaskService.java
index d9b21bf..9f01f64 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/TaskService.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/TaskService.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/TransactionHelper.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/TransactionHelper.java
similarity index 94%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/TransactionHelper.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/TransactionHelper.java
index 1ad90dc..58946ce 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/TransactionHelper.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/TransactionHelper.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
import java.lang.reflect.UndeclaredThrowableException;
import lombok.extern.slf4j.Slf4j;
-import org.apache.inlong.manager.workflow.exception.WorkflowNoRollbackException;
-import org.apache.inlong.manager.workflow.exception.WorkflowRollbackOnceException;
+import org.apache.inlong.manager.common.exceptions.WorkflowNoRollbackException;
+import org.apache.inlong.manager.common.exceptions.WorkflowRollbackOnceException;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionException;
import org.springframework.transaction.TransactionStatus;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowContextBuilder.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowContextBuilder.java
similarity index 89%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowContextBuilder.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowContextBuilder.java
index ded2874..bab26b3 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowContextBuilder.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowContextBuilder.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowDataAccessor.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowDataAccessor.java
similarity index 85%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowDataAccessor.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowDataAccessor.java
index 3ee0f9d..09414ee 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowDataAccessor.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowDataAccessor.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.dao.ProcessInstanceStorage;
-import org.apache.inlong.manager.workflow.dao.TaskInstanceStorage;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.dao.ProcessInstanceStorage;
+import org.apache.inlong.manager.common.dao.TaskInstanceStorage;
/**
* Workflow data accessor
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowEngine.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowEngine.java
similarity index 97%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowEngine.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowEngine.java
index 880006d..836abdb 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowEngine.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
/**
* Workflow engine
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowProcessorExecutor.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowProcessorExecutor.java
similarity index 87%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowProcessorExecutor.java
rename to inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowProcessorExecutor.java
index f945f9f..1a3ddb1 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/WorkflowProcessorExecutor.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/workflow/WorkflowProcessorExecutor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.core;
+package org.apache.inlong.manager.common.workflow;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
/**
* Workload component processor execution
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ConsumptionEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ConsumptionEntityMapper.java
index 82ac6fa..27cbb9a 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ConsumptionEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ConsumptionEntityMapper.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.inlong.manager.common.pojo.consumption.ConsumptionQuery;
import org.apache.inlong.manager.dao.entity.ConsumptionEntity;
-import org.apache.inlong.manager.workflow.model.view.CountByKey;
+import org.apache.inlong.manager.common.model.view.CountByKey;
import org.springframework.stereotype.Repository;
@Repository
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/EventLogEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/EventLogEntityMapper.java
index 3b26c18..01e78b1 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/EventLogEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/EventLogEntityMapper.java
@@ -18,9 +18,9 @@
package org.apache.inlong.manager.dao.mapper;
import java.util.List;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ProcessInstanceEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ProcessInstanceEntityMapper.java
index 1c81503..8e89e39 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ProcessInstanceEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/ProcessInstanceEntityMapper.java
@@ -17,7 +17,7 @@
package org.apache.inlong.manager.dao.mapper;
-import org.apache.inlong.manager.workflow.dao.ProcessInstanceStorage;
+import org.apache.inlong.manager.common.dao.ProcessInstanceStorage;
import org.springframework.stereotype.Repository;
/**
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/TaskInstanceEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/TaskInstanceEntityMapper.java
index 0f0f7f6..6702044 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/TaskInstanceEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/TaskInstanceEntityMapper.java
@@ -17,7 +17,7 @@
package org.apache.inlong.manager.dao.mapper;
-import org.apache.inlong.manager.workflow.dao.TaskInstanceStorage;
+import org.apache.inlong.manager.common.dao.TaskInstanceStorage;
import org.springframework.stereotype.Repository;
@Repository
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
index 7c77590..eb429b3 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
@@ -320,7 +320,7 @@
<select id="countByStatus"
parameterType="org.apache.inlong.manager.common.pojo.consumption.ConsumptionQuery"
- resultType="org.apache.inlong.manager.workflow.model.view.CountByKey">
+ resultType="org.apache.inlong.manager.common.model.view.CountByKey">
select
status as `key`,count(1) as value
from consumption
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/EventLogMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/EventLogMapper.xml
index 64aa45b..21a1983 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/EventLogMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/EventLogMapper.xml
@@ -20,7 +20,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.EventLogEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.workflow.model.instance.EventLog">
+ <resultMap id="BaseResultMap" type="org.apache.inlong.manager.common.model.instance.EventLog">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="process_inst_id" jdbcType="INTEGER" property="processInstId"/>
<result column="process_name" jdbcType="VARCHAR" property="processName"/>
@@ -52,7 +52,7 @@
from wf_event_log
where id = #{id,jdbcType=INTEGER}
</select>
- <select id="list" parameterType="org.apache.inlong.manager.workflow.model.view.EventLogQuery"
+ <select id="list" parameterType="org.apache.inlong.manager.common.model.view.EventLogQuery"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
@@ -109,7 +109,7 @@
order by id desc
</select>
<insert id="insert" useGeneratedKeys="true" keyProperty="id" keyColumn="id"
- parameterType="org.apache.inlong.manager.workflow.model.instance.EventLog">
+ parameterType="org.apache.inlong.manager.common.model.instance.EventLog">
insert into wf_event_log (id, process_inst_id,
process_name, process_display_name,
inlong_group_id, task_inst_id,
@@ -128,7 +128,7 @@
#{endTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=LONGVARCHAR}, #{exception,jdbcType=LONGVARCHAR})
</insert>
- <update id="update" parameterType="org.apache.inlong.manager.workflow.model.instance.EventLog">
+ <update id="update" parameterType="org.apache.inlong.manager.common.model.instance.EventLog">
update wf_event_log
set state = #{state,jdbcType=INTEGER},
end_time = #{endTime,jdbcType=TIMESTAMP},
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/ProcessInstanceEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/ProcessInstanceEntityMapper.xml
index fb0d478..d5f1428 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/ProcessInstanceEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/ProcessInstanceEntityMapper.xml
@@ -20,7 +20,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.ProcessInstanceEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.workflow.model.instance.ProcessInstance">
+ <resultMap id="BaseResultMap" type="org.apache.inlong.manager.common.model.instance.ProcessInstance">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="display_name" jdbcType="VARCHAR" property="displayName"/>
@@ -46,7 +46,7 @@
from wf_process_instance
where id = #{id,jdbcType=INTEGER}
</select>
- <select id="listByQuery" parameterType="org.apache.inlong.manager.workflow.model.view.ProcessQuery"
+ <select id="listByQuery" parameterType="org.apache.inlong.manager.common.model.view.ProcessQuery"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
@@ -99,8 +99,8 @@
</select>
<select id="countByState"
- parameterType="org.apache.inlong.manager.workflow.model.view.ProcessSummaryQuery"
- resultType="org.apache.inlong.manager.workflow.model.view.CountByKey">
+ parameterType="org.apache.inlong.manager.common.model.view.ProcessSummaryQuery"
+ resultType="org.apache.inlong.manager.common.model.view.CountByKey">
select state as `key`,count(1) as value
from wf_process_instance
<where>
@@ -136,7 +136,7 @@
</select>
<insert id="insert" useGeneratedKeys="true" keyProperty="id" keyColumn="id"
- parameterType="org.apache.inlong.manager.workflow.model.instance.ProcessInstance">
+ parameterType="org.apache.inlong.manager.common.model.instance.ProcessInstance">
insert into wf_process_instance (name, display_name,
type, title, inlong_group_id,
applicant, state,
@@ -149,7 +149,7 @@
#{formData,jdbcType=LONGVARCHAR}, #{ext,jdbcType=LONGVARCHAR}, #{hidden,jdbcType=BIT})
</insert>
- <update id="update" parameterType="org.apache.inlong.manager.workflow.model.instance.ProcessInstance">
+ <update id="update" parameterType="org.apache.inlong.manager.common.model.instance.ProcessInstance">
update wf_process_instance
set state = #{state,jdbcType=VARCHAR},
end_time = #{endTime,jdbcType=TIMESTAMP},
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/TaskInstanceEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/TaskInstanceEntityMapper.xml
index da2a938..d12818e 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/TaskInstanceEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/TaskInstanceEntityMapper.xml
@@ -20,7 +20,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.apache.inlong.manager.dao.mapper.TaskInstanceEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.workflow.model.instance.TaskInstance">
+ <resultMap id="BaseResultMap" type="org.apache.inlong.manager.common.model.instance.TaskInstance">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="type" jdbcType="VARCHAR" property="type"/>
<result column="process_inst_id" jdbcType="INTEGER" property="processInstId"/>
@@ -65,7 +65,7 @@
and state = #{state,jdbcType=VARCHAR}
</select>
<select id="listByQuery"
- parameterType="org.apache.inlong.manager.workflow.model.view.TaskQuery"
+ parameterType="org.apache.inlong.manager.common.model.view.TaskQuery"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
@@ -121,8 +121,8 @@
</select>
<select id="countByState"
- parameterType="org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery"
- resultType="org.apache.inlong.manager.workflow.model.view.CountByKey">
+ parameterType="org.apache.inlong.manager.common.model.view.TaskSummaryQuery"
+ resultType="org.apache.inlong.manager.common.model.view.CountByKey">
select
state as `key`,count(1) as value
from wf_task_instance
@@ -165,7 +165,7 @@
</select>
<insert id="insert" useGeneratedKeys="true" keyProperty="id"
- parameterType="org.apache.inlong.manager.workflow.model.instance.TaskInstance">
+ parameterType="org.apache.inlong.manager.common.model.instance.TaskInstance">
insert into wf_task_instance (id, type, process_inst_id, process_name, process_display_name, name,
display_name, applicant, approvers, state,
operator, remark, start_time,
@@ -179,7 +179,7 @@
</insert>
<update id="update"
- parameterType="org.apache.inlong.manager.workflow.model.instance.TaskInstance">
+ parameterType="org.apache.inlong.manager.common.model.instance.TaskInstance">
update wf_task_instance
set state = #{state,jdbcType=VARCHAR},
operator = #{operator,jdbcType=VARCHAR},
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/WorkflowEventService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/WorkflowEventService.java
index 005c4ef..ba3e2c2 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/WorkflowEventService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/WorkflowEventService.java
@@ -18,10 +18,10 @@
package org.apache.inlong.manager.service.core;
import com.github.pagehelper.PageInfo;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
-import org.apache.inlong.manager.workflow.model.view.EventLogView;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.model.view.EventLogView;
/**
* Workflow event related services
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
index 316b356..7819250 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
@@ -60,7 +60,7 @@ import org.apache.inlong.manager.service.workflow.ProcessName;
import org.apache.inlong.manager.service.workflow.WorkflowResult;
import org.apache.inlong.manager.service.workflow.WorkflowService;
import org.apache.inlong.manager.service.workflow.consumption.NewConsumptionWorkflowForm;
-import org.apache.inlong.manager.workflow.model.view.CountByKey;
+import org.apache.inlong.manager.common.model.view.CountByKey;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowApproverServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowApproverServiceImpl.java
index dbaa75e..0c8b3e3 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowApproverServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowApproverServiceImpl.java
@@ -35,10 +35,10 @@ import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.WorkflowApproverEntity;
import org.apache.inlong.manager.dao.mapper.WorkflowApproverEntityMapper;
import org.apache.inlong.manager.service.core.WorkflowApproverService;
-import org.apache.inlong.manager.workflow.core.WorkflowEngine;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.definition.UserTask;
+import org.apache.inlong.manager.common.workflow.WorkflowEngine;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.definition.UserTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowEventServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowEventServiceImpl.java
index 15f66db..fc55f7f 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowEventServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/WorkflowEventServiceImpl.java
@@ -23,13 +23,13 @@ import com.github.pagehelper.PageInfo;
import java.util.List;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.service.core.WorkflowEventService;
-import org.apache.inlong.manager.workflow.core.EventListenerService;
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
-import org.apache.inlong.manager.workflow.model.view.EventLogView;
+import org.apache.inlong.manager.common.workflow.EventListenerService;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.model.view.EventLogView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/CreateHiveTableForStreamListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/CreateHiveTableForStreamListener.java
index 9106bca..78bb270 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/CreateHiveTableForStreamListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/CreateHiveTableForStreamListener.java
@@ -22,10 +22,10 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.pojo.datastorage.StorageHiveSortInfo;
import org.apache.inlong.manager.dao.mapper.StorageHiveEntityMapper;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/CreateHiveTableListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/CreateHiveTableListener.java
index 665d1ee..032bef3 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/CreateHiveTableListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/CreateHiveTableListener.java
@@ -22,10 +22,10 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.pojo.datastorage.StorageHiveSortInfo;
import org.apache.inlong.manager.dao.mapper.StorageHiveEntityMapper;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/HiveTableOperator.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/HiveTableOperator.java
index aba950f..60c0acc 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/HiveTableOperator.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/hive/HiveTableOperator.java
@@ -32,7 +32,7 @@ import org.apache.inlong.manager.dao.entity.StorageHiveFieldEntity;
import org.apache.inlong.manager.dao.mapper.StorageHiveFieldEntityMapper;
import org.apache.inlong.manager.service.core.DataSourceService;
import org.apache.inlong.manager.service.core.StorageService;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarGroupForStreamTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarGroupForStreamTaskListener.java
index 901f1d1..aae9d86 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarGroupForStreamTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarGroupForStreamTaskListener.java
@@ -30,11 +30,11 @@ import org.apache.inlong.manager.service.core.ConsumptionService;
import org.apache.inlong.manager.service.core.StorageService;
import org.apache.inlong.manager.service.thirdpart.mq.util.PulsarUtils;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarGroupTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarGroupTaskListener.java
index 2fa3fe0..df646cd 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarGroupTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarGroupTaskListener.java
@@ -28,11 +28,11 @@ import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.core.ConsumptionService;
import org.apache.inlong.manager.service.thirdpart.mq.util.PulsarUtils;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarResourceTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarResourceTaskListener.java
index 2ee9dfa..35b42b8 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarResourceTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarResourceTaskListener.java
@@ -30,11 +30,11 @@ import org.apache.inlong.manager.dao.mapper.DataStreamEntityMapper;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.thirdpart.mq.util.PulsarUtils;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarTopicForStreamTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarTopicForStreamTaskListener.java
index 1211c86..7e65e02 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarTopicForStreamTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreatePulsarTopicForStreamTaskListener.java
@@ -27,11 +27,11 @@ import org.apache.inlong.manager.dao.mapper.DataStreamEntityMapper;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.thirdpart.mq.util.PulsarUtils;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreateTubeGroupTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreateTubeGroupTaskListener.java
index 3a83099..1911e38 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreateTubeGroupTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreateTubeGroupTaskListener.java
@@ -27,11 +27,11 @@ import org.apache.inlong.manager.common.pojo.tubemq.QueryTubeTopicRequest;
import org.apache.inlong.manager.dao.mapper.ClusterInfoMapper;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreateTubeTopicTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreateTubeTopicTaskListener.java
index 2bd275c..02165a6 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreateTubeTopicTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/mq/CreateTubeTopicTaskListener.java
@@ -23,11 +23,11 @@ import org.apache.inlong.manager.common.pojo.business.BusinessInfo;
import org.apache.inlong.manager.common.pojo.tubemq.AddTubeMqTopicRequest;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/sort/PushHiveConfigTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/sort/PushHiveConfigTaskListener.java
index dd49261..004dfff 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/sort/PushHiveConfigTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/thirdpart/sort/PushHiveConfigTaskListener.java
@@ -38,11 +38,11 @@ import org.apache.inlong.manager.dao.mapper.StorageHiveEntityMapper;
import org.apache.inlong.manager.dao.mapper.StorageHiveFieldEntityMapper;
import org.apache.inlong.manager.service.core.DataStreamService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.apache.inlong.sort.ZkTools;
import org.apache.inlong.sort.formats.common.FormatInfo;
import org.apache.inlong.sort.formats.common.TimestampFormatInfo;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/BaseWorkflowFormType.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/BaseWorkflowFormType.java
index d5649b5..90482b5 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/BaseWorkflowFormType.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/BaseWorkflowFormType.java
@@ -24,7 +24,7 @@ import lombok.Data;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
import org.apache.inlong.manager.service.workflow.business.NewBusinessWorkflowForm;
import org.apache.inlong.manager.service.workflow.consumption.NewConsumptionWorkflowForm;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
/**
* The main form of the process-submitted when the process is initiated
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/BaseWorkflowTaskFormType.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/BaseWorkflowTaskFormType.java
index b844057..ed2c781 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/BaseWorkflowTaskFormType.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/BaseWorkflowTaskFormType.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
import lombok.Data;
import org.apache.inlong.manager.service.workflow.business.BusinessAdminApproveForm;
import org.apache.inlong.manager.service.workflow.consumption.ConsumptionAdminApproveForm;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
/**
* Approval task node form
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowDefinition.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowDefinition.java
index 2de9dd4..527fab4 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowDefinition.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowDefinition.java
@@ -17,7 +17,7 @@
package org.apache.inlong.manager.service.workflow;
-import org.apache.inlong.manager.workflow.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.Process;
/**
* Definition of workflow
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowEngineConfig.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowEngineConfig.java
index 244e06d..6a67319 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowEngineConfig.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowEngineConfig.java
@@ -17,18 +17,18 @@
package org.apache.inlong.manager.service.workflow;
-import org.apache.inlong.manager.workflow.core.EventListenerService;
-import org.apache.inlong.manager.workflow.core.ProcessDefinitionService;
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.WorkflowEngine;
+import org.apache.inlong.manager.common.workflow.EventListenerService;
+import org.apache.inlong.manager.common.workflow.ProcessDefinitionService;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.workflow.WorkflowEngine;
import org.apache.inlong.manager.workflow.core.impl.MemoryProcessDefinitionStorage;
import org.apache.inlong.manager.workflow.core.impl.WorkflowDataAccessorImpl;
import org.apache.inlong.manager.workflow.core.impl.WorkflowEngineImpl;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.dao.ProcessInstanceStorage;
-import org.apache.inlong.manager.workflow.dao.TaskInstanceStorage;
-import org.apache.inlong.manager.workflow.model.WorkflowConfig;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.dao.ProcessInstanceStorage;
+import org.apache.inlong.manager.common.dao.TaskInstanceStorage;
+import org.apache.inlong.manager.common.model.WorkflowConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowResult.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowResult.java
index f6e6eb5..f6670c8 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowResult.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowResult.java
@@ -17,9 +17,9 @@
package org.apache.inlong.manager.service.workflow;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.view.ProcessView;
-import org.apache.inlong.manager.workflow.model.view.TaskView;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.view.ProcessView;
+import org.apache.inlong.manager.common.model.view.TaskView;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowService.java
index bdc0114..3d11e6a 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowService.java
@@ -19,17 +19,17 @@ package org.apache.inlong.manager.service.workflow;
import com.github.pagehelper.PageInfo;
import java.util.List;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
-import org.apache.inlong.manager.workflow.model.view.ProcessDetail;
-import org.apache.inlong.manager.workflow.model.view.ProcessListView;
-import org.apache.inlong.manager.workflow.model.view.ProcessQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryView;
-import org.apache.inlong.manager.workflow.model.view.TaskListView;
-import org.apache.inlong.manager.workflow.model.view.TaskQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryView;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.view.ProcessDetail;
+import org.apache.inlong.manager.common.model.view.ProcessListView;
+import org.apache.inlong.manager.common.model.view.ProcessQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryView;
+import org.apache.inlong.manager.common.model.view.TaskListView;
+import org.apache.inlong.manager.common.model.view.TaskQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryView;
/**
* Workflow service
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java
index 986c12a..9167649 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImpl.java
@@ -31,26 +31,26 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.service.workflow.WorkflowTaskExecuteLog.ListenerExecutorLog;
import org.apache.inlong.manager.service.workflow.WorkflowTaskExecuteLog.TaskExecutorLog;
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.WorkflowEngine;
-import org.apache.inlong.manager.workflow.exception.WorkflowNoRollbackException;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
-import org.apache.inlong.manager.workflow.model.definition.UserTask;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessDetail;
-import org.apache.inlong.manager.workflow.model.view.ProcessListView;
-import org.apache.inlong.manager.workflow.model.view.ProcessQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryView;
-import org.apache.inlong.manager.workflow.model.view.TaskListView;
-import org.apache.inlong.manager.workflow.model.view.TaskQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryView;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.workflow.WorkflowEngine;
+import org.apache.inlong.manager.common.exceptions.WorkflowNoRollbackException;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.definition.UserTask;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.model.view.ProcessDetail;
+import org.apache.inlong.manager.common.model.view.ProcessListView;
+import org.apache.inlong.manager.common.model.view.ProcessQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryView;
+import org.apache.inlong.manager.common.model.view.TaskListView;
+import org.apache.inlong.manager.common.model.view.TaskQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryView;
import org.apache.inlong.manager.workflow.util.WorkflowFormParserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowTaskExecuteLog.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowTaskExecuteLog.java
index 2c58d87..1183f3d 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowTaskExecuteLog.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowTaskExecuteLog.java
@@ -25,8 +25,8 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
/**
* Workflow system task execution log
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowTaskExecuteLogQuery.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowTaskExecuteLogQuery.java
index 8469e97..8ec086b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowTaskExecuteLogQuery.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/WorkflowTaskExecuteLogQuery.java
@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.inlong.manager.workflow.model.view.PageQuery;
+import org.apache.inlong.manager.common.model.view.PageQuery;
/**
* Task execution log query
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/BusinessAdminApproveForm.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/BusinessAdminApproveForm.java
index 380294e..4cea88d 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/BusinessAdminApproveForm.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/BusinessAdminApproveForm.java
@@ -25,7 +25,7 @@ import org.apache.inlong.manager.common.pojo.business.BusinessApproveInfo;
import org.apache.inlong.manager.common.pojo.datastream.DataStreamApproveInfo;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.service.workflow.BaseWorkflowTaskFormType;
-import org.apache.inlong.manager.workflow.exception.FormValidateException;
+import org.apache.inlong.manager.common.exceptions.FormValidateException;
/**
* The system administrator approves and fills in the form
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/BusinessResourceWorkflowForm.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/BusinessResourceWorkflowForm.java
index ac1d844..7eb974b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/BusinessResourceWorkflowForm.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/BusinessResourceWorkflowForm.java
@@ -21,7 +21,7 @@ import com.google.common.collect.Maps;
import org.apache.inlong.manager.common.pojo.business.BusinessInfo;
import org.apache.inlong.manager.service.workflow.BaseWorkflowFormType;
-import org.apache.inlong.manager.workflow.exception.FormValidateException;
+import org.apache.inlong.manager.common.exceptions.FormValidateException;
import java.util.Map;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/CreateBusinessWorkflowDefinition.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/CreateBusinessWorkflowDefinition.java
index 0f01b7e..de446bc 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/CreateBusinessWorkflowDefinition.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/CreateBusinessWorkflowDefinition.java
@@ -37,10 +37,10 @@ import org.apache.inlong.manager.service.workflow.WorkflowDefinition;
import org.apache.inlong.manager.service.workflow.business.listener.BusinessCompleteProcessListener;
import org.apache.inlong.manager.service.workflow.business.listener.BusinessFailedProcessListener;
import org.apache.inlong.manager.service.workflow.business.listener.InitBusinessInfoListener;
-import org.apache.inlong.manager.workflow.model.definition.EndEvent;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ServiceTask;
-import org.apache.inlong.manager.workflow.model.definition.StartEvent;
+import org.apache.inlong.manager.common.model.definition.EndEvent;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ServiceTask;
+import org.apache.inlong.manager.common.model.definition.StartEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/NewBusinessWorkflowDefinition.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/NewBusinessWorkflowDefinition.java
index 7ad4b17..15e2c8a 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/NewBusinessWorkflowDefinition.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/NewBusinessWorkflowDefinition.java
@@ -26,10 +26,10 @@ import org.apache.inlong.manager.service.workflow.business.listener.BusinessCanc
import org.apache.inlong.manager.service.workflow.business.listener.BusinessPassTaskListener;
import org.apache.inlong.manager.service.workflow.business.listener.BusinessRejectProcessListener;
import org.apache.inlong.manager.service.workflow.business.listener.StartCreateResourceProcessListener;
-import org.apache.inlong.manager.workflow.model.definition.EndEvent;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.StartEvent;
-import org.apache.inlong.manager.workflow.model.definition.UserTask;
+import org.apache.inlong.manager.common.model.definition.EndEvent;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.StartEvent;
+import org.apache.inlong.manager.common.model.definition.UserTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/NewBusinessWorkflowForm.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/NewBusinessWorkflowForm.java
index fe475e4..c6cb6ce 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/NewBusinessWorkflowForm.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/NewBusinessWorkflowForm.java
@@ -26,7 +26,7 @@ import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.pojo.business.BusinessInfo;
import org.apache.inlong.manager.common.pojo.datastream.DataStreamSummaryInfo;
import org.apache.inlong.manager.service.workflow.BaseWorkflowFormType;
-import org.apache.inlong.manager.workflow.exception.FormValidateException;
+import org.apache.inlong.manager.common.exceptions.FormValidateException;
import org.apache.inlong.manager.common.util.Preconditions;
/**
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessCancelProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessCancelProcessListener.java
index 21634fd..d422098 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessCancelProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessCancelProcessListener.java
@@ -21,11 +21,11 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.EntityStatus;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.workflow.business.NewBusinessWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessCompleteProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessCompleteProcessListener.java
index c1e41c1..69cf92a 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessCompleteProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessCompleteProcessListener.java
@@ -23,11 +23,11 @@ import org.apache.inlong.manager.dao.mapper.SourceFileDetailEntityMapper;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.core.DataStreamService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessFailedProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessFailedProcessListener.java
index 50e2a1d..731d68f 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessFailedProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessFailedProcessListener.java
@@ -22,11 +22,11 @@ import org.apache.inlong.manager.common.enums.EntityStatus;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.core.DataStreamService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessPassTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessPassTaskListener.java
index a23c574..03fd818 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessPassTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessPassTaskListener.java
@@ -24,11 +24,11 @@ import org.apache.inlong.manager.common.pojo.datastream.DataStreamApproveInfo;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.core.DataStreamService;
import org.apache.inlong.manager.service.workflow.business.BusinessAdminApproveForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessRejectProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessRejectProcessListener.java
index ead0d56..2b09582 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessRejectProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/BusinessRejectProcessListener.java
@@ -21,11 +21,11 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.EntityStatus;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.workflow.business.NewBusinessWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/InitBusinessInfoListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/InitBusinessInfoListener.java
index 1827b43..9b14305 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/InitBusinessInfoListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/InitBusinessInfoListener.java
@@ -22,11 +22,11 @@ import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.business.BusinessInfo;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/StartCreateResourceProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/StartCreateResourceProcessListener.java
index 03ffbc8..518728e 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/StartCreateResourceProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/business/listener/StartCreateResourceProcessListener.java
@@ -23,11 +23,11 @@ import org.apache.inlong.manager.service.workflow.ProcessName;
import org.apache.inlong.manager.service.workflow.WorkflowService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
import org.apache.inlong.manager.service.workflow.business.NewBusinessWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/ConsumptionAdminApproveForm.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/ConsumptionAdminApproveForm.java
index ba7824c..b042f91 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/ConsumptionAdminApproveForm.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/ConsumptionAdminApproveForm.java
@@ -23,7 +23,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.service.workflow.BaseWorkflowTaskFormType;
-import org.apache.inlong.manager.workflow.exception.FormValidateException;
+import org.apache.inlong.manager.common.exceptions.FormValidateException;
/**
* New consumption approve form for admin
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionProcessDetailHandler.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionProcessDetailHandler.java
index 7c108fc..98b40b0 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionProcessDetailHandler.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionProcessDetailHandler.java
@@ -17,10 +17,10 @@
package org.apache.inlong.manager.service.workflow.consumption;
-import org.apache.inlong.manager.workflow.core.ProcessDefinitionService;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ProcessDetailHandler;
-import org.apache.inlong.manager.workflow.model.view.ProcessDetail;
+import org.apache.inlong.manager.common.workflow.ProcessDefinitionService;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ProcessDetailHandler;
+import org.apache.inlong.manager.common.model.view.ProcessDetail;
import org.apache.inlong.manager.workflow.util.WorkflowFormParserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionWorkflowDefinition.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionWorkflowDefinition.java
index 16d527f..1630576 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionWorkflowDefinition.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionWorkflowDefinition.java
@@ -30,11 +30,11 @@ import org.apache.inlong.manager.service.workflow.consumption.listener.Consumpti
import org.apache.inlong.manager.service.workflow.consumption.listener.ConsumptionCompleteProcessListener;
import org.apache.inlong.manager.service.workflow.consumption.listener.ConsumptionPassTaskListener;
import org.apache.inlong.manager.service.workflow.consumption.listener.ConsumptionRejectProcessListener;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.EndEvent;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.StartEvent;
-import org.apache.inlong.manager.workflow.model.definition.UserTask;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.EndEvent;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.StartEvent;
+import org.apache.inlong.manager.common.model.definition.UserTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionWorkflowForm.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionWorkflowForm.java
index d20db44..b9ba9fb 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionWorkflowForm.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/NewConsumptionWorkflowForm.java
@@ -23,7 +23,7 @@ import java.util.Map;
import lombok.Data;
import org.apache.inlong.manager.common.pojo.consumption.ConsumptionInfo;
import org.apache.inlong.manager.service.workflow.BaseWorkflowFormType;
-import org.apache.inlong.manager.workflow.exception.FormValidateException;
+import org.apache.inlong.manager.common.exceptions.FormValidateException;
import org.apache.inlong.manager.common.util.Preconditions;
/**
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCancelProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCancelProcessListener.java
index ee483da..f735eda 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCancelProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCancelProcessListener.java
@@ -23,11 +23,11 @@ import org.apache.inlong.manager.common.enums.ConsumptionStatus;
import org.apache.inlong.manager.dao.entity.ConsumptionEntity;
import org.apache.inlong.manager.dao.mapper.ConsumptionEntityMapper;
import org.apache.inlong.manager.service.workflow.consumption.NewConsumptionWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCompleteProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCompleteProcessListener.java
index 9f74716..eef7cee 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCompleteProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionCompleteProcessListener.java
@@ -36,11 +36,11 @@ import org.apache.inlong.manager.service.thirdpart.mq.PulsarOptService;
import org.apache.inlong.manager.service.thirdpart.mq.TubeMqOptService;
import org.apache.inlong.manager.service.thirdpart.mq.util.PulsarUtils;
import org.apache.inlong.manager.service.workflow.consumption.NewConsumptionWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionPassTaskListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionPassTaskListener.java
index 8159a2e..4421d8f 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionPassTaskListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionPassTaskListener.java
@@ -25,11 +25,11 @@ import org.apache.inlong.manager.common.pojo.consumption.ConsumptionInfo;
import org.apache.inlong.manager.service.core.ConsumptionService;
import org.apache.inlong.manager.service.workflow.consumption.ConsumptionAdminApproveForm;
import org.apache.inlong.manager.service.workflow.consumption.NewConsumptionWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionRejectProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionRejectProcessListener.java
index 0bcbd9b..950d8f7 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionRejectProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/consumption/listener/ConsumptionRejectProcessListener.java
@@ -22,11 +22,11 @@ import org.apache.inlong.manager.common.enums.ConsumptionStatus;
import org.apache.inlong.manager.dao.entity.ConsumptionEntity;
import org.apache.inlong.manager.dao.mapper.ConsumptionEntityMapper;
import org.apache.inlong.manager.service.workflow.consumption.NewConsumptionWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/CreateStreamWorkflowDefinition.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/CreateStreamWorkflowDefinition.java
index ff201ff..b9da8a9 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/CreateStreamWorkflowDefinition.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/CreateStreamWorkflowDefinition.java
@@ -31,10 +31,10 @@ import org.apache.inlong.manager.service.workflow.ProcessName;
import org.apache.inlong.manager.service.workflow.WorkflowDefinition;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
import org.apache.inlong.manager.service.workflow.business.listener.InitBusinessInfoListener;
-import org.apache.inlong.manager.workflow.model.definition.EndEvent;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ServiceTask;
-import org.apache.inlong.manager.workflow.model.definition.StartEvent;
+import org.apache.inlong.manager.common.model.definition.EndEvent;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ServiceTask;
+import org.apache.inlong.manager.common.model.definition.StartEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/InitBusinessInfoForStreamListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/InitBusinessInfoForStreamListener.java
index 1975689..4be786c 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/InitBusinessInfoForStreamListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/InitBusinessInfoForStreamListener.java
@@ -22,11 +22,11 @@ import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.business.BusinessInfo;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/StreamCompleteProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/StreamCompleteProcessListener.java
index eab472f..d662d90 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/StreamCompleteProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/StreamCompleteProcessListener.java
@@ -23,11 +23,11 @@ import org.apache.inlong.manager.dao.mapper.SourceFileDetailEntityMapper;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.core.DataStreamService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/StreamFailedProcessListener.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/StreamFailedProcessListener.java
index fe0df90..712312c 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/StreamFailedProcessListener.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/stream/StreamFailedProcessListener.java
@@ -22,11 +22,11 @@ import org.apache.inlong.manager.common.enums.EntityStatus;
import org.apache.inlong.manager.service.core.BusinessService;
import org.apache.inlong.manager.service.core.DataStreamService;
import org.apache.inlong.manager.service.workflow.business.BusinessResourceWorkflowForm;
-import org.apache.inlong.manager.workflow.core.event.ListenerResult;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowListenerException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
+import org.apache.inlong.manager.common.event.ListenerResult;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/EndEvent.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/BaseConfig.java
similarity index 69%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/EndEvent.java
rename to inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/BaseConfig.java
index 6ecaf1d..12f6a14 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/EndEvent.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/BaseConfig.java
@@ -15,20 +15,17 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.service.workflow.business;
-/**
- * End event
- */
-public class EndEvent extends Element {
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
- public EndEvent() {
- this.setName("EndEvent");
- this.setDisplayName("EndEvent");
+@Configuration
+public class BaseConfig {
+ @Bean
+ public RestTemplate restTemplate() {
+ return new RestTemplate();
}
- @Override
- public void validate() {
- // do notion
- }
}
diff --git a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/BaseTest.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/BaseTest.java
new file mode 100644
index 0000000..236d536
--- /dev/null
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/BaseTest.java
@@ -0,0 +1,39 @@
+package org.apache.inlong.manager.service.workflow.business;
+/*
+ * 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.
+ */
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@SpringBootApplication
+@EnableConfigurationProperties
+@ComponentScan(basePackages = "org.apache.inlong.manager")
+@SpringBootTest
+@RunWith(SpringRunner.class)
+@ActiveProfiles(value = {"test"})
+public class BaseTest {
+
+ public static void main(String[] args) {
+ SpringApplication.run(BaseTest.class, args);
+ }
+}
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessForm.java b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/CreateBusinessWorkflowDefinitionTest.java
similarity index 51%
rename from inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessForm.java
rename to inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/CreateBusinessWorkflowDefinitionTest.java
index 7b9c37e..5e8ab6f 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/model/definition/ProcessForm.java
+++ b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/business/CreateBusinessWorkflowDefinitionTest.java
@@ -15,38 +15,24 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.workflow.model.definition;
+package org.apache.inlong.manager.service.workflow.business;
-import java.util.Map;
+import org.junit.Assert;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
-/**
- * Process main form
- */
-public interface ProcessForm extends Form {
-
- /**
- * Get business group id
- *
- * @return business group id
- */
- String getInlongGroupId();
+public class CreateBusinessWorkflowDefinitionTest extends BaseTest {
- /**
- * Get title
- *
- * @return
- */
- default String getTitle() {
- return null;
- }
+ @Autowired
+ CreateBusinessWorkflowDefinition createBusinessWorkflowDefinition;
- /**
- * Field data displayed in the process list
- *
- * @return
- */
- default Map<String, Object> showInList() {
- return null;
+ @Test
+ public void testDefineProcess() {
+ Process process = createBusinessWorkflowDefinition.defineProcess();
+ Assert.assertTrue("Business Resource Creation".equals(process.getType()));
+ Assert.assertTrue(process.getTaskByName("createHiveTableTask") != null);
+ Assert.assertTrue(process.getNameToTaskMap().size() == 6);
}
}
diff --git a/inlong-manager/manager-service/src/test/resources/application-test.properties b/inlong-manager/manager-service/src/test/resources/application-test.properties
new file mode 100644
index 0000000..41582e4
--- /dev/null
+++ b/inlong-manager/manager-service/src/test/resources/application-test.properties
@@ -0,0 +1,71 @@
+#
+# 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.
+#
+
+# Log level
+logging.level.root=INFO
+logging.level.org.apache.inlong.manager=debug
+
+spring.datasource.druid.url=jdbc:h2:mem:test;MODE=MYSQL;DB_CLOSE_DELAY=-1;IGNORECASE=TRUE;
+spring.datasource.druid.username=root
+spring.datasource.druid.password=""
+
+spring.datasource.druid.driver-class-name=org.h2.Driver
+spring.datasource.schema=classpath:sql/apache_inlong_manager.sql
+
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.druid.validationQuery=SELECT 'x'
+# Initialization size, minimum, maximum
+spring.datasource.druid.initialSize=20
+spring.datasource.druid.minIdle=20
+spring.datasource.druid.maxActive=300
+# Configure the timeout period to wait for the connection to be acquired
+spring.datasource.druid.maxWait=600000
+# Configure the minimum survival time of a connection in the pool, in milliseconds
+spring.datasource.druid.minEvictableIdleTimeMillis=3600000
+# Detect when applying for connection. It is recommended to configure it to true, which does not affect performance and ensures safety
+spring.datasource.druid.testWhileIdle=true
+# Perform detection when obtaining a connection, it is recommended to close it, which affects performance
+spring.datasource.druid.testOnBorrow=false
+# Perform detection when returning the connection, it is recommended to close it, which affects performance
+spring.datasource.druid.testOnReturn=false
+# Configure filters for monitoring statistics interception, stat:monitoring statistics, log4j:log, wall:defense against SQL injection
+spring.datasource.druid.filters=stat,wall
+# Open the mergeSql function through the connectProperties property, Slow SQL records
+spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+# Manager address of Tube cluster, used to create Topic
+cluster.tube.manager=http://127.0.0.1:8081
+# Master address, used to manage Tube broker
+cluster.tube.master=127.0.0.1:8000,127.0.0.1:8010
+# Tube cluster ID
+cluster.tube.clusterId=1
+
+# Push configuration to the path on ZooKeeper
+cluster.zk.url=127.0.0.1:2181
+cluster.zk.root=inlong_hive
+
+# Application name in Sort
+sort.appName=inlong_app
+
+# Pulsar admin URL
+pulsar.adminUrl=http://127.0.0.1:8080,127.0.0.2:8080,127.0.0.3:8080
+# Pulsar broker address
+pulsar.serviceUrl=pulsar://127.0.0.1:6650,127.0.0.1:6650,127.0.0.1:6650
+# Default tenant of Pulsar
+pulsar.defaultTenant=public
diff --git a/inlong-manager/manager-service/src/test/resources/sql/apache_inlong_manager.sql b/inlong-manager/manager-service/src/test/resources/sql/apache_inlong_manager.sql
new file mode 100644
index 0000000..8ba9380
--- /dev/null
+++ b/inlong-manager/manager-service/src/test/resources/sql/apache_inlong_manager.sql
@@ -0,0 +1,1048 @@
+/*
+ * 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.
+ */
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for agent_heartbeat_log
+-- ----------------------------
+DROP TABLE IF EXISTS `agent_heartbeat_log`;
+CREATE TABLE `agent_heartbeat_log`
+(
+ `ip` varchar(64) NOT NULL COMMENT 'agent host ip',
+ `version` varchar(128) DEFAULT NULL,
+ `heartbeat_msg` text DEFAULT NULL COMMENT 'massage in heartbeat request',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`ip`)
+);
+
+-- ----------------------------
+-- Table structure for agent_sys_conf
+-- ----------------------------
+DROP TABLE IF EXISTS `agent_sys_conf`;
+CREATE TABLE `agent_sys_conf`
+(
+ `ip` varchar(64) NOT NULL COMMENT 'ip',
+ `max_retry_threads` int(11) NOT NULL DEFAULT '6' COMMENT 'Maximum number of retry threads',
+ `min_retry_threads` int(11) NOT NULL DEFAULT '3' COMMENT 'Minimum number of retry threads',
+ `db_path` varchar(64) DEFAULT '../db' COMMENT 'The path where bd is located, use a relative path',
+ `scan_interval_sec` int(11) NOT NULL DEFAULT '30' COMMENT 'Interval time to scan file directory',
+ `batch_size` int(11) NOT NULL DEFAULT '20' COMMENT 'The amount sent to data proxy in batch',
+ `msg_size` int(11) NOT NULL DEFAULT '100' COMMENT 'As many packages as possible at one time',
+ `send_runnable_size` int(11) NOT NULL DEFAULT '5' COMMENT 'The number of sending threads corresponding to a data source',
+ `msg_queue_size` int(11) DEFAULT '500',
+ `max_reader_cnt` int(11) NOT NULL DEFAULT '18' COMMENT 'The maximum number of threads of an Agent',
+ `thread_manager_sleep_interval` int(11) NOT NULL DEFAULT '30000' COMMENT 'Interval time between manager thread to taskManager to fetch tasks',
+ `oneline_size` int(11) NOT NULL DEFAULT '1048576' COMMENT 'Maximum length of a row of data',
+ `clear_day_offset` int(11) NOT NULL DEFAULT '11' COMMENT 'How many days ago to clear the data of BDB',
+ `clear_interval_sec` int(11) NOT NULL DEFAULT '86400' COMMENT 'Interval time for clearing bdb data',
+ `buffer_size_in_bytes` int(16) NOT NULL DEFAULT '268435456' COMMENT 'Maximum memory occupied by msg buffer',
+ `agent_rpc_reconnect_time` int(11) NOT NULL DEFAULT '0' COMMENT 'The interval time to update the link, if it is 0, it will not be updated',
+ `send_timeout_mill_sec` int(11) NOT NULL DEFAULT '60000' COMMENT 'The timeout period for sending a message (if the packet is not full within one minute, it will be sent out forcibly)',
+ `flush_event_timeout_mill_sec` int(11) NOT NULL DEFAULT '16000',
+ `stat_interval_sec` int(11) NOT NULL DEFAULT '60' COMMENT 'Statistical message sending frequency',
+ `conf_refresh_interval_secs` int(11) NOT NULL DEFAULT '300' COMMENT 'The frequency at which the Agent regularly pulls the configuration from the InLongManager',
+ `flow_size` int(11) DEFAULT '1048576000',
+ `bufferSize` int(11) DEFAULT '1048576' COMMENT 'bufferSize, default 1048576',
+ `compress` tinyint(2) DEFAULT NULL COMMENT 'Whether to compress',
+ `event_check_interval` int(11) DEFAULT NULL COMMENT 'File scanning period',
+ `is_calMD5` tinyint(2) DEFAULT NULL COMMENT 'Do you want to calculate the cumulative md5 of read characters',
+ PRIMARY KEY (`ip`)
+);
+
+-- ----------------------------
+-- Table structure for business
+-- ----------------------------
+DROP TABLE IF EXISTS `business`;
+CREATE TABLE `business`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Business group id, filled in by the user, undeleted ones cannot be repeated',
+ `name` varchar(128) DEFAULT '' COMMENT 'Business name, English, numbers and underscore',
+ `cn_name` varchar(256) DEFAULT NULL COMMENT 'Chinese display name',
+ `description` varchar(256) DEFAULT '' COMMENT 'Business Introduction',
+ `middleware_type` varchar(10) DEFAULT 'TUBE' COMMENT 'The middleware type of message queue, high throughput: TUBE, high consistency: PULSAR',
+ `queue_module` VARCHAR(20) NULL DEFAULT 'parallel' COMMENT 'Queue model of Pulsar, parallel: multiple partitions, high throughput, out-of-order messages; serial: single partition, low throughput, and orderly messages',
+ `topic_partition_num` INT(4) NULL DEFAULT '3' COMMENT 'The number of partitions of Pulsar Topic, 1-20',
+ `mq_resource_obj` varchar(128) NOT NULL COMMENT 'MQ resource object, for Tube, its Topic, for Pulsar, its Namespace',
+ `daily_records` int(11) DEFAULT '10' COMMENT 'Number of access records per day, unit: 10,000 records per day',
+ `daily_storage` int(11) DEFAULT '10' COMMENT 'Access size by day, unit: GB per day',
+ `peak_records` int(11) DEFAULT '1000' COMMENT 'Access peak per second, unit: records per second',
+ `max_length` int(11) DEFAULT '10240' COMMENT 'The maximum length of a single piece of data, unit: Byte',
+ `schema_name` varchar(128) DEFAULT NULL COMMENT 'Data type, associated data_schema table',
+ `in_charges` varchar(512) NOT NULL COMMENT 'Name of responsible person, separated by commas',
+ `followers` varchar(512) DEFAULT NULL COMMENT 'List of names of business followers, separated by commas',
+ `status` int(4) DEFAULT '21' COMMENT 'Business status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `temp_view` text DEFAULT NULL COMMENT 'Temporary view, used to save intermediate data that has not been submitted or approved after modification',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_business` (`inlong_group_id`, `is_deleted`, `modify_time`)
+);
+
+-- ----------------------------
+-- Table structure for business_pulsar
+-- ----------------------------
+DROP TABLE IF EXISTS `business_pulsar`;
+CREATE TABLE `business_pulsar`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Business group id, filled in by the user, undeleted ones cannot be repeated',
+ `ensemble` int(3) DEFAULT '3' COMMENT 'The writable nodes number of ledger',
+ `write_quorum` int(3) DEFAULT '3' COMMENT 'The copies number of ledger',
+ `ack_quorum` int(3) DEFAULT '2' COMMENT 'The number of requested acks',
+ `retention_time` int(11) DEFAULT '72' COMMENT 'Message storage time',
+ `retention_time_unit` char(20) DEFAULT 'hours' COMMENT 'The unit of the message storage time',
+ `ttl` int(11) DEFAULT '24' COMMENT 'Message time-to-live duration',
+ `ttl_unit` varchar(20) DEFAULT 'hours' COMMENT 'The unit of time-to-live duration',
+ `retention_size` int(11) DEFAULT '-1' COMMENT 'Message size',
+ `retention_size_unit` varchar(20) DEFAULT 'MB' COMMENT 'The unit of message size',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for business_ext
+-- ----------------------------
+DROP TABLE IF EXISTS `business_ext`;
+CREATE TABLE `business_ext`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Business group id',
+ `key_name` varchar(64) NOT NULL COMMENT 'Configuration item name',
+ `key_value` varchar(256) DEFAULT NULL COMMENT 'The value of the configuration item',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`),
+ KEY `index_group_id` (`inlong_group_id`)
+);
+
+-- ----------------------------
+-- Table structure for cluster_info
+-- ----------------------------
+DROP TABLE IF EXISTS `cluster_info`;
+CREATE TABLE `cluster_info`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `name` varchar(128) NOT NULL COMMENT 'cluster name',
+ `type` varchar(32) NOT NULL COMMENT 'Cluster type, including TUBE, PULSAR, etc.',
+ `ip` varchar(64) NOT NULL COMMENT 'Cluster IP address',
+ `port` int(11) NOT NULL COMMENT 'Cluster port',
+ `in_charges` varchar(512) NOT NULL COMMENT 'Name of responsible person, separated by commas',
+ `url` varchar(256) DEFAULT NULL COMMENT 'Cluster URL address',
+ `is_backup` tinyint(1) DEFAULT '0' COMMENT 'Whether it is a backup cluster, 0: no, 1: yes',
+ `ext_props` text DEFAULT NULL COMMENT 'extended properties',
+ `status` int(4) DEFAULT '1' COMMENT 'cluster status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for common_db_server
+-- ----------------------------
+DROP TABLE IF EXISTS `common_db_server`;
+CREATE TABLE `common_db_server`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `access_type` varchar(20) NOT NULL COMMENT 'Collection type, with Agent, DataProxy client, LoadProxy',
+ `connection_name` varchar(128) NOT NULL COMMENT 'The name of the database connection',
+ `db_type` varchar(128) DEFAULT 'MySQL' COMMENT 'DB type, such as MySQL, Oracle',
+ `db_server_ip` varchar(64) NOT NULL COMMENT 'DB Server IP',
+ `port` int(11) NOT NULL COMMENT 'Port number',
+ `db_name` varchar(128) DEFAULT NULL COMMENT 'Target database name',
+ `username` varchar(64) NOT NULL COMMENT 'Username',
+ `password` varchar(64) NOT NULL COMMENT 'The password corresponding to the above user name',
+ `has_select` tinyint(1) DEFAULT '0' COMMENT 'Is there DB permission select, 0: No, 1: Yes',
+ `has_insert` tinyint(1) DEFAULT '0' COMMENT 'Is there DB permission to insert, 0: No, 1: Yes',
+ `has_update` tinyint(1) DEFAULT '0' COMMENT 'Is there a DB permission update, 0: No, 1: Yes',
+ `has_delete` tinyint(1) DEFAULT '0' COMMENT 'Is there a DB permission to delete, 0: No, 1: Yes',
+ `in_charges` varchar(512) NOT NULL COMMENT 'DB person in charge, separated by a comma when there are multiple ones',
+ `is_region_id` tinyint(1) DEFAULT '0' COMMENT 'Whether it contains a region ID, 0: No, 1: Yes',
+ `db_description` varchar(256) DEFAULT NULL COMMENT 'DB description',
+ `backup_db_server_ip` varchar(64) DEFAULT NULL COMMENT 'Backup DB HOST',
+ `backup_db_port` int(11) DEFAULT NULL COMMENT 'Backup DB port',
+ `status` int(4) DEFAULT '0' COMMENT 'status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of visible persons, separated by commas',
+ `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of visible groups, separated by commas',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for common_file_server
+-- ----------------------------
+DROP TABLE IF EXISTS `common_file_server`;
+CREATE TABLE `common_file_server`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `access_type` varchar(20) NOT NULL COMMENT 'Collection type, with Agent, DataProxy, LoadProxy',
+ `ip` varchar(64) NOT NULL COMMENT 'Data source IP',
+ `port` int(11) NOT NULL COMMENT 'Port number',
+ `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is intranet, 0: No, 1: Yes',
+ `issue_type` varchar(128) DEFAULT NULL COMMENT 'Issuance method, such as SSH, TCS, etc.',
+ `username` varchar(64) NOT NULL COMMENT 'User name of the data source IP host',
+ `password` varchar(64) NOT NULL COMMENT 'The password corresponding to the above user name',
+ `status` int(4) DEFAULT '0' COMMENT 'status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of visible persons, separated by commas',
+ `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of visible groups, separated by commas',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for consumption
+-- ----------------------------
+DROP TABLE IF EXISTS `consumption`;
+CREATE TABLE `consumption`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `consumer_group_name` varchar(255) DEFAULT NULL COMMENT 'consumer group name',
+ `consumer_group_id` varchar(255) NOT NULL COMMENT 'Consumer group ID',
+ `in_charges` varchar(512) NOT NULL COMMENT 'Person in charge of consumption',
+ `inlong_group_id` varchar(255) NOT NULL COMMENT 'Business group id',
+ `middleware_type` varchar(10) DEFAULT 'TUBE' COMMENT 'The middleware type of message queue, high throughput: TUBE, high consistency: PULSAR',
+ `topic` varchar(255) NOT NULL COMMENT 'Consumption topic',
+ `filter_enabled` int(2) DEFAULT '0' COMMENT 'Whether to filter, default 0, not filter consume',
+ `inlong_stream_id` varchar(1024) DEFAULT NULL COMMENT 'Data stream ID for consumption, if filter_enable is 1, it cannot empty',
+ `status` int(4) NOT NULL COMMENT 'Status: draft, pending approval, approval rejected, approval passed',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'creator',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'modifier',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for consumption_pulsar
+-- ----------------------------
+DROP TABLE IF EXISTS `consumption_pulsar`;
+CREATE TABLE `consumption_pulsar`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `consumption_id` int(11) DEFAULT NULL COMMENT 'ID of the consumption information to which it belongs, guaranteed to be uniquely associated with consumption information',
+ `consumer_group_id` varchar(255) NOT NULL COMMENT 'Consumer group ID',
+ `consumer_group_name` varchar(255) DEFAULT NULL COMMENT 'Consumer group name',
+ `inlong_group_id` varchar(255) NOT NULL COMMENT 'Business group ID',
+ `is_rlq` tinyint(1) DEFAULT '0' COMMENT 'Whether to configure the retry letter topic, 0: no configuration, 1: configuration',
+ `retry_letter_topic` varchar(255) DEFAULT NULL COMMENT 'The name of the retry queue topic',
+ `is_dlq` tinyint(1) DEFAULT '0' COMMENT 'Whether to configure dead letter topic, 0: no configuration, 1: means configuration',
+ `dead_letter_topic` varchar(255) DEFAULT NULL COMMENT 'dead letter topic name',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete',
+ PRIMARY KEY (`id`)
+) COMMENT ='Pulsar consumption table';
+
+-- ----------------------------
+-- Table structure for data_proxy_cluster
+-- ----------------------------
+DROP TABLE IF EXISTS `data_proxy_cluster`;
+CREATE TABLE `data_proxy_cluster`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `name` varchar(128) NOT NULL COMMENT 'cluster name',
+ `description` varchar(500) DEFAULT NULL COMMENT 'cluster description',
+ `address` varchar(128) NOT NULL COMMENT 'cluster address',
+ `port` varchar(256) DEFAULT '46801' COMMENT 'Access port number, multiple ports are separated by a comma',
+ `is_backup` tinyint(1) DEFAULT '0' COMMENT 'Whether it is a backup cluster, 0: no, 1: yes',
+ `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is intranet, 0: no, 1: yes',
+ `net_type` varchar(20) DEFAULT NULL COMMENT 'Cluster network type, internal, or public',
+ `in_charges` varchar(512) DEFAULT NULL COMMENT 'Name of responsible person, separated by commas',
+ `ext_props` text DEFAULT NULL COMMENT 'Extended properties',
+ `status` int(4) DEFAULT '1' COMMENT 'Cluster status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for data_schema
+-- ----------------------------
+DROP TABLE IF EXISTS `data_schema`;
+CREATE TABLE `data_schema`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `name` varchar(128) NOT NULL COMMENT 'Data format name, globally unique',
+ `agent_type` varchar(20) NOT NULL COMMENT 'Agent type: file, db_incr, db_full',
+ `data_generate_rule` varchar(32) NOT NULL COMMENT 'Data file generation rules, including day and hour',
+ `sort_type` int(11) NOT NULL COMMENT 'sort logic rules, 0, 5, 9, 10, 13, 15',
+ `time_offset` varchar(10) NOT NULL COMMENT 'time offset',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name` (`name`)
+);
+
+-- create default data schema
+INSERT INTO `data_schema` (name, agent_type, data_generate_rule, sort_type, time_offset)
+values ('m0_day', 'file_agent', 'day', 0, '-0d');
+
+-- ----------------------------
+-- Table structure for data_source_cmd_config
+-- ----------------------------
+DROP TABLE IF EXISTS `data_source_cmd_config`;
+CREATE TABLE `data_source_cmd_config`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'cmd id',
+ `cmd_type` int(11) NOT NULL,
+ `task_id` int(11) NOT NULL,
+ `specified_data_time` varchar(64) NOT NULL,
+ `bSend` tinyint(1) NOT NULL,
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Last update time ',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `result_info` varchar(64) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `index_1` (`task_id`, `bSend`, `specified_data_time`)
+);
+
+-- ----------------------------
+-- Table structure for data_stream
+-- ----------------------------
+DROP TABLE IF EXISTS `data_stream`;
+CREATE TABLE `data_stream`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_stream_id` varchar(128) NOT NULL COMMENT 'Data stream id, non-deleted globally unique',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Owning business group id',
+ `name` varchar(64) DEFAULT NULL COMMENT 'The name of the data stream page display, can be Chinese',
+ `description` varchar(256) DEFAULT '' COMMENT 'Introduction to data stream',
+ `mq_resource_obj` varchar(128) DEFAULT NULL COMMENT 'MQ resource object, in the data stream, Tube is data_stream_id, Pulsar is Topic',
+ `data_source_type` varchar(32) DEFAULT 'FILE' COMMENT 'Data source type, including: FILE, DB, Auto-Push (DATA_PROXY_SDK, HTTP)',
+ `storage_period` int(11) DEFAULT '1' COMMENT 'The storage period of data in MQ, unit: day',
+ `data_type` varchar(20) DEFAULT 'TEXT' COMMENT 'Data type, there are: TEXT, KEY-VALUE, PB, BON, TEXT and BON should be treated differently',
+ `data_encoding` varchar(8) DEFAULT 'UTF-8' COMMENT 'Data encoding format, including: UTF-8, GBK',
+ `data_separator` varchar(8) DEFAULT NULL COMMENT 'The source data field separator, stored as ASCII code',
+ `data_escape_char` varchar(8) DEFAULT NULL COMMENT 'Source data field escape character, the default is NULL (NULL), stored as 1 character',
+ `have_predefined_fields` tinyint(1) DEFAULT '0' COMMENT '(File, DB access) whether there are predefined fields, 0: none, 1: yes (save to data_stream_field)',
+ `daily_records` int(11) DEFAULT '10' COMMENT 'Number of access records per day, unit: 10,000 records per day',
+ `daily_storage` int(11) DEFAULT '10' COMMENT 'Access size by day, unit: GB per day',
+ `peak_records` int(11) DEFAULT '1000' COMMENT 'Access peak per second, unit: records per second',
+ `max_length` int(11) DEFAULT '10240' COMMENT 'The maximum length of a single piece of data, unit: Byte',
+ `in_charges` varchar(512) DEFAULT NULL COMMENT 'Name of responsible person, separated by commas',
+ `status` int(4) DEFAULT '0' COMMENT 'Data stream status',
+ `previous_status` int(4) DEFAULT '0' COMMENT 'Previous status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) DEFAULT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `temp_view` varchar(512) DEFAULT NULL COMMENT 'Temporary view, used to save intermediate data that has not been submitted or approved after modification',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_data_stream` (`inlong_stream_id`, `inlong_group_id`, `is_deleted`, `modify_time`)
+);
+
+-- ----------------------------
+-- Table structure for data_stream_ext
+-- ----------------------------
+DROP TABLE IF EXISTS `data_stream_ext`;
+CREATE TABLE `data_stream_ext`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Owning business group id',
+ `inlong_stream_id` varchar(128) NOT NULL COMMENT 'Owning data stream id',
+ `key_name` varchar(64) NOT NULL COMMENT 'Configuration item name',
+ `key_value` varchar(256) DEFAULT NULL COMMENT 'The value of the configuration item',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`),
+ KEY `index_stream_id` (`inlong_stream_id`)
+);
+
+-- ----------------------------
+-- Table structure for data_stream_field
+-- ----------------------------
+DROP TABLE IF EXISTS `data_stream_field`;
+CREATE TABLE `data_stream_field`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Owning business group id',
+ `inlong_stream_id` varchar(256) NOT NULL COMMENT 'Owning data stream id',
+ `is_predefined_field` tinyint(1) DEFAULT '0' COMMENT 'Whether it is a predefined field, 0: no, 1: yes',
+ `field_name` varchar(20) NOT NULL COMMENT 'field name',
+ `field_value` varchar(128) DEFAULT NULL COMMENT 'Field value, required if it is a predefined field',
+ `pre_expression` varchar(256) DEFAULT NULL COMMENT 'Pre-defined field value expression',
+ `field_type` varchar(20) NOT NULL COMMENT 'field type',
+ `field_comment` varchar(50) DEFAULT NULL COMMENT 'Field description',
+ `rank_num` smallint(6) DEFAULT '0' COMMENT 'Field order (front-end display field order)',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `is_exist` tinyint(1) DEFAULT '0' COMMENT 'Does it exist, 0: does not exist, 1: exists',
+ `bon_field_path` varchar(256) DEFAULT NULL COMMENT 'BON field path',
+ `bon_field_type` varchar(64) DEFAULT NULL COMMENT 'BON field type',
+ `encrypt_level` varchar(20) DEFAULT NULL COMMENT 'Encryption level',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for operation_log
+-- ----------------------------
+DROP TABLE IF EXISTS `operation_log`;
+CREATE TABLE `operation_log`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `authentication_type` varchar(64) DEFAULT NULL COMMENT 'Authentication type',
+ `operation_type` varchar(255) DEFAULT NULL COMMENT 'operation type',
+ `http_method` varchar(64) DEFAULT NULL COMMENT 'Request method',
+ `invoke_method` varchar(255) DEFAULT NULL COMMENT 'invoke method',
+ `operator` varchar(255) DEFAULT NULL COMMENT 'operator',
+ `proxy` varchar(255) DEFAULT NULL COMMENT 'proxy',
+ `request_url` varchar(255) DEFAULT NULL COMMENT 'Request URL',
+ `remote_address` varchar(255) DEFAULT NULL COMMENT 'Request IP',
+ `cost_time` bigint(20) DEFAULT NULL COMMENT 'time-consuming',
+ `body` text COMMENT 'Request body',
+ `param` text COMMENT 'parameter',
+ `status` int(4) DEFAULT NULL COMMENT 'status',
+ `request_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'request time',
+ `err_msg` text COMMENT 'Error message',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for role
+-- ----------------------------
+DROP TABLE IF EXISTS `role`;
+CREATE TABLE `role`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `role_code` varchar(100) NOT NULL COMMENT 'Role code',
+ `role_name` varchar(255) NOT NULL COMMENT 'Role Chinese name',
+ `create_time` datetime NOT NULL,
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `create_by` varchar(255) NOT NULL,
+ `update_by` varchar(255) NOT NULL,
+ `disabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Is it disabled?',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `role_role_code_uindex` (`role_code`),
+ UNIQUE KEY `role_role_name_uindex` (`role_name`)
+);
+
+-- ----------------------------
+-- Table structure for source_db_basic
+-- ----------------------------
+DROP TABLE IF EXISTS `source_db_basic`;
+CREATE TABLE `source_db_basic`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Owning business group id',
+ `inlong_stream_id` varchar(256) NOT NULL COMMENT 'Owning data stream id',
+ `sync_type` tinyint(1) DEFAULT '0' COMMENT 'Data synchronization type, 0: FULL, full amount, 1: INCREMENTAL, incremental',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `temp_view` text DEFAULT NULL COMMENT 'Temporary view, used to save intermediate data that has not been submitted or approved after modification',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for source_db_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `source_db_detail`;
+CREATE TABLE `source_db_detail`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Owning business group id',
+ `inlong_stream_id` varchar(128) NOT NULL COMMENT 'Owning data stream id',
+ `access_type` varchar(20) NOT NULL COMMENT 'Collection type, with Agent, DataProxy client, LoadProxy',
+ `db_name` varchar(128) DEFAULT NULL COMMENT 'database name',
+ `transfer_ip` varchar(64) DEFAULT NULL COMMENT 'Transfer IP',
+ `connection_name` varchar(128) DEFAULT NULL COMMENT 'The name of the database connection',
+ `table_name` varchar(128) DEFAULT NULL COMMENT 'Data table name, required for increment',
+ `table_fields` longtext COMMENT 'Data table fields, multiple are separated by half-width commas, required for increment',
+ `data_sql` longtext COMMENT 'SQL statement to collect source data, required for full amount',
+ `crontab` varchar(56) DEFAULT NULL COMMENT 'Timed scheduling expression, required for full amount',
+ `status` int(4) DEFAULT '0' COMMENT 'Data source status',
+ `previous_status` int(4) DEFAULT '0' COMMENT 'Previous status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `temp_view` text DEFAULT NULL COMMENT 'Temporary view, used to save un-submitted and unapproved intermediate data after modification',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for source_file_basic
+-- ----------------------------
+DROP TABLE IF EXISTS `source_file_basic`;
+CREATE TABLE `source_file_basic`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Business group id',
+ `inlong_stream_id` varchar(128) NOT NULL COMMENT 'Data stream id',
+ `is_hybrid_source` tinyint(1) DEFAULT '0' COMMENT 'Whether to mix data sources',
+ `is_table_mapping` tinyint(1) DEFAULT '0' COMMENT 'Is there a table name mapping',
+ `date_offset` int(4) DEFAULT '0' COMMENT 'Time offset\n',
+ `date_offset_unit` varchar(2) DEFAULT 'H' COMMENT 'Time offset unit',
+ `file_rolling_type` varchar(2) DEFAULT 'H' COMMENT 'File rolling type',
+ `upload_max_size` int(4) DEFAULT '120' COMMENT 'Upload maximum size',
+ `need_compress` tinyint(1) DEFAULT '0' COMMENT 'Whether need compress',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Delete switch',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `temp_view` text DEFAULT NULL COMMENT 'temp view',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for source_file_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `source_file_detail`;
+CREATE TABLE `source_file_detail`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Owning business group id',
+ `inlong_stream_id` varchar(128) NOT NULL COMMENT 'Owning data stream id',
+ `access_type` varchar(20) DEFAULT 'Agent' COMMENT 'Collection type, there are Agent, DataProxy client, LoadProxy, the file can only be Agent temporarily',
+ `server_name` varchar(64) DEFAULT NULL COMMENT 'The name of the data source service. If it is empty, add configuration through the following fields',
+ `ip` varchar(128) NOT NULL COMMENT 'Data source IP address',
+ `port` int(11) NOT NULL COMMENT 'Data source port number',
+ `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is intranet, 0: no, 1: yes',
+ `issue_type` varchar(10) DEFAULT 'SSH' COMMENT 'Issuing method, there are SSH, TCS',
+ `username` varchar(32) DEFAULT NULL COMMENT 'User name of the data source IP host',
+ `password` varchar(64) DEFAULT NULL COMMENT 'The password corresponding to the above user name',
+ `file_path` varchar(256) NOT NULL COMMENT 'File path, supports regular matching',
+ `status` int(4) DEFAULT '0' COMMENT 'Data source status',
+ `previous_status` int(4) DEFAULT '0' COMMENT 'Previous status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ `temp_view` text DEFAULT NULL COMMENT 'Temporary view, used to save un-submitted and unapproved intermediate data after modification',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for storage_ext
+-- ----------------------------
+DROP TABLE IF EXISTS `storage_ext`;
+CREATE TABLE `storage_ext`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `storage_type` varchar(20) NOT NULL COMMENT 'Storage type, including: HDFS, HIVE, etc.',
+ `storage_id` int(11) NOT NULL COMMENT 'data storage id',
+ `key_name` varchar(64) NOT NULL COMMENT 'Configuration item name',
+ `key_value` varchar(256) DEFAULT NULL COMMENT 'The value of the configuration item',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`),
+ KEY `index_storage_id` (`storage_id`)
+);
+
+-- ----------------------------
+-- Table structure for storage_hive
+-- ----------------------------
+DROP TABLE IF EXISTS `storage_hive`;
+CREATE TABLE `storage_hive`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Owning business group id',
+ `inlong_stream_id` varchar(128) NOT NULL COMMENT 'Owning data stream id',
+ `jdbc_url` varchar(255) DEFAULT NULL COMMENT 'Hive JDBC connection URL, such as "jdbc:hive2://127.0.0.1:10000"',
+ `username` varchar(128) DEFAULT NULL COMMENT 'Username',
+ `password` varchar(255) DEFAULT NULL COMMENT 'User password',
+ `db_name` varchar(128) DEFAULT NULL COMMENT 'Target database name',
+ `table_name` varchar(128) DEFAULT NULL COMMENT 'Target data table name',
+ `hdfs_default_fs` varchar(255) DEFAULT NULL COMMENT 'HDFS defaultFS, such as "hdfs://127.0.0.1:9000"',
+ `warehouse_dir` varchar(250) DEFAULT '/user/hive/warehouse' COMMENT 'Hive table storage path on HDFS, such as "/user/hive/warehouse"',
+ `partition_interval` int(5) DEFAULT NULL COMMENT 'Partition interval, support: 1(D / H), 10 I, 30 I',
+ `partition_unit` varchar(10) DEFAULT 'D' COMMENT 'Partition type, support: D-day, H-hour, I-minute',
+ `primary_partition` varchar(255) DEFAULT 'dt' COMMENT 'primary partition field',
+ `secondary_partition` varchar(256) DEFAULT NULL COMMENT 'secondary partition field',
+ `partition_creation_strategy` varchar(50) DEFAULT 'COMPLETED' COMMENT 'Partition creation strategy, support: ARRIVED, COMPLETED',
+ `file_format` varchar(15) DEFAULT 'TextFile' COMMENT 'The stored table format, TextFile, RCFile, SequenceFile, Avro',
+ `data_encoding` varchar(20) DEFAULT 'UTF-8' COMMENT 'data encoding type',
+ `data_separator` varchar(10) DEFAULT NULL COMMENT 'data field separator',
+ `storage_period` int(5) DEFAULT '10' COMMENT 'Data storage period, unit: day',
+ `opt_log` varchar(5000) DEFAULT NULL COMMENT 'Background operation log',
+ `status` int(4) DEFAULT '0' COMMENT 'status',
+ `previous_status` int(4) DEFAULT '0' COMMENT 'Previous status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) DEFAULT NULL COMMENT 'creator name',
+ `modifier` varchar(64) DEFAULT NULL COMMENT 'modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'modify time',
+ `temp_view` text DEFAULT NULL COMMENT 'Temporary view, used to save un-submitted and unapproved intermediate data after modification',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for storage_hive_field
+-- ----------------------------
+DROP TABLE IF EXISTS `storage_hive_field`;
+CREATE TABLE `storage_hive_field`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `storage_id` int(11) NOT NULL COMMENT 'Hive data storage id',
+ `source_field_name` varchar(20) NOT NULL COMMENT 'source field name',
+ `source_field_type` varchar(20) NOT NULL COMMENT 'source field type',
+ `field_name` varchar(20) NOT NULL COMMENT 'field name',
+ `field_type` varchar(20) NOT NULL COMMENT 'field type',
+ `field_comment` varchar(2000) DEFAULT '' COMMENT 'Field description',
+ `is_required` tinyint(1) DEFAULT NULL COMMENT 'Is it required, 0: not necessary, 1: required',
+ `bon_field_path` varchar(256) DEFAULT NULL COMMENT 'BON field path',
+ `bon_field_type` varchar(64) DEFAULT NULL COMMENT 'BON field type',
+ `encrypt_level` varchar(20) DEFAULT NULL COMMENT 'Encryption level',
+ `is_exist` tinyint(1) DEFAULT '0' COMMENT 'Does it exist, 0: does not exist, 1: exists',
+ `rank_num` smallint(6) DEFAULT '0' COMMENT 'Field order (front-end display field order)',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for task
+-- ----------------------------
+DROP TABLE IF EXISTS `task`;
+CREATE TABLE `task`
+(
+ `id` bigint(20) NOT NULL,
+ `taskflow_id` bigint(20) NOT NULL COMMENT 'Owning task flow id',
+ `task_def_id` bigint(20) DEFAULT NULL COMMENT 'task definition id',
+ `task_name` varchar(255) NOT NULL COMMENT 'task name',
+ `status` varchar(255) DEFAULT NULL COMMENT 'task status',
+ `post_param` varchar(255) DEFAULT NULL COMMENT 'Task parameters',
+ `resultmsg` varchar(1000) DEFAULT NULL COMMENT 'Execution result log',
+ `create_time` datetime NOT NULL COMMENT 'Create time',
+ `create_by` varchar(255) NOT NULL COMMENT 'creator',
+ `update_time` datetime DEFAULT NULL COMMENT 'last modified time',
+ `update_by` varchar(0) DEFAULT NULL COMMENT 'last modified person',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for task_def
+-- ----------------------------
+DROP TABLE IF EXISTS `task_def`;
+CREATE TABLE `task_def`
+(
+ `id` bigint(20) NOT NULL,
+ `taskflow_def_id` bigint(20) NOT NULL COMMENT 'Task flow definition id',
+ `parent_id` bigint(20) DEFAULT NULL COMMENT 'parent task id',
+ `implclass` varchar(255) DEFAULT NULL COMMENT 'task processing flow class',
+ `task_name` varchar(255) DEFAULT NULL COMMENT 'task name',
+ `create_time` datetime NOT NULL COMMENT 'Create time',
+ `create_by` varchar(255) NOT NULL COMMENT 'creator',
+ `update_time` datetime DEFAULT NULL COMMENT 'last modified time',
+ `update_by` datetime DEFAULT NULL COMMENT 'last modified person',
+ `delivery_id` bigint(20) DEFAULT NULL COMMENT 'Task push method',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for taskflow
+-- ----------------------------
+DROP TABLE IF EXISTS `taskflow`;
+CREATE TABLE `taskflow`
+(
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `taskflow_def_id` bigint(20) NOT NULL COMMENT 'Taskflow definition id',
+ `status` varchar(255) DEFAULT NULL COMMENT 'status',
+ `create_by` varchar(255) NOT NULL COMMENT 'creator',
+ `create_time` datetime DEFAULT NULL COMMENT 'Create time',
+ `update_time` datetime DEFAULT NULL COMMENT 'last modified time',
+ `update_by` varchar(255) DEFAULT NULL COMMENT 'last modified person',
+ `event` varchar(255) DEFAULT NULL COMMENT 'trigger event',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for taskflow_def
+-- ----------------------------
+DROP TABLE IF EXISTS `taskflow_def`;
+CREATE TABLE `taskflow_def`
+(
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL COMMENT 'Workflow definition name',
+ `descrip` varchar(255) DEFAULT NULL COMMENT 'Workflow function description',
+ `create_time` datetime NOT NULL COMMENT 'Create time',
+ `create_by` varchar(255) NOT NULL COMMENT 'creator',
+ `isValid` int(11) DEFAULT NULL COMMENT 'logical deletion',
+ `trigger_event` varchar(255) DEFAULT NULL COMMENT 'trigger event',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for user
+-- ----------------------------
+DROP TABLE IF EXISTS `user`;
+CREATE TABLE `user`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL COMMENT 'account name',
+ `password` varchar(64) NOT NULL COMMENT 'password md5',
+ `account_type` int(11) NOT NULL DEFAULT '1' COMMENT 'account type, 0-manager 1-normal',
+ `due_date` datetime DEFAULT NULL COMMENT 'due date for account',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'update time',
+ `create_by` varchar(255) NOT NULL COMMENT 'create by sb.',
+ `update_by` varchar(255) DEFAULT NULL COMMENT 'update by sb.',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `user_name_uindex` (`name`)
+);
+
+-- create default admin user, username is 'admin', password is 'inlong'
+INSERT INTO `user` (name, password, account_type, due_date, create_time, update_time, create_by, update_by)
+VALUES ('admin', '628ed559bff5ae36bd2184d4216973cf', 0, '2099-12-31 23:59:59',
+ CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'inlong_init', 'inlong_init');
+
+-- ----------------------------
+-- Table structure for user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `user_role`;
+CREATE TABLE `user_role`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `user_name` varchar(255) NOT NULL COMMENT 'username rtx',
+ `role_code` varchar(255) NOT NULL COMMENT 'role',
+ `create_time` datetime NOT NULL,
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `create_by` varchar(255) NOT NULL,
+ `update_by` varchar(255) NOT NULL,
+ `disabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Is it disabled?',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for wf_approver
+-- ----------------------------
+DROP TABLE IF EXISTS `wf_approver`;
+CREATE TABLE `wf_approver`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `process_name` varchar(255) NOT NULL COMMENT 'process definition name',
+ `task_name` varchar(255) NOT NULL COMMENT 'Approval task name',
+ `filter_key` varchar(64) NOT NULL COMMENT 'filter condition KEY',
+ `filter_value` varchar(255) DEFAULT NULL COMMENT 'Filter matching value',
+ `filter_value_desc` varchar(255) DEFAULT NULL COMMENT 'Filter value description',
+ `approvers` varchar(1024) NOT NULL COMMENT 'Approvers, separated by commas',
+ `creator` varchar(64) NOT NULL COMMENT 'creator',
+ `modifier` varchar(64) NOT NULL COMMENT 'modifier',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'update time',
+ `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0 is not deleted, if greater than 0, delete',
+ PRIMARY KEY (`id`),
+ KEY `process_name_task_name_index` (`process_name`, `task_name`)
+);
+
+-- create default approver for new consumption and new business
+INSERT INTO `wf_approver`(`process_name`, `task_name`, `filter_key`, `filter_value`, `approvers`,
+ `creator`, `modifier`, `create_time`, `modify_time`, `is_deleted`)
+VALUES ('NEW_CONSUMPTION_WORKFLOW', 'ut_admin', 'DEFAULT', NULL, 'admin',
+ 'inlong_init', 'inlong_init', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0),
+ ('NEW_BUSINESS_WORKFLOW', 'ut_admin', 'DEFAULT', NULL, 'admin',
+ 'inlong_init', 'inlong_init', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+
+-- ----------------------------
+-- Table structure for wf_event_log
+-- ----------------------------
+DROP TABLE IF EXISTS `wf_event_log`;
+CREATE TABLE `wf_event_log`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `process_inst_id` int(11) NOT NULL,
+ `process_name` varchar(255) DEFAULT NULL COMMENT 'Process name',
+ `process_display_name` varchar(255) NOT NULL COMMENT 'Process name',
+ `inlong_group_id` varchar(128) DEFAULT NULL COMMENT 'Business group id',
+ `task_inst_id` int(11) DEFAULT NULL COMMENT 'Task ID',
+ `element_name` varchar(255) NOT NULL COMMENT 'The name of the component that triggered the event',
+ `element_display_name` varchar(255) NOT NULL COMMENT 'Chinese name of the component that triggered the event',
+ `event_type` varchar(64) NOT NULL COMMENT 'Event type: process event/task event',
+ `event` varchar(64) NOT NULL COMMENT 'Event name',
+ `listener` varchar(1024) DEFAULT NULL COMMENT 'Event listener name',
+ `state` int(11) NOT NULL COMMENT 'state',
+ `async` tinyint(1) NOT NULL COMMENT 'Asynchronous or not',
+ `ip` varchar(64) DEFAULT NULL COMMENT 'IP address executed by listener',
+ `start_time` datetime NOT NULL COMMENT 'Monitor start execution time',
+ `end_time` datetime DEFAULT NULL COMMENT 'Listener end time',
+ `remark` text COMMENT 'Execution result remark information',
+ `exception` text COMMENT 'Exception information',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for wf_process_instance
+-- ----------------------------
+DROP TABLE IF EXISTS `wf_process_instance`;
+CREATE TABLE `wf_process_instance`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL COMMENT 'process name',
+ `display_name` varchar(255) NOT NULL COMMENT 'Process display name',
+ `type` varchar(255) DEFAULT NULL COMMENT 'Process classification',
+ `title` varchar(255) DEFAULT NULL COMMENT 'Process title',
+ `inlong_group_id` varchar(128) DEFAULT NULL COMMENT 'Business group id: to facilitate related business',
+ `applicant` varchar(255) NOT NULL COMMENT 'applicant',
+ `state` varchar(64) NOT NULL COMMENT 'state',
+ `form_data` mediumtext COMMENT 'form information',
+ `start_time` datetime NOT NULL COMMENT 'start time',
+ `end_time` datetime DEFAULT NULL COMMENT 'End event',
+ `ext` text COMMENT 'Extended information-json',
+ `hidden` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Is it hidden',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for wf_task_instance
+-- ----------------------------
+DROP TABLE IF EXISTS `wf_task_instance`;
+CREATE TABLE `wf_task_instance`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `type` varchar(64) NOT NULL COMMENT 'Task type: UserTask user task/ServiceTask system task',
+ `process_inst_id` int(11) NOT NULL COMMENT 'process ID',
+ `process_name` varchar(255) NOT NULL COMMENT 'process name',
+ `process_display_name` varchar(255) NOT NULL COMMENT 'process name',
+ `name` varchar(255) NOT NULL COMMENT 'task name',
+ `display_name` varchar(255) NOT NULL COMMENT 'Task display name',
+ `applicant` varchar(64) DEFAULT NULL COMMENT 'applicant',
+ `approvers` varchar(1024) NOT NULL COMMENT 'approvers',
+ `state` varchar(64) NOT NULL COMMENT 'state',
+ `operator` varchar(255) DEFAULT NULL COMMENT 'actual operator',
+ `remark` varchar(1024) DEFAULT NULL COMMENT 'Remark information',
+ `form_data` mediumtext COMMENT 'form information submitted by the current task',
+ `start_time` datetime NOT NULL COMMENT 'start time',
+ `end_time` datetime DEFAULT NULL COMMENT 'End time',
+ `ext` text COMMENT 'Extended information-json',
+ PRIMARY KEY (`id`)
+);
+
+-- ----------------------------
+-- Table structure for cluster_set
+-- ----------------------------
+DROP TABLE IF EXISTS `cluster_set`;
+CREATE TABLE `cluster_set`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `cn_name` varchar(256) COMMENT 'Chinese display name',
+ `description` varchar(256) COMMENT 'ClusterSet Introduction',
+ `middleware_type` varchar(10) DEFAULT 'TUBE' COMMENT 'The middleware type of message queue, high throughput: TUBE, high consistency: PULSAR',
+ `in_charges` varchar(512) COMMENT 'Name of responsible person, separated by commas',
+ `followers` varchar(512) COMMENT 'List of names of business followers, separated by commas',
+ `status` int(4) DEFAULT '21' COMMENT 'ClusterSet status',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `creator` varchar(64) NOT NULL COMMENT 'Creator name',
+ `modifier` varchar(64) NULL COMMENT 'Modifier name',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_cluster_set` (`set_name`)
+);
+
+-- ----------------------------
+-- Table structure for cluster_set_inlongid
+-- ----------------------------
+DROP TABLE IF EXISTS `cluster_set_inlongid`;
+CREATE TABLE `cluster_set_inlongid`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `inlong_group_id` varchar(128) NOT NULL COMMENT 'Business group id, filled in by the user, undeleted ones cannot be repeated',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_cluster_set_inlongid` (`set_name`, `inlong_group_id`)
+);
+
+-- ----------------------------
+-- Table structure for cache_cluster
+-- ----------------------------
+DROP TABLE IF EXISTS `cache_cluster`;
+CREATE TABLE `cache_cluster`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `cluster_name` varchar(128) NOT NULL COMMENT 'CacheCluster name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `zone` varchar(128) NOT NULL COMMENT 'Zone, sz/sh/tj',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_cache_cluster` (`cluster_name`)
+);
+
+-- ----------------------------
+-- Table structure for cache_cluster_ext
+-- ----------------------------
+DROP TABLE IF EXISTS `cache_cluster_ext`;
+CREATE TABLE `cache_cluster_ext`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `cluster_name` varchar(128) NOT NULL COMMENT 'CacheCluster name, English, numbers and underscore',
+ `key_name` varchar(64) NOT NULL COMMENT 'Configuration item name',
+ `key_value` varchar(256) NULL COMMENT 'The value of the configuration item',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`),
+ KEY `index_cache_cluster` (`cluster_name`)
+);
+
+-- ----------------------------
+-- Table structure for cache_topic
+-- ----------------------------
+DROP TABLE IF EXISTS `cache_topic`;
+CREATE TABLE `cache_topic`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `topic_name` varchar(128) NOT NULL COMMENT 'Topic name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `partition_num` int(11) NOT NULL COMMENT 'Partition number',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_cache_topic` (`topic_name`, `set_name`)
+);
+
+-- ----------------------------
+-- Table structure for proxy_cluster
+-- ----------------------------
+DROP TABLE IF EXISTS `proxy_cluster`;
+CREATE TABLE `proxy_cluster`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `cluster_name` varchar(128) NOT NULL COMMENT 'ProxyCluster name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `zone` varchar(128) NOT NULL COMMENT 'Zone, sz/sh/tj',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_proxy_cluster` (`cluster_name`, `set_name`)
+);
+
+-- ----------------------------
+-- Table structure for proxy_cluster_to_cache_cluster
+-- ----------------------------
+DROP TABLE IF EXISTS `proxy_cluster_to_cache_cluster`;
+CREATE TABLE `proxy_cluster_to_cache_cluster`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `proxy_cluster_name` varchar(128) NOT NULL COMMENT 'ProxyCluster name, English, numbers and underscore',
+ `cache_cluster_name` varchar(128) NOT NULL COMMENT 'CacheCluster name, English, numbers and underscore',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_proxy_cluster_to_cache_cluster` (`proxy_cluster_name`, `cache_cluster_name`)
+);
+
+-- ----------------------------
+-- Table structure for flume_source
+-- ----------------------------
+DROP TABLE IF EXISTS `flume_source`;
+CREATE TABLE `flume_source`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `source_name` varchar(128) NOT NULL COMMENT 'FlumeSource name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `type` varchar(128) NOT NULL COMMENT 'FlumeSource classname',
+ `channels` varchar(128) NOT NULL COMMENT 'The channels of FlumeSource, separated by space',
+ `selector_type` varchar(128) NOT NULL COMMENT 'FlumeSource channel selector classname',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_flume_source` (`source_name`, `set_name`)
+);
+
+-- ----------------------------
+-- Table structure for flume_source_ext
+-- ----------------------------
+DROP TABLE IF EXISTS `flume_source_ext`;
+CREATE TABLE `flume_source_ext`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `parent_name` varchar(128) NOT NULL COMMENT 'FlumeSource name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `key_name` varchar(64) NOT NULL COMMENT 'Configuration item name',
+ `key_value` varchar(256) NULL COMMENT 'The value of the configuration item',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`),
+ KEY `index_flume_source_ext` (`parent_name`)
+);
+
+-- ----------------------------
+-- Table structure for flume_channel
+-- ----------------------------
+DROP TABLE IF EXISTS `flume_channel`;
+CREATE TABLE `flume_channel`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `channel_name` varchar(128) NOT NULL COMMENT 'FlumeChannel name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `type` varchar(128) NOT NULL COMMENT 'FlumeChannel classname',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_flume_channel` (`channel_name`, `set_name`)
+);
+
+-- ----------------------------
+-- Table structure for flume_channel_ext
+-- ----------------------------
+DROP TABLE IF EXISTS `flume_channel_ext`;
+CREATE TABLE `flume_channel_ext`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `parent_name` varchar(128) NOT NULL COMMENT 'FlumeChannel name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `key_name` varchar(64) NOT NULL COMMENT 'Configuration item name',
+ `key_value` varchar(256) NULL COMMENT 'The value of the configuration item',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`),
+ KEY `index_flume_channel_ext` (`parent_name`)
+);
+
+-- ----------------------------
+-- Table structure for flume_sink
+-- ----------------------------
+DROP TABLE IF EXISTS `flume_sink`;
+CREATE TABLE `flume_sink`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `sink_name` varchar(128) NOT NULL COMMENT 'FlumeSink name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `type` varchar(128) NOT NULL COMMENT 'FlumeSink classname',
+ `channel` varchar(128) NOT NULL COMMENT 'FlumeSink channel',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_flume_sink` (`sink_name`, `set_name`)
+);
+
+-- ----------------------------
+-- Table structure for flume_sink_ext
+-- ----------------------------
+DROP TABLE IF EXISTS `flume_sink_ext`;
+CREATE TABLE `flume_sink_ext`
+(
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
+ `parent_name` varchar(128) NOT NULL COMMENT 'FlumeSink name, English, numbers and underscore',
+ `set_name` varchar(128) NOT NULL COMMENT 'ClusterSet name, English, numbers and underscore',
+ `key_name` varchar(64) NOT NULL COMMENT 'Configuration item name',
+ `key_value` varchar(256) NULL COMMENT 'The value of the configuration item',
+ `is_deleted` tinyint(1) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, 1: deleted',
+ `modify_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
+ PRIMARY KEY (`id`),
+ KEY `index_flume_sink_ext` (`parent_name`)
+);
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHandler.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHandler.java
index 83fc1cf..2897ff6 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHandler.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHandler.java
@@ -26,7 +26,7 @@ import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.user.UserDetail;
import org.apache.inlong.manager.common.util.LoginUserUtil;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
import org.apache.shiro.authc.AuthenticationException;
import org.springframework.http.converter.HttpMessageConversionException;
import org.springframework.validation.BindException;
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
index 5c62c67..1e4ad75 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
@@ -33,15 +33,15 @@ import org.apache.inlong.manager.service.workflow.WorkflowService;
import org.apache.inlong.manager.service.workflow.WorkflowTaskExecuteLog;
import org.apache.inlong.manager.service.workflow.WorkflowTaskExecuteLogQuery;
import org.apache.inlong.manager.service.workflow.WorkflowTaskOperation;
-import org.apache.inlong.manager.workflow.model.view.ProcessDetail;
-import org.apache.inlong.manager.workflow.model.view.ProcessListView;
-import org.apache.inlong.manager.workflow.model.view.ProcessQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryView;
-import org.apache.inlong.manager.workflow.model.view.TaskListView;
-import org.apache.inlong.manager.workflow.model.view.TaskQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryView;
+import org.apache.inlong.manager.common.model.view.ProcessDetail;
+import org.apache.inlong.manager.common.model.view.ProcessListView;
+import org.apache.inlong.manager.common.model.view.ProcessQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryView;
+import org.apache.inlong.manager.common.model.view.TaskListView;
+import org.apache.inlong.manager.common.model.view.TaskQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
index 39fbf51..fb534c1 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
@@ -26,10 +26,10 @@ import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.OperationType;
import org.apache.inlong.manager.service.core.WorkflowEventService;
import org.apache.inlong.manager.service.core.operationlog.OperationLog;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
-import org.apache.inlong.manager.workflow.model.view.EventLogView;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.model.view.EventLogView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceTest.java b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceTest.java
index e0b98a2..1a83ac0 100644
--- a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceTest.java
+++ b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceTest.java
@@ -20,10 +20,10 @@ package org.apache.inlong.manager.service.workflow;
import com.github.pagehelper.PageInfo;
import java.util.Collections;
import org.apache.inlong.manager.web.ServiceBaseTest;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.model.ProcessState;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.model.ProcessState;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/EventListenerServiceImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/EventListenerServiceImpl.java
index 3ec7586..e7e9b8a 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/EventListenerServiceImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/EventListenerServiceImpl.java
@@ -17,20 +17,20 @@
package org.apache.inlong.manager.workflow.core.impl;
-import org.apache.inlong.manager.workflow.core.EventListenerService;
-import org.apache.inlong.manager.workflow.core.WorkflowContextBuilder;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListener;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListener;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
+import org.apache.inlong.manager.common.workflow.EventListenerService;
+import org.apache.inlong.manager.common.workflow.WorkflowContextBuilder;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventListener;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventListener;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.instance.EventLog;
import org.apache.inlong.manager.common.util.Preconditions;
/**
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/MemoryProcessDefinitionStorage.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/MemoryProcessDefinitionStorage.java
index 9788c7b..efff73f 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/MemoryProcessDefinitionStorage.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/MemoryProcessDefinitionStorage.java
@@ -20,9 +20,9 @@ package org.apache.inlong.manager.workflow.core.impl;
import com.google.common.collect.Maps;
import java.util.Map;
import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.workflow.core.ProcessDefinitionStorage;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.definition.Process;
+import org.apache.inlong.manager.common.workflow.ProcessDefinitionStorage;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.definition.Process;
/**
* Memory process memory
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/ProcessDefinitionServiceImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/ProcessDefinitionServiceImpl.java
index 2eedd4d..ee5d969 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/ProcessDefinitionServiceImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/ProcessDefinitionServiceImpl.java
@@ -17,9 +17,9 @@
package org.apache.inlong.manager.workflow.core.impl;
-import org.apache.inlong.manager.workflow.core.ProcessDefinitionService;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.model.definition.Process;
+import org.apache.inlong.manager.common.workflow.ProcessDefinitionService;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.model.definition.Process;
import org.apache.inlong.manager.common.util.Preconditions;
/**
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/ProcessServiceImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/ProcessServiceImpl.java
index 6c609d6..d6e7313 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/ProcessServiceImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/ProcessServiceImpl.java
@@ -19,16 +19,16 @@ package org.apache.inlong.manager.workflow.core.impl;
import java.util.List;
import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.workflow.core.ProcessService;
-import org.apache.inlong.manager.workflow.core.WorkflowContextBuilder;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.WorkflowProcessorExecutor;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.workflow.ProcessService;
+import org.apache.inlong.manager.common.workflow.WorkflowContextBuilder;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.workflow.WorkflowProcessorExecutor;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
/**
* Process service
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/QueryServiceImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/QueryServiceImpl.java
index bb64a6f..19fd65f 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/QueryServiceImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/QueryServiceImpl.java
@@ -19,35 +19,35 @@ package org.apache.inlong.manager.workflow.core.impl;
import com.google.common.collect.Maps;
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.ProcessState;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.definition.NextableElement;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
-import org.apache.inlong.manager.workflow.model.definition.UserTask;
-import org.apache.inlong.manager.workflow.model.instance.EventLog;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
-import org.apache.inlong.manager.workflow.model.view.CountByKey;
-import org.apache.inlong.manager.workflow.model.view.ElementView;
-import org.apache.inlong.manager.workflow.model.view.EventLogQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessDetail;
-import org.apache.inlong.manager.workflow.model.view.ProcessQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.ProcessSummaryView;
-import org.apache.inlong.manager.workflow.model.view.ProcessView;
-import org.apache.inlong.manager.workflow.model.view.TaskQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryQuery;
-import org.apache.inlong.manager.workflow.model.view.TaskSummaryView;
-import org.apache.inlong.manager.workflow.model.view.TaskView;
-import org.apache.inlong.manager.workflow.model.view.WorkflowView;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.ProcessState;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.definition.NextableElement;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.definition.UserTask;
+import org.apache.inlong.manager.common.model.instance.EventLog;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.view.CountByKey;
+import org.apache.inlong.manager.common.model.view.ElementView;
+import org.apache.inlong.manager.common.model.view.EventLogQuery;
+import org.apache.inlong.manager.common.model.view.ProcessDetail;
+import org.apache.inlong.manager.common.model.view.ProcessQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryQuery;
+import org.apache.inlong.manager.common.model.view.ProcessSummaryView;
+import org.apache.inlong.manager.common.model.view.ProcessView;
+import org.apache.inlong.manager.common.model.view.TaskQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryQuery;
+import org.apache.inlong.manager.common.model.view.TaskSummaryView;
+import org.apache.inlong.manager.common.model.view.TaskView;
+import org.apache.inlong.manager.common.model.view.WorkflowView;
import org.apache.inlong.manager.workflow.util.WorkflowFormParserUtils;
import java.util.Comparator;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/TaskServiceImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/TaskServiceImpl.java
index c83c02a..c9db6cc 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/TaskServiceImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/TaskServiceImpl.java
@@ -17,12 +17,12 @@
package org.apache.inlong.manager.workflow.core.impl;
-import org.apache.inlong.manager.workflow.core.TaskService;
-import org.apache.inlong.manager.workflow.core.WorkflowContextBuilder;
-import org.apache.inlong.manager.workflow.core.WorkflowProcessorExecutor;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
+import org.apache.inlong.manager.common.workflow.TaskService;
+import org.apache.inlong.manager.common.workflow.WorkflowContextBuilder;
+import org.apache.inlong.manager.common.workflow.WorkflowProcessorExecutor;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowContextBuilderImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowContextBuilderImpl.java
index e841835..bcd1890 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowContextBuilderImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowContextBuilderImpl.java
@@ -23,16 +23,16 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.workflow.core.WorkflowContextBuilder;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.workflow.WorkflowContextBuilder;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
import org.apache.inlong.manager.workflow.util.WorkflowFormParserUtils;
/**
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowDataAccessorImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowDataAccessorImpl.java
index a8dfdae..54fc8e1 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowDataAccessorImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowDataAccessorImpl.java
@@ -17,11 +17,11 @@
package org.apache.inlong.manager.workflow.core.impl;
-import org.apache.inlong.manager.workflow.core.ProcessDefinitionStorage;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.dao.EventLogStorage;
-import org.apache.inlong.manager.workflow.dao.ProcessInstanceStorage;
-import org.apache.inlong.manager.workflow.dao.TaskInstanceStorage;
+import org.apache.inlong.manager.common.workflow.ProcessDefinitionStorage;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.dao.EventLogStorage;
+import org.apache.inlong.manager.common.dao.ProcessInstanceStorage;
+import org.apache.inlong.manager.common.dao.TaskInstanceStorage;
/**
* Workflow data accessor
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEngineImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEngineImpl.java
index 69d1de3..c046f97 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEngineImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEngineImpl.java
@@ -19,17 +19,17 @@ package org.apache.inlong.manager.workflow.core.impl;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.util.JsonUtils;
-import org.apache.inlong.manager.workflow.core.EventListenerService;
-import org.apache.inlong.manager.workflow.core.ProcessDefinitionService;
-import org.apache.inlong.manager.workflow.core.ProcessService;
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.TaskService;
-import org.apache.inlong.manager.workflow.core.TransactionHelper;
-import org.apache.inlong.manager.workflow.core.WorkflowContextBuilder;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.WorkflowEngine;
-import org.apache.inlong.manager.workflow.core.WorkflowProcessorExecutor;
-import org.apache.inlong.manager.workflow.model.WorkflowConfig;
+import org.apache.inlong.manager.common.workflow.EventListenerService;
+import org.apache.inlong.manager.common.workflow.ProcessDefinitionService;
+import org.apache.inlong.manager.common.workflow.ProcessService;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.workflow.TaskService;
+import org.apache.inlong.manager.common.workflow.TransactionHelper;
+import org.apache.inlong.manager.common.workflow.WorkflowContextBuilder;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.workflow.WorkflowEngine;
+import org.apache.inlong.manager.common.workflow.WorkflowProcessorExecutor;
+import org.apache.inlong.manager.common.model.WorkflowConfig;
/**
* Workflow engine
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEventListenerManager.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEventListenerManager.java
index 0c34a67..4338d41 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEventListenerManager.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEventListenerManager.java
@@ -17,9 +17,9 @@
package org.apache.inlong.manager.workflow.core.impl;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListenerManager;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListenerManager;
-import org.apache.inlong.manager.workflow.model.WorkflowConfig;
+import org.apache.inlong.manager.common.event.process.ProcessEventListenerManager;
+import org.apache.inlong.manager.common.event.task.TaskEventListenerManager;
+import org.apache.inlong.manager.common.model.WorkflowConfig;
/**
* Workflow event listener manager
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEventNotifier.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEventNotifier.java
index 7632f61..5c4afb9 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEventNotifier.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowEventNotifier.java
@@ -17,8 +17,8 @@
package org.apache.inlong.manager.workflow.core.impl;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventNotifier;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventNotifier;
+import org.apache.inlong.manager.common.event.process.ProcessEventNotifier;
+import org.apache.inlong.manager.common.event.task.TaskEventNotifier;
/**
* Workflow event notifier
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowInternalEventListenerRegister.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowInternalEventListenerRegister.java
index 37e959e..622271e 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowInternalEventListenerRegister.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowInternalEventListenerRegister.java
@@ -17,10 +17,10 @@
package org.apache.inlong.manager.workflow.core.impl;
-import org.apache.inlong.manager.workflow.core.QueryService;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventListenerRegister;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventListenerRegister;
-import org.apache.inlong.manager.workflow.model.WorkflowConfig;
+import org.apache.inlong.manager.common.workflow.QueryService;
+import org.apache.inlong.manager.common.event.process.ProcessEventListenerRegister;
+import org.apache.inlong.manager.common.event.task.TaskEventListenerRegister;
+import org.apache.inlong.manager.common.model.WorkflowConfig;
/**
* Register of workflow internal event listener
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowProcessorExecutorImpl.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowProcessorExecutorImpl.java
index 06999db..18783ec 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowProcessorExecutorImpl.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/impl/WorkflowProcessorExecutorImpl.java
@@ -21,23 +21,23 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
-import org.apache.inlong.manager.workflow.core.TransactionHelper;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.WorkflowProcessorExecutor;
+import org.apache.inlong.manager.common.workflow.TransactionHelper;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.workflow.WorkflowProcessorExecutor;
import org.apache.inlong.manager.workflow.core.processor.EndEventProcessor;
import org.apache.inlong.manager.workflow.core.processor.ServiceTaskProcessor;
import org.apache.inlong.manager.workflow.core.processor.SkipAbleElementProcessor;
import org.apache.inlong.manager.workflow.core.processor.StartEventProcessor;
import org.apache.inlong.manager.workflow.core.processor.UserTaskProcessor;
import org.apache.inlong.manager.workflow.core.processor.WorkflowElementProcessor;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.exception.WorkflowNoRollbackException;
-import org.apache.inlong.manager.workflow.exception.WorkflowRollbackOnceException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.definition.NextableElement;
-import org.apache.inlong.manager.workflow.model.definition.SkippableElement;
-import org.apache.inlong.manager.workflow.model.definition.Task;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.exceptions.WorkflowNoRollbackException;
+import org.apache.inlong.manager.common.exceptions.WorkflowRollbackOnceException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.definition.NextableElement;
+import org.apache.inlong.manager.common.model.definition.SkippableElement;
+import org.apache.inlong.manager.common.model.definition.Task;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.support.TransactionCallback;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/AbstractNextableElementProcessor.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/AbstractNextableElementProcessor.java
index a950bb9..3c7a3e6 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/AbstractNextableElementProcessor.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/AbstractNextableElementProcessor.java
@@ -17,11 +17,11 @@
package org.apache.inlong.manager.workflow.core.processor;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.definition.EndEvent;
-import org.apache.inlong.manager.workflow.model.definition.NextableElement;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.definition.EndEvent;
+import org.apache.inlong.manager.common.model.definition.NextableElement;
import org.apache.inlong.manager.common.util.Preconditions;
import java.util.Collections;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/AbstractTaskProcessor.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/AbstractTaskProcessor.java
index e16c1ba..8fdff13 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/AbstractTaskProcessor.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/AbstractTaskProcessor.java
@@ -19,13 +19,13 @@ package org.apache.inlong.manager.workflow.core.processor;
import com.google.common.base.Joiner;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.ApproverAssign;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.ApproverAssign;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
import org.apache.inlong.manager.common.util.Preconditions;
import java.util.Date;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/EndEventProcessor.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/EndEventProcessor.java
index dc654f8..508c3c7 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/EndEventProcessor.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/EndEventProcessor.java
@@ -17,19 +17,19 @@
package org.apache.inlong.manager.workflow.core.processor;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventNotifier;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventNotifier;
import org.apache.inlong.manager.workflow.core.impl.WorkflowEventNotifier;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.ProcessState;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.definition.EndEvent;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.ProcessState;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.definition.EndEvent;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
import java.util.Collections;
import java.util.Date;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/ServiceTaskProcessor.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/ServiceTaskProcessor.java
index 6f3b6a0..f57aca2 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/ServiceTaskProcessor.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/ServiceTaskProcessor.java
@@ -22,20 +22,20 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventNotifier;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventNotifier;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventNotifier;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventNotifier;
import org.apache.inlong.manager.workflow.core.impl.WorkflowEventNotifier;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.ApproverAssign;
-import org.apache.inlong.manager.workflow.model.definition.ServiceTask;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.ApproverAssign;
+import org.apache.inlong.manager.common.model.definition.ServiceTask;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.common.util.Preconditions;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/SkipAbleElementProcessor.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/SkipAbleElementProcessor.java
index af7f878..3f57b2a 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/SkipAbleElementProcessor.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/SkipAbleElementProcessor.java
@@ -17,8 +17,8 @@
package org.apache.inlong.manager.workflow.core.processor;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
/**
* Skippable element executor
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/StartEventProcessor.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/StartEventProcessor.java
index e8bd577..5e698ed 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/StartEventProcessor.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/StartEventProcessor.java
@@ -17,17 +17,17 @@
package org.apache.inlong.manager.workflow.core.processor;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEvent;
-import org.apache.inlong.manager.workflow.core.event.process.ProcessEventNotifier;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.process.ProcessEvent;
+import org.apache.inlong.manager.common.event.process.ProcessEventNotifier;
import org.apache.inlong.manager.workflow.core.impl.WorkflowEventNotifier;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.ProcessState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.StartEvent;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.ProcessState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.StartEvent;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.common.util.Preconditions;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/UserTaskProcessor.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/UserTaskProcessor.java
index 92798cf..4f35def 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/UserTaskProcessor.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/UserTaskProcessor.java
@@ -30,18 +30,18 @@ import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.workflow.core.WorkflowDataAccessor;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEvent;
-import org.apache.inlong.manager.workflow.core.event.task.TaskEventNotifier;
+import org.apache.inlong.manager.common.workflow.WorkflowDataAccessor;
+import org.apache.inlong.manager.common.event.task.TaskEvent;
+import org.apache.inlong.manager.common.event.task.TaskEventNotifier;
import org.apache.inlong.manager.workflow.core.impl.WorkflowEventNotifier;
-import org.apache.inlong.manager.workflow.exception.WorkflowException;
-import org.apache.inlong.manager.workflow.model.Action;
-import org.apache.inlong.manager.workflow.model.TaskState;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
-import org.apache.inlong.manager.workflow.model.definition.UserTask;
-import org.apache.inlong.manager.workflow.model.instance.ProcessInstance;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.exceptions.WorkflowException;
+import org.apache.inlong.manager.common.model.Action;
+import org.apache.inlong.manager.common.model.TaskState;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
+import org.apache.inlong.manager.common.model.definition.UserTask;
+import org.apache.inlong.manager.common.model.instance.ProcessInstance;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
/**
* User task processor
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/WorkflowElementProcessor.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/WorkflowElementProcessor.java
index c6214d3..19cd9a7 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/WorkflowElementProcessor.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/core/processor/WorkflowElementProcessor.java
@@ -17,8 +17,8 @@
package org.apache.inlong.manager.workflow.core.processor;
-import org.apache.inlong.manager.workflow.model.WorkflowContext;
-import org.apache.inlong.manager.workflow.model.definition.Element;
+import org.apache.inlong.manager.common.model.WorkflowContext;
+import org.apache.inlong.manager.common.model.definition.Element;
import java.util.List;
diff --git a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/util/WorkflowFormParserUtils.java b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/util/WorkflowFormParserUtils.java
index 30d2412..2d08ad0 100644
--- a/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/util/WorkflowFormParserUtils.java
+++ b/inlong-manager/manager-workflow-engine/src/main/java/org/apache/inlong/manager/workflow/util/WorkflowFormParserUtils.java
@@ -22,13 +22,13 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.workflow.exception.FormParseException;
-import org.apache.inlong.manager.workflow.model.definition.Process;
-import org.apache.inlong.manager.workflow.model.definition.ProcessForm;
-import org.apache.inlong.manager.workflow.model.definition.Task;
-import org.apache.inlong.manager.workflow.model.definition.TaskForm;
-import org.apache.inlong.manager.workflow.model.definition.UserTask;
-import org.apache.inlong.manager.workflow.model.instance.TaskInstance;
+import org.apache.inlong.manager.common.exceptions.FormParseException;
+import org.apache.inlong.manager.common.model.definition.Process;
+import org.apache.inlong.manager.common.model.definition.ProcessForm;
+import org.apache.inlong.manager.common.model.definition.Task;
+import org.apache.inlong.manager.common.model.definition.TaskForm;
+import org.apache.inlong.manager.common.model.definition.UserTask;
+import org.apache.inlong.manager.common.model.instance.TaskInstance;
/**
* Process form analysis tool
diff --git a/inlong-manager/pom.xml b/inlong-manager/pom.xml
index 08c049f..bef3a22 100644
--- a/inlong-manager/pom.xml
+++ b/inlong-manager/pom.xml
@@ -429,7 +429,6 @@
</dependencies>
</dependencyManagement>
-
<repositories>
<repository>
<id>central</id>