Skip to content

Commit

Permalink
Merge branch 'main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
#	README-ZH.md
#	README.md
#	assembly/bin/appconn-refresh.sh
#	assembly/bin/dssinstall.sh
#	assembly/config/config.sh
#	assembly/dss-package/pom.xml
#	assembly/pom.xml
#	conf/dss-framework-orchestrator-server.properties
#	conf/dss-server.properties
#	conf/dss.properties
#	db/dss_ddl.sql
#	dss-appconn/appconns/dss-datachecker-appconn/pom.xml
#	dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/DataChecker.java
#	dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
#	dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataDruidFactory.java
#	dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
#	dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
#	dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/entity/EventChecker.java
#	dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/service/AbstractEventCheck.java
#	dss-appconn/appconns/dss-schedulis-appconn/pom.xml
#	dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/constant/AzkabanConstant.java
#	dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJob.java
#	dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJobConverter.java
#	dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/operation/SchedulisProjectSearchOperation.java
#	dss-appconn/appconns/dss-scriptis-appconn/pom.xml
#	dss-appconn/appconns/dss-sendemail-appconn/pom.xml
#	dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
#	dss-appconn/appconns/dss-sso-appconn/pom.xml
#	dss-appconn/appconns/dss-workflow-appconn/pom.xml
#	dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java
#	dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefExportOperation.java
#	dss-appconn/dss-appconn-core/pom.xml
#	dss-appconn/dss-appconn-loader/pom.xml
#	dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
#	dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/conf/AppConnManagerClientConfiguration.java
#	dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java
#	dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
#	dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
#	dss-appconn/dss-appconn-manager/pom.xml
#	dss-appconn/dss-scheduler-appconn/pom.xml
#	dss-appconn/linkis-appconn-engineplugin/pom.xml
#	dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties
#	dss-appconn/pom.xml
#	dss-apps/dss-apiservice-server/pom.xml
#	dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/config/ApiServiceConfiguration.java
#	dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/execute/ExecuteCodeHelper.java
#	dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/restful/ApiServiceExecuteRestfulApi.java
#	dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/TokenStatusCheckerTask.java
#	dss-apps/dss-apiservice-server/src/test/resources/linkis.properties
#	dss-apps/dss-apps-server/pom.xml
#	dss-apps/dss-data-api/dss-api-sql-template/pom.xml
#	dss-apps/dss-data-api/dss-data-api-server/pom.xml
#	dss-apps/dss-data-api/dss-data-api-server/src/main/resources/dss.properties
#	dss-apps/dss-data-api/pom.xml
#	dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
#	dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
#	dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
#	dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
#	dss-apps/dss-data-governance/dss-data-governance-server/src/main/resources/dss.properties
#	dss-apps/dss-data-governance/pom.xml
#	dss-apps/dss-scriptis-server/pom.xml
#	dss-apps/dss-scriptis-server/src/main/java/com/webank/wedatasphere/dss/scriptis/config/DSSScriptisConfiguration.java
#	dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
#	dss-apps/dss-user-guide/dss-user-guide-server/src/main/resources/dss.properties
#	dss-apps/dss-user-guide/pom.xml
#	dss-apps/pom.xml
#	dss-commons/dss-common/pom.xml
#	dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java
#	dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
#	dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/IoUtils.java
#	dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
#	dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocolObject.scala
#	dss-commons/dss-contextservice/pom.xml
#	dss-commons/dss-sender-service/pom.xml
#	dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderService.java
#	dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/conf/DSSSenderServiceConf.java
#	dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSSenderServiceImpl.java
#	dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSServerSenderServiceImpl.java
#	dss-commons/pom.xml
#	dss-framework/dss-appconn-framework/pom.xml
#	dss-framework/dss-framework-admin-service/pom.xml
#	dss-framework/dss-framework-common/pom.xml
#	dss-framework/dss-framework-orchestrator-server/pom.xml
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorSpringConf.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/constant/DSSOrchestratorConstant.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorCreateRequest.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorModifyRequest.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorRequest.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/OrchestratorIERestful.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
#	dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
#	dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
#	dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
#	dss-framework/dss-framework-project-server/pom.xml
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/DSSProjectMapper.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/restful/DSSFrameworkProjectRestfulApi.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
#	dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
#	dss-framework/dss-framework-project-server/src/main/resources/dss.properties
#	dss-framework/dss-framework-proxy-user-service/pom.xml
#	dss-framework/dss-framework-workspace-server/pom.xml
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/DSSWorkspace.java
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceService.java
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
#	dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
#	dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ExportDSSOrchestratorPlugin.java
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ImportDSSOrchestratorPlugin.java
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ExportDSSOrchestratorPluginImpl.java
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java
#	dss-framework/pom.xml
#	dss-orchestrator/dss-orchestrator-common/pom.xml
#	dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java
#	dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorVersion.java
#	dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
#	dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
#	dss-orchestrator/dss-orchestrator-core/pom.xml
#	dss-orchestrator/dss-orchestrator-db/pom.xml
#	dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
#	dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
#	dss-orchestrator/dss-orchestrator-loader/pom.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala
#	dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala
#	dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala
#	dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/conf/LinkisJobExecutionConfiguration.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/parser/NodeParser.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestUnlockWorkflow.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/NodeExportService.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/NodeExportServiceImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/MetaInputService.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/NodeInputService.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/WorkFlowInputService.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/MetaInputServiceImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/parser/DefaultNodeParser.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
#	dss-orchestrator/orchestrators/dss-workflow/pom.xml
#	dss-orchestrator/pom.xml
#	dss-server/pom.xml
#	dss-standard/development-standard/development-process-standard-execution/pom.xml
#	dss-standard/development-standard/development-process-standard/pom.xml
#	dss-standard/dss-standard-common/pom.xml
#	dss-standard/pom.xml
#	dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
#	dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
#	dss-standard/sso-standard/sso-integration-standard/pom.xml
#	dss-standard/structure-standard/dss-project-plugin/pom.xml
#	dss-standard/structure-standard/dss-role-plugin/pom.xml
#	dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
#	dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java
#	dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java
#	dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
#	plugins/azkaban/linkis-jobtype/bin/config.sh
#	plugins/azkaban/linkis-jobtype/pom.xml
#	plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties
#	plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
#	plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
#	plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
#	plugins/dolphinscheduler/pom.xml
#	plugins/linkis/dss-gateway-support/pom.xml
#	pom.xml
#	web/README-DEV.md
#	web/package-lock.json
#	web/package.json
#	web/packages/apiServices/module/apiServicesExecute/result.vue
#	web/packages/cyeditor/cyeditor-context-menu/index.js
#	web/packages/cyeditor/cyeditor-snap-grid/index.js
#	web/packages/cyeditor/example.js
#	web/packages/cyeditor/index.js
#	web/packages/cyeditor/package.json
#	web/packages/dataGovernance/module/common/tabCard/index.vue
#	web/packages/dataGovernance/view/fieldInfo/index.vue
#	web/packages/dataService/module/common/navMenu.vue
#	web/packages/dataService/module/dataManagement/index.vue
#	web/packages/dolphinScheduler/assets/styles/workflow.scss
#	web/packages/dolphinScheduler/components/tabList/index.scss
#	web/packages/exts/open-source/scriptis/apiPublish/index.vue
#	web/packages/exts/scriptisGuide/i18n/en.json
#	web/packages/exts/scriptisGuide/i18n/zh.json
#	web/packages/scriptis/components/importToHive/index.vue
#	web/packages/scriptis/i18n/common/en.json
#	web/packages/scriptis/i18n/common/zh.json
#	web/packages/scriptis/module/hdfsSidebar/hdfsSidebar.vue
#	web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.vue
#	web/packages/scriptis/module/workSidebar/workSidebar.vue
#	web/packages/scriptis/module/workbench/createTable/components/importTable.vue
#	web/packages/scriptis/module/workbench/createTable/components/importTable_csv.vue
#	web/packages/scriptis/module/workbench/createTable/index.vue
#	web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue
#	web/packages/scriptis/module/workbench/script/editor.vue
#	web/packages/scriptis/module/workbench/script/script.vue
#	web/packages/shared/common/i18n/zh.json
#	web/packages/shared/common/service/api.js
#	web/packages/shared/common/service/apiCache.js
#	web/packages/shared/common/service/execute.js
#	web/packages/shared/common/style/overwrite.scss
#	web/packages/shared/components/consoleComponent/console.vue
#	web/packages/shared/components/consoleComponent/result.vue
#	web/packages/shared/components/consoleComponent/resultsExport.vue
#	web/packages/shared/components/consoleComponent/toolbar.vue
#	web/packages/shared/components/vue-process/nodeView.vue
#	web/packages/shared/components/vue-process/noder.vue
#	web/packages/shared/components/vue-process/style/index.scss
#	web/packages/shared/package.json
#	web/packages/workflows/module/process/component/console.vue
#	web/packages/workflows/module/process/component/designtoolbar.vue
#	web/packages/workflows/module/process/component/nodeparameter.vue
#	web/packages/workflows/module/process/component/templateSelectDrawer.vue
#	web/packages/workflows/module/process/cyeditor/convert.js
#	web/packages/workflows/module/process/cyeditor/index.vue
#	web/packages/workflows/module/process/cyeditor/styles.js
#	web/packages/workflows/module/process/module.vue
#	web/packages/workflows/module/workflow/index.vue
#	web/packages/workflows/module/workflow/module/workflowForm.vue
#	web/packages/workflows/module/workflow/module/workflowFormNew.vue
#	web/packages/workflows/module/workflow/module/workflowModal.vue
#	web/packages/workflows/view/layout.vue
#	web/packages/workflows/view/process/index.vue
#	web/packages/workflows/view/workflow/index.vue
#	web/packages/workspace/i18n/en.json
#	web/packages/workspace/i18n/zh.json
  • Loading branch information
zqburde committed Jan 3, 2025
2 parents dfe8f94 + 8157a91 commit 7772907
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 0 deletions.
12 changes: 12 additions & 0 deletions web/lerna.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"packages": [
"packages/*"
],
"command": {
"bootstrap": {
"hoist": true
}
},
"npmClient": "npm",
"version": "1.1.6"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
流式应用物料包是指的按照Streamis打包规范,将元数据信息(流式应用描述信息),流式应用代码,流式应用使用到的物料等内容打包成zip包。其具体格式如下:

xxx.zip
├── meta.json
├── test.sql
├── test.jar
├── file3

其中,meta.json格式为:
{
"projectName": "", # 项目名
"jobName": "", # 作业名
"jobType": "flink.sql", # 目前只支持flink.sql、flink.jar
"tags": "", # 应用标签
"description": "" # 作业描述,
"jobContent": {
# 不同的jobType,其内容各不相同,具体请往下看
}
}

如果jobType为"flink.sql",则jobContent为:
{
"type": "" # file, bml or sql
"sql": "select 1",
"file": "test.sql",
"resourceId": "",
"version": ""
}
其中,如果type为"file",则只识别file字段;如果type为"sql",则只识别sql字段;如果type为"bml",则只识别resourceId和version字段。


如果jobType为"flink.jar",则jobContent为:

{
"main.class.jar": "", # string。main class的jar,如:test.jar
"main.class": "", # main class,如 com.webank.Test
"args": "", # main class 的入参,即main函数的args,请以空格为分隔符
"hdfs.jars"; [], # 依赖的HDFS jars,如:hdfs:///user/enjoyyin/test1.jar
"dependency.jars": [], # 依赖的jars,如:test2.jar
"resources": [] # 依赖的资源文件,如:test.properties
}


也支持直接requestBody为JSON的方式创建新Job,或者是更新Job版本,requestBody格式跟meta.json一模一样,只是相关的文件是工程级别的文件。


上传文件:
/api/rest_j/v1/streamis/project/files/upload
{
"fileName": "",
"version": "",
"projectName": "",
"updateWhenExists": false
}
mutildata带上文件字节流

/api/rest_j/v1/streamis/project/files/list
/api/rest_j/v1/streamis/project/files/delete

/api/rest_j/v1/streamis/job/upload
带上zip

/api/rest_j/v1/streamis/job/createOrUpdate
requestBody为zip的meta.json
Binary file added web/packages/dss/public/streamis/flinkJar.zip
Binary file not shown.

0 comments on commit 7772907

Please sign in to comment.