This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.
from 2ac6d2f Allow merge as there are many PR has multiple authors (#6126)
add a561a61 [Feature][JsonSplit-api] api of processDefinition
create/update (#5602)
add 309deae [Fix-5581][SQL] Specific key was too long, max key length is
767 bytes for varchar(256) in some mysql with innodb_large_prefix=OFF (#5582)
add 3193837 [DS-5559][fix][Master Server] Master Server was shutdown but
the process still in system (#5588)
add d8f2aa3 [Fix-5468][Common] Fix obtaining IP is incorrect (#5594)
add 006fb67 [Fix-5583][sql] fix table name error in sql upgrade script
(#5606)
add 30c8803 [Feature-#3961][Registry]Registry-SPI (#5562)
add 053e548 [Improvement-5539][Master] Check status of taskInstance from
cache (#5572)
add 47812d2 [Fix][Docker] Fix docker image build error (#5613)
add 6e81803 modify issues translation robot (#5614)
add 43be965 [Improvement-5567][UI] Add project id in web ui url for
sharing and project name in project page (#5568)
add 109e654 modify issues translation robot (#5624)
add 3fb01e1 [Fix-5596][Python] Fix conflict between python_home and
datax_home configuration in dolphinscheduler_env.sh (#5612)
add 71a44f8 [Fix-5483] [Bug][API] Can't view variables in the page of
Process Instance (#5631)
add 728bd31 [Feature][JsonSplit-api] api of project (#5630)
add 85f3ab4 [Feature][JsonSplit-api] define task api (#5647)
add fc203fb Merge remote-tracking branch 'origin/dev' into json_split_two
add 5b6c9b7 [Feature][JsonSplit-api] select-by-code of processDefinition
(#5687)
add 57414c4 [Feature][JsonSplit-api] merging from dev to json_split_two
(#5712)
add c386b64 [Feature][JsonSplit-api] copy of processDefinition (#5740)
add 14035c0 [Feature][JsonSplit-api]move of processDefinition, the
projectCode instead of projectName (#5744)
add 654fa39 [Feature][JsonSplit-api]merge code from dev to json_split_two
(#5750)
add d382a7b [Fix-5509]: createSchedule interface, process definition id
-> process definition code (#5756)
add cfa22d7 [Fix-5511]: the updateSchedule interface, projectName ->
projectCode (#5761)
add e4f427a [Fix-5763]: The scheduler online/offline interface,
projectName -> projectCode (#5764)
add 72535a4 [Fix-5510]: the scheduler list-page interface, projectName ->
projectCode, processDefinitionId -> processDefinitionCode (#5771)
add d2a9e05 [Fix-5778]: The scheduler list、preview、delete interface,
projectName -> projectCode (#5779)
add 7da7bb0 fix processDefinitonController projectCode (#5800)
add 006ef97 [Feature][JsonSplit-api]queryAllByProjectCode of
processDefinition (#5801)
add f66a166 [Feature][JsonSplit-api]query taskNodeList of
processDefinition (#5802)
add 47de7ca [Feature][JsonSplit-api] replace projectName with projectCode
for taskDefinition (#5815)
add 13c607e [Feature][JsonSplit-api]merge code from dev to json_2 (#5827)
add 741d757 [Feature][JsonSplit-api]taskDefinition save interface (#5828)
add 901bc9a [Fix-5517]: The workflow lineage interface, projectId change
to projectCode (#5834)
add 5f5aec9 [Fix-5518]: The data analysis state count interface,
projectId change to projectCode (#5837)
add 90a9a72 [Fix-5518]: The user definition count interface, projectId
change to projectCode (#5839)
add f1a9c49 [Fix-5518]: The command state count interface, projectId
change to projectCode (#5849)
add 8f0c400 [Fix-5518]: the command state count interface and queue state
count interface, remove unused paramaters (#5853)
add c5bc4fc [Fix-5519] The executor api, projectName change to
projectCode (#5863)
add 4e3bedd [Feature][JsonSplit-api]taskDefinition update interface
(#5869)
add 3a4c608 [Feature][JsonSplit-api] modify viewTree of ProcessDefiniton
(#5881)
add 93abae9 [Feature][JsonSplit-api] export/import of ProcessDefinition
api (#5910)
add ce73868 [Feature][JsonSplit-api] remove connects of ProcessDefinition
(#5920)
add 7427dc6 [Feature][JsonSplit-api]merge code from dev to json_split_two
(#5923)
add d1a61f1 [Fix-5778]: The t_ds_schedules table, process_definition_id
change to process_definition_code (#5928)
add 92b92b5 [Fix-5519] The t_ds_command table and t_ds_error_command
table, process_definition_id change to process_definition_code (#5937)
add 316b919 check has cycle of ProcessDefinition (#5944)
add 8bd88d9 [Feature][JsonSplit-api] checkProcessNode of
processDefinition (#5946)
add 339d7f4 [Feature][JsonSplit-api] fix TaskInstance api (#5948)
add 7c1f891 [Feature][JsonSplit-api] Replace projectName with projectCode
in ProcessInstance api (#5950)
add 595205c [Feature][JsonSplit-api] update ProcessInstance api (#5953)
add a5d9427 [Feature][JsonSplit-api]remove unuse field (#5955)
add 80ef756 [Feature][JsonSplit-api] refactor of
ProjectService.checkProjectAndAuth (#5961)
add 0344b21 [json_split_two]cherry pick [Improvement-5880][api] Optimized
data structure of pagination query API results (#5895). (#5966)
add 9ca51cf [Feature][JsonSplit-api] fix api run error (#5989)
add effbad4 [Feature][JsonSplit-api] api of
ProcessDefinition/TaskDefinition (#6010)
add ab07a31 [Feature][JsonSplit-api] taskService methon (#6017)
add 3b495d2 [Feature][JsonSplit-api] merge code from dev to json2 (#6023)
add bef57bd fix create task definition bug (#6050)
add 9201400 [Feature][JsonSplit-api] update of processInstance (#6061)
add ee4e64a [Feature][JsonSplit-api] refactor method of task save (#6067)
add 2f0a277 [Feature][JsonSplit-api] update method of ProcessDefinition
(#6089)
add f6ba944 [Feature][JsonSplit-api] fix some bug in joint commissioning
(#6096)
add d4f5012 [Feature-5498][JsonSplit-api] refactor of
dolphin-scheduler-ui/dag (#6098)
add 537af05 [Feature][JsonSplit-api] fix some bug in joint commissioning
(#6108)
add d510a13 [Feature][JsonSplit-api] modify API to Restful-02 (#6090)
add b102629 modify Monitor (#6100)
add e323509 [Feature][JsonSplit-api] modify API to Restful-01 (#6016)
add aa8301a [Feature][JsonSplit-api] modify API to Restful-04 (#6110)
add 33ea3ed [Feature][JsonSplit-api] merge code from dev to json2 (#6115)
add 2799203 update api path
add 5d06702 [Feature-5498][JsonSplit-api] add task status (#6119)
add baa8f30 [Feature-5498][JsonSplit-api] fix some ut (#6121)
add b661ec9 Merge remote-tracking branch 'upstream/dev' into json2
add 5d27e18 Merge remote-tracking branch 'upstream/dev' into json2
add 501c936 code style
add 331a8e9 code style
add 26d578e update
add c4478f8 code style
new 1f838e6 Merge pull request #6124 from apache/json_split_two
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/actions/translate-on-issue | 1 -
.gitignore | 1 +
.../dolphinscheduler/logback/logback-alert.xml | 7 +-
.../conf/dolphinscheduler/logback/logback-api.xml | 7 +-
.../dolphinscheduler/logback/logback-master.xml | 11 +-
.../dolphinscheduler/logback/logback-worker.xml | 11 +-
.../templates/deployment-dolphinscheduler-api.yaml | 2 +-
.../statefulset-dolphinscheduler-master.yaml | 2 +-
.../statefulset-dolphinscheduler-worker.yaml | 2 +-
docker/kubernetes/dolphinscheduler/values.yaml | 18 +-
.../src/main/resources/logback-alert.xml | 8 +-
.../api/controller/AccessTokenController.java | 48 +-
.../api/controller/AlertGroupController.java | 64 +-
.../controller/AlertPluginInstanceController.java | 51 +-
.../api/controller/BaseController.java | 5 +-
.../api/controller/DataAnalysisController.java | 65 +-
.../api/controller/DataSourceController.java | 73 +-
.../api/controller/ExecutorController.java | 37 +-
.../api/controller/LoggerController.java | 28 +-
.../api/controller/LoginController.java | 16 +-
.../api/controller/MonitorController.java | 8 +-
.../controller/ProcessDefinitionController.java | 491 +++---
.../api/controller/ProcessInstanceController.java | 269 ++--
.../api/controller/ProjectController.java | 132 +-
.../api/controller/QueueController.java | 46 +-
.../api/controller/ResourcesController.java | 245 ++-
.../api/controller/SchedulerController.java | 115 +-
.../api/controller/TaskDefinitionController.java | 313 ++++
.../api/controller/TaskInstanceController.java | 69 +-
.../api/controller/TenantController.java | 46 +-
.../api/controller/UiPluginController.java | 10 +-
.../api/controller/UsersController.java | 152 +-
.../api/controller/WorkFlowLineageController.java | 14 +-
.../api/controller/WorkerGroupController.java | 40 +-
.../dolphinscheduler/api/dto/DagDataSchedule.java | 41 +-
.../dolphinscheduler/api/dto/ProcessMeta.java | 231 ---
.../apache/dolphinscheduler/api/enums/Status.java | 25 +-
.../api/service/DataAnalysisService.java | 20 +-
.../api/service/ExecutorService.java | 16 +-
.../api/service/ProcessDefinitionService.java | 235 +--
.../api/service/ProcessInstanceService.java | 90 +-
.../api/service/ProcessTaskRelationService.java | 40 -
.../api/service/ProjectService.java | 24 +-
.../api/service/SchedulerService.java | 39 +-
.../api/service/TaskDefinitionService.java | 105 +-
.../api/service/TaskInstanceService.java | 28 +-
.../api/service/WorkFlowLineageService.java | 4 +-
.../api/service/impl/DataAnalysisServiceImpl.java | 93 +-
.../api/service/impl/DataSourceServiceImpl.java | 3 +-
.../api/service/impl/ExecutorServiceImpl.java | 118 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 1621 +++++++-------------
.../service/impl/ProcessInstanceServiceImpl.java | 295 ++--
.../impl/ProcessTaskRelationServiceImpl.java | 78 -
.../api/service/impl/ProjectServiceImpl.java | 80 +-
.../api/service/impl/ResourcesServiceImpl.java | 30 +-
.../api/service/impl/SchedulerServiceImpl.java | 87 +-
.../service/impl/TaskDefinitionServiceImpl.java | 340 ++--
.../api/service/impl/TaskInstanceServiceImpl.java | 47 +-
.../api/service/impl/TenantServiceImpl.java | 20 -
.../service/impl/WorkFlowLineageServiceImpl.java | 8 +-
.../dolphinscheduler/api/utils/CheckUtils.java | 19 +-
.../src/main/resources/logback-api.xml | 7 +-
.../api/controller/AbstractControllerTest.java | 20 +
.../api/controller/AccessTokenControllerTest.java | 12 +-
.../api/controller/AlertGroupControllerTest.java | 16 +-
.../api/controller/DataAnalysisControllerTest.java | 55 +-
.../api/controller/DataSourceControllerTest.java | 25 +-
.../api/controller/LoggerControllerTest.java | 5 +-
.../api/controller/LoginControllerTest.java | 5 +-
.../api/controller/MonitorControllerTest.java | 13 +-
.../ProcessDefinitionControllerTest.java | 242 ++-
.../controller/ProcessInstanceControllerTest.java | 146 +-
.../api/controller/ProjectControllerTest.java | 270 ++--
.../api/controller/QueueControllerTest.java | 25 +-
.../api/controller/ResourcesControllerTest.java | 38 +-
.../api/controller/SchedulerControllerTest.java | 78 +-
.../api/controller/TaskInstanceControllerTest.java | 10 +-
.../api/controller/TenantControllerTest.java | 30 +-
.../api/controller/UsersControllerTest.java | 33 +-
.../controller/WorkFlowLineageControllerTest.java | 45 +-
.../api/exceptions/ApiExceptionHandlerTest.java | 9 +-
.../api/service/DataAnalysisServiceTest.java | 205 ++-
.../api/service/DataSourceServiceTest.java | 26 +-
.../api/service/ExecutorService2Test.java | 308 ----
.../api/service/ExecutorServiceTest.java | 315 +++-
.../api/service/LoggerServiceTest.java | 6 +-
.../api/service/ProcessDefinitionServiceTest.java | 1162 ++++----------
.../api/service/ProcessInstanceServiceTest.java | 331 ++--
.../ProcessTaskRelationServiceImplTest.java | 107 --
.../api/service/ProjectServiceTest.java | 55 +-
.../api/service/QueueServiceTest.java | 10 +-
.../api/service/ResourcesServiceTest.java | 13 +-
.../api/service/SchedulerServiceTest.java | 43 +-
.../api/service/TaskDefinitionServiceImplTest.java | 263 ++--
.../api/service/TaskInstanceServiceTest.java | 82 +-
.../api/service/TenantServiceTest.java | 2 +-
.../api/service/WorkFlowLineageServiceTest.java | 8 +-
.../dolphinscheduler/api/utils/ResultTest.java | 6 +-
.../apache/dolphinscheduler/common/Constants.java | 8 +-
.../apache/dolphinscheduler/common/enums/Flag.java | 3 +-
.../dolphinscheduler/common/enums/Priority.java | 2 +-
.../common/enums/TaskStateType.java | 4 +-
.../common/enums/TaskTimeoutStrategy.java | 13 +-
.../dolphinscheduler/common/utils/JSONUtils.java | 1 -
.../common/task/SqlParametersTest.java | 3 -
.../dolphinscheduler/dao/entity/Command.java | 24 +-
.../dolphinscheduler/dao/entity/DagData.java | 74 +
.../dolphinscheduler/dao/entity/ErrorCommand.java | 43 +-
.../dao/entity/ProcessDefinition.java | 144 +-
.../dao/entity/ProcessDefinitionLog.java | 5 +-
.../dao/entity/ProcessInstance.java | 185 +--
.../dao/entity/ProcessTaskRelation.java | 58 +-
.../dao/entity/ProcessTaskRelationLog.java | 10 +
.../dolphinscheduler/dao/entity/Project.java | 10 +-
.../dolphinscheduler/dao/entity/Schedule.java | 15 +-
.../dao/entity/TaskDefinition.java | 100 +-
.../dao/entity/TaskDefinitionLog.java | 11 +
.../dao/mapper/ProcessDefinitionLogMapper.java | 29 +-
.../dao/mapper/ProcessDefinitionMapper.java | 43 +-
.../dao/mapper/ProcessTaskRelationLogMapper.java | 11 +-
.../dao/mapper/ProcessTaskRelationMapper.java | 19 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.java | 5 +-
.../dao/mapper/ScheduleMapper.java | 32 +-
.../dao/mapper/TaskDefinitionLogMapper.java | 49 +-
.../dao/mapper/TaskDefinitionMapper.java | 56 +-
.../dolphinscheduler/dao/mapper/TenantMapper.java | 4 +-
.../dolphinscheduler/dao/mapper/CommandMapper.xml | 6 +-
.../dao/mapper/ErrorCommandMapper.xml | 4 +-
.../dao/mapper/ProcessDefinitionLogMapper.xml | 18 +-
.../dao/mapper/ProcessDefinitionMapper.xml | 31 +-
.../dao/mapper/ProcessTaskRelationLogMapper.xml | 24 +-
.../dao/mapper/ProcessTaskRelationMapper.xml | 12 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.xml | 2 +-
.../dolphinscheduler/dao/mapper/ScheduleMapper.xml | 32 +-
.../dao/mapper/TaskDefinitionLogMapper.xml | 44 +-
.../dao/mapper/TaskDefinitionMapper.xml | 62 +-
.../dao/mapper/WorkFlowLineageMapper.xml | 4 +-
.../dao/mapper/CommandMapperTest.java | 73 +-
.../dao/mapper/ErrorCommandMapperTest.java | 11 +-
.../dao/mapper/ProcessDefinitionMapperTest.java | 13 +-
.../dao/mapper/ProcessInstanceMapperTest.java | 2 -
.../dao/mapper/ScheduleMapperTest.java | 46 +-
.../dao/mapper/TaskDefinitionLogMapperTest.java | 20 -
.../dao/mapper/TaskDefinitionMapperTest.java | 34 +-
.../dao/mapper/TaskInstanceMapperTest.java | 2 -
.../dao/mapper/TenantMapperTest.java | 4 +-
.../dao/mapper/WorkFlowLineageMapperTest.java | 7 +-
.../server}/log/SensitiveDataConverter.java | 14 +-
.../cache/impl/TaskInstanceCacheManagerImpl.java | 1 -
.../master/runner/WorkflowExecuteThread.java | 8 +-
.../server/utils/FlinkArgsUtils.java | 12 +-
.../src/main/resources/config/install_config.conf | 14 +-
.../src/main/resources/logback-master.xml | 11 +-
.../src/main/resources/logback-worker.xml | 11 +-
...orTest.java => SensitiveDataConverterTest.java} | 107 +-
.../server/master/MasterCommandTest.java | 22 +-
.../server/master/SwitchTaskTest.java | 3 -
.../server/master/WorkflowExecuteThreadTest.java | 4 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 6 -
.../server/worker/task/sql/SqlTaskTest.java | 90 +-
.../service/process/ProcessService.java | 762 ++++-----
.../service/quartz/ProcessScheduleJob.java | 6 +-
.../src/main/resources/logback-zookeeper.xml | 0
.../service/log/SensitiveDataConverterTest.java | 137 --
.../service/process/ProcessServiceTest.java | 176 +--
.../spi/plugin/DolphinPluginDiscovery.java | 12 +-
.../spi/plugin/DolphinPluginManagerConfig.java | 2 +-
.../src/main/resources/registry.properties | 13 +-
dolphinscheduler-ui/package.json | 2 +
.../home/pages/dag/_source/canvas/canvas.scss} | 57 +-
.../conf/home/pages/dag/_source/canvas/canvas.vue | 747 +++++++++
.../pages/dag/_source/canvas/contextMenu.scss} | 35 +-
.../home/pages/dag/_source/canvas/contextMenu.vue | 155 ++
.../pages/dag/_source/canvas/draggableBox.vue} | 37 +-
.../pages/dag/_source/canvas/edgeEditModel.vue | 114 ++
.../index.vue => dag/_source/canvas/menuItem.vue} | 21 +-
.../home/pages/dag/_source/canvas/nodeStatus.js | 52 +
.../dag/_source/canvas/nodeStatus.scss} | 17 +-
.../home/pages/dag/_source/canvas/taskbar.scss | 167 ++
.../home/pages/dag/_source/canvas/taskbar.vue} | 52 +-
.../home/pages/dag/_source/canvas/toolbar.scss | 113 ++
.../conf/home/pages/dag/_source/canvas/toolbar.vue | 218 +++
.../home/pages/dag/_source/canvas/x6-helper.js | 315 ++++
.../home/pages/dag/_source/canvas/x6-style.scss} | 17 +-
.../src/js/conf/home/pages/dag/_source/dag.js | 195 ---
.../src/js/conf/home/pages/dag/_source/dag.scss | 563 +------
.../src/js/conf/home/pages/dag/_source/dag.vue | 1224 ++++++---------
.../home/pages/dag/_source/formModel/formModel.vue | 198 +--
.../conf/home/pages/dag/_source/formModel/log.vue | 13 +-
.../dag/_source/formModel/tasks/_source/commcon.js | 5 -
.../home/pages/dag/_source/formModel/tasks/sql.vue | 24 -
.../dag/_source/formModel/tasks/sub_process.vue | 32 +-
.../pages/dag/_source/images/full-screen-close.png | Bin 0 -> 463 bytes
.../dag/_source/images/full-screen-close_hover.png | Bin 0 -> 652 bytes
.../pages/dag/_source/images/full-screen-open.png | Bin 0 -> 575 bytes
.../dag/_source/images/full-screen-open_hover.png | Bin 0 -> 575 bytes
.../home/pages/dag/_source/images/graph-format.png | Bin 0 -> 458 bytes
.../dag/_source/images/graph-format_hover.png | Bin 0 -> 461 bytes
.../pages/dag/_source/images/startup-params.png | Bin 0 -> 903 bytes
.../dag/_source/images/startup-params_hover.png | Bin 0 -> 903 bytes
.../dag/_source/images/task-icos/conditions.png | Bin 0 -> 812 bytes
.../_source/images/task-icos/conditions_hover.png | Bin 0 -> 736 bytes
.../pages/dag/_source/images/task-icos/datax.png | Bin 0 -> 1122 bytes
.../dag/_source/images/task-icos/datax_hover.png | Bin 0 -> 1127 bytes
.../dag/_source/images/task-icos/dependent.png | Bin 0 -> 743 bytes
.../_source/images/task-icos/dependent_hover.png | Bin 0 -> 745 bytes
.../pages/dag/_source/images/task-icos/flink.png | Bin 0 -> 1443 bytes
.../dag/_source/images/task-icos/flink_hover.png | Bin 0 -> 1348 bytes
.../pages/dag/_source/images/task-icos/http.png | Bin 0 -> 707 bytes
.../dag/_source/images/task-icos/http_hover.png | Bin 0 -> 709 bytes
.../home/pages/dag/_source/images/task-icos/mr.png | Bin 0 -> 930 bytes
.../dag/_source/images/task-icos/mr_hover.png | Bin 0 -> 862 bytes
.../dag/_source/images/task-icos/procedure.png | Bin 0 -> 1555 bytes
.../_source/images/task-icos/procedure_hover.png | Bin 0 -> 1436 bytes
.../pages/dag/_source/images/task-icos/python.png | Bin 0 -> 1618 bytes
.../dag/_source/images/task-icos/python_hover.png | Bin 0 -> 1233 bytes
.../pages/dag/_source/images/task-icos/shell.png | Bin 0 -> 747 bytes
.../dag/_source/images/task-icos/shell_hover.png | Bin 0 -> 745 bytes
.../pages/dag/_source/images/task-icos/spark.png | Bin 0 -> 1067 bytes
.../dag/_source/images/task-icos/spark_hover.png | Bin 0 -> 1066 bytes
.../pages/dag/_source/images/task-icos/sql.png | Bin 0 -> 1317 bytes
.../dag/_source/images/task-icos/sql_hover.png | Bin 0 -> 1262 bytes
.../pages/dag/_source/images/task-icos/sqoop.png | Bin 0 -> 896 bytes
.../dag/_source/images/task-icos/sqoop_hover.png | Bin 0 -> 897 bytes
.../dag/_source/images/task-icos/sub_process.png | Bin 0 -> 692 bytes
.../_source/images/task-icos/sub_process_hover.png | Bin 0 -> 693 bytes
.../dag/_source/images/task-icos/waterdrop.png | Bin 0 -> 1086 bytes
.../_source/images/task-icos/waterdrop_hover.png | Bin 0 -> 1054 bytes
.../pages/dag/_source/images/view-variables.png | Bin 0 -> 858 bytes
.../dag/_source/images/view-variables_hover.png | Bin 0 -> 858 bytes
.../dag/_source/loading.scss} | 15 +-
.../home/pages/dag/_source/plugIn/downChart.js | 122 --
.../conf/home/pages/dag/_source/plugIn/dragZoom.js | 38 -
.../home/pages/dag/_source/plugIn/jsPlumbHandle.js | 814 ----------
.../home/pages/dag/_source/plugIn/multiDrag.js | 67 -
.../js/conf/home/pages/dag/_source/plugIn/util.js | 171 ---
.../pages/dag/_source/udp/_source/selectTenant.vue | 7 +-
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 48 +-
.../js/conf/home/pages/dag/definitionDetails.vue | 13 +-
.../pages/definition/pages/list/_source/list.vue | 30 +-
.../pages/definition/pages/list/_source/start.vue | 4 +-
.../pages/definition/pages/list/_source/timing.vue | 2 +-
.../definition/pages/list/_source/versions.vue | 7 +-
.../pages/definition/timing/_source/list.vue | 2 +-
.../pages/index/_source/commandStateCount.vue | 94 --
.../pages/index/_source/defineUserCount.vue | 8 +-
.../pages/index/_source/processStateCount.vue | 6 +-
.../projects/pages/index/_source/queueCount.vue | 101 --
.../pages/index/_source/taskStatusCount.vue | 4 +-
.../conf/home/pages/projects/pages/index/index.vue | 12 +-
.../pages/instance/pages/list/_source/list.vue | 4 +-
.../pages/projects/pages/list/_source/list.vue | 6 +-
.../conf/home/pages/security/pages/users/index.vue | 6 +-
.../src/js/conf/home/router/index.js | 32 +-
.../src/js/conf/home/store/dag/actions.js | 263 ++--
.../src/js/conf/home/store/dag/mutations.js | 57 +-
.../src/js/conf/home/store/dag/state.js | 16 +-
.../src/js/conf/home/store/datasource/actions.js | 10 +-
.../src/js/conf/home/store/kinship/actions.js | 8 +-
.../src/js/conf/home/store/monitor/actions.js | 8 +-
.../src/js/conf/home/store/projects/actions.js | 10 +-
.../src/js/conf/home/store/resource/actions.js | 22 +-
.../src/js/conf/home/store/security/actions.js | 62 +-
.../src/js/conf/home/store/user/actions.js | 10 +-
.../components/secondaryMenu/secondaryMenu.vue | 7 +
.../src/js/module/i18n/locale/en_US.js | 3 -
.../src/js/module/i18n/locale/zh_CN.js | 3 -
pom.xml | 3 +-
sql/dolphinscheduler_h2.sql | 4 +-
sql/dolphinscheduler_mysql.sql | 13 +-
sql/dolphinscheduler_postgre.sql | 11 +-
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 296 ----
.../postgresql/dolphinscheduler_ddl.sql | 339 +---
273 files changed, 8734 insertions(+), 11390 deletions(-)
delete mode 160000 .github/actions/translate-on-issue
create mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/exceptions/ExecuteException.java
=>
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/DagDataSchedule.java
(55%)
delete mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/ProcessMeta.java
delete mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessTaskRelationService.java
delete mode 100644
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessTaskRelationServiceImpl.java
delete mode 100644
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
delete mode 100644
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessTaskRelationServiceImplTest.java
create mode 100644
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DagData.java
rename
{dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service =>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server}/log/SensitiveDataConverter.java
(93%)
copy
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/{TaskLogDiscriminatorTest.java
=> SensitiveDataConverterTest.java} (54%)
rename
dolphinscheduler-registry-plugin/dolphinscheduler-registry-zookeeper/src/main/resources/logback.xml
=> dolphinscheduler-service/src/main/resources/logback-zookeeper.xml (100%)
delete mode 100644
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/log/SensitiveDataConverterTest.java
copy docker/build/checkpoint.sh =>
dolphinscheduler-standalone-server/src/main/resources/registry.properties (74%)
mode change 100755 => 100644
copy dolphinscheduler-ui/src/js/{module/components/layout/layout.vue =>
conf/home/pages/dag/_source/canvas/canvas.scss} (61%)
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/canvas.vue
copy dolphinscheduler-ui/src/js/{module/mixin/disabledState.js =>
conf/home/pages/dag/_source/canvas/contextMenu.scss} (64%)
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/contextMenu.vue
copy dolphinscheduler-ui/src/{components/Counter.vue =>
js/conf/home/pages/dag/_source/canvas/draggableBox.vue} (67%)
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/edgeEditModel.vue
copy
dolphinscheduler-ui/src/js/conf/home/pages/{projects/pages/instance/pages/details/index.vue
=> dag/_source/canvas/menuItem.vue} (72%)
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/nodeStatus.js
copy dolphinscheduler-ui/src/js/conf/home/{store/projects/mutations.js =>
pages/dag/_source/canvas/nodeStatus.scss} (84%)
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss
copy
dolphinscheduler-ui/src/js/{module/components/listConstruction/listConstruction.vue
=> conf/home/pages/dag/_source/canvas/taskbar.vue} (50%)
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.scss
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/x6-helper.js
copy
dolphinscheduler-ui/src/js/{module/components/crontab/source/_source/i18n/index.js
=> conf/home/pages/dag/_source/canvas/x6-style.scss} (78%)
mode change 100755 => 100644
delete mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
mode change 100755 => 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
mode change 100755 => 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/full-screen-close.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/full-screen-close_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/full-screen-open.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/full-screen-open_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/graph-format.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/graph-format_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/startup-params.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/startup-params_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/conditions.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/conditions_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/datax.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/datax_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/dependent.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/dependent_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/flink.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/flink_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/http.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/http_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/mr.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/mr_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/procedure.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/procedure_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/python.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/python_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/shell.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/shell_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/spark.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/spark_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/sql.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/sql_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/sqoop.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/sqoop_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/sub_process.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/sub_process_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/waterdrop.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/waterdrop_hover.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/view-variables.png
create mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/view-variables_hover.png
copy dolphinscheduler-ui/src/js/conf/home/{store/projects/mutations.js =>
pages/dag/_source/loading.scss} (85%)
delete mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
delete mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/dragZoom.js
delete mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
delete mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/multiDrag.js
delete mode 100755
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
delete mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue
delete mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue
mode change 100755 => 100644
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
