Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest code #1125

Open
wants to merge 193 commits into
base: master
Choose a base branch
from
Open

Merge latest code #1125

wants to merge 193 commits into from

Conversation

zqburde
Copy link
Contributor

@zqburde zqburde commented Apr 29, 2024

Merge internal lasted code to community.

zqburde and others added 30 commits June 8, 2023 15:42
yuankang134 and others added 29 commits January 15, 2024 11:28
# Conflicts:
#	assembly/bin/appconn-refresh.sh
#	assembly/dss-package/pom.xml
#	assembly/pom.xml
#	conf/application-dss.yml
#	conf/dss-framework-orchestrator-server.properties
#	db/dss_ddl.sql
#	db/dss_dml.sql
#	dss-appconn/appconns/dss-datachecker-appconn/pom.xml
#	dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/common/CheckDataObject.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/utils/QualitisUtil.java
#	dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
#	dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
#	dss-appconn/appconns/dss-schedulis-appconn/pom.xml
#	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/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-core/pom.xml
#	dss-appconn/dss-appconn-manager/pom.xml
#	dss-appconn/dss-scheduler-appconn/pom.xml
#	dss-appconn/linkis-appconn-engineplugin/pom.xml
#	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/service/impl/ApiServiceQueryServiceImpl.java
#	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/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/pom.xml
#	dss-apps/dss-scriptis-server/pom.xml
#	dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
#	dss-apps/dss-user-guide/pom.xml
#	dss-apps/pom.xml
#	dss-commons/dss-common/pom.xml
#	dss-commons/dss-contextservice/pom.xml
#	dss-commons/dss-sender-service/pom.xml
#	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-project-server/pom.xml
#	dss-framework/dss-framework-proxy-user-service/pom.xml
#	dss-framework/dss-framework-workspace-server/pom.xml
#	dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
#	dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
#	dss-framework/pom.xml
#	dss-orchestrator/dss-orchestrator-common/pom.xml
#	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-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/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java
#	dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
#	dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
#	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/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/spring-origin-dss-project-plugin/pom.xml
#	plugins/azkaban/linkis-jobtype/pom.xml
#	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/package-lock.json
#	web/packages/apiServices/package.json
#	web/packages/dataGovernance/package.json
#	web/packages/dataService/package.json
#	web/packages/dolphinScheduler/package.json
#	web/packages/dss/package.json
#	web/packages/editor/editor.vue
#	web/packages/editor/package.json
#	web/packages/editorLsp/package.json
#	web/packages/exts/package.json
#	web/packages/scriptis/module/hiveSidebar/index.js
#	web/packages/scriptis/module/workbench/container.vue
#	web/packages/scriptis/module/workbench/script/editor.vue
#	web/packages/scriptis/module/workbench/script/script.vue
#	web/packages/scriptis/package.json
#	web/packages/shared/components/dynamicForm/index.vue
#	web/packages/shared/package.json
#	web/packages/workflows/package.json
#	web/packages/workspace/module/management/index.vue
#	web/packages/workspace/package.json
@zqburde zqburde changed the title Merge lasted code Merge latest code May 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants