Force check ci on prapare/release branch (#16216 )

[Chore] [CI] Add api-test and e2e-test to spotless check (#16242 )
Remove unused dependentResult in TaskInstance (#16236 )
2024-07-01 09:20:56 +08:00 · 2024-06-30 22:39:12 +08:00 · 2024-06-30 18:56:53 +08:00 · 2024-06-29 14:34:30 +08:00 · 2024-06-28 09:51:02 +08:00 · 2024-06-27 21:49:21 +08:00
790 changed files with 14278 additions and 21059 deletions
--- a/.asf.yaml
+++ b/.asf.yaml
@ -46,7 +46,8 @@ github:
          - E2E
          - Docs
          - Frontend Build
-#          - "Mergeable: milestone-label-check"
+          - "Mergeable: milestone-label-check"
+          - "Title Validator"
      required_pull_request_reviews:
        dismiss_stale_reviews: true
        required_approving_review_count: 2
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -16,30 +16,39 @@
 #

 /.github/ @SbloodyS
-/deploy/ @caishunfeng
-/dolphinscheduler-alert/ @caishunfeng
-/dolphinscheduler-e2e/ @SbloodyS
-/dolphinscheduler-api-test/ @SbloodyS
-/dolphinscheduler-registry/ @caishunfeng @ruanwenjun
+/deploy/ @SbloodyS
+/dolphinscheduler-alert/ @SbloodyS
 /dolphinscheduler-api/ @caishunfeng @SbloodyS
-/dolphinscheduler-dao/ @caishunfeng @SbloodyS
-/dolphinscheduler-dao/src/main/resources/sql/ @EricGao888
-/dolphinscheduler-common/ @caishunfeng
-/dolphinscheduler-standalone-server/ @caishunfeng
-/dolphinscheduler-datasource-plugin/ @caishunfeng
-/dolphinscheduler-dist/ @caishunfeng
-/dolphinscheduler-meter/ @caishunfeng @ruanwenjun @EricGao888
-/dolphinscheduler-scheduler-plugin/ @caishunfeng
+/dolphinscheduler-api-test/ @SbloodyS
+/dolphinscheduler-authentication/ @ruanwenjun
+/dolphinscheduler-bom/ @ruanwenjun
+/dolphinscheduler-common/ @SbloodyS
+/dolphinscheduler-dao/  @SbloodyS @ruanwenjun
+/dolphinscheduler-dao-plugin/ @SbloodyS @ruanwenjun
+/dolphinscheduler-data-quality/ @SbloodyS
+/dolphinscheduler-datasource-plugin/ @SbloodyS
+/dolphinscheduler-dist/ @SbloodyS
+/dolphinscheduler-e2e/ @SbloodyS
+/dolphinscheduler-extract/ @ruanwenjun
 /dolphinscheduler-master/ @caishunfeng @SbloodyS @ruanwenjun
-/dolphinscheduler-worker/ @caishunfeng @SbloodyS @ruanwenjun
+/dolphinscheduler-meter/  @ruanwenjun @EricGao888
+/dolphinscheduler-microbench/ @SbloodyS @ruanwenjun
+/dolphinscheduler-registry/  @ruanwenjun
+/dolphinscheduler-scheduler-plugin/ @ruanwenjun
 /dolphinscheduler-service/ @caishunfeng
-/dolphinscheduler-extract/ @caishunfeng @ruanwenjun
 /dolphinscheduler-spi/ @caishunfeng
+/dolphinscheduler-standalone-server/ @SbloodyS
+/dolphinscheduler-storage-plugin/ @ruanwenjun @SbloodyS
 /dolphinscheduler-task-plugin/ @caishunfeng @SbloodyS @zhuangchong
 /dolphinscheduler-tools/ @caishunfeng @SbloodyS @EricGao888
-/script/ @caishunfeng @SbloodyS @EricGao888
 /dolphinscheduler-ui/ @songjianet @Amy0104
-/docs/ @EricGao888
+/dolphinscheduler-worker/ @caishunfeng @SbloodyS @ruanwenjun
+/dolphinscheduler-yarn-aop/ @ruanwenjun
+
+/dolphinscheduler-dao/src/main/resources/sql/ @EricGao888
+
+/script/  @SbloodyS @EricGao888
+/docs/ @EricGao888 @SbloodyS
 /licenses/ @EricGao888
 /images/ @EricGao888
-/style/ @caishunfeng
+/style/ @SbloodyS @EricGao888
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -31,4 +31,7 @@ This change added tests and can be verified as follows:

 (or)

+## Pull Request Notice
+[Pull Request Notice](https://github.com/apache/dolphinscheduler/blob/dev/docs/docs/en/contribute/join/pull-request.md)
+
 If your pull request contain incompatible change, you should also add it to `docs/docs/en/guide/upgrede/incompatible.md`
--- a/.github/actions/auto-assign-action
+++ b/.github/actions/auto-assign-action
@ -0,0 +1 @@
+Subproject commit 288f36f8cea1dded676b9c4477a64ff91e50c104
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/src/main/resources/org/apache/dolphinscheduler/plugin/task/pigeon/config.properties
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/src/main/resources/org/apache/dolphinscheduler/plugin/task/pigeon/config.properties
@ -15,12 +15,8 @@
 # limitations under the License.
 #

-job.trigger.url=http://%s/tjs/coredefine/coredefine.ajax
-job.trigger.post.body=action=datax_action&emethod=trigger_fullbuild_task
+# Set addAssignees to 'author' to set the PR creator as the assignee.
+addAssignees: author

-job.cancel.post.body=action=core_action&event_submit_do_cancel_task=y&taskid=%s
-
-job.status.url=http://%s/tjs/config/config.ajax?action=collection_action&emethod=get_task_status
-job.status.post.body={\n taskid: %s\n, log: false }
-
-job.logs.fetch.url=ws://%s/tjs/download/logfeedback?logtype=full&collection=%s&taskid=%s
+# Enable it to run on drafts
+runOnDraft: true
--- a/.github/actions/labeler/labeler.yml
+++ b/.github/actions/labeler/labeler.yml
@ -18,37 +18,54 @@
 backend:
  - 'dolphinscheduler-alert/**/*'
  - 'dolphinscheduler-api/**/*'
+  - 'dolphinscheduler-authentication/**/*'
+  - 'dolphinscheduler-bom/**/*'
  - 'dolphinscheduler-common/**/*'
  - 'dolphinscheduler-dao/**/*'
+  - 'dolphinscheduler-dao-plugin/**/*'
  - 'dolphinscheduler-data-quality/**/*'
  - 'dolphinscheduler-datasource-plugin/**/*'
  - 'dolphinscheduler-dist/**/*'
-  - 'dolphinscheduler-master/**/*'
-  - 'dolphinscheduler-registry/**/*'
  - 'dolphinscheduler-extract/**/*'
+  - 'dolphinscheduler-master/**/*'
+  - 'dolphinscheduler-meter/**/*'
+  - 'dolphinscheduler-microbench/**/*'
+  - 'dolphinscheduler-registry/**/*'
  - 'dolphinscheduler-scheduler-plugin/**/*'
  - 'dolphinscheduler-service/**/*'
  - 'dolphinscheduler-spi/**/*'
  - 'dolphinscheduler-standalone-server/**/*'
+  - 'dolphinscheduler-storage-plugin/**/*'
  - 'dolphinscheduler-task-plugin/**/*'
  - 'dolphinscheduler-tools/**/*'
  - 'dolphinscheduler-worker/**/*'
+  - 'dolphinscheduler-yarn-aop/**/*'
  - 'script/**/*'
+  - '.github/workflows/backend.yml'

 document:
  - 'docs/**/*'
+  - '**/*.md'

 CI&CD:
  - any: ['.github/**/*']

 docker:
-  - any: ['.deploy/**/*']
+  - any: ['deploy/docker/**/*']

 UI:
  - any: ['dolphinscheduler-ui/**/*']
+  - any: ['.github/workflows/frontend.yml']

 e2e:
  - any: ['dolphinscheduler-e2e/**/*']
+  - any: ['dolphinscheduler-api-test/**/*']
+  - any: ['.github/workflows/e2e.yml']
+  - any: ['.github/workflows/api-test.yml']
+  - any: ['.github/workflows/e2e-k8s.yml']

 test:
-  - any: ['dolphinscheduler-api-test/**/*']
+  - any: ['**/test/**/*']
+
+kubernetes:
+  - any: ['deploy/kubernetes/**/*']
--- a/.github/boring-cyborg.yml
+++ b/.github/boring-cyborg.yml
@ -0,0 +1,72 @@
+################################################################################
+#  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.
+# Details: https://github.com/apps/boring-cyborg
+
+###### IssueLink Adder #################################################################################################
+# Insert Issue (Jira/Github etc) link in PR description based on the Issue ID in PR title.
+insertIssueLinkInPrDescription:
+  # specify the placeholder for the issue link that should be present in the description
+  descriptionIssuePlaceholderRegexp: "^fix: (.*)$"
+  matchers:
+    # you can have several matches - for different types of issues
+    # only the first matching entry is replaced
+    jiraIssueMatch:
+      # specify the regexp of issue id that you can find in the title of the PR
+      # the match groups can be used to build the issue id (${1}, ${2}, etc.).
+      titleIssueIdRegexp: \[(Feature|Fix|Improvement|Test|E2E|Doc-[0-9]+)\]
+      # the issue link to be added. ${1}, ${2} ... are replaced with the match groups from the
+      # title match (remember to use quotes)
+      descriptionIssueLink: "[${1}](https://github.com/apache/dolphinschedule/${1}/)"
+
+###### Title Validator #################################################################################################
+# Verifies if commit/PR titles match the regexp specified
+verifyTitles:
+  # Regular expression that should be matched by titles of commits or PR
+  titleRegexp: ^\[DSIP-[0-9]+\].*$|^\[Feature-[0-9]+\].*$|^\[Fix-[0-9]+\].*$|^\[Doc-[0-9]+\].*$|^\[Improvement-[0-9]+\].*$|^\[Test-[0-9]+\].*$|^\[E2E-[0-9]+\].*$|^\[CI].*$|^\[Chore].*$
+  # If set to true, it will always check the PR title (as opposed to the individual commits).
+  alwaysUsePrTitle: true
+  # If set to true, it will only check the commit in case there is a single commit.
+  # In case of multiple commits it will check PR title.
+  # This reflects the standard behaviour of Github that for `Squash & Merge` GitHub
+  # uses the PR title rather than commit messages for the squashed commit ¯\_(ツ)_/¯
+  # For single-commit PRs it takes the squashed commit message from the commit as expected.
+  #
+  # If set to false it will check all commit messages. This is useful when you do not squash commits at merge.
+  validateEitherPrOrSingleCommitTitle: true
+  # The title the GitHub status should appear from.
+  statusTitle: "Title Validator"
+  # A custom message to be displayed when the title passes validation.
+  successMessage: "Title Validation successful!"
+  # A custom message to be displayed when the title fails validation.
+  # Allows insertion of ${type} (commit/PR), ${title} (the title validated) and ${regex} (the titleRegexp above).
+  failureMessage: "Wrong ${type} title: ${title}"
+
+# Various Flags to control behaviour of the "Labeler"
+labelerFlags:
+  # If this flag is changed to 'false', labels would only be added when the PR is first created
+  # and not when existing PR is updated.
+  # The default is 'true' which means the labels would be added when PR is updated even if they
+  # were removed by the user
+  labelOnPRUpdates: true
+
+# Comment to be posted to welcome users when they open their first PR
+firstPRWelcomeComment: >
+  Thanks for opening this pull request! Please check out our contributing guidelines. (https://github.com/apache/dolphinscheduler/blob/dev/docs/docs/en/contribute/join/pull-request.md)
+
+# Comment to be posted to congratulate user on their first merged PR
+firstPRMergeComment: >
+  Awesome work, congrats on your first merged pull request!
--- a/.github/workflows/api-test.yml
+++ b/.github/workflows/api-test.yml
@ -20,6 +20,8 @@ on:
  push:
    branches:
      - dev
+      - '[0-9]+.[0-9]+.[0-9]+-prepare'
+      - '[0-9]+.[0-9]+.[0-9]+-release'

 name: API-Test

@ -35,7 +37,7 @@ jobs:
    outputs:
      not-ignore: ${{ steps.filter.outputs.not-ignore }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
        id: filter
        with:
@ -49,7 +51,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Sanity Check
@ -73,7 +75,7 @@ jobs:
        run: |
          docker save apache/dolphinscheduler-standalone-server:ci -o /tmp/standalone-image.tar \
          && du -sh /tmp/standalone-image.tar
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
        name: Upload Docker Images
        with:
          name: standalone-image
@ -104,7 +106,7 @@ jobs:
    env:
      RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Cache local Maven repository
@ -113,7 +115,7 @@ jobs:
          path: ~/.m2/repository
          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
          restore-keys: ${{ runner.os }}-maven-
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
        name: Download Docker Images
        with:
          name: standalone-image
@ -125,9 +127,9 @@ jobs:
        run: |
          ./mvnw -B -f dolphinscheduler-api-test/pom.xml -am \
            -DfailIfNoTests=false \
-            -Dspotless.skip=false \
+            -Dspotless.skip=true \
            -Dtest=${{ matrix.case.class }} test
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
        if: always()
        name: Upload Recording
        with:
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@ -44,7 +44,7 @@ jobs:
      not-ignore: ${{ steps.filter.outputs.not-ignore }}
      db-schema: ${{ steps.filter.outputs.db-schema }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
        id: filter
        with:
@ -63,7 +63,7 @@ jobs:
        java: [ '8', '11' ]
    timeout-minutes: 30
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Set up JDK ${{ matrix.java }}
@ -91,7 +91,7 @@ jobs:
                 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
      - name: Check dependency license
        run: tools/dependencies/check-LICENSE.sh
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
        if: ${{ matrix.java == '8' }}
        name: Upload Binary Package
        with:
@ -115,10 +115,10 @@ jobs:
          - name: cluster-test-postgresql-with-postgresql-registry
            script: .github/workflows/cluster-test/postgresql_with_postgresql_registry/start-job.sh
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
        name: Download Binary Package
        with:
          # Only run cluster test on jdk8
@ -165,7 +165,7 @@ jobs:
          mkdir -p dolphinscheduler/dev dolphinscheduler/${{ matrix.version }}
          curl -sSf https://atlasgo.sh | sh
      - name: Download Tarball
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
        with:
          name: binary-package-8
          path: dolphinscheduler/dev
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@ -23,6 +23,8 @@ on:
  pull_request:
    branches:
      - 'dev'
+      - '[0-9]+.[0-9]+.[0-9]+-prepare'
+      - '[0-9]+.[0-9]+.[0-9]+-release'

 concurrency:
  group: codeql-${{ github.event.pull_request.number || github.ref }}
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@ -30,7 +30,7 @@ jobs:
    timeout-minutes: 10
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Style Check
        run: ./mvnw spotless:check
  img-check:
@ -40,7 +40,7 @@ jobs:
      run:
        working-directory: docs
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Set up Python 3.9
        uses: actions/setup-python@v2
        with:
@ -54,7 +54,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 30
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - run: sudo npm install -g markdown-link-check@3.11.2
      - run: sudo apt install plocate -y
      # NOTE: Change command from `find . -name "*.md"` to `find . -not -path "*/node_modules/*" -not -path "*/.tox/*" -name "*.md"`
@ -70,7 +70,7 @@ jobs:
    outputs:
      helm-doc: ${{ steps.filter.outputs.helm-doc }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
        id: filter
        with:
@ -84,7 +84,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Generating helm-doc
--- a/.github/workflows/e2e-k8s.yml
+++ b/.github/workflows/e2e-k8s.yml
@ -20,6 +20,8 @@ on:
  push:
    branches:
      - dev
+      - '[0-9]+.[0-9]+.[0-9]+-prepare'
+      - '[0-9]+.[0-9]+.[0-9]+-release'

 name: E2E-K8S

@ -35,7 +37,7 @@ jobs:
    outputs:
      not-ignore: ${{ steps.filter.outputs.not-ignore }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
        id: filter
        with:
@ -49,7 +51,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Build Image
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@ -20,6 +20,8 @@ on:
  push:
    branches:
      - dev
+      - '[0-9]+.[0-9]+.[0-9]+-prepare'
+      - '[0-9]+.[0-9]+.[0-9]+-release'

 name: E2E

@ -35,7 +37,7 @@ jobs:
    outputs:
      not-ignore: ${{ steps.filter.outputs.not-ignore }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
        id: filter
        with:
@ -49,7 +51,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Sanity Check
@ -74,7 +76,7 @@ jobs:
        run: |
          docker save apache/dolphinscheduler-standalone-server:ci -o /tmp/standalone-image.tar \
          && du -sh /tmp/standalone-image.tar
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
        name: Upload Docker Images
        with:
          name: standalone-image
@ -114,20 +116,18 @@ jobs:
 #            class: org.apache.dolphinscheduler.e2e.cases.WorkflowSwitchE2ETest
          - name: FileManage
            class: org.apache.dolphinscheduler.e2e.cases.FileManageE2ETest
-          - name: UdfManage
-            class: org.apache.dolphinscheduler.e2e.cases.UdfManageE2ETest
-          - name: FunctionManage
-            class: org.apache.dolphinscheduler.e2e.cases.FunctionManageE2ETest
          - name: MysqlDataSource
            class: org.apache.dolphinscheduler.e2e.cases.MysqlDataSourceE2ETest
          - name: ClickhouseDataSource
            class: org.apache.dolphinscheduler.e2e.cases.ClickhouseDataSourceE2ETest
          - name: PostgresDataSource
            class: org.apache.dolphinscheduler.e2e.cases.PostgresDataSourceE2ETest
+          - name: ShellTaskE2ETest
+            class: org.apache.dolphinscheduler.e2e.cases.tasks.ShellTaskE2ETest
    env:
      RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Cache local Maven repository
@ -136,7 +136,7 @@ jobs:
          path: ~/.m2/repository
          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
          restore-keys: ${{ runner.os }}-maven-
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
        name: Download Docker Images
        with:
          name: standalone-image
@ -149,7 +149,7 @@ jobs:
          ./mvnw -B -f dolphinscheduler-e2e/pom.xml -am \
            -DfailIfNoTests=false \
            -Dtest=${{ matrix.case.class }} test
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
        if: always()
        name: Upload Recording
        with:
@ -171,7 +171,7 @@ jobs:
    env:
      RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Cache local Maven repository
@ -180,7 +180,7 @@ jobs:
          path: ~/.m2/repository
          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
          restore-keys: ${{ runner.os }}-maven-
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
        name: Download Docker Images
        with:
          name: standalone-image
@ -193,7 +193,7 @@ jobs:
          ./mvnw -B -f dolphinscheduler-e2e/pom.xml -am \
            -DfailIfNoTests=false \
            -Dtest=${{ matrix.case.class }} test
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
        if: always()
        name: Upload Recording
        with:
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@ -20,7 +20,8 @@ name: Frontend
 on:
  push:
    branches:
-      - dev
+      - '[0-9]+.[0-9]+.[0-9]+-prepare'
+      - '[0-9]+.[0-9]+.[0-9]+-release'
    paths:
      - '.github/workflows/frontend.yml'
      - 'dolphinscheduler-ui/**'
@ -41,7 +42,7 @@ jobs:
    outputs:
      not-ignore: ${{ steps.filter.outputs.not-ignore }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
        id: filter
        with:
@ -58,7 +59,7 @@ jobs:
      matrix:
        os: [ ubuntu-latest, macos-latest ]
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - if: matrix.os == 'ubuntu-latest'
@ -82,7 +83,7 @@ jobs:
    needs: [ build, paths-filter ]
    if: always()
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Status
        run: |
          if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' && ${{ github.event_name }} == 'pull_request' ]]; then
--- a/.github/workflows/issue-robot.yml
+++ b/.github/workflows/issue-robot.yml
@ -26,7 +26,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: "Checkout ${{ github.ref }}"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          persist-credentials: false
          submodules: true
--- a/.github/workflows/mergeable.yml
+++ b/.github/workflows/mergeable.yml
@ -14,65 +14,50 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
---
-#version: 2

 on:
  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - labeled
+      - unlabeled
+      - milestoned
+      - demilestoned
+

 name: "Mergeable"

+
 jobs:
  result:
    name: "Mergeable: milestone-label-check"
    runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 10
    steps:
-      - name: Status
-        run: |
-          echo "Temporary skipping this check"
-
-#mergeable:
-#  # we can not use `pull_request.*` which including event `pull_request.labeled`, according to https://github.com/mergeability/mergeable/issues/643,
-#  # otherwise mergeable will keep add or remove label endless, we just need this CI act like the default behavior as
-#  # GitHub action workflow `pull_requests` https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request like,
-#  # which only trigger runs when a pull_request event's activity type is opened, synchronize, or reopened
-#  - when: pull_request.opened, pull_request.reopened, pull_request.synchronize
-#    name: sync-sql-ddl
-#    validate:
-#      # Sql files must change synchronize
-#      - do: dependent
-#        files:
-#          - 'dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql'
-#          - 'dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql'
-#          - 'dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql'
-#        message: 'Sql files not change synchronize'
-#    # Add labels 'sql not sync' and comment to reviewers if Sql files not change synchronize
-#    fail:
-#      - do: comment
-#        payload:
-#          body: >
-#            :warning: This PR do not change database DDL synchronize.
-#        leave_old_comment: false
-#      - do: labels
-#        add: 'sql not sync'
-#    # Remove labels 'sql not sync' if pass
-#    pass:
-#      - do: labels
-#        delete: 'sql not sync'
-#
-#  - when: pull_request.*
-#    name: milestone-label-check
-#    validate:
-#      - do: milestone
-#        no_empty:
-#          enabled: false # Cannot be empty when true.
-#          message: 'Milestone is required and cannot be empty.'
-#      - do: label
-#        and:
-#          - must_include:
-#              regex: 'feature|bug|improvement|document|chore|revert'
-#              message: 'Label must include one of the following: `feature`, `bug`, `improvement`, `document`, `chore`, `revert`'
-#          - must_include:
-#              regex: 'ready-to-merge'
-#              message: 'Please check if there are PRs that already have a `ready-to-merge` label and can be merged, if exists please merge them first.'
+      - name: Check milestone and labels
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { data } = await github.request("GET /repos/{owner}/{repo}/pulls/{pr}", {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pr: context.payload.pull_request.number
+            });
+            if (data.milestone) {
+              core.info(`This pull request has a milestone: ${data.milestone.title}`);
+            } else {
+              core.setFailed(`A maintainer needs to set the milestone for this pull request.`);
+            }
+            let labeledFlag = false;
+            for (const label of data.labels) {
+              if (['feature', 'bug', 'improvement', 'document', 'chore', 'DSIP', 'CI&CD', 'revert'].includes(label.name)) {
+                core.info(`This pull request has a valid label: ${label.name}`);
+                labeledFlag = true;
+                break;
+              }
+            }
+            if (!labeledFlag) {
+              core.setFailed(`A maintainer needs to set a valid label for this pull request.`);
+            }
--- a/.github/workflows/owasp-dependency-check.yaml
+++ b/.github/workflows/owasp-dependency-check.yaml
@ -20,7 +20,8 @@ name: OWASP Dependency Check
 on:
  push:
    branches:
-      - dev
+      - '[0-9]+.[0-9]+.[0-9]+-prepare'
+      - '[0-9]+.[0-9]+.[0-9]+-release'
  pull_request:
    paths:
      - '**/pom.xml'
@ -30,8 +31,9 @@ env:
 jobs:
  build:
    runs-on: ubuntu-latest
+    timeout-minutes: 120
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Set up JDK 8
@ -42,9 +44,9 @@ jobs:
      - name: Run OWASP Dependency Check
        run: ./mvnw -B clean install verify dependency-check:check -DskipDepCheck=false -Dmaven.test.skip=true -Dspotless.skip=true
      - name: Upload report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        if: ${{ cancelled() || failure() }}
        continue-on-error: true
        with:
          name: dependency report
-          path: target/dependency-check-report.html          
+          path: target/dependency-check-report.html
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@ -33,7 +33,7 @@ jobs:
      packages: write
    timeout-minutes: 30
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Cache local Maven repository
        uses: actions/cache@v3
        with:
--- a/.github/workflows/publish-helm-chart.yaml
+++ b/.github/workflows/publish-helm-chart.yaml
@ -33,7 +33,7 @@ jobs:
      packages: write
    timeout-minutes: 30
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Set environment variables
        run: |
          if [[ ${{ github.event_name }} == "release" ]]; then
--- a/.github/workflows/pull-request-target-robot.yml
+++ b/.github/workflows/pull-request-target-robot.yml
@ -15,20 +15,21 @@
 # limitations under the License.
 #

-name: "pull-request-robot"
+name: "pull-request-target-robot"

 on:
  pull_request_target:

 jobs:
-  labelRobot:
+  pullRequestTargetRobot:
    permissions:
      contents: read
      pull-requests: write
    runs-on: ubuntu-latest
+    timeout-minutes: 10
    steps:
      - name: "Checkout ${{ github.ref }}"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          persist-credentials: false
          submodules: true
@ -39,3 +40,8 @@ jobs:
          repo-token: "${{ secrets.GITHUB_TOKEN }}"
          configuration-path: .github/actions/labeler/labeler.yml
          sync-labels: true
+
+      - name: "Auto assign in pull request"
+        uses: ./.github/actions/auto-assign-action
+        with:
+          configuration-path: .github/actions/auto-assign/auto-assign.yml
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@ -24,7 +24,8 @@ on:
      - '**/*.md'
      - 'dolphinscheduler-ui'
    branches:
-      - dev
+      - '[0-9]+.[0-9]+.[0-9]+-prepare'
+      - '[0-9]+.[0-9]+.[0-9]+-release'

 env:
  LOG_DIR: /tmp/dolphinscheduler
@ -40,7 +41,7 @@ jobs:
    outputs:
      not-ignore: ${{ steps.filter.outputs.not-ignore }}
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
        id: filter
        with:
@ -57,7 +58,7 @@ jobs:
        java: ['8', '11']
    timeout-minutes: 45
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - name: Sanity Check
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,7 @@
 .target
 .idea/
 !.idea/icon.png
+!.idea/vcs.xml
 .run/
 target/
 dist/
--- a/.gitmodules
+++ b/.gitmodules
@ -21,3 +21,7 @@
 [submodule ".github/actions/translate-on-issue"]
 	path = .github/actions/translate-on-issue
 	url = https://github.com/xingchun-chen/translation-helper
+[submodule ".github/actions/auto-assign-action"]
+	path = .github/actions/auto-assign-action
+	url = https://github.com/kentaro-m/auto-assign-action.git
+	branch = 288f36f
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#(\d+)" />
+          <option name="linkRegexp" value="https://github.com/apache/dolphinscheduler/issues/$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@ -51,5 +51,6 @@ header:
    - '**/banner.txt'
    - '.terraform.lock.hcl'
    - deploy/kubernetes/dolphinscheduler/README.md.gotmpl
+    - .idea/vcs.xml

  comment: on-failure
--- a/deploy/kubernetes/dolphinscheduler/README.md
+++ b/deploy/kubernetes/dolphinscheduler/README.md
@ -14,6 +14,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 |-----|------|---------|-------------|
 | alert.affinity | object | `{}` | Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints. More info: [node-affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) |
 | alert.annotations | object | `{}` | You can use annotations to attach arbitrary non-identifying metadata to objects. Clients such as tools and libraries can retrieve this metadata. |
+| alert.customizedConfig | object | `{}` | configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml |
+| alert.enableCustomizedConfig | bool | `false` | enable configure custom config |
 | alert.enabled | bool | `true` | Enable or disable the Alert-Server component |
 | alert.env.JAVA_OPTS | string | `"-Xms512m -Xmx512m -Xmn256m"` | The jvm options for alert server |
 | alert.livenessProbe | object | `{"enabled":true,"failureThreshold":"3","initialDelaySeconds":"30","periodSeconds":"30","successThreshold":"1","timeoutSeconds":"5"}` | Periodic probe of container liveness. Container will be restarted if the probe fails. More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) |
@ -52,6 +54,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | alert.tolerations | list | `[]` | Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission, effectively unioning the set of nodes tolerated by the pod and the RuntimeClass. |
 | api.affinity | object | `{}` | Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints. More info: [node-affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) |
 | api.annotations | object | `{}` | You can use annotations to attach arbitrary non-identifying metadata to objects. Clients such as tools and libraries can retrieve this metadata. |
+| api.customizedConfig | object | `{}` | configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-api/src/main/resources/application.yaml |
+| api.enableCustomizedConfig | bool | `false` | enable configure custom config |
 | api.enabled | bool | `true` | Enable or disable the API-Server component |
 | api.env.JAVA_OPTS | string | `"-Xms512m -Xmx512m -Xmn256m"` | The jvm options for api server |
 | api.livenessProbe | object | `{"enabled":true,"failureThreshold":"3","initialDelaySeconds":"30","periodSeconds":"30","successThreshold":"1","timeoutSeconds":"5"}` | Periodic probe of container liveness. Container will be restarted if the probe fails. More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) |
@ -120,6 +124,12 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | conf.auto | bool | `false` | auto restart, if true, all components will be restarted automatically after the common configuration is updated. if false, you need to restart the components manually. default is false |
 | conf.common."alert.rpc.port" | int | `50052` | rpc port |
 | conf.common."appId.collect" | string | `"log"` | way to collect applicationId: log, aop |
+| conf.common."aws.credentials.provider.type" | string | `"AWSStaticCredentialsProvider"` |  |
+| conf.common."aws.s3.access.key.id" | string | `"minioadmin"` | The AWS access key. if resource.storage.type=S3, and credentials.provider.type is AWSStaticCredentialsProvider. This configuration is required |
+| conf.common."aws.s3.access.key.secret" | string | `"minioadmin"` | The AWS secret access key. if resource.storage.type=S3, and credentials.provider.type is AWSStaticCredentialsProvider. This configuration is required |
+| conf.common."aws.s3.bucket.name" | string | `"dolphinscheduler"` | The name of the bucket. You need to create them by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share a single namespace; ensure the bucket is given a unique name. |
+| conf.common."aws.s3.endpoint" | string | `"http://minio:9000"` | You need to set this parameter when private cloud s3. If S3 uses public cloud, you only need to set resource.aws.region or set to the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn |
+| conf.common."aws.s3.region" | string | `"ca-central-1"` | The AWS Region to use. if resource.storage.type=S3, This configuration is required |
 | conf.common."conda.path" | string | `"/opt/anaconda3/etc/profile.d/conda.sh"` | set path of conda.sh |
 | conf.common."data-quality.jar.dir" | string | `nil` | data quality option |
 | conf.common."data.basedir.path" | string | `"/tmp/dolphinscheduler"` | user data local directory path, please make sure the directory exists and have read write permissions |
@ -138,11 +148,6 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | conf.common."resource.alibaba.cloud.oss.bucket.name" | string | `"dolphinscheduler"` | oss bucket name, required if you set resource.storage.type=OSS |
 | conf.common."resource.alibaba.cloud.oss.endpoint" | string | `"https://oss-cn-hangzhou.aliyuncs.com"` | oss bucket endpoint, required if you set resource.storage.type=OSS |
 | conf.common."resource.alibaba.cloud.region" | string | `"cn-hangzhou"` | alibaba cloud region, required if you set resource.storage.type=OSS |
-| conf.common."resource.aws.access.key.id" | string | `"minioadmin"` | The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required |
-| conf.common."resource.aws.region" | string | `"ca-central-1"` | The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required |
-| conf.common."resource.aws.s3.bucket.name" | string | `"dolphinscheduler"` | The name of the bucket. You need to create them by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share a single namespace; ensure the bucket is given a unique name. |
-| conf.common."resource.aws.s3.endpoint" | string | `"http://minio:9000"` | You need to set this parameter when private cloud s3. If S3 uses public cloud, you only need to set resource.aws.region or set to the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn |
-| conf.common."resource.aws.secret.access.key" | string | `"minioadmin"` | The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required |
 | conf.common."resource.azure.client.id" | string | `"minioadmin"` | azure storage account name, required if you set resource.storage.type=ABS |
 | conf.common."resource.azure.client.secret" | string | `"minioadmin"` | azure storage account key, required if you set resource.storage.type=ABS |
 | conf.common."resource.azure.subId" | string | `"minioadmin"` | azure storage subId, required if you set resource.storage.type=ABS |
@ -158,6 +163,7 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | conf.common."yarn.application.status.address" | string | `"http://ds1:%s/ws/v1/cluster/apps/%s"` | if resourcemanager HA is enabled or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ds1 to actual resourcemanager hostname |
 | conf.common."yarn.job.history.status.address" | string | `"http://ds1:19888/ws/v1/history/mapreduce/jobs/%s"` | job history status url when application number threshold is reached(default 10000, maybe it was set to 1000) |
 | conf.common."yarn.resourcemanager.ha.rm.ids" | string | `"192.168.xx.xx,192.168.xx.xx"` | if resourcemanager HA is enabled, please set the HA IPs; if resourcemanager is single, keep this value empty |
+| datasource.profile | string | `"postgresql"` | The profile of datasource |
 | externalDatabase.database | string | `"dolphinscheduler"` | The database of external database |
 | externalDatabase.driverClassName | string | `"org.postgresql.Driver"` | The driverClassName of external database |
 | externalDatabase.enabled | bool | `false` | If exists external database, and set postgresql.enable value to false. external database will be used, otherwise Dolphinscheduler's internal database will be used. |
@ -189,6 +195,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | initImage.pullPolicy | string | `"IfNotPresent"` | Image pull policy. Options: Always, Never, IfNotPresent |
 | master.affinity | object | `{}` | Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints. More info: [node-affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) |
 | master.annotations | object | `{}` | You can use annotations to attach arbitrary non-identifying metadata to objects. Clients such as tools and libraries can retrieve this metadata. |
+| master.customizedConfig | object | `{}` | configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-master/src/main/resources/application.yaml |
+| master.enableCustomizedConfig | bool | `false` | enable configure custom config |
 | master.enabled | bool | `true` | Enable or disable the Master component |
 | master.env.JAVA_OPTS | string | `"-Xms1g -Xmx1g -Xmn512m"` | The jvm options for master server |
 | master.env.MASTER_DISPATCH_TASK_NUM | string | `"3"` | Master dispatch task number per batch |
@ -295,6 +303,8 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | timezone | string | `"Asia/Shanghai"` | World time and date for cities in all time zones |
 | worker.affinity | object | `{}` | Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints. More info: [node-affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) |
 | worker.annotations | object | `{}` | You can use annotations to attach arbitrary non-identifying metadata to objects. Clients such as tools and libraries can retrieve this metadata. |
+| worker.customizedConfig | object | `{}` | configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-worker/src/main/resources/application.yaml |
+| worker.enableCustomizedConfig | bool | `false` | enable configure custom config |
 | worker.enabled | bool | `true` | Enable or disable the Worker component |
 | worker.env.DEFAULT_TENANT_ENABLED | bool | `false` | If set true, will use worker bootstrap user as the tenant to execute task when the tenant is `default`; |
 | worker.env.WORKER_EXEC_THREADS | string | `"100"` | Worker execute thread number to limit task instances |
@ -306,7 +316,6 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | worker.env.WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_CPU_USAGE_PERCENTAGE_THRESHOLDS | float | `0.7` | Worker max system cpu usage, when the worker's system cpu usage is smaller then this value, worker server can be dispatched tasks. |
 | worker.env.WORKER_SERVER_LOAD_PROTECTION_MAX_SYSTEM_MEMORY_USAGE_PERCENTAGE_THRESHOLDS | float | `0.7` | Worker max memory usage , when the worker's memory usage is smaller then this value, worker server can be dispatched tasks. |
 | worker.env.WORKER_TENANT_CONFIG_AUTO_CREATE_TENANT_ENABLED | bool | `true` | tenant corresponds to the user of the system, which is used by the worker to submit the job. If system does not have this user, it will be automatically created after the parameter worker.tenant.auto.create is true. |
-| worker.env.WORKER_TENANT_CONFIG_DISTRIBUTED_TENANT | bool | `false` | Scenes to be used for distributed users. For example, users created by FreeIpa are stored in LDAP. This parameter only applies to Linux, When this parameter is true, worker.tenant.auto.create has no effect and will not automatically create tenants. |
 | worker.keda.advanced | object | `{}` | Specify HPA related options |
 | worker.keda.cooldownPeriod | int | `30` | How many seconds KEDA will wait before scaling to zero. Note that HPA has a separate cooldown period for scale-downs |
 | worker.keda.enabled | bool | `false` | Enable or disable the Keda component |
@ -314,7 +323,6 @@ Please refer to the [Quick Start in Kubernetes](../../../docs/docs/en/guide/inst
 | worker.keda.minReplicaCount | int | `0` | Minimum number of workers created by keda |
 | worker.keda.namespaceLabels | object | `{}` | Keda namespace labels |
 | worker.keda.pollingInterval | int | `5` | How often KEDA polls the DolphinScheduler DB to report new scale requests to the HPA |
-| worker.livenessProbe | object | `{"enabled":true,"failureThreshold":"3","initialDelaySeconds":"30","periodSeconds":"30","successThreshold":"1","timeoutSeconds":"5"}` | Periodic probe of container liveness. Container will be restarted if the probe fails. More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) |
 | worker.livenessProbe.enabled | bool | `true` | Turn on and off liveness probe |
 | worker.livenessProbe.failureThreshold | string | `"3"` | Minimum consecutive failures for the probe |
 | worker.livenessProbe.initialDelaySeconds | string | `"30"` | Delay before liveness probe is initiated |
--- a/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
+++ b/deploy/kubernetes/dolphinscheduler/templates/_helpers.tpl
@ -51,7 +51,6 @@ Create a default common labels.
 {{- define "dolphinscheduler.common.labels" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- end -}}

 {{/*
--- a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-{{- if and .Values.alert.enabled }}
+{{- if .Values.alert.enableCustomizedConfig }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@ -23,83 +23,8 @@ metadata:
    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-alert
    {{- include "dolphinscheduler.alert.labels" . | nindent 4 }}
 data:
-  application.yaml: |
-    spring:
-      profiles:
-        active: {{ .Values.datasource.profile }}
-      jackson:
-        time-zone: UTC
-        date-format: "yyyy-MM-dd HH:mm:ss"
-      banner:
-        charset: UTF-8
-      datasource:
-        profile: postgresql
-        config:
-          driver-class-name: org.postgresql.Driver
-          url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
-          username: root
-          password: root
-          hikari:
-            connection-test-query: select 1
-            pool-name: DolphinScheduler
-    
-    # Mybatis-plus configuration, you don't need to change it
-    mybatis-plus:
-      mapper-locations: classpath:org/apache/dolphinscheduler/dao/mapper/*Mapper.xml
-      type-aliases-package: org.apache.dolphinscheduler.dao.entity
-      configuration:
-        cache-enabled: false
-        call-setters-on-nulls: true
-        map-underscore-to-camel-case: true
-        jdbc-type-for-null: NULL
-      global-config:
-        db-config:
-          id-type: auto
-        banner: false
-    
-    server:
-      port: 50053
-    
-    management:
-      endpoints:
-        web:
-          exposure:
-            include: health,metrics,prometheus
-      endpoint:
-        health:
-          enabled: true
-          show-details: always
-      health:
-        db:
-          enabled: true
-        defaults:
-          enabled: false
-      metrics:
-        tags:
-          application: ${spring.application.name}
-    
-    alert:
-      port: 50052
-      # Mark each alert of alert server if late after x milliseconds as failed.
-      # Define value is (0 = infinite), and alert server would be waiting alert result.
-      wait-timeout: 0
-      max-heartbeat-interval: 60s
-      query_alert_threshold: 100
-    
-    registry:
-      type: zookeeper
-      zookeeper:
-        namespace: dolphinscheduler
-        connect-string: localhost:2181
-        retry-policy:
-          base-sleep-time: 60ms
-          max-sleep: 300ms
-          max-retries: 5
-        session-timeout: 30s
-        connection-timeout: 9s
-        block-until-connected: 600ms
-        digest: ~
-    
-    metrics:
-      enabled: true
-{{- end }}
+{{- range $path, $config := .Values.alert.customizedConfig }}
+  {{ $path }}: |
+{{ $config | indent 4 -}}
+{{- end -}}
+{{- end -}}
--- a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-{{- if and .Values.api.enabled }}
+{{- if .Values.api.enableCustomizedConfig }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@ -23,223 +23,8 @@ metadata:
    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-api
    {{- include "dolphinscheduler.api.labels" . | nindent 4 }}
 data:
-  application.yaml: |
-    server:
-      port: 12345
-      servlet:
-        session:
-          timeout: 120m
-        context-path: /dolphinscheduler/
-      compression:
-        enabled: true
-        mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml
-      jetty:
-        max-http-form-post-size: 5000000
-        accesslog:
-          enabled: true
-          custom-format: '%{client}a - %u %t "%r" %s %O %{ms}Tms'
-    
-    spring:
-      profiles:
-        active: {{ .Values.datasource.profile }}
-      banner:
-        charset: UTF-8
-      jackson:
-        time-zone: UTC
-        date-format: "yyyy-MM-dd HH:mm:ss"
-      servlet:
-        multipart:
-          max-file-size: 1024MB
-          max-request-size: 1024MB
-      messages:
-        basename: i18n/messages
-      datasource:
-        profile: postgresql
-        config:
-          driver-class-name: org.postgresql.Driver
-          url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
-          username: root
-          password: root
-          hikari:
-            connection-test-query: select 1
-            pool-name: DolphinScheduler
-      quartz:
-        auto-startup: false
-        job-store-type: jdbc
-        jdbc:
-          initialize-schema: never
-        properties:
-          org.quartz.jobStore.isClustered: true
-          org.quartz.jobStore.class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
-          org.quartz.scheduler.instanceId: AUTO
-          org.quartz.jobStore.tablePrefix: QRTZ_
-          org.quartz.jobStore.acquireTriggersWithinLock: true
-          org.quartz.scheduler.instanceName: DolphinScheduler
-          org.quartz.threadPool.class: org.apache.dolphinscheduler.scheduler.quartz.QuartzZeroSizeThreadPool
-          org.quartz.jobStore.useProperties: false
-          org.quartz.jobStore.misfireThreshold: 60000
-          org.quartz.scheduler.makeSchedulerThreadDaemon: true
-          org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-          org.quartz.jobStore.clusterCheckinInterval: 5000
-          org.quartz.scheduler.batchTriggerAcquisitionMaxCount: 1
-      mvc:
-        pathmatch:
-          matching-strategy: ANT_PATH_MATCHER
-        static-path-pattern: /static/**
-    springdoc:
-      swagger-ui:
-        path: /swagger-ui.html
-      packages-to-scan: org.apache.dolphinscheduler.api
-    
-    # Mybatis-plus configuration, you don't need to change it
-    mybatis-plus:
-      mapper-locations: classpath:org/apache/dolphinscheduler/dao/mapper/*Mapper.xml
-      type-aliases-package: org.apache.dolphinscheduler.dao.entity
-      configuration:
-        cache-enabled: false
-        call-setters-on-nulls: true
-        map-underscore-to-camel-case: true
-        jdbc-type-for-null: NULL
-      global-config:
-        db-config:
-          id-type: auto
-        banner: false
-    
-    management:
-      endpoints:
-        web:
-          exposure:
-            include: health,metrics,prometheus
-      endpoint:
-        health:
-          enabled: true
-          show-details: always
-      health:
-        db:
-          enabled: true
-        defaults:
-          enabled: false
-      metrics:
-        tags:
-          application: ${spring.application.name}
-    
-    registry:
-      type: zookeeper
-      zookeeper:
-        namespace: dolphinscheduler
-        connect-string: localhost:2181
-        retry-policy:
-          base-sleep-time: 60ms
-          max-sleep: 300ms
-          max-retries: 5
-        session-timeout: 60s
-        connection-timeout: 15s
-        block-until-connected: 15s
-        digest: ~
-    
-    api:
-      audit-enable: false
-      # Traffic control, if you turn on this config, the maximum number of request/s will be limited.
-      # global max request number per second
-      # default tenant-level max request number
-      traffic-control:
-        global-switch: false
-        max-global-qps-rate: 300
-        tenant-switch: false
-        default-tenant-qps-rate: 10
-          #customize-tenant-qps-rate:
-        # eg.
-        #tenant1: 11
-        #tenant2: 20
-      python-gateway:
-        # Weather enable python gateway server or not. The default value is false.
-        enabled: false
-        # Authentication token for connection from python api to python gateway server. Should be changed the default value
-        # when you deploy in public network.
-        auth-token: jwUDzpLsNKEFER4*a8gruBH_GsAurNxU7A@Xc
-        # The address of Python gateway server start. Set its value to `0.0.0.0` if your Python API run in different
-        # between Python gateway server. It could be be specific to other address like `127.0.0.1` or `localhost`
-        gateway-server-address: 0.0.0.0
-        # The port of Python gateway server start. Define which port you could connect to Python gateway server from
-        # Python API side.
-        gateway-server-port: 25333
-        # The address of Python callback client.
-        python-address: 127.0.0.1
-        # The port of Python callback client.
-        python-port: 25334
-        # Close connection of socket server if no other request accept after x milliseconds. Define value is (0 = infinite),
-        # and socket server would never close even though no requests accept
-        connect-timeout: 0
-        # Close each active connection of socket server if python program not active after x milliseconds. Define value is
-        # (0 = infinite), and socket server would never close even though no requests accept
-        read-timeout: 0
-    
-    metrics:
-      enabled: true
-    
-    security:
-      authentication:
-        # Authentication types (supported types: PASSWORD,LDAP,CASDOOR_SSO)
-        type: PASSWORD
-        # IF you set type `LDAP`, below config will be effective
-        ldap:
-          # ldap server config
-          urls: ldap://ldap.forumsys.com:389/
-          base-dn: dc=example,dc=com
-          username: cn=read-only-admin,dc=example,dc=com
-          password: password
-          user:
-            # admin userId when you use LDAP login
-            admin: read-only-admin
-            identity-attribute: uid
-            email-attribute: mail
-            # action when ldap user is not exist (supported types: CREATE,DENY)
-            not-exist-action: CREATE
-          ssl:
-            enable: false
-            # jks file absolute path && password
-            trust-store: "/ldapkeystore.jks"
-            trust-store-password: "password"
-        casdoor:
-          user:
-            admin: ""
-        oauth2:
-          enable: false
-          provider:
-            github:
-              authorizationUri: ""
-              redirectUri: ""
-              clientId: ""
-              clientSecret: ""
-              tokenUri: ""
-              userInfoUri: ""
-              callbackUrl: ""
-              iconUri: ""
-              provider: github
-            google:
-              authorizationUri: ""
-              redirectUri: ""
-              clientId: ""
-              clientSecret: ""
-              tokenUri: ""
-              userInfoUri: ""
-              callbackUrl: ""
-              iconUri: ""
-              provider: google
-    casdoor:
-      # Your Casdoor server url
-      endpoint: ""
-      client-id: ""
-      client-secret: ""
-      # The certificate may be multi-line, you can use `|-` for ease
-      certificate: ""
-      # Your organization name added in Casdoor
-      organization-name: ""
-      # Your application name added in Casdoor
-      application-name: ""
-      # Doplhinscheduler login url
-      redirect-url: ""
-{{- end }}
-
-
-
+{{- range $path, $config := .Values.api.customizedConfig }}
+  {{ $path }}: |
+{{ $config | indent 4 -}}
+{{- end -}}
+{{- end -}}
--- a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-{{- if and .Values.master.enabled }}
+{{- if .Values.master.enableCustomizedConfig }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@ -23,138 +23,8 @@ metadata:
    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-master
    {{- include "dolphinscheduler.master.labels" . | nindent 4 }}
 data:
-  application.yaml: |
-    spring:
-      profiles:
-        active: {{ .Values.datasource.profile }}
-      banner:
-        charset: UTF-8
-      jackson:
-        time-zone: UTC
-        date-format: "yyyy-MM-dd HH:mm:ss"
-      datasource:
-        profile: postgresql
-        config:
-          driver-class-name: org.postgresql.Driver
-          url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
-          username: root
-          password: root
-          hikari:
-            connection-test-query: select 1
-            pool-name: DolphinScheduler
-      quartz:
-        job-store-type: jdbc
-        jdbc:
-          initialize-schema: never
-        properties:
-          org.quartz.threadPool.threadPriority: 5
-          org.quartz.jobStore.isClustered: true
-          org.quartz.jobStore.class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
-          org.quartz.scheduler.instanceId: AUTO
-          org.quartz.jobStore.tablePrefix: QRTZ_
-          org.quartz.jobStore.acquireTriggersWithinLock: true
-          org.quartz.scheduler.instanceName: DolphinScheduler
-          org.quartz.threadPool.class: org.quartz.simpl.SimpleThreadPool
-          org.quartz.jobStore.useProperties: false
-          org.quartz.threadPool.makeThreadsDaemons: true
-          org.quartz.threadPool.threadCount: 25
-          org.quartz.jobStore.misfireThreshold: 60000
-          org.quartz.scheduler.batchTriggerAcquisitionMaxCount: 1
-          org.quartz.scheduler.makeSchedulerThreadDaemon: true
-          org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-          org.quartz.jobStore.clusterCheckinInterval: 5000
-    
-    # Mybatis-plus configuration, you don't need to change it
-    mybatis-plus:
-      mapper-locations: classpath:org/apache/dolphinscheduler/dao/mapper/*Mapper.xml
-      type-aliases-package: org.apache.dolphinscheduler.dao.entity
-      configuration:
-        cache-enabled: false
-        call-setters-on-nulls: true
-        map-underscore-to-camel-case: true
-        jdbc-type-for-null: NULL
-      global-config:
-        db-config:
-          id-type: auto
-        banner: false
-    
-    
-    registry:
-      type: zookeeper
-      zookeeper:
-        namespace: dolphinscheduler
-        connect-string: localhost:2181
-        retry-policy:
-          base-sleep-time: 60ms
-          max-sleep: 300ms
-          max-retries: 5
-        session-timeout: 30s
-        connection-timeout: 9s
-        block-until-connected: 600ms
-        digest: ~
-    
-    master:
-      listen-port: 5678
-      # master fetch command num
-      fetch-command-num: 10
-      # master prepare execute thread number to limit handle commands in parallel
-      pre-exec-threads: 10
-      # master execute thread number to limit process instances in parallel
-      exec-threads: 100
-      # master dispatch task number per batch, if all the tasks dispatch failed in a batch, will sleep 1s.
-      dispatch-task-number: 3
-      # master host selector to select a suitable worker, default value: LowerWeight. Optional values include random, round_robin, lower_weight
-      host-selector: lower_weight
-      # master heartbeat interval
-      max-heartbeat-interval: 10s
-      # master commit task retry times
-      task-commit-retry-times: 5
-      # master commit task interval
-      task-commit-interval: 1s
-      state-wheel-interval: 5s
-      server-load-protection:
-        # If set true, will open master overload protection
-        enabled: true
-        # Master max system cpu usage, when the master's system cpu usage is smaller then this value, master server can execute workflow.
-        max-system-cpu-usage-percentage-thresholds: 0.7
-        # Master max jvm cpu usage, when the master's jvm cpu usage is smaller then this value, master server can execute workflow.
-        max-jvm-cpu-usage-percentage-thresholds: 0.7
-        # Master max System memory usage , when the master's system memory usage is smaller then this value, master server can execute workflow.
-        max-system-memory-usage-percentage-thresholds: 0.7
-        # Master max disk usage , when the master's disk usage is smaller then this value, master server can execute workflow.
-        max-disk-usage-percentage-thresholds: 0.7
-      # failover interval, the unit is minute
-      failover-interval: 10m
-      # kill yarn / k8s application when failover taskInstance, default true
-      kill-application-when-task-failover: true
-      registry-disconnect-strategy:
-        # The disconnect strategy: stop, waiting
-        strategy: waiting
-        # The max waiting time to reconnect to registry if you set the strategy to waiting
-        max-waiting-time: 100s
-      worker-group-refresh-interval: 10s
-    
-    server:
-      port: 5679
-    
-    management:
-      endpoints:
-        web:
-          exposure:
-            include: health,metrics,prometheus
-      endpoint:
-        health:
-          enabled: true
-          show-details: always
-      health:
-        db:
-          enabled: true
-        defaults:
-          enabled: false
-      metrics:
-        tags:
-          application: ${spring.application.name}
-    
-    metrics:
-      enabled: true
-{{- end }}
+{{- range $path, $config := .Values.master.customizedConfig }}
+  {{ $path }}: |
+{{ $config | indent 4 -}}
+{{- end -}}
+{{- end -}}
--- a/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-{{- if and .Values.worker.enabled }}
+{{- if .Values.worker.enableCustomizedConfig }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@ -23,86 +23,8 @@ metadata:
    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-worker
    {{- include "dolphinscheduler.worker.labels" . | nindent 4 }}
 data:
-  application.yaml: |
-    spring:
-      banner:
-        charset: UTF-8
-      jackson:
-        time-zone: UTC
-        date-format: "yyyy-MM-dd HH:mm:ss"
-      autoconfigure:
-        exclude:
-          - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-    
-    registry:
-      type: zookeeper
-      zookeeper:
-        namespace: dolphinscheduler
-        connect-string: localhost:2181
-        retry-policy:
-          base-sleep-time: 60ms
-          max-sleep: 300ms
-          max-retries: 5
-        session-timeout: 30s
-        connection-timeout: 9s
-        block-until-connected: 600ms
-        digest: ~
-    
-    worker:
-      # worker listener port
-      listen-port: 1234
-      # worker execute thread number to limit task instances in parallel
-      exec-threads: 100
-      # worker heartbeat interval
-      max-heartbeat-interval: 10s
-      # worker host weight to dispatch tasks, default value 100
-      host-weight: 100
-      server-load-protection:
-        # If set true, will open worker overload protection
-        enabled: true
-        # Worker max system cpu usage, when the worker's system cpu usage is smaller then this value, worker server can be dispatched tasks.
-        max-system-cpu-usage-percentage-thresholds: 0.7
-        # Worker max jvm cpu usage, when the worker's jvm cpu usage is smaller then this value, worker server can be dispatched tasks.
-        max-jvm-cpu-usage-percentage-thresholds: 0.7
-        # Worker max System memory usage , when the master's system memory usage is smaller then this value, master server can execute workflow.
-        max-system-memory-usage-percentage-thresholds: 0.7
-        # Worker max disk usage , when the worker's disk usage is smaller then this value, worker server can be dispatched tasks.
-        max-disk-usage-percentage-thresholds: 0.7
-      registry-disconnect-strategy:
-        # The disconnect strategy: stop, waiting
-        strategy: waiting
-        # The max waiting time to reconnect to registry if you set the strategy to waiting
-        max-waiting-time: 100s
-      task-execute-threads-full-policy: REJECT
-      tenant-config:
-        # tenant corresponds to the user of the system, which is used by the worker to submit the job. If system does not have this user, it will be automatically created after the parameter worker.tenant.auto.create is true.
-        auto-create-tenant-enabled: true
-        # Scenes to be used for distributed users. For example, users created by FreeIpa are stored in LDAP. This parameter only applies to Linux, When this parameter is true, auto-create-tenant-enabled has no effect and will not automatically create tenants.
-        distributed-tenant-enabled: false
-        # If set true, will use worker bootstrap user as the tenant to execute task when the tenant is `default`.
-        default-tenant-enabled: false
-    
-    server:
-      port: 1235
-    
-    management:
-      endpoints:
-        web:
-          exposure:
-            include: health,metrics,prometheus
-      endpoint:
-        health:
-          enabled: true
-          show-details: always
-      health:
-        db:
-          enabled: true
-        defaults:
-          enabled: false
-      metrics:
-        tags:
-          application: ${spring.application.name}
-    
-    metrics:
-      enabled: true
-{{- end }}
+{{- range $path, $config := .Values.worker.customizedConfig }}
+  {{ $path }}: |
+{{ $config | indent 4 -}}
+{{- end -}}
+{{- end -}}
--- a/deploy/kubernetes/dolphinscheduler/templates/configmap.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/configmap.yaml
@ -37,7 +37,7 @@ data:
  {{- range $key, $value := index .Values.conf "common" }}
    {{- if and $.Values.minio.enabled }}
    {{- if eq $key "resource.storage.type" }}{{ $value = "S3" }}{{- end }}
-    {{- if eq $key "resource.aws.s3.endpoint" }}{{ $value = print "http://" (include "dolphinscheduler.minio.fullname" $) ":9000" }}{{- end }}
+    {{- if eq $key "aws.s3.endpoint" }}{{ $value = print "http://" (include "dolphinscheduler.minio.fullname" $) ":9000" }}{{- end }}
    {{- end }}
    {{ $key }}={{ $value }}
  {{- end }}
--- a/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
@ -115,9 +115,11 @@ spec:
            - name: config-volume
              mountPath: /opt/dolphinscheduler/conf/common.properties
              subPath: common.properties
+            {{- if .Values.alert.enableCustomizedConfig }}
            - name: alert-config-volume
              mountPath: /opt/dolphinscheduler/conf/application.yaml
              subPath: application.yaml
+            {{- end }}
      volumes:
        - name: {{ include "dolphinscheduler.fullname" . }}-alert
          {{- if .Values.alert.persistentVolumeClaim.enabled }}
@ -129,7 +131,9 @@ spec:
        - name: config-volume
          configMap:
            name: {{ include "dolphinscheduler.fullname" . }}-configs
+        {{- if .Values.alert.enableCustomizedConfig }}
        - name: alert-config-volume
          configMap:
-            name: { { include "dolphinscheduler.fullname" . } }-alert
+            name: {{ include "dolphinscheduler.fullname" . }}-alert
+        {{- end }}
 {{- end }}
--- a/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
@ -121,9 +121,11 @@ spec:
              mountPath: /opt/dolphinscheduler/conf/task-type-config.yaml
              subPath: task-type-config.yaml
            {{- end }}
+            {{- if .Values.api.enableCustomizedConfig }}
            - name: api-config-volume
              mountPath: /opt/dolphinscheduler/conf/application.yaml
              subPath: application.yaml
+            {{- end }}
            {{- include "dolphinscheduler.sharedStorage.volumeMount" . | nindent 12 }}
            {{- include "dolphinscheduler.fsFileResource.volumeMount" . | nindent 12 }}
            {{- include "dolphinscheduler.ldap.ssl.volumeMount" . | nindent 12 }}
@ -139,9 +141,11 @@ spec:
        - name: config-volume
          configMap:
            name: {{ include "dolphinscheduler.fullname" . }}-configs
+        {{- if .Values.api.enableCustomizedConfig }}
        - name: api-config-volume
          configMap:
-            name: { { include "dolphinscheduler.fullname" . } }-api
+            name: {{ include "dolphinscheduler.fullname" . }}-api
+        {{- end }}
        {{- include "dolphinscheduler.sharedStorage.volume" . | nindent 8 }}
        {{- include "dolphinscheduler.fsFileResource.volume" . | nindent 8 }}
        {{- include "dolphinscheduler.ldap.ssl.volume" . | nindent 8 }}
--- a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
@ -109,9 +109,11 @@ spec:
          volumeMounts:
            - mountPath: "/opt/dolphinscheduler/logs"
              name: {{ include "dolphinscheduler.fullname" . }}-master
+            {{- if .Values.master.enableCustomizedConfig }}
            - name: master-config-volume
              mountPath: /opt/dolphinscheduler/conf/application.yaml
              subPath: application.yaml
+            {{- end }}
            {{- include "dolphinscheduler.sharedStorage.volumeMount" . | nindent 12 }}
            - name: config-volume
              mountPath: /opt/dolphinscheduler/conf/common.properties
@ -125,9 +127,11 @@ spec:
          {{- else }}
          emptyDir: {}
          {{- end }}
+        {{- if .Values.master.enableCustomizedConfig }}
        - name: master-config-volume
          configMap:
-            name: { { include "dolphinscheduler.fullname" . } }-master
+            name: {{ include "dolphinscheduler.fullname" . }}-master
+        {{- end }}
        {{- include "dolphinscheduler.sharedStorage.volume" . | nindent 8 }}
        - name: config-volume
          configMap:
--- a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
@ -111,9 +111,11 @@ spec:
              name: {{ include "dolphinscheduler.fullname" . }}-worker-data
            - mountPath: "/opt/dolphinscheduler/logs"
              name: {{ include "dolphinscheduler.fullname" . }}-worker-logs
+            {{- if .Values.worker.enableCustomizedConfig }}
            - name: worker-config-volume
              mountPath: /opt/dolphinscheduler/conf/application.yaml
              subPath: application.yaml
+            {{- end }}
            - name: config-volume
              mountPath: /opt/dolphinscheduler/conf/common.properties
              subPath: common.properties
@ -142,9 +144,11 @@ spec:
        - name: {{ include "dolphinscheduler.fullname" . }}-worker-logs
          emptyDir: {}
        {{- end }}
+        {{- if .Values.worker.enableCustomizedConfig }}
        - name: worker-config-volume
          configMap:
-            name: { { include "dolphinscheduler.fullname" . } }-worker
+            name: {{ include "dolphinscheduler.fullname" . }}-worker
+        {{- end }}
        - name: config-volume
          configMap:
            name: {{ include "dolphinscheduler.fullname" . }}-configs
--- a/deploy/kubernetes/dolphinscheduler/values.yaml
+++ b/deploy/kubernetes/dolphinscheduler/values.yaml
@ -49,6 +49,10 @@ image:
  # -- tools image
  tools: dolphinscheduler-tools

+datasource:
+  # -- The profile of datasource
+  profile: postgresql
+
 postgresql:
  # -- If not exists external PostgreSQL, by default, the DolphinScheduler will use a internal PostgreSQL
  enabled: true
@ -246,20 +250,25 @@ conf:
    # -- resource store on HDFS/S3 path, resource file will store to this base path, self configuration, please make sure the directory exists on hdfs and have read write permissions. "/dolphinscheduler" is recommended
    resource.storage.upload.base.path: /dolphinscheduler

-    # -- The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-    resource.aws.access.key.id: minioadmin
+    # The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
+    # AWSStaticCredentialsProvider: use the access key and secret key to authenticate
+    # InstanceProfileCredentialsProvider: use the IAM role to authenticate
+    aws.credentials.provider.type: AWSStaticCredentialsProvider

-    # -- The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-    resource.aws.secret.access.key: minioadmin
+    # -- The AWS access key. if resource.storage.type=S3, and credentials.provider.type is AWSStaticCredentialsProvider. This configuration is required
+    aws.s3.access.key.id: minioadmin

-    # -- The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-    resource.aws.region: ca-central-1
+    # -- The AWS secret access key. if resource.storage.type=S3, and credentials.provider.type is AWSStaticCredentialsProvider. This configuration is required
+    aws.s3.access.key.secret: minioadmin
+
+    # -- The AWS Region to use. if resource.storage.type=S3, This configuration is required
+    aws.s3.region: ca-central-1

    # -- The name of the bucket. You need to create them by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share a single namespace; ensure the bucket is given a unique name.
-    resource.aws.s3.bucket.name: dolphinscheduler
+    aws.s3.bucket.name: dolphinscheduler

    # -- You need to set this parameter when private cloud s3. If S3 uses public cloud, you only need to set resource.aws.region or set to the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn
-    resource.aws.s3.endpoint: http://minio:9000
+    aws.s3.endpoint: http://minio:9000

    # -- alibaba cloud access key id, required if you set resource.storage.type=OSS
    resource.alibaba.cloud.access.key.id: <your-access-key-id>
@ -440,7 +449,19 @@ master:
  #   requests:
  #     memory: "2Gi"
  #     cpu: "500m"
-
+  # -- enable configure custom config
+  enableCustomizedConfig: false
+  # -- configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-master/src/main/resources/application.yaml
+  customizedConfig: { }
+  #  customizedConfig:
+  #    application.yaml: |
+  #      profiles:
+  #        active: postgresql
+  #      banner:
+  #        charset: UTF-8
+  #      jackson:
+  #        time-zone: UTC
+  #        date-format: "yyyy-MM-dd HH:mm:ss"
  # -- Periodic probe of container liveness. Container will be restarted if the probe fails.
  # More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes)
  livenessProbe:
@ -569,6 +590,17 @@ worker:

  # -- Periodic probe of container liveness. Container will be restarted if the probe fails.
  # More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes)
+  # -- enable configure custom config
+  enableCustomizedConfig: false
+  # -- configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-worker/src/main/resources/application.yaml
+  customizedConfig: { }
+#  customizedConfig:
+#    application.yaml: |
+#      banner:
+#        charset: UTF-8
+#      jackson:
+#        time-zone: UTC
+#        date-format: "yyyy-MM-dd HH:mm:ss"
  livenessProbe:
    # -- Turn on and off liveness probe
    enabled: true
@ -645,8 +677,6 @@ worker:
    WORKER_HOST_WEIGHT: "100"
    # -- tenant corresponds to the user of the system, which is used by the worker to submit the job. If system does not have this user, it will be automatically created after the parameter worker.tenant.auto.create is true.
    WORKER_TENANT_CONFIG_AUTO_CREATE_TENANT_ENABLED: true
-    # -- Scenes to be used for distributed users. For example, users created by FreeIpa are stored in LDAP. This parameter only applies to Linux, When this parameter is true, worker.tenant.auto.create has no effect and will not automatically create tenants.
-    WORKER_TENANT_CONFIG_DISTRIBUTED_TENANT: false
    # -- If set true, will use worker bootstrap user as the tenant to execute task when the tenant is `default`;
    DEFAULT_TENANT_ENABLED: false

@ -733,7 +763,19 @@ alert:
  #   requests:
  #     memory: "1Gi"
  #     cpu: "500m"
-
+  # -- enable configure custom config
+  enableCustomizedConfig: false
+  # -- configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml
+  customizedConfig: { }
+  #  customizedConfig:
+  #    application.yaml: |
+  #      profiles:
+  #        active: postgresql
+  #      banner:
+  #        charset: UTF-8
+  #      jackson:
+  #        time-zone: UTC
+  #        date-format: "yyyy-MM-dd HH:mm:ss"
  # -- Periodic probe of container liveness. Container will be restarted if the probe fails.
  # More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes)
  livenessProbe:
@ -833,7 +875,19 @@ api:
  #   requests:
  #     memory: "1Gi"
  #     cpu: "500m"
-
+  # -- enable configure custom config
+  enableCustomizedConfig: false
+  # -- configure aligned with https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-api/src/main/resources/application.yaml
+  customizedConfig: { }
+  #  customizedConfig:
+  #    application.yaml: |
+  #      profiles:
+  #        active: postgresql
+  #      banner:
+  #        charset: UTF-8
+  #      jackson:
+  #        time-zone: UTC
+  #        date-format: "yyyy-MM-dd HH:mm:ss"
  # -- Periodic probe of container liveness. Container will be restarted if the probe fails.
  # More info: [container-probes](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes)
  livenessProbe:
--- a/docs/configs/docsdev.js
+++ b/docs/configs/docsdev.js
@ -145,10 +145,6 @@ export default {
                                title: 'Sqoop',
                                link: '/en-us/docs/dev/user_doc/guide/task/sqoop.html',
                            },
-                            {
-                                title: 'Pigeon',
-                                link: '/en-us/docs/dev/user_doc/guide/task/pigeon.html',
-                            },
                            {
                                title: 'Conditions',
                                link: '/en-us/docs/dev/user_doc/guide/task/conditions.html',
@ -432,10 +428,6 @@ export default {
                                title: 'File Manage',
                                link: '/en-us/docs/dev/user_doc/guide/resource/file-manage.html'
                            },
-                            {
-                                title: 'UDF Manage',
-                                link: '/en-us/docs/dev/user_doc/guide/resource/udf-manage.html'
-                            },
                            {
                                title: 'Task Group Manage',
                                link: '/en-us/docs/dev/user_doc/guide/resource/task-group.html'
@ -881,10 +873,6 @@ export default {
                                title: 'Sqoop',
                                link: '/zh-cn/docs/dev/user_doc/guide/task/sqoop.html',
                            },
-                            {
-                                title: 'Pigeon',
-                                link: '/zh-cn/docs/dev/user_doc/guide/task/pigeon.html',
-                            },
                            {
                                title: 'Conditions',
                                link: '/zh-cn/docs/dev/user_doc/guide/task/conditions.html',
@ -1153,10 +1141,6 @@ export default {
                                title: '文件管理',
                                link: '/zh-cn/docs/dev/user_doc/guide/resource/file-manage.html'
                            },
-                            {
-                                title: 'UDF 管理',
-                                link: '/zh-cn/docs/dev/user_doc/guide/resource/udf-manage.html'
-                            },
                            {
                                title: '任务组管理',
                                link: '/zh-cn/docs/dev/user_doc/guide/resource/task-group.html'
--- a/docs/docs/en/architecture/configuration.md
+++ b/docs/docs/en/architecture/configuration.md
@ -191,19 +191,21 @@ The default configuration is as follows:

 Note that DolphinScheduler also supports zookeeper related configuration through `bin/env/dolphinscheduler_env.sh`.

-For ETCD Registry, please see more details on [link](https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/README.md).
-For JDBC Registry, please see more details on [link](https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/README.md).
+For ETCD Registry, please see more details
+on [link](https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/README.md).
+For JDBC Registry, please see more details
+on [link](https://github.com/apache/dolphinscheduler/blob/dev/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/README.md).

 ### common.properties [hadoop、s3、yarn config properties]

 Currently, common.properties mainly configures Hadoop,s3a related configurations. Configuration file location:

-|    Service    |           Configuration file           |
-|---------------|----------------------------------------|
-| Master Server | `master-server/conf/common.properties` |
-| Api Server    | `api-server/conf/common.properties`    |
-| Worker Server | `worker-server/conf/common.properties` |
-| Alert Server  | `alert-server/conf/common.properties`  |
+|    Service    |                          Configuration file                           |
+|---------------|-----------------------------------------------------------------------|
+| Master Server | `master-server/conf/common.properties`                                |
+| Api Server    | `api-server/conf/common.properties`, `api-server/conf/aws.yaml`       |
+| Worker Server | `worker-server/conf/common.properties`, `worker-server/conf/aws.yaml` |
+| Alert Server  | `alert-server/conf/common.properties`                                 |

 The default configuration is as follows:

@ -212,10 +214,6 @@ The default configuration is as follows:
 | data.basedir.path                             | /tmp/dolphinscheduler                            | local directory used to store temp files                                                                                                                                                                                                                                                                                                                                                                                             |
 | resource.storage.type                         | NONE                                             | type of resource files: HDFS, S3, OSS, GCS, ABS, NONE                                                                                                                                                                                                                                                                                                                                                                                |
 | resource.upload.path                          | /dolphinscheduler                                | storage path of resource files                                                                                                                                                                                                                                                                                                                                                                                                       |
-| aws.access.key.id                             | minioadmin                                       | access key id of S3                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| aws.secret.access.key                         | minioadmin                                       | secret access key of S3                                                                                                                                                                                                                                                                                                                                                                                                              |
-| aws.region                                    | us-east-1                                        | region of S3                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| aws.s3.endpoint                               | http://minio:9000                                | endpoint of S3                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | hdfs.root.user                                | hdfs                                             | configure users with corresponding permissions if storage type is HDFS                                                                                                                                                                                                                                                                                                                                                               |
 | fs.defaultFS                                  | hdfs://mycluster:8020                            | If resource.storage.type=S3, then the request url would be similar to 's3a://dolphinscheduler'. Otherwise if resource.storage.type=HDFS and hadoop supports HA, copy core-site.xml and hdfs-site.xml into 'conf' directory                                                                                                                                                                                                           |
 | hadoop.security.authentication.startup.state  | false                                            | whether hadoop grant kerberos permission                                                                                                                                                                                                                                                                                                                                                                                             |
@ -330,7 +328,6 @@ Location: `worker-server/conf/application.yaml`
 | worker.registry-disconnect-strategy.max-waiting-time                        | 100s          | Used when the worker disconnect from registry, and the disconnect strategy is waiting, this config means the worker will waiting to reconnect to registry in given times, and after the waiting times, if the worker still cannot connect to registry, will stop itself, if the value is 0s, will wait infinitely |
 | worker.task-execute-threads-full-policy                                     | REJECT        | If REJECT, when the task waiting in the worker reaches exec-threads, it will reject the received task and the Master will redispatch it; If CONTINUE, it will put the task into the worker's execution queue and wait for a free thread to start execution                                                        |
 | worker.tenant-config.auto-create-tenant-enabled                             | true          | tenant corresponds to the user of the system, which is used by the worker to submit the job. If system does not have this user, it will be automatically created after the parameter worker.tenant.auto.create is true.                                                                                           |
-| worker.tenant-config.distributed-tenant-enabled                             | false         | When this parameter is true, auto-create-tenant-enabled has no effect and will not automatically create tenants                                                                                                                                                                                                   |
 | worker.tenant-config.default-tenant-enabled                                 | false         | If set true, will use worker bootstrap user as the tenant to execute task when the tenant is `default`.                                                                                                                                                                                                           |

 ### Alert Server related configuration
--- a/docs/docs/en/architecture/metadata.md
+++ b/docs/docs/en/architecture/metadata.md
@ -22,8 +22,6 @@ see sql files in `dolphinscheduler/dolphinscheduler-dao/src/main/resources/sql`

 - User can have multiple projects, user project authorization completes the relationship binding using `project_id` and `user_id` in `t_ds_relation_project_user` table.
 - The `user_id` in the `t_ds_projcet` table represents the user who create the project, and the `user_id` in the `t_ds_relation_project_user` table represents users who have permission to the project.
- The `user_id` in the `t_ds_resources` table represents the user who create the resource, and the `user_id` in `t_ds_relation_resources_user` represents the user who has permissions to the resource.
- The `user_id` in the `t_ds_udfs` table represents the user who create the UDF, and the `user_id` in the `t_ds_relation_udfs_user` table represents a user who has permission to the UDF.

 ### Project - Tenant - ProcessDefinition - Schedule

--- a/docs/docs/en/architecture/task-structure.md
+++ b/docs/docs/en/architecture/task-structure.md
@ -146,7 +146,6 @@ No.|parameter name||type|description |note
 5| |type |String |database type
 6| |datasource |Int |datasource id
 7| |sql |String |query SQL statement
-8| |udfs | String| udf functions|specify UDF function ids, separate by comma
 9| |sqlType | String| SQL node type |0 for query and 1 for none-query SQL
 10| |title |String | mail title
 11| |receivers |String |receivers
@ -180,7 +179,6 @@ No.|parameter name||type|description |note
        "type":"MYSQL",
        "datasource":1,
        "sql":"select id , namge , age from emp where id =  ${id}",
-        "udfs":"",
        "sqlType":"0",
        "title":"xxxx@xxx.com",
        "receivers":"xxxx@xxx.com",
--- a/docs/docs/en/contribute/development-environment-setup.md
+++ b/docs/docs/en/contribute/development-environment-setup.md
@ -153,7 +153,7 @@ The browser access address [http://localhost:5173](http://localhost:5173) can lo

 #### zookeeper

-Download [ZooKeeper](https://www.apache.org/dyn/closer.lua/zookeeper/zookeeper-3.6.3), and extract it.
+Download [ZooKeeper](https://zookeeper.apache.org/releases.html), and extract it.

 - Create directory `zkData` and `zkLog`
 - Go to the zookeeper installation directory, copy configure file `zoo_sample.cfg` to `conf/zoo.cfg`, and change value of dataDir in conf/zoo.cfg to dataDir=./tmp/zookeeper
--- a/docs/docs/en/contribute/frontend-development.md
+++ b/docs/docs/en/contribute/frontend-development.md
@ -163,9 +163,6 @@ Resource Management => `http://localhost:8888/#/resource/file`

 ```
 | File Management
-| udf Management
-  - Resource Management
-  - Function management
 ```

 Data Source Management => `http://localhost:8888/#/datasource/list`
--- a/docs/docs/en/contribute/join/pull-request.md
+++ b/docs/docs/en/contribute/join/pull-request.md
@ -31,7 +31,7 @@ The corresponding relationship between `Pull Request Type` and `Issue Type` is a
        <tr>
            <td style="text-align: center;">Bug</td>
            <td style="text-align: center;">Fix</td>
-            <td style="text-align: center;">[Fix-3333][server] Fix xxx</td>
+            <td style="text-align: center;">[Fix-3333][ui] Fix xxx</td>
        </tr>
        <tr>
            <td style="text-align: center;">Improvement</td>
@ -44,9 +44,24 @@ The corresponding relationship between `Pull Request Type` and `Issue Type` is a
            <td style="text-align: center;">[Test-3333][api] Add the e2e test of xxx</td>
        </tr>
        <tr>
-            <td style="text-align: center;">Sub-Task</td>
-            <td style="text-align: center;">(Parent type corresponding to Sub-Task)</td>
-            <td style="text-align: center;">[Feature-3333][server] Implement xxx</td>
+            <td style="text-align: center;">Doc</td>
+            <td style="text-align: center;">Doc</td>
+            <td style="text-align: center;">[Doc-3333] Improve xxx</td>
+        </tr>
+        <tr>
+            <td style="text-align: center;">E2E</td>
+            <td style="text-align: center;">E2E</td>
+            <td style="text-align: center;">[E2E-3333] Implement xxx</td>
+        </tr>
+        <tr>
+            <td style="text-align: center;">CI</td>
+            <td style="text-align: center;">CI</td>
+            <td style="text-align: center;">[CI] Improve xxx</td>
+        </tr>
+        <tr>
+            <td style="text-align: center;">Chore</td>
+            <td style="text-align: center;">Chore</td>
+            <td style="text-align: center;">[Chore] Improve xxx</td>
        </tr>
    </tbody>
 </table>
--- a/docs/docs/en/guide/installation/cluster.md
+++ b/docs/docs/en/guide/installation/cluster.md
@ -14,21 +14,7 @@ Configure all the configurations refer to [pseudo-cluster deployment](pseudo-clu

 ### Modify Configuration

-This step differs quite a lot from [pseudo-cluster deployment](pseudo-cluster.md), because the deployment script transfers the required resources for installation to each deployment machine by using `scp`. So we only need to modify the configuration of the machine that runs `install.sh` script and configurations will dispatch to cluster by `scp`. The configuration file is under the path `bin/env/install_env.sh`, here we only need to modify section **INSTALL MACHINE**, **DolphinScheduler ENV, Database, Registry Server** and keep other sections the same as [pseudo-cluster deployment](pseudo-cluster .md), the following describes the parameters that must be modified:
-
-```shell
-# ---------------------------------------------------------
-# INSTALL MACHINE
-# ---------------------------------------------------------
-# Using IP or machine hostname for the server going to deploy master, worker, API server, the IP of the server
-# If you using a hostname, make sure machines could connect each other by hostname
-# As below, the hostname of the machine deploying DolphinScheduler is ds1, ds2, ds3, ds4, ds5, where ds1, ds2 install the master server, ds3, ds4, and ds5 installs worker server, the alert server is installed in ds4, and the API server is installed in ds5
-ips="ds1,ds2,ds3,ds4,ds5"
-masters="ds1,ds2"
-workers="ds3:default,ds4:default,ds5:default"
-alertServer="ds4"
-apiServers="ds5"
-```
+This step differs quite a lot from [pseudo-cluster deployment](pseudo-cluster.md), please use `scp` or other methods to distribute the configuration files to each machine, then modify the configuration files.

 ## Start and Login DolphinScheduler

--- a/docs/docs/en/guide/installation/pseudo-cluster.md
+++ b/docs/docs/en/guide/installation/pseudo-cluster.md
@ -2,7 +2,7 @@

 The purpose of the pseudo-cluster deployment is to deploy the DolphinScheduler service on a single machine. In this mode, DolphinScheduler's master, worker, API server, are all on the same machine.

-If you are a new hand and want to experience DolphinScheduler functions, we recommend you install follow [Standalone deployment](standalone.md). If you want to experience more complete functions and schedule massive tasks, we recommend you install follow[pseudo-cluster deployment. If you want to deploy DolphinScheduler in production, we recommend you follow [cluster deployment](cluster.md) or [Kubernetes deployment](kubernetes.md).
+If you are a new hand and want to experience DolphinScheduler functions, we recommend you install follow [Standalone deployment](standalone.md). If you want to experience more complete functions and schedule massive tasks, we recommend you install follow [pseudo-cluster deployment](pseudo-cluster.md). If you want to deploy DolphinScheduler in production, we recommend you follow [cluster deployment](cluster.md) or [Kubernetes deployment](kubernetes.md).

 ## Preparation

@ -71,31 +71,7 @@ Go to the ZooKeeper installation directory, copy configure file `zoo_sample.cfg`
 ## Modify Configuration

 After completing the preparation of the basic environment, you need to modify the configuration file according to the
-environment you used. Change the environment configurations via `export <ENV_NAME>=<VALUE>`. The configuration files are located in directory `bin/env` as `install_env.sh` and `dolphinscheduler_env.sh`.
-
-### Modify `install_env.sh`
-
-File `install_env.sh` describes which machines will be installed DolphinScheduler and what server will be installed on
-each machine. You could find this file in the path `bin/env/install_env.sh` and the detail of the configuration as below.
-
-```shell
-# ---------------------------------------------------------
-# INSTALL MACHINE
-# ---------------------------------------------------------
-# Due to the master, worker, and API server being deployed on a single node, the IP of the server is the machine IP or localhost
-ips="localhost"
-sshPort="22"
-masters="localhost"
-workers="localhost:default"
-alertServer="localhost"
-apiServers="localhost"
-
-# DolphinScheduler installation path, it will auto-create if not exists
-installPath=~/dolphinscheduler
-
-# Deploy user, use the user you create in section **Configure machine SSH password-free login**
-deployUser="dolphinscheduler"
-```
+environment you used. Change the environment configurations via `export <ENV_NAME>=<VALUE>`. The configuration files are located in directory `bin/env` as `dolphinscheduler_env.sh`.

 ### Modify `dolphinscheduler_env.sh`

@ -146,11 +122,7 @@ Follow the instructions in [datasource-setting](../howto/datasource-setting.md)

 ## Start DolphinScheduler

-Use **deployment user** you created above, running the following command to complete the deployment, and the server log will be stored in the logs folder.
-
-```shell
-bash ./bin/install.sh
-```
+Use **deployment user** you created above, running the command to complete the deployment, and the server log will be stored in the logs folder.

 > **_Note:_** For the first time deployment, there maybe occur five times of `sh: bin/dolphinscheduler-daemon.sh: No such file or directory` in the terminal,
 > this is non-important information that you can ignore.
--- a/docs/docs/en/guide/installation/standalone.md
+++ b/docs/docs/en/guide/installation/standalone.md
@ -36,7 +36,7 @@ Access address `http://localhost:12345/dolphinscheduler/ui` and login DolphinSch

 ### Start or Stop Server

-The script `./bin/dolphinscheduler-daemon.sh`can be used not only quickly start standalone, but also to stop the service operation. The following are all the commands:
+The script `./bin/dolphinscheduler-daemon.sh` can be used not only quickly start standalone, but also to stop the service operation. The following are all the commands:

 ```shell
 # Start Standalone Server
--- a/docs/docs/en/guide/metrics/metrics.md
+++ b/docs/docs/en/guide/metrics/metrics.md
@ -91,6 +91,11 @@ For example, you can get the master metrics by `curl http://localhost:5679/actua
  - stop: the number of stopped workflow instances
  - failover: the number of workflow instance fail-overs

+### RPC Related Metrics
+
+- ds.rpc.client.sync.request.exception.count: (counter) the number of exceptions occurred in sync rpc requests
+- ds.rpc.client.sync.request.duration.time: (histogram) the time cost of sync rpc requests
+
 ### Master Server Metrics

 - ds.master.overload.count: (counter) the number of times the master overloaded
--- a/docs/docs/en/guide/parameter/global.md
+++ b/docs/docs/en/guide/parameter/global.md
@ -22,7 +22,7 @@ Create a shell task and enter `echo ${dt}` in the script content. In this case,

 ### Save the workflow and set global parameters

-Set global parameter: On the workflow definition page, click the plus sign to the right of "Set Global", after filling in the variable name and value, save it.
+Set global parameter: On the workflow definition page, click the plus sign to the right of "Set Global", after filling in the variable name and value, select the appropriate parameter value type, save it.

 ![global-parameter02](../../../../img/new_ui/dev/parameter/global_parameter02.png)

--- a/docs/docs/en/guide/parameter/project-parameter.md
+++ b/docs/docs/en/guide/parameter/project-parameter.md
@ -8,7 +8,7 @@ Project-level parameters are valid for all task nodes under the entire project.

 ### Define project-level parameters

-On the project page, click Project Parameters and Create Parameters, and fill in the parameter name and parameter value. As shown below:
+On the project page, click Project Parameters and Create Parameters, and fill in the parameter name and parameter value, select the appropriate parameter value type. As shown below:

 ![project-parameter01](../../../../img/new_ui/dev/parameter/project_parameter01.png)

--- a/docs/docs/en/guide/parameter/startup-parameter.md
+++ b/docs/docs/en/guide/parameter/startup-parameter.md
@ -6,7 +6,7 @@ Parameters are valid for all task nodes of the entire workflow. It can be config

 ## Usage

-Usage of startup parameters is: at the task launch page, click the '+' below the 'Startup Parameter' and fill in the key and value to save. The workflow will add them into global parameters.
+Usage of startup parameters is: at the task launch page, click the '+' below the 'Startup Parameter' and fill in the key and value, select the appropriate parameter value type then to save. The workflow will add them into global parameters.

 ## Example

--- a/docs/docs/en/guide/resource/configuration.md
+++ b/docs/docs/en/guide/resource/configuration.md
@ -1,6 +1,6 @@
 # Resource Center Configuration

- You could use `Resource Center` to upload text files, UDFs and other task-related files.
+- You could use `Resource Center` to upload text files and other task-related files.
 - You could configure `Resource Center` to use distributed file system like [Hadoop](https://hadoop.apache.org/docs/r2.7.0/) (2.6+), [MinIO](https://github.com/minio/minio) cluster or remote storage products like [AWS S3](https://aws.amazon.com/s3/), [Alibaba Cloud OSS](https://www.aliyun.com/product/oss), [Huawei Cloud OBS](https://support.huaweicloud.com/obs/index.html) etc.
 - You could configure `Resource Center` to use local file system. If you deploy `DolphinScheduler` in `Standalone` mode, you could configure it to use local file system for `Resource Center` without the need of an external `HDFS` system or `S3`.
 - Furthermore, if you deploy `DolphinScheduler` in `Cluster` mode, you could use [S3FS-FUSE](https://github.com/s3fs-fuse/s3fs-fuse) to mount `S3` or [JINDO-FUSE](https://help.aliyun.com/document_detail/187410.html) to mount `OSS` to your machines and use the local file system for `Resource Center`. In this way, you could operate remote files as if on your local machines.
@ -28,74 +28,37 @@ The configuration you may need to change:

 ## connect AWS S3

-if you want to upload resources to `Resource Center` connected to `S3`, you need to configure `api-server/conf/common.properties` and `worker-server/conf/common.properties`. You can refer to the following:
+if you want to upload resources to `Resource Center` connected to `S3`, you need to configure `api-server/conf/common.properties`, `api-server/conf/aws.yaml` and `worker-server/conf/common.properties`, `worker-server/conf/aws.yaml`. You can refer to the following:

 config the following fields

 ```properties
-......

 resource.storage.type=S3
-
-......
-
-resource.aws.access.key.id=aws_access_key_id
-# The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.secret.access.key=aws_secret_access_key
-# The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.region=us-west-2
-# The name of the bucket. You need to create them by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share a single namespace; ensure the bucket is given a unique name.
-resource.aws.s3.bucket.name=dolphinscheduler
-# You need to set this parameter when private cloud s4. If S3 uses public cloud, you only need to set resource.aws.region or set to the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn
-resource.aws.s3.endpoint=
-
-......
 ```

-## Use HDFS or Remote Object Storage
+```yaml
+aws:
+    s3:
+        # The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
+        # AWSStaticCredentialsProvider: use the access key and secret key to authenticate
+        # InstanceProfileCredentialsProvider: use the IAM role to authenticate
+        credentials.provider.type: AWSStaticCredentialsProvider
+        access.key.id: <access.key.id>
+        access.key.secret: <access.key.secret>
+        region: <region>
+        bucket.name: <bucket.name>
+        endpoint: <endpoint>

-After version 3.0.0-alpha, if you want to upload resources to `Resource Center` connected to `HDFS`, you need to configure `api-server/conf/common.properties` and `worker-server/conf/common.properties`.
+```
+
+## connect OSS S3
+
+if you want to upload resources to `Resource Center` connected to `OSS`, you need to configure `api-server/conf/common.properties` and `worker-server/conf/common.properties`. You can refer to the following:
+
+config the following fields

 ```properties
-#
-# 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.
-#
-
-# user data local directory path, please make sure the directory exists and have read write permissions
-data.basedir.path=/tmp/dolphinscheduler
-
-# resource view suffixs
-#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js
-
-# resource storage type: LOCAL, HDFS, S3, OSS, GCS, ABS, OBS
-resource.storage.type=LOCAL
-# resource store on HDFS/S3/OSS path, resource file will store to this base path, self configuration, please make sure the directory exists on hdfs and have read write permissions. "/dolphinscheduler" is recommended
-resource.storage.upload.base.path=/tmp/dolphinscheduler
-
-# The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.access.key.id=minioadmin
-# The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.secret.access.key=minioadmin
-# The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.region=cn-north-1
-# The name of the bucket. You need to create them by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share a single namespace; ensure the bucket is given a unique name.
-resource.aws.s3.bucket.name=dolphinscheduler
-# You need to set this parameter when private cloud s3. If S3 uses public cloud, you only need to set resource.aws.region or set to the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn
-resource.aws.s3.endpoint=http://localhost:9000
-
 # alibaba cloud access key id, required if you set resource.storage.type=OSS 
 resource.alibaba.cloud.access.key.id=<your-access-key-id>
 # alibaba cloud access key secret, required if you set resource.storage.type=OSS
@ -107,89 +70,24 @@ resource.alibaba.cloud.oss.bucket.name=dolphinscheduler
 # oss bucket endpoint, required if you set resource.storage.type=OSS
 resource.alibaba.cloud.oss.endpoint=https://oss-cn-hangzhou.aliyuncs.com

-# alibaba cloud access key id, required if you set resource.storage.type=OBS
+```
+
+## connect OBS S3
+
+if you want to upload resources to `Resource Center` connected to `OBS`, you need to configure `api-server/conf/common.properties` and `worker-server/conf/common.properties`. You can refer to the following:
+
+config the following fields
+
+```properties
+# access key id, required if you set resource.storage.type=OBS
 resource.huawei.cloud.access.key.id=<your-access-key-id>
-# alibaba cloud access key secret, required if you set resource.storage.type=OBS
+# access key secret, required if you set resource.storage.type=OBS
 resource.huawei.cloud.access.key.secret=<your-access-key-secret>
 # oss bucket name, required if you set resource.storage.type=OBS
 resource.huawei.cloud.obs.bucket.name=dolphinscheduler
 # oss bucket endpoint, required if you set resource.storage.type=OBS
 resource.huawei.cloud.obs.endpoint=obs.cn-southwest-2.huaweicloud.com

-# if resource.storage.type=HDFS, the user must have the permission to create directories under the HDFS root path
-resource.hdfs.root.user=hdfs
-# if resource.storage.type=S3, the value like: s3a://dolphinscheduler; if resource.storage.type=HDFS and namenode HA is enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir
-resource.hdfs.fs.defaultFS=hdfs://mycluster:8020
-
-# whether to startup kerberos
-hadoop.security.authentication.startup.state=false
-
-# java.security.krb5.conf path
-java.security.krb5.conf.path=/opt/krb5.conf
-
-# login user from keytab username
-login.user.keytab.username=hdfs-mycluster@ESZ.COM
-
-# login user from keytab path
-login.user.keytab.path=/opt/hdfs.headless.keytab
-
-# kerberos expire time, the unit is hour
-kerberos.expire.time=2
-
-
-# resourcemanager port, the default value is 8088 if not specified
-resource.manager.httpaddress.port=8088
-# if resourcemanager HA is enabled, please set the HA IPs; if resourcemanager is single, keep this value empty
-yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
-# if resourcemanager HA is enabled or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ds1 to actual resourcemanager hostname
-yarn.application.status.address=http://ds1:%s/ws/v1/cluster/apps/%s
-# job history status url when application number threshold is reached(default 10000, maybe it was set to 1000)
-yarn.job.history.status.address=http://ds1:19888/ws/v1/history/mapreduce/jobs/%s
-
-# datasource encryption enable
-datasource.encryption.enable=false
-
-# datasource encryption salt
-datasource.encryption.salt=!@#$%^&*
-
-# data quality jar directory path, it would auto discovery data quality jar from this given dir. You should keep it empty if you do not change anything in
-# data-quality, it will auto discovery by dolphinscheduler itself. Change it only if you want to use your own data-quality jar and it is not in worker-server
-# libs directory(but may sure your jar name start with `dolphinscheduler-data-quality`).
-data-quality.jar.dir=
-
-#data-quality.error.output.path=/tmp/data-quality-error-data
-
-# Network IP gets priority, default inner outer
-
-# Whether hive SQL is executed in the same session
-support.hive.oneSession=false
-
-# use sudo or not, if set true, executing user is tenant user and deploy user needs sudo permissions; if set false, executing user is the deploy user and doesn't need sudo permissions
-sudo.enable=true
-
-# network interface preferred like eth0, default: empty
-#dolphin.scheduler.network.interface.preferred=
-
-# network IP gets priority, default: inner outer
-#dolphin.scheduler.network.priority.strategy=default
-
-# system env path
-#dolphinscheduler.env.path=dolphinscheduler_env.sh
-
-# development state
-development.state=false
-
-# rpc port
-alert.rpc.port=50052
-
-# set path of conda.sh
-conda.path=/opt/anaconda3/etc/profile.d/conda.sh
-
-# Task resource limit state
-task.resource.limit.state=false
-
-# way to collect applicationId: log(original regex match), aop
-appId.collect: log
 ```

 > **Note:**
--- a/docs/docs/en/guide/resource/intro.md
+++ b/docs/docs/en/guide/resource/intro.md
@ -1,5 +1,5 @@
 # Resource Center Introduction

-The Resource Center is typically used for uploading files, UDF functions, and task group management. For a stand-alone
+The Resource Center is typically used for uploading files and task group management. For a stand-alone
 environment, you can select the local file directory as the upload folder (**this operation does not require Hadoop or HDFS deployment**).
 Of course, you can also choose to upload to Hadoop or MinIO cluster. In this case, you need to have Hadoop (2.6+) or MinIO and other related environments.
--- a/docs/docs/en/guide/resource/udf-manage.md
+++ b/docs/docs/en/guide/resource/udf-manage.md
@ -1,45 +0,0 @@
-# UDF Manage
-
-## Resource Management
-
- The resource management and file management functions are similar. The difference is that the resource management is the UDF upload function, and the file management uploads the user programs, scripts and configuration files.
- It mainly includes the following operations: rename, download, delete, etc.
- Upload UDF resources: Same as uploading files.
-
-## Function Management
-
-### Create UDF function
-
-Click `Create UDF Function`, enter the UDF function parameters, select the UDF resource, and click `Submit` to create the UDF function.
-Currently only temporary UDF functions for HIVE are supported.
-
- UDF function name: Enter the name of the UDF function.
- Package name Class name: Enter the full path of the UDF function.
- UDF resource: Set the resource file corresponding to the created UDF function.
-
-![create-udf](../../../../img/new_ui/dev/resource/create-udf.png)
-
-## Example
-
-### Write UDF functions
-
-Users can customize the desired UDF function according to actual production requirements. Here's a function that appends "HelloWorld" to the end of any string. As shown below:
-
-![code-udf](../../../../img/new_ui/dev/resource/demo/udf-demo01.png)
-
-### Configure the UDF function
-
-Before configuring UDF functions, you need to upload the required function jar package through resource management. Then enter the function management and configure the relevant information. As shown below:
-
-![conf-udf](../../../../img/new_ui/dev/resource/demo/udf-demo02.png)
-
-### Use UDF functions
-
-In the process of using UDF functions, users only need to pay attention to the specific function writing, and upload the configuration through the resource center. The system will automatically configure the create function statement, refer to the following: [SqlTask](https://github.com/apache/dolphinscheduler/blob/923f3f38e3271d7f1d22b3abc3497cecb6957e4a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java#L507-L531)
-
-Enter the workflow to define an SQL node, the data source type is HIVE, and the data source instance type is HIVE/IMPALA.
-
- SQL statement: `select HwUdf("abc");` This function is used in the same way as the built-in functions, and can be accessed directly using the function name.
- UDF function: Select the one configured for the resource center.
-
-![use-udf](../../../../img/new_ui/dev/resource/demo/udf-demo03.png)
--- a/docs/docs/en/guide/security/security.md
+++ b/docs/docs/en/guide/security/security.md
@ -103,8 +103,8 @@ public  void doPOSTParam()throws Exception{

 ## Granted Permissions

-* Granted permissions include project permissions, resource permissions, data source permissions, and UDF function permissions.
-* Administrators can authorize projects, resources, data sources, and UDF functions that ordinary users do not create. Because the authorization methods of projects, resources, data sources and UDF functions are all the same, the project authorization is used as an example to introduce.
+* Granted permissions include project permissions, resource permissions, data source permissions.
+* Administrators can authorize projects, resources, data sources that ordinary users do not create. Because the authorization methods of projects, resources, data sources are all the same, the project authorization is used as an example to introduce.
 * Note: For projects created by the user, the user has all permissions. Therefore, permission changes to projects created by users themselves are not valid.
 - The administrator enters the `Security Center -> User Management` page, and clicks the "Authorize" button of the user to be authorized, as shown in the following figure:

@ -118,7 +118,7 @@ public  void doPOSTParam()throws Exception{

 ![no-permission-error](../../../../img/new_ui/dev/security/no-permission-error.png)

- Resources, data sources, and UDF function authorization are the same as project authorization.
+- Resources, data sources authorization are the same as project authorization.

 ## Worker Grouping

--- a/docs/docs/en/guide/task/dms.md
+++ b/docs/docs/en/guide/task/dms.md
@ -73,14 +73,17 @@ Parameters of restarting the task by interface

 ## Environment to prepare

-Some AWS configuration is required, modify a field in file `common.properties`
+Some AWS configuration is required, modify a field in file `aws.yaml`

 ```yaml
-# The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.access.key.id=<YOUR AWS ACCESS KEY>
-# The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.secret.access.key=<YOUR AWS SECRET KEY>
-# The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.region=<AWS REGION>
+dms:
+  # The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
+  # AWSStaticCredentialsProvider: use the access key and secret key to authenticate
+  # InstanceProfileCredentialsProvider: use the IAM role to authenticate
+  credentials.provider.type: AWSStaticCredentialsProvider
+  access.key.id: <access.key.id>
+  access.key.secret: <access.key.secret>
+  region: <region>
+  endpoint: <endpoint>
 ```

--- a/docs/docs/en/guide/task/pigeon.md
+++ b/docs/docs/en/guide/task/pigeon.md
@ -1,22 +0,0 @@
-# Pigeon
-
-## Overview
-
-Pigeon is a task used to trigger remote tasks, acquire logs or status by calling remote WebSocket service. It is DolphinScheduler uses a remote WebSocket service to call tasks.
-
-## Create Task
-
- Click `Project Management -> Project Name -> Workflow Definition`, and click the `Create Workflow` button to enter the DAG editing page.
- Drag from the toolbar <img src="../../../../img/pigeon.png" width="20"/> to the canvas to create a new Pigeon task.
-
-## Task Parameters
-
-[//]: # (TODO: use the commented anchor below once our website template supports this syntax)
-[//]: # (- Please refer to [DolphinScheduler Task Parameters Appendix]&#40;appendix.md#default-task-parameters&#41; `Default Task Parameters` section for default parameters.)
-
- Please refer to [DolphinScheduler Task Parameters Appendix](appendix.md) `Default Task Parameters` section for default parameters.
-
-|  **Parameter**   |            **Description**            |
-|------------------|---------------------------------------|
-| Target task name | Target task name of this Pigeon node. |
-
--- a/docs/docs/en/guide/task/sagemaker.md
+++ b/docs/docs/en/guide/task/sagemaker.md
@ -35,14 +35,17 @@ The task plugin are shown as follows:

 ## Environment to prepare

-Some AWS configuration is required, modify a field in file `common.properties`
+Some AWS configuration is required, modify a field in file `aws.yaml`

 ```yaml
-# The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.access.key.id=<YOUR AWS ACCESS KEY>
-# The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.secret.access.key=<YOUR AWS SECRET KEY>
-# The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.region=<AWS REGION>
+sagemaker:
+  # The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
+  # AWSStaticCredentialsProvider: use the access key and secret key to authenticate
+  # InstanceProfileCredentialsProvider: use the IAM role to authenticate
+  credentials.provider.type: AWSStaticCredentialsProvider
+  access.key.id: <access.key.id>
+  access.key.secret: <access.key.secret>
+  region: <region>
+  endpoint: <endpoint>
 ```

--- a/docs/docs/en/guide/task/sql.md
+++ b/docs/docs/en/guide/task/sql.md
@ -21,12 +21,11 @@ Refer to [datasource-setting](../howto/datasource-setting.md) `DataSource Center
 - Please refer to [DolphinScheduler Task Parameters Appendix](appendix.md) `Default Task Parameters` section for default parameters.

 |   **Parameter**   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           **Description**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-|-------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|-------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---|
 | Data source       | Select the corresponding DataSource.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | SQL type          | Supports query and non-query. <ul><li>Query: supports `DML select` type commands, which return a result set. You can specify three templates for email notification as form, attachment or form attachment;</li><li>Non-query: support `DDL` all commands and `DML update, delete, insert` three types of commands;<ul><li>Segmented execution symbol: When the data source does not support executing multiple SQL statements at a time, the symbol for splitting SQL statements is provided to call the data source execution method multiple times. Example: 1. When the Hive data source is selected as the data source, please do not use `;\n` due to Hive JDBC does not support executing multiple SQL statements at one time; 2. When the MySQL data source is selected as the data source, and multi-segment SQL statements are to be executed, this parameter needs to be filled in with a semicolon `;. Because the MySQL data source does not support executing multiple SQL statements at one time.</li></ul></li></ul> |
 | SQL parameter     | The input parameter format is `key1=value1;key2=value2...`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| SQL statement     | SQL statement.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| UDF function      | For Hive DataSources, you can refer to UDF functions created in the resource center, but other DataSource do not support UDF functions.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| SQL statement     | SQL statement.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |   |
 | Custom parameters | SQL task type, and stored procedure is a custom parameter order, to set customized parameter type and data type for the method is the same as the stored procedure task type. The difference is that the custom parameter of the SQL task type replaces the `${variable}` in the SQL statement.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | Pre-SQL           | Pre-SQL executes before the SQL statement.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | Post-SQL          | Post-SQL executes after the SQL statement.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
@ -57,5 +56,3 @@ Table created in the Pre-SQL, after use in the SQL statement, cleaned in the Pos
 ## Note

 Pay attention to the selection of SQL type. If it is an insert operation, need to change to "Non-Query" type.
-
-To compatible with long session,UDF function are created by the syntax(CREATE OR REPLACE)
--- a/docs/docs/en/guide/upgrade/incompatible.md
+++ b/docs/docs/en/guide/upgrade/incompatible.md
@ -26,3 +26,8 @@ This document records the incompatible updates between each version. You need to

 * Add required field `database` in /datasources/tables && /datasources/tableColumns Api [#14406](https://github.com/apache/dolphinscheduler/pull/14406)

+## 3.3.0
+
+* Remove the `udf-manage` function from the `resource center` ([#16209])
+* Remove the `Pigeon` from the `Task Plugin` ([#16218])
+
--- a/docs/docs/zh/architecture/configuration.md
+++ b/docs/docs/zh/architecture/configuration.md
@ -331,7 +331,6 @@ common.properties配置文件目前主要是配置hadoop/s3/yarn/applicationId
 | worker.registry-disconnect-strategy.max-waiting-time                        | 100s      | 当Worker与注册中心失联之后重连时间, 之后当strategy为waiting时，该值生效。 该值表示当Worker与注册中心失联时会在给定时间之内进行重连, 在给定时间之内重连失败将会停止自己，在重连时，Worker会丢弃kill正在执行的任务。值为0表示会无限期等待 |
 | worker.task-execute-threads-full-policy                                     | REJECT    | 如果是 REJECT, 当Worker中等待队列中的任务数达到exec-threads时, Worker将会拒绝接下来新接收的任务，Master将会重新分发该任务; 如果是 CONTINUE, Worker将会接收任务，放入等待队列中等待空闲线程去执行该任务         |
 | worker.tenant-config.auto-create-tenant-enabled                             | true      | 租户对应于系统的用户,由worker提交作业.如果系统没有该用户,则在参数worker.tenant.auto.create为true后自动创建。                                                                 |
-| worker.tenant-config.distributed-tenant-enabled                             | false     | 如果设置为true, auto-create-tenant-enabled 将会不起作用。                                                                                             |
 | worker.tenant-config.default-tenant-enabled                                 | false     | 如果设置为true, 将会使用worker服务启动用户作为 `default` 租户。                                                                                               |

 ## Alert Server相关配置
--- a/docs/docs/zh/architecture/metadata.md
+++ b/docs/docs/zh/architecture/metadata.md
@ -20,8 +20,6 @@

 - 一个用户可以有多个项目，用户项目授权通过`t_ds_relation_project_user`表完成project_id和user_id的关系绑定；<br />
 - `t_ds_projcet`表中的`user_id`表示创建该项目的用户，`t_ds_relation_project_user`表中的`user_id`表示对项目有权限的用户；<br />
- `t_ds_resources`表中的`user_id`表示创建该资源的用户，`t_ds_relation_resources_user`中的`user_id`表示对资源有权限的用户；<br />
- `t_ds_udfs`表中的`user_id`表示创建该UDF的用户，`t_ds_relation_udfs_user`表中的`user_id`表示对UDF有权限的用户；<br />

 ### 项目 - 租户 - 工作流定义 - 定时

--- a/docs/docs/zh/architecture/task-structure.md
+++ b/docs/docs/zh/architecture/task-structure.md
@ -145,7 +145,6 @@
 5| |type |String | 数据库类型
 6| |datasource |Int | 数据源id
 7| |sql |String | 查询SQL语句
-8| |udfs | String| udf函数|UDF函数id,以逗号分隔.
 9| |sqlType | String| SQL节点类型 |0 查询  , 1 非查询
 10| |title |String | 邮件标题
 11| |receivers |String | 收件人
@ -179,7 +178,6 @@
        "type":"MYSQL",
        "datasource":1,
        "sql":"select id , namge , age from emp where id =  ${id}",
-        "udfs":"",
        "sqlType":"0",
        "title":"xxxx@xxx.com",
        "receivers":"xxxx@xxx.com",
--- a/docs/docs/zh/contribute/development-environment-setup.md
+++ b/docs/docs/zh/contribute/development-environment-setup.md
@ -148,7 +148,7 @@ pnpm run dev

 #### zookeeper

-下载 [ZooKeeper](https://www.apache.org/dyn/closer.lua/zookeeper/zookeeper-3.6.3)，解压
+下载 [ZooKeeper](https://zookeeper.apache.org/releases.html)，解压

 * 在 ZooKeeper 的目录下新建 zkData、zkLog文件夹
 * 将 conf 目录下的 `zoo_sample.cfg` 文件，复制一份，重命名为 `zoo.cfg`，修改其中数据和日志的配置，如：
--- a/docs/docs/zh/contribute/frontend-development.md
+++ b/docs/docs/zh/contribute/frontend-development.md
@ -163,9 +163,6 @@ npm install node-sass --unsafe-perm #单独安装node-sass依赖

 ```
 | 文件管理
-| UDF管理
-  - 资源管理
-  - 函数管理
 ```

 数据源管理 => `http://localhost:8888/#/datasource/list`
--- a/docs/docs/zh/contribute/join/pull-request.md
+++ b/docs/docs/zh/contribute/join/pull-request.md
@ -33,7 +33,7 @@ waste time。
        <tr>
            <td style="text-align: center;">Bug</td>
            <td style="text-align: center;">Fix</td>
-            <td style="text-align: center;">[Fix-3333][server] Fix xxx</td>
+            <td style="text-align: center;">[Fix-3333][ui] Fix xxx</td>
        </tr>
        <tr>
            <td style="text-align: center;">Improvement</td>
@ -46,9 +46,23 @@ waste time。
            <td style="text-align: center;">[Test-3333][api] Add the e2e test of xxx</td>
        </tr>
        <tr>
-            <td style="text-align: center;">Sub-Task</td>
-            <td style="text-align: center;">Sub-Task 对应的父类型</td>
-            <td style="text-align: center;">[Feature-3333][server] Implement xxx</td>
+            <td style="text-align: center;">Doc</td>
+            <td style="text-align: center;">Doc</td>
+            <td style="text-align: center;">[Doc-3333] Improve xxx</td>
+        <tr>
+            <td style="text-align: center;">E2E</td>
+            <td style="text-align: center;">E2E</td>
+            <td style="text-align: center;">[E2E-3333] Implement xxx</td>
+        </tr>
+        <tr>
+            <td style="text-align: center;">CI</td>
+            <td style="text-align: center;">CI</td>
+            <td style="text-align: center;">[CI] Improve xxx</td>
+        </tr>
+        <tr>
+            <td style="text-align: center;">Chore</td>
+            <td style="text-align: center;">Chore</td>
+            <td style="text-align: center;">[Chore] Improve xxx</td>
        </tr>
    </tbody>
 </table>
--- a/docs/docs/zh/guide/installation/cluster.md
+++ b/docs/docs/zh/guide/installation/cluster.md
@ -14,21 +14,7 @@

 ### 修改相关配置

-这个是与[伪集群部署](pseudo-cluster.md)差异较大的一步，因为部署脚本会通过 `scp` 的方式将安装需要的资源传输到各个机器上，所以这一步我们仅需要修改运行`install.sh`脚本的所在机器的配置即可。配置文件在路径在`bin/env/install_env.sh`下，此处我们仅需修改**INSTALL MACHINE**，**DolphinScheduler ENV、Database、Registry Server**与伪集群部署保持一致，下面对必须修改参数进行说明
-
-```shell
-# ---------------------------------------------------------
-# INSTALL MACHINE
-# ---------------------------------------------------------
-# 需要配置master、worker、API server，所在服务器的IP均为机器IP或者localhost
-# 如果是配置hostname的话，需要保证机器间可以通过hostname相互链接
-# 如下图所示，部署 DolphinScheduler 机器的 hostname 为 ds1,ds2,ds3,ds4,ds5，其中 ds1,ds2 安装 master 服务，ds3,ds4,ds5安装 worker 服务，alert server安装在ds4中，api server 安装在ds5中
-ips="ds1,ds2,ds3,ds4,ds5"
-masters="ds1,ds2"
-workers="ds3:default,ds4:default,ds5:default"
-alertServer="ds4"
-apiServers="ds5"
-```
+这个是与[伪集群部署](pseudo-cluster.md)差异较大的一步，请使用 scp 等方式将配置文件分发到各台机器上，然后修改配置文件

 ## 启动 DolphinScheduler && 登录 DolphinScheduler && 启停服务

--- a/docs/docs/zh/guide/installation/pseudo-cluster.md
+++ b/docs/docs/zh/guide/installation/pseudo-cluster.md
@ -70,30 +70,7 @@ chmod 600 ~/.ssh/authorized_keys

 ## 修改相关配置

-完成基础环境的准备后，需要根据你的机器环境修改配置文件。配置文件可以在目录 `bin/env` 中找到，他们分别是 并命名为 `install_env.sh` 和 `dolphinscheduler_env.sh`。
-
-### 修改 `install_env.sh` 文件
-
-文件 `install_env.sh` 描述了哪些机器将被安装 DolphinScheduler 以及每台机器对应安装哪些服务。您可以在路径 `bin/env/install_env.sh` 中找到此文件，可通过以下方式更改 env 变量,export <ENV_NAME>=<VALUE>，配置详情如下。
-
-```shell
-# ---------------------------------------------------------
-# INSTALL MACHINE
-# ---------------------------------------------------------
-# Due to the master, worker, and API server being deployed on a single node, the IP of the server is the machine IP or localhost
-ips="localhost"
-sshPort="22"
-masters="localhost"
-workers="localhost:default"
-alertServer="localhost"
-apiServers="localhost"
-
-# DolphinScheduler installation path, it will auto-create if not exists
-installPath=~/dolphinscheduler
-
-# Deploy user, use the user you create in section **Configure machine SSH password-free login**
-deployUser="dolphinscheduler"
-```
+完成基础环境的准备后，需要根据你的机器环境修改配置文件。配置文件可以在目录 `bin/env/dolphinscheduler_env.sh` 中找到。

 ### 修改 `dolphinscheduler_env.sh` 文件

@ -141,11 +118,7 @@ export PATH=$HADOOP_HOME/bin:$SPARK_HOME/bin:$PYTHON_LAUNCHER:$JAVA_HOME/bin:$HI

 ## 启动 DolphinScheduler

-使用上面创建的**部署用户**运行以下命令完成部署，部署后的运行日志将存放在 logs 文件夹内
-
-```shell
-bash ./bin/install.sh
-```
+使用上面创建的**部署用户**运行命令完成部署，部署后的运行日志将存放在 logs 文件夹内

 > **_注意:_** 第一次部署的话，可能出现 5 次`sh: bin/dolphinscheduler-daemon.sh: No such file or directory`相关信息，此为非重要信息直接忽略即可

--- a/docs/docs/zh/guide/metrics/metrics.md
+++ b/docs/docs/zh/guide/metrics/metrics.md
@ -91,6 +91,11 @@ metrics exporter端口`server.port`是在application.yaml里定义的: master: `
  - stop：停止的工作流实例数量
  - failover：容错的工作流实例数量

+### RPC相关指标
+
+- ds.rpc.client.sync.request.exception.count: (counter) 同步rpc请求异常数
+- ds.rpc.client.sync.request.duration.time: (histogram) 同步rpc请求耗时
+
 ### Master Server指标

 - ds.master.overload.count: (counter) master过载次数
--- a/docs/docs/zh/guide/parameter/global.md
+++ b/docs/docs/zh/guide/parameter/global.md
@ -20,7 +20,7 @@

 ### 保存工作流，并设置全局参数

-全局参数配置方式如下：在工作流定义页面，点击“设置全局”右边的加号，填写对应的变量名称和对应的值，保存即可。如下图所示：
+全局参数配置方式如下：在工作流定义页面，点击“设置全局”右边的加号，填写对应的变量名称和对应的值，选择相应的参数值类型，保存即可。如下图所示：

 ![global-parameter02](../../../../img/new_ui/dev/parameter/global_parameter02.png)

--- a/docs/docs/zh/guide/parameter/project-parameter.md
+++ b/docs/docs/zh/guide/parameter/project-parameter.md
@ -8,7 +8,7 @@

 ### 定义项目级别参数

-在项目管理页面，点击项目级别参数，点击创建项目级别参数，填写参数名称和参数值。如下图所示：
+在项目管理页面，点击项目级别参数，点击创建项目级别参数，填写参数名称和参数值，选择相应的参数值类型。如下图所示：

 ![project-parameter01](../../../../img/new_ui/dev/parameter/project_parameter01.png)

--- a/docs/docs/zh/guide/parameter/startup-parameter.md
+++ b/docs/docs/zh/guide/parameter/startup-parameter.md
@ -6,7 +6,7 @@

 ## 使用方式

-启动参数配置方式如下：在启动前参数设置界面，点击“启动参数“下面的加号，填写对应的参数名称和对应的值，点击确定，工作流会将启动参数加入全局参数中。
+启动参数配置方式如下：在启动前参数设置界面，点击“启动参数“下面的加号，填写对应的参数名称和对应的值，选择相应的参数值类型，点击确定，工作流会将启动参数加入全局参数中。

 ## 任务样例

--- a/docs/docs/zh/guide/resource/configuration.md
+++ b/docs/docs/zh/guide/resource/configuration.md
@ -1,6 +1,6 @@
 # 资源中心配置详情

- 资源中心通常用于上传文件、UDF 函数，以及任务组管理等操作。
+- 资源中心通常用于上传文件以及任务组管理等操作。
 - 资源中心可以对接分布式的文件存储系统，如[Hadoop](https://hadoop.apache.org/docs/r2.7.0/)（2.6+）或者[MinIO](https://github.com/minio/minio)集群，也可以对接远端的对象存储，如[AWS S3](https://aws.amazon.com/s3/)或者[阿里云 OSS](https://www.aliyun.com/product/oss)，[华为云 OBS](https://support.huaweicloud.com/obs/index.html) 等。
 - 资源中心也可以直接对接本地文件系统。在单机模式下，您无需依赖`Hadoop`或`S3`一类的外部存储系统，可以方便地对接本地文件系统进行体验。
 - 除此之外，对于集群模式下的部署，您可以通过使用[S3FS-FUSE](https://github.com/s3fs-fuse/s3fs-fuse)将`S3`挂载到本地，或者使用[JINDO-FUSE](https://help.aliyun.com/document_detail/187410.html)将`OSS`挂载到本地等，再用资源中心对接本地文件系统方式来操作远端对象存储中的文件。
@ -26,77 +26,35 @@ Dolphinscheduler 资源中心使用本地系统默认是开启的，不需要用

 ## 对接AWS S3

-如果需要使用到资源中心的 S3 上传资源，我们需要对以下路径的进行配置：`api-server/conf/common.properties` 和 `worker-server/conf/common.properties`。可参考如下：
+如果需要使用到资源中心的 S3 上传资源，我们需要对以下路径的进行配置：`api-server/conf/common.properties`, `api-server/conf/aws.yaml` 和 `worker-server/conf/common.properties`, `worker-server/conf/aws.yaml`。可参考如下：

 配置以下字段

 ```properties
-......

 resource.storage.type=S3
-
-......
-
-resource.aws.access.key.id=aws_access_key_id
-# The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.secret.access.key=aws_secret_access_key
-# The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.region=us-west-2
-# The name of the bucket. You need to create them by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share a single namespace; ensure the bucket is given a unique name.
-resource.aws.s3.bucket.name=dolphinscheduler
-# You need to set this parameter when private cloud s4. If S3 uses public cloud, you only need to set resource.aws.region or set to the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn
-resource.aws.s3.endpoint=
-
-......
 ```

-## 对接分布式或远端对象存储
+```yaml
+aws:
+    s3:
+        # The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
+        # AWSStaticCredentialsProvider: use the access key and secret key to authenticate
+        # InstanceProfileCredentialsProvider: use the IAM role to authenticate
+        credentials.provider.type: AWSStaticCredentialsProvider
+        access.key.id: <access.key.id>
+        access.key.secret: <access.key.secret>
+        region: <region>
+        bucket.name: <bucket.name>
+        endpoint: <endpoint>

-当需要使用资源中心进行相关文件的创建或者上传操作时，所有的文件和资源都会被存储在分布式文件系统`HDFS`或者远端的对象存储，如`S3`上。所以需要进行以下配置：
+```

-### 配置 common.properties 文件
+## 对接阿里云 OSS

-在 3.0.0-alpha 版本之后，如果需要使用到资源中心的 HDFS 或 S3 上传资源，我们需要对以下路径的进行配置：`api-server/conf/common.properties` 和 `worker-server/conf/common.properties`。可参考如下：
+如果需要使用到资源中心的 OSS 上传资源，我们需要对以下路径的进行配置：`api-server/conf/common.properties` 和 `worker-server/conf/common.properties`。可参考如下：

 ```properties
-#
-# 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.
-#
-
-# user data local directory path, please make sure the directory exists and have read write permissions
-data.basedir.path=/tmp/dolphinscheduler
-
-# resource storage type: LOCAL, HDFS, S3, OSS, GCS, ABS, OBS
-resource.storage.type=LOCAL
-
-# resource store on HDFS/S3/OSS path, resource file will store to this hadoop hdfs path, self configuration,
-# please make sure the directory exists on hdfs and have read write permissions. "/dolphinscheduler" is recommended
-resource.storage.upload.base.path=/tmp/dolphinscheduler
-
-# The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.access.key.id=minioadmin
-# The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.secret.access.key=minioadmin
-# The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.region=cn-north-1
-# The name of the bucket. You need to create them by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share a single namespace; ensure the bucket is given a unique name.
-resource.aws.s3.bucket.name=dolphinscheduler
-# You need to set this parameter when private cloud s3. If S3 uses public cloud, you only need to set resource.aws.region or set to the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn
-resource.aws.s3.endpoint=http://localhost:9000
-
 # alibaba cloud access key id, required if you set resource.storage.type=OSS 
 resource.alibaba.cloud.access.key.id=<your-access-key-id>
 # alibaba cloud access key secret, required if you set resource.storage.type=OSS
@ -108,87 +66,22 @@ resource.alibaba.cloud.oss.bucket.name=dolphinscheduler
 # oss bucket endpoint, required if you set resource.storage.type=OSS
 resource.alibaba.cloud.oss.endpoint=https://oss-cn-hangzhou.aliyuncs.com

-# alibaba cloud access key id, required if you set resource.storage.type=OBS
+```
+
+## 对接华为云 OBS
+
+如果需要使用到资源中心的 OBS 上传资源，我们需要对以下路径的进行配置：`api-server/conf/common.properties` 和 `worker-server/conf/common.properties`。可参考如下：
+
+```properties
+# access key id, required if you set resource.storage.type=OBS
 resource.huawei.cloud.access.key.id=<your-access-key-id>
-# alibaba cloud access key secret, required if you set resource.storage.type=OBS
+# access key secret, required if you set resource.storage.type=OBS
 resource.huawei.cloud.access.key.secret=<your-access-key-secret>
 # oss bucket name, required if you set resource.storage.type=OBS
 resource.huawei.cloud.obs.bucket.name=dolphinscheduler
 # oss bucket endpoint, required if you set resource.storage.type=OBS
 resource.huawei.cloud.obs.endpoint=obs.cn-southwest-2.huaweicloud.com

-# if resource.storage.type=HDFS, the user must have the permission to create directories under the HDFS root path
-resource.hdfs.root.user=root
-# if resource.storage.type=S3, the value like: s3a://dolphinscheduler;
-# if resource.storage.type=HDFS and namenode HA is enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir
-resource.hdfs.fs.defaultFS=hdfs://localhost:8020
-
-# whether to startup kerberos
-hadoop.security.authentication.startup.state=false
-
-# java.security.krb5.conf path
-java.security.krb5.conf.path=/opt/krb5.conf
-
-# login user from keytab username
-login.user.keytab.username=hdfs-mycluster@ESZ.COM
-
-# login user from keytab path
-login.user.keytab.path=/opt/hdfs.headless.keytab
-
-# kerberos expire time, the unit is hour
-kerberos.expire.time=2
-# resource view suffixs
-#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js
-
-# resourcemanager port, the default value is 8088 if not specified
-resource.manager.httpaddress.port=8088
-# if resourcemanager HA is enabled, please set the HA IPs; if resourcemanager is single, keep this value empty
-yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
-# if resourcemanager HA is enabled or not use resourcemanager, please keep the default value;
-# If resourcemanager is single, you only need to replace ds1 to actual resourcemanager hostname
-yarn.application.status.address=http://localhost:%s/ds/v1/cluster/apps/%s
-# job history status url when application number threshold is reached(default 10000, maybe it was set to 1000)
-yarn.job.history.status.address=http://localhost:19888/ds/v1/history/mapreduce/jobs/%s
-
-# datasource encryption enable
-datasource.encryption.enable=false
-
-# datasource encryption salt
-datasource.encryption.salt=!@#$%^&*
-
-# data quality jar directory path, it would auto discovery data quality jar from this given dir. You should keep it empty if you do not change anything in
-# data-quality, it will auto discovery by dolphinscheduler itself. Change it only if you want to use your own data-quality jar and it is not in worker-server
-# libs directory(but may sure your jar name start with `dolphinscheduler-data-quality`).
-data-quality.jar.dir=
-
-#data-quality.error.output.path=/tmp/data-quality-error-data
-
-# Network IP gets priority, default inner outer
-
-# Whether hive SQL is executed in the same session
-support.hive.oneSession=false
-
-# use sudo or not, if set true, executing user is tenant user and deploy user needs sudo permissions;
-# if set false, executing user is the deploy user and doesn't need sudo permissions
-sudo.enable=true
-
-# network interface preferred like eth0, default: empty
-#dolphin.scheduler.network.interface.preferred=
-
-# network IP gets priority, default: inner outer
-#dolphin.scheduler.network.priority.strategy=default
-
-# system env path
-#dolphinscheduler.env.path=env/dolphinscheduler_env.sh
-
-# development state
-development.state=false
-
-# rpc port
-alert.rpc.port=50052
-
-# way to collect applicationId: log(original regex match), aop
-appId.collect: log
 ```

 > **注意**：
--- a/docs/docs/zh/guide/resource/intro.md
+++ b/docs/docs/zh/guide/resource/intro.md
@ -1,4 +1,4 @@
 # 资源中心简介

-资源中心通常用于上传文件、UDF 函数和任务组管理。 对于 standalone 环境，可以选择本地文件目录作为上传文件夹（此操作不需要Hadoop部署）。当然，你也可以
+资源中心通常用于上传文件和任务组管理。 对于 standalone 环境，可以选择本地文件目录作为上传文件夹（此操作不需要Hadoop部署）。当然，你也可以
 选择上传到 Hadoop 或者 MinIO 集群。 在这种情况下，您需要有 Hadoop（2.6+）或 MinIO 等相关环境。
--- a/docs/docs/zh/guide/resource/udf-manage.md
+++ b/docs/docs/zh/guide/resource/udf-manage.md
@ -1,46 +0,0 @@
-# UDF 管理
-
- 资源管理和文件管理功能类似，不同之处是资源管理是上传的 UDF 函数，文件管理上传的是用户程序，脚本及配置文件。
- 主要包括以下操作：重命名、下载、删除等。
-* 上传 UDF 资源
-
-> 和上传文件相同。
-
-## 函数管理
-
-* 创建 UDF 函数
-
-  > 点击“创建 UDF 函数”，输入 UDF 函数参数，选择udf资源，点击“提交”，创建 UDF 函数。
-  > 目前只支持 HIVE 的临时 UDF 函数
-
- UDF 函数名称：输入 UDF 函数时的名称
- 包名类名：输入 UDF 函数的全路径
- UDF 资源：设置创建的 UDF 对应的资源文件
-
-![create-udf](../../../../img/new_ui/dev/resource/create-udf.png)
-
-## 任务样例
-
-### 编写 UDF 函数
-
-用户可以根据实际生产需求，自定义想要的 UDF 函数。这里编写一个在任意字符串的末尾添加 "HelloWorld" 的函数。如下图所示：
-
-![code-udf](../../../../img/new_ui/dev/resource/demo/udf-demo01.png)
-
-### 配置 UDF 函数
-
-配置 UDF 函数前，需要先通过资源管理上传所需的函数 jar 包。然后进入函数管理，配置相关信息即可。如下图所示：
-
-![conf-udf](../../../../img/new_ui/dev/resource/demo/udf-demo02.png)
-
-### 使用 UDF 函数
-
-在使用 UDF 函数过程中，用户只需关注具体的函数编写，通过资源中心上传配置完成即可。系统会自动配置 create function 语句，参考如下：[SqlTask](https://github.com/apache/dolphinscheduler/blob/923f3f38e3271d7f1d22b3abc3497cecb6957e4a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java#L507-L531)
-
-进入工作流定义一个 SQL 节点，数据源类型选择为 HIVE，数据源实例类型为 HIVE/IMPALA。
-
- SQL 语句：`select HwUdf("abc");` 该函数与内置函数使用方式一样，直接使用函数名称即可访问。
- UDF 函数：选择资源中心所配置的即可。
-
-![use-udf](../../../../img/new_ui/dev/resource/demo/udf-demo03.png)
-
--- a/docs/docs/zh/guide/security/security.md
+++ b/docs/docs/zh/guide/security/security.md
@ -97,8 +97,8 @@

 ## 授予权限

-* 授予权限包括项目权限，资源权限，数据源权限，UDF函数权限，k8s命名空间。
-* 管理员可以对普通用户进行非其创建的项目、资源、数据源、UDF函数、k8s命名空间。因为项目、资源、数据源、UDF函数、k8s命名空间授权方式都是一样的，所以以项目授权为例介绍。
+* 授予权限包括项目权限，数据源权限和k8s命名空间。
+* 管理员可以对普通用户进行非其创建的项目、数据源k8s命名空间。因为项目、数据源、k8s命名空间授权方式都是一样的，所以以项目授权为例介绍。
 * 注意：对于用户自己创建的项目，该用户默认拥有所有的权限，因此对用户自己创建的项目进行权限变更是无效的。
 - 管理员进入`安全中心->用户管理页面`，点击需授权用户的“授权”按钮，如下图所示：

@ -112,7 +112,7 @@

 ![no-permission-error](../../../../img/new_ui/dev/security/no-permission-error.png)

- 资源、数据源、UDF 函数授权同项目授权。
+- 数据源授权同项目授权。

 ## Worker 分组

--- a/docs/docs/zh/guide/task/appendix.md
+++ b/docs/docs/zh/guide/task/appendix.md
@ -8,7 +8,7 @@
 |----------|--------------------------------------------------------------------------------------------------------------------------------------|
 | 任务名称     | 任务的名称，同一个工作流定义中的节点名称不能重复。                                                                                                            |
 | 运行标志     | 标识这个节点是否需要调度执行，如果不需要执行，可以打开禁止执行开关。                                                                                                   |
-| 缓存执行     | 标识这个节点是否需要进行缓存，如果缓存，则对于相同标识（相同任务版本，相同任务定义，相同参数传入）的任务进行缓存，运行时若已经存在缓存过的任务时，不在重复执行，直接复用结果。                                              |
+| 缓存执行     | 标识这个节点是否需要进行缓存，如果缓存，则对于相同标识（相同任务版本，相同任务定义，相同参数传入）的任务进行缓存，运行时若已经存在缓存过的任务时，不再重复执行，直接复用结果。                                              |
 | 描述       | 当前节点的功能描述。                                                                                                                           |
 | 任务优先级    | worker线程数不足时，根据优先级从高到低依次执行任务，优先级一样时根据先到先得原则执行。                                                                                       |
 | Worker分组 | 设置分组后，任务会被分配给worker组的机器机执行。若选择Default，则会随机选择一个worker执行。                                                                              |
--- a/docs/docs/zh/guide/task/dms.md
+++ b/docs/docs/zh/guide/task/dms.md
@ -73,14 +73,17 @@ DolphinScheduler 在 启动DMS 任务后，会跟中DMS任务状态，直至DMS

 ## 环境配置

-需要进行AWS的一些配置，修改`common.properties`中的以下配置信息
+需要进行AWS的一些配置，修改`aws.yml`中的以下配置信息

 ```yaml
-# The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.access.key.id=<YOUR AWS ACCESS KEY>
-# The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.secret.access.key=<YOUR AWS SECRET KEY>
-# The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.region=<AWS REGION>
+dms:
+  # The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
+  # AWSStaticCredentialsProvider: use the access key and secret key to authenticate
+  # InstanceProfileCredentialsProvider: use the IAM role to authenticate
+  credentials.provider.type: AWSStaticCredentialsProvider
+  access.key.id: <access.key.id>
+  access.key.secret: <access.key.secret>
+  region: <region>
+  endpoint: <endpoint>
 ```

--- a/docs/docs/zh/guide/task/pigeon.md
+++ b/docs/docs/zh/guide/task/pigeon.md
@ -1,19 +0,0 @@
-# Pigeon
-
-Pigeon任务类型是通过调用远程websocket服务，实现远程任务的触发，状态、日志的获取，是 DolphinScheduler 通用远程 websocket 服务调用任务
-
-## 创建任务
-
-拖动工具栏中的<img src="../../../../img/pigeon.png" width="20"/>任务节点到画板中即能完成任务创建
-
-## 任务参数
-
-[//]: # (TODO: use the commented anchor below once our website template supports this syntax)
-[//]: # (- 默认参数说明请参考[DolphinScheduler任务参数附录]&#40;appendix.md#默认任务参数&#41;`默认任务参数`一栏。)
-
- 默认参数说明请参考[DolphinScheduler任务参数附录](appendix.md)`默认任务参数`一栏。
-
-| **任务参数** |      **描述**       |
-|----------|-------------------|
-| 目标任务名    | 输入Pigeon任务的目标任务名称 |
-
--- a/docs/docs/zh/guide/task/sagemaker.md
+++ b/docs/docs/zh/guide/task/sagemaker.md
@ -33,14 +33,17 @@ DolphinScheduler SageMaker 组件的功能:

 ## 环境配置

-需要进行AWS的一些配置，修改`common.properties`中的`xxxxx`为你的配置信息
+需要进行AWS的一些配置，修改`aws.yml`中的以下配置信息

 ```yaml
-# The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.access.key.id=<YOUR AWS ACCESS KEY>
-# The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.secret.access.key=<YOUR AWS SECRET KEY>
-# The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
-resource.aws.region=<AWS REGION>
+sagemaker:
+  # The AWS credentials provider type. support: AWSStaticCredentialsProvider, InstanceProfileCredentialsProvider
+  # AWSStaticCredentialsProvider: use the access key and secret key to authenticate
+  # InstanceProfileCredentialsProvider: use the IAM role to authenticate
+  credentials.provider.type: AWSStaticCredentialsProvider
+  access.key.id: <access.key.id>
+  access.key.secret: <access.key.secret>
+  region: <region>
+  endpoint: <endpoint>
 ```

--- a/docs/docs/zh/guide/task/sql.md
+++ b/docs/docs/zh/guide/task/sql.md
@ -26,7 +26,6 @@ SQL任务类型，用于连接数据库并执行相应SQL。
 - 默认采用`;\n`作为SQL分隔符,拆分成多段SQL语句执行。Hive的JDBC不支持一次执行多段SQL语句，请不要使用`;\n`。
 - sql参数：输入参数格式为key1=value1;key2=value2…
 - sql语句：SQL语句
- UDF函数：对于HIVE类型的数据源，可以引用资源中心中创建的UDF函数，其他类型的数据源暂不支持UDF函数。
 - 自定义参数：SQL任务类型，而存储过程是自定义参数顺序，给方法设置值自定义参数类型和数据类型，同存储过程任务类型一样。区别在于SQL任务类型自定义参数会替换sql语句中${变量}。
 - 前置sql:前置sql在sql语句之前执行。
 - 后置sql:后置sql在sql语句之后执行。
@ -57,5 +56,4 @@ SQL任务类型，用于连接数据库并执行相应SQL。
 ## 注意事项

 * 注意SQL类型的选择，如果是INSERT等操作需要选择非查询类型。
-* 为了兼容长会话情况,UDF函数的创建是通过CREATE OR REPLACE语句

--- a/docs/docs/zh/guide/upgrade/incompatible.md
+++ b/docs/docs/zh/guide/upgrade/incompatible.md
@ -24,3 +24,8 @@

 * 在 /datasources/tables && /datasources/tableColumns 接口中添加了必选字段`database` [#14406](https://github.com/apache/dolphinscheduler/pull/14406)

+## 3.3.0
+
+* 从 `资源中心` 中移除了 `udf-manage` 功能 ([#16209])
+* 从 `任务插件` 中移除了 `Pigeon` 类型 ([#16218])
+
--- a/docs/img/new_ui/dev/parameter/context-subprocess02.png
+++ b/docs/img/new_ui/dev/parameter/context-subprocess02.png
--- a/docs/img/new_ui/dev/parameter/context_parameter04.png
+++ b/docs/img/new_ui/dev/parameter/context_parameter04.png
--- a/docs/img/new_ui/dev/parameter/global_parameter02.png
+++ b/docs/img/new_ui/dev/parameter/global_parameter02.png
--- a/docs/img/new_ui/dev/parameter/project_parameter01.png
+++ b/docs/img/new_ui/dev/parameter/project_parameter01.png
--- a/docs/img/new_ui/dev/parameter/startup_parameter02.png
+++ b/docs/img/new_ui/dev/parameter/startup_parameter02.png
--- a/docs/img/new_ui/dev/parameter/startup_parameter04.png
+++ b/docs/img/new_ui/dev/parameter/startup_parameter04.png
--- a/docs/img/new_ui/dev/resource/create-udf.png
+++ b/docs/img/new_ui/dev/resource/create-udf.png
--- a/docs/img/new_ui/dev/resource/demo/udf-demo01.png
+++ b/docs/img/new_ui/dev/resource/demo/udf-demo01.png
--- a/docs/img/new_ui/dev/resource/demo/udf-demo02.png
+++ b/docs/img/new_ui/dev/resource/demo/udf-demo02.png
--- a/docs/img/new_ui/dev/resource/demo/udf-demo03.png
+++ b/docs/img/new_ui/dev/resource/demo/udf-demo03.png
--- a/docs/img/pigeon.png
+++ b/docs/img/pigeon.png
--- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/assembly/dolphinscheduler-alert-server.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/assembly/dolphinscheduler-alert-server.xml
@ -56,6 +56,13 @@
            </includes>
            <outputDirectory>conf</outputDirectory>
        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../dolphinscheduler-authentication/dolphinscheduler-aws-authentication/src/main/resources</directory>
+            <includes>
+                <include>**/*.yaml</include>
+            </includes>
+            <outputDirectory>conf</outputDirectory>
+        </fileSet>
    </fileSets>
    <dependencySets>
        <dependencySet>
--- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/bin/jvm_args_env.sh
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/bin/jvm_args_env.sh
@ -24,6 +24,7 @@
 -XX:+PrintGCDetails
 -Xloggc:gc.log

+-XX:-OmitStackTraceInFastThrow
 -XX:+ExitOnOutOfMemoryError
 -XX:+HeapDumpOnOutOfMemoryError
 -XX:HeapDumpPath=dump.hprof
--- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/application.yaml
@ -82,12 +82,12 @@ registry:
    namespace: dolphinscheduler
    connect-string: localhost:2181
    retry-policy:
-      base-sleep-time: 60ms
-      max-sleep: 300ms
+      base-sleep-time: 1s
+      max-sleep: 3s
      max-retries: 5
-    session-timeout: 30s
-    connection-timeout: 9s
-    block-until-connected: 600ms
+    session-timeout: 60s
+    connection-timeout: 15s
+    block-until-connected: 15s
    digest: ~

 metrics:
--- a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ExecutorAPITest.java
+++ b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ExecutorAPITest.java
@ -31,17 +31,8 @@ import org.apache.dolphinscheduler.common.enums.FailureStrategy;
 import org.apache.dolphinscheduler.common.enums.ReleaseState;
 import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.common.enums.WarningType;
-import org.apache.dolphinscheduler.dao.entity.Project;
 import org.apache.dolphinscheduler.dao.entity.User;

-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-
-import lombok.extern.slf4j.Slf4j;
-
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.util.EntityUtils;

@ -51,6 +42,14 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;

+import lombok.extern.slf4j.Slf4j;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+
 //TODO: Some test cases rely on ProcessInstance APIs. Should complete remaining cases after ProcessInstance related API tests done.
@DolphinScheduler(composeFiles = "docker/basic/docker-compose.yaml")
@Slf4j
@ -80,7 +79,8 @@ public class ExecutorAPITest {
    public static void setup() {
        LoginPage loginPage = new LoginPage();
        HttpResponse loginHttpResponse = loginPage.login(username, password);
-        sessionId = JSONUtils.convertValue(loginHttpResponse.getBody().getData(), LoginResponseData.class).getSessionId();
+        sessionId =
+                JSONUtils.convertValue(loginHttpResponse.getBody().getData(), LoginResponseData.class).getSessionId();
        executorPage = new ExecutorPage(sessionId);
        processDefinitionPage = new ProcessDefinitionPage(sessionId);
        projectPage = new ProjectPage(sessionId);
@ -103,24 +103,30 @@ public class ExecutorAPITest {
            HttpResponse createProjectResponse = projectPage.createProject(loginUser, "project-test");
            HttpResponse queryAllProjectListResponse = projectPage.queryAllProjectList(loginUser);
            Assertions.assertTrue(queryAllProjectListResponse.getBody().getSuccess());
-            projectCode = (long) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProjectListResponse.getBody().getData()).get(0)).get("code");
+            projectCode = (long) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProjectListResponse
+                    .getBody().getData()).get(0)).get("code");

            // upload test workflow definition json
            ClassLoader classLoader = getClass().getClassLoader();
            File file = new File(classLoader.getResource("workflow-json/test.json").getFile());
            CloseableHttpResponse importProcessDefinitionResponse = processDefinitionPage
-                .importProcessDefinition(loginUser, projectCode, file);
+                    .importProcessDefinition(loginUser, projectCode, file);
            String data = EntityUtils.toString(importProcessDefinitionResponse.getEntity());
            Assertions.assertTrue(data.contains("\"success\":true"));

            // get workflow definition code
-            HttpResponse queryAllProcessDefinitionByProjectCodeResponse = processDefinitionPage.queryAllProcessDefinitionByProjectCode(loginUser, projectCode);
+            HttpResponse queryAllProcessDefinitionByProjectCodeResponse =
+                    processDefinitionPage.queryAllProcessDefinitionByProjectCode(loginUser, projectCode);
            Assertions.assertTrue(queryAllProcessDefinitionByProjectCodeResponse.getBody().getSuccess());
-            Assertions.assertTrue(queryAllProcessDefinitionByProjectCodeResponse.getBody().getData().toString().contains("hello world"));
-            processDefinitionCode = (long) ((LinkedHashMap<String, Object>) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProcessDefinitionByProjectCodeResponse.getBody().getData()).get(0)).get("processDefinition")).get("code");
+            Assertions.assertTrue(queryAllProcessDefinitionByProjectCodeResponse.getBody().getData().toString()
+                    .contains("hello world"));
+            processDefinitionCode =
+                    (long) ((LinkedHashMap<String, Object>) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProcessDefinitionByProjectCodeResponse
+                            .getBody().getData()).get(0)).get("processDefinition")).get("code");

            // release test workflow
-            HttpResponse releaseProcessDefinitionResponse = processDefinitionPage.releaseProcessDefinition(loginUser, projectCode, processDefinitionCode, ReleaseState.ONLINE);
+            HttpResponse releaseProcessDefinitionResponse = processDefinitionPage.releaseProcessDefinition(loginUser,
+                    projectCode, processDefinitionCode, ReleaseState.ONLINE);
            Assertions.assertTrue(releaseProcessDefinitionResponse.getBody().getSuccess());

            // trigger workflow instance
@ -128,11 +134,12 @@ public class ExecutorAPITest {
            Date date = new Date();
            String scheduleTime = String.format("%s,%s", formatter.format(date), formatter.format(date));
            log.info("use current time {} as scheduleTime", scheduleTime);
-            HttpResponse startProcessInstanceResponse = executorPage.startProcessInstance(loginUser, projectCode, processDefinitionCode, scheduleTime, FailureStrategy.END, WarningType.NONE);
+            HttpResponse startProcessInstanceResponse = executorPage.startProcessInstance(loginUser, projectCode,
+                    processDefinitionCode, scheduleTime, FailureStrategy.END, WarningType.NONE);
            Assertions.assertTrue(startProcessInstanceResponse.getBody().getSuccess());

            triggerCode = (long) startProcessInstanceResponse.getBody().getData();
-        }  catch (Exception e) {
+        } catch (Exception e) {
            log.error("failed", e);
            Assertions.fail();
        }
@ -141,7 +148,8 @@ public class ExecutorAPITest {
    @Test
    @Order(2)
    public void testStartCheckProcessDefinition() {
-        HttpResponse testStartCheckProcessDefinitionResponse = executorPage.startCheckProcessDefinition(loginUser, projectCode, processDefinitionCode);
+        HttpResponse testStartCheckProcessDefinitionResponse =
+                executorPage.startCheckProcessDefinition(loginUser, projectCode, processDefinitionCode);
        Assertions.assertTrue(testStartCheckProcessDefinitionResponse.getBody().getSuccess());
    }

--- a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProcessDefinitionAPITest.java
+++ b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProcessDefinitionAPITest.java
@ -30,21 +30,21 @@ import org.apache.dolphinscheduler.common.enums.ReleaseState;
 import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.dao.entity.User;

-import java.io.File;;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.util.EntityUtils;
+
+import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.List;

+import lombok.extern.slf4j.Slf4j;
+
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;

-import lombok.extern.slf4j.Slf4j;
-
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.util.EntityUtils;
-
@DolphinScheduler(composeFiles = "docker/basic/docker-compose.yaml")
@Slf4j
 public class ProcessDefinitionAPITest {
@ -67,12 +67,12 @@ public class ProcessDefinitionAPITest {

    private static String processDefinitionName;

-
    @BeforeAll
    public static void setup() {
        LoginPage loginPage = new LoginPage();
        HttpResponse loginHttpResponse = loginPage.login(username, password);
-        sessionId = JSONUtils.convertValue(loginHttpResponse.getBody().getData(), LoginResponseData.class).getSessionId();
+        sessionId =
+                JSONUtils.convertValue(loginHttpResponse.getBody().getData(), LoginResponseData.class).getSessionId();
        processDefinitionPage = new ProcessDefinitionPage(sessionId);
        projectPage = new ProjectPage(sessionId);
        loginUser = new User();
@ -93,14 +93,15 @@ public class ProcessDefinitionAPITest {
            HttpResponse queryAllProjectListResponse = projectPage.queryAllProjectList(loginUser);
            Assertions.assertTrue(queryAllProjectListResponse.getBody().getSuccess());

-            projectCode = (long) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProjectListResponse.getBody().getData()).get(0)).get("code");
+            projectCode = (long) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProjectListResponse
+                    .getBody().getData()).get(0)).get("code");
            ClassLoader classLoader = getClass().getClassLoader();
            File file = new File(classLoader.getResource("workflow-json/test.json").getFile());
            CloseableHttpResponse importProcessDefinitionResponse = processDefinitionPage
-                .importProcessDefinition(loginUser, projectCode, file);
+                    .importProcessDefinition(loginUser, projectCode, file);
            String data = EntityUtils.toString(importProcessDefinitionResponse.getEntity());
            Assertions.assertTrue(data.contains("\"success\":true"));
-        }  catch (Exception e) {
+        } catch (Exception e) {
            log.error("failed", e);
            Assertions.fail();
        }
@ -109,72 +110,92 @@ public class ProcessDefinitionAPITest {
    @Test
    @Order(2)
    public void testQueryAllProcessDefinitionByProjectCode() {
-        HttpResponse queryAllProcessDefinitionByProjectCodeResponse = processDefinitionPage.queryAllProcessDefinitionByProjectCode(loginUser, projectCode);
+        HttpResponse queryAllProcessDefinitionByProjectCodeResponse =
+                processDefinitionPage.queryAllProcessDefinitionByProjectCode(loginUser, projectCode);
        Assertions.assertTrue(queryAllProcessDefinitionByProjectCodeResponse.getBody().getSuccess());
-        Assertions.assertTrue(queryAllProcessDefinitionByProjectCodeResponse.getBody().getData().toString().contains("hello world"));
-        processDefinitionCode = (long) ((LinkedHashMap<String, Object>) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProcessDefinitionByProjectCodeResponse.getBody().getData()).get(0)).get("processDefinition")).get("code");
-        processDefinitionName = (String) ((LinkedHashMap<String, Object>) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProcessDefinitionByProjectCodeResponse.getBody().getData()).get(0)).get("processDefinition")).get("name");
+        Assertions.assertTrue(
+                queryAllProcessDefinitionByProjectCodeResponse.getBody().getData().toString().contains("hello world"));
+        processDefinitionCode =
+                (long) ((LinkedHashMap<String, Object>) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProcessDefinitionByProjectCodeResponse
+                        .getBody().getData()).get(0)).get("processDefinition")).get("code");
+        processDefinitionName =
+                (String) ((LinkedHashMap<String, Object>) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProcessDefinitionByProjectCodeResponse
+                        .getBody().getData()).get(0)).get("processDefinition")).get("name");
    }

    @Test
    @Order(3)
    public void testQueryProcessDefinitionByCode() {
-        HttpResponse queryProcessDefinitionByCodeResponse = processDefinitionPage.queryProcessDefinitionByCode(loginUser, projectCode, processDefinitionCode);
+        HttpResponse queryProcessDefinitionByCodeResponse =
+                processDefinitionPage.queryProcessDefinitionByCode(loginUser, projectCode, processDefinitionCode);
        Assertions.assertTrue(queryProcessDefinitionByCodeResponse.getBody().getSuccess());
-        Assertions.assertTrue(queryProcessDefinitionByCodeResponse.getBody().getData().toString().contains("hello world"));
+        Assertions.assertTrue(
+                queryProcessDefinitionByCodeResponse.getBody().getData().toString().contains("hello world"));
    }

    @Test
    @Order(4)
    public void testgetProcessListByProjectCode() {
-        HttpResponse getProcessListByProjectCodeResponse = processDefinitionPage.getProcessListByProjectCode(loginUser, projectCode);
+        HttpResponse getProcessListByProjectCodeResponse =
+                processDefinitionPage.getProcessListByProjectCode(loginUser, projectCode);
        Assertions.assertTrue(getProcessListByProjectCodeResponse.getBody().getSuccess());
-        Assertions.assertTrue(getProcessListByProjectCodeResponse.getBody().getData().toString().contains("test_import"));
+        Assertions
+                .assertTrue(getProcessListByProjectCodeResponse.getBody().getData().toString().contains("test_import"));
    }

    @Test
    @Order(5)
    public void testQueryProcessDefinitionByName() {
-        HttpResponse queryProcessDefinitionByNameResponse = processDefinitionPage.queryProcessDefinitionByName(loginUser, projectCode, processDefinitionName);
+        HttpResponse queryProcessDefinitionByNameResponse =
+                processDefinitionPage.queryProcessDefinitionByName(loginUser, projectCode, processDefinitionName);
        Assertions.assertTrue(queryProcessDefinitionByNameResponse.getBody().getSuccess());
-        Assertions.assertTrue(queryProcessDefinitionByNameResponse.getBody().getData().toString().contains("hello world"));
+        Assertions.assertTrue(
+                queryProcessDefinitionByNameResponse.getBody().getData().toString().contains("hello world"));
    }

    @Test
    @Order(6)
    public void testQueryProcessDefinitionList() {
-        HttpResponse queryProcessDefinitionListResponse = processDefinitionPage.queryProcessDefinitionList(loginUser, projectCode);
+        HttpResponse queryProcessDefinitionListResponse =
+                processDefinitionPage.queryProcessDefinitionList(loginUser, projectCode);
        Assertions.assertTrue(queryProcessDefinitionListResponse.getBody().getSuccess());
-        Assertions.assertTrue(queryProcessDefinitionListResponse.getBody().getData().toString().contains("hello world"));
+        Assertions
+                .assertTrue(queryProcessDefinitionListResponse.getBody().getData().toString().contains("hello world"));
    }

    @Test
    @Order(7)
    public void testReleaseProcessDefinition() {
-        HttpResponse releaseProcessDefinitionResponse = processDefinitionPage.releaseProcessDefinition(loginUser, projectCode, processDefinitionCode, ReleaseState.ONLINE);
+        HttpResponse releaseProcessDefinitionResponse = processDefinitionPage.releaseProcessDefinition(loginUser,
+                projectCode, processDefinitionCode, ReleaseState.ONLINE);
        Assertions.assertTrue(releaseProcessDefinitionResponse.getBody().getSuccess());

-        HttpResponse queryProcessDefinitionByCodeResponse = processDefinitionPage.queryProcessDefinitionByCode(loginUser, projectCode, processDefinitionCode);
+        HttpResponse queryProcessDefinitionByCodeResponse =
+                processDefinitionPage.queryProcessDefinitionByCode(loginUser, projectCode, processDefinitionCode);
        Assertions.assertTrue(queryProcessDefinitionByCodeResponse.getBody().getSuccess());
-        Assertions.assertTrue(queryProcessDefinitionByCodeResponse.getBody().getData().toString().contains("releaseState=ONLINE"));
+        Assertions.assertTrue(
+                queryProcessDefinitionByCodeResponse.getBody().getData().toString().contains("releaseState=ONLINE"));
    }

    @Test
    @Order(8)
    public void testDeleteProcessDefinitionByCode() {
-        HttpResponse deleteProcessDefinitionByCodeResponse = processDefinitionPage.deleteProcessDefinitionByCode(loginUser, projectCode, processDefinitionCode);
+        HttpResponse deleteProcessDefinitionByCodeResponse =
+                processDefinitionPage.deleteProcessDefinitionByCode(loginUser, projectCode, processDefinitionCode);
        Assertions.assertFalse(deleteProcessDefinitionByCodeResponse.getBody().getSuccess());

-        HttpResponse releaseProcessDefinitionResponse = processDefinitionPage.releaseProcessDefinition(loginUser, projectCode, processDefinitionCode, ReleaseState.OFFLINE);
+        HttpResponse releaseProcessDefinitionResponse = processDefinitionPage.releaseProcessDefinition(loginUser,
+                projectCode, processDefinitionCode, ReleaseState.OFFLINE);
        Assertions.assertTrue(releaseProcessDefinitionResponse.getBody().getSuccess());

-        deleteProcessDefinitionByCodeResponse = processDefinitionPage.deleteProcessDefinitionByCode(loginUser, projectCode, processDefinitionCode);
+        deleteProcessDefinitionByCodeResponse =
+                processDefinitionPage.deleteProcessDefinitionByCode(loginUser, projectCode, processDefinitionCode);
        Assertions.assertTrue(deleteProcessDefinitionByCodeResponse.getBody().getSuccess());

-        HttpResponse queryProcessDefinitionListResponse = processDefinitionPage.queryProcessDefinitionList(loginUser, projectCode);
+        HttpResponse queryProcessDefinitionListResponse =
+                processDefinitionPage.queryProcessDefinitionList(loginUser, projectCode);
        Assertions.assertTrue(queryProcessDefinitionListResponse.getBody().getSuccess());
-        Assertions.assertFalse(queryProcessDefinitionListResponse.getBody().getData().toString().contains("hello world"));
+        Assertions
+                .assertFalse(queryProcessDefinitionListResponse.getBody().getData().toString().contains("hello world"));
    }
 }
-
-
--- a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProcessInstanceAPITest.java
+++ b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProcessInstanceAPITest.java
@ -48,6 +48,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

+import lombok.extern.slf4j.Slf4j;
+
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@ -55,8 +57,6 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.shaded.org.awaitility.Awaitility;

-import lombok.extern.slf4j.Slf4j;
-
@DolphinScheduler(composeFiles = "docker/basic/docker-compose.yaml")
@Slf4j
 public class ProcessInstanceAPITest {
@ -89,7 +89,8 @@ public class ProcessInstanceAPITest {
    public static void setup() {
        LoginPage loginPage = new LoginPage();
        HttpResponse loginHttpResponse = loginPage.login(username, password);
-        sessionId = JSONUtils.convertValue(loginHttpResponse.getBody().getData(), LoginResponseData.class).getSessionId();
+        sessionId =
+                JSONUtils.convertValue(loginHttpResponse.getBody().getData(), LoginResponseData.class).getSessionId();
        processInstancePage = new ProcessInstancePage(sessionId);
        executorPage = new ExecutorPage(sessionId);
        processDefinitionPage = new ProcessDefinitionPage(sessionId);
@ -113,24 +114,30 @@ public class ProcessInstanceAPITest {
            HttpResponse createProjectResponse = projectPage.createProject(loginUser, "project-test");
            HttpResponse queryAllProjectListResponse = projectPage.queryAllProjectList(loginUser);
            assertTrue(queryAllProjectListResponse.getBody().getSuccess());
-            projectCode = (long) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProjectListResponse.getBody().getData()).get(0)).get("code");
+            projectCode = (long) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProjectListResponse
+                    .getBody().getData()).get(0)).get("code");

            // upload test workflow definition json
            ClassLoader classLoader = getClass().getClassLoader();
            File file = new File(classLoader.getResource("workflow-json/test.json").getFile());
            CloseableHttpResponse importProcessDefinitionResponse = processDefinitionPage
-                .importProcessDefinition(loginUser, projectCode, file);
+                    .importProcessDefinition(loginUser, projectCode, file);
            String data = EntityUtils.toString(importProcessDefinitionResponse.getEntity());
            assertTrue(data.contains("\"success\":true"));

            // get workflow definition code
-            HttpResponse queryAllProcessDefinitionByProjectCodeResponse = processDefinitionPage.queryAllProcessDefinitionByProjectCode(loginUser, projectCode);
+            HttpResponse queryAllProcessDefinitionByProjectCodeResponse =
+                    processDefinitionPage.queryAllProcessDefinitionByProjectCode(loginUser, projectCode);
            assertTrue(queryAllProcessDefinitionByProjectCodeResponse.getBody().getSuccess());
-            assertTrue(queryAllProcessDefinitionByProjectCodeResponse.getBody().getData().toString().contains("hello world"));
-            processDefinitionCode = (long) ((LinkedHashMap<String, Object>) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProcessDefinitionByProjectCodeResponse.getBody().getData()).get(0)).get("processDefinition")).get("code");
+            assertTrue(queryAllProcessDefinitionByProjectCodeResponse.getBody().getData().toString()
+                    .contains("hello world"));
+            processDefinitionCode =
+                    (long) ((LinkedHashMap<String, Object>) ((LinkedHashMap<String, Object>) ((List<LinkedHashMap>) queryAllProcessDefinitionByProjectCodeResponse
+                            .getBody().getData()).get(0)).get("processDefinition")).get("code");

            // release test workflow
-            HttpResponse releaseProcessDefinitionResponse = processDefinitionPage.releaseProcessDefinition(loginUser, projectCode, processDefinitionCode, ReleaseState.ONLINE);
+            HttpResponse releaseProcessDefinitionResponse = processDefinitionPage.releaseProcessDefinition(loginUser,
+                    projectCode, processDefinitionCode, ReleaseState.ONLINE);
            assertTrue(releaseProcessDefinitionResponse.getBody().getSuccess());

            // trigger workflow instance
@ -138,23 +145,27 @@ public class ProcessInstanceAPITest {
            Date date = new Date();
            String scheduleTime = String.format("%s,%s", formatter.format(date), formatter.format(date));
            log.info("use current time {} as scheduleTime", scheduleTime);
-            HttpResponse startProcessInstanceResponse = executorPage.startProcessInstance(loginUser, projectCode, processDefinitionCode, scheduleTime, FailureStrategy.END, WarningType.NONE);
+            HttpResponse startProcessInstanceResponse = executorPage.startProcessInstance(loginUser, projectCode,
+                    processDefinitionCode, scheduleTime, FailureStrategy.END, WarningType.NONE);
            assertTrue(startProcessInstanceResponse.getBody().getSuccess());

            // make sure process instance has completed and successfully persisted into db
            Awaitility.await()
-                .atMost(30, TimeUnit.SECONDS)
-                .untilAsserted(() -> {
-                    // query workflow instance by trigger code
-                    triggerCode = (long) startProcessInstanceResponse.getBody().getData();
-                    HttpResponse queryProcessInstancesByTriggerCodeResponse = processInstancePage.queryProcessInstancesByTriggerCode(loginUser, projectCode, triggerCode);
-                    assertTrue(queryProcessInstancesByTriggerCodeResponse.getBody().getSuccess());
-                    List<LinkedHashMap<String, Object>> body = (List<LinkedHashMap<String, Object>>) queryProcessInstancesByTriggerCodeResponse.getBody().getData();
-                    assertTrue(CollectionUtils.isNotEmpty(body));
-                    assertEquals("SUCCESS", body.get(0).get("state"));
-                    processInstanceId = (int) body.get(0).get("id");
-                });
-        }  catch (Exception e) {
+                    .atMost(30, TimeUnit.SECONDS)
+                    .untilAsserted(() -> {
+                        // query workflow instance by trigger code
+                        triggerCode = (long) startProcessInstanceResponse.getBody().getData();
+                        HttpResponse queryProcessInstancesByTriggerCodeResponse = processInstancePage
+                                .queryProcessInstancesByTriggerCode(loginUser, projectCode, triggerCode);
+                        assertTrue(queryProcessInstancesByTriggerCodeResponse.getBody().getSuccess());
+                        List<LinkedHashMap<String, Object>> body =
+                                (List<LinkedHashMap<String, Object>>) queryProcessInstancesByTriggerCodeResponse
+                                        .getBody().getData();
+                        assertTrue(CollectionUtils.isNotEmpty(body));
+                        assertEquals("SUCCESS", body.get(0).get("state"));
+                        processInstanceId = (int) body.get(0).get("id");
+                    });
+        } catch (Exception e) {
            log.error("failed", e);
            Assertions.fail();
        }
@ -163,7 +174,8 @@ public class ProcessInstanceAPITest {
    @Test
    @Order(2)
    public void testQueryProcessInstanceList() {
-        HttpResponse queryProcessInstanceListResponse = processInstancePage.queryProcessInstanceList(loginUser, projectCode, 1, 10);
+        HttpResponse queryProcessInstanceListResponse =
+                processInstancePage.queryProcessInstanceList(loginUser, projectCode, 1, 10);
        assertTrue(queryProcessInstanceListResponse.getBody().getSuccess());
        assertTrue(queryProcessInstanceListResponse.getBody().getData().toString().contains("test_import"));
    }
@ -171,7 +183,8 @@ public class ProcessInstanceAPITest {
    @Test
    @Order(3)
    public void testQueryTaskListByProcessId() {
-        HttpResponse queryTaskListByProcessIdResponse = processInstancePage.queryTaskListByProcessId(loginUser, projectCode, processInstanceId);
+        HttpResponse queryTaskListByProcessIdResponse =
+                processInstancePage.queryTaskListByProcessId(loginUser, projectCode, processInstanceId);
        assertTrue(queryTaskListByProcessIdResponse.getBody().getSuccess());
        assertTrue(queryTaskListByProcessIdResponse.getBody().getData().toString().contains("test_import"));
    }
@ -179,7 +192,8 @@ public class ProcessInstanceAPITest {
    @Test
    @Order(4)
    public void testQueryProcessInstanceById() {
-        HttpResponse queryProcessInstanceByIdResponse = processInstancePage.queryProcessInstanceById(loginUser, projectCode, processInstanceId);
+        HttpResponse queryProcessInstanceByIdResponse =
+                processInstancePage.queryProcessInstanceById(loginUser, projectCode, processInstanceId);
        assertTrue(queryProcessInstanceByIdResponse.getBody().getSuccess());
        assertTrue(queryProcessInstanceByIdResponse.getBody().getData().toString().contains("test_import"));
    }
@ -187,10 +201,12 @@ public class ProcessInstanceAPITest {
    @Test
    @Order(5)
    public void testDeleteProcessInstanceById() {
-        HttpResponse deleteProcessInstanceByIdResponse = processInstancePage.deleteProcessInstanceById(loginUser, projectCode, processInstanceId);
+        HttpResponse deleteProcessInstanceByIdResponse =
+                processInstancePage.deleteProcessInstanceById(loginUser, projectCode, processInstanceId);
        assertTrue(deleteProcessInstanceByIdResponse.getBody().getSuccess());

-        HttpResponse queryProcessInstanceListResponse = processInstancePage.queryProcessInstanceList(loginUser, projectCode, 1, 10);
+        HttpResponse queryProcessInstanceListResponse =
+                processInstancePage.queryProcessInstanceList(loginUser, projectCode, 1, 10);
        assertTrue(queryProcessInstanceListResponse.getBody().getSuccess());
        Assertions.assertFalse(queryProcessInstanceListResponse.getBody().getData().toString().contains("test_import"));
    }
--- a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProjectAPITest.java
+++ b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProjectAPITest.java
@ -29,17 +29,17 @@ import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.dao.entity.Project;
 import org.apache.dolphinscheduler.dao.entity.User;

+import java.util.LinkedHashMap;
+import java.util.List;
+
+import lombok.extern.slf4j.Slf4j;
+
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;

-import lombok.extern.slf4j.Slf4j;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-
@DolphinScheduler(composeFiles = "docker/basic/docker-compose.yaml")
@Slf4j
 // TODO: Add more detailed permission control related cases after userPage test cases completed
@ -59,7 +59,8 @@ public class ProjectAPITest {
    public static void setup() {
        LoginPage loginPage = new LoginPage();
        HttpResponse loginHttpResponse = loginPage.login(username, password);
-        sessionId = JSONUtils.convertValue(loginHttpResponse.getBody().getData(), LoginResponseData.class).getSessionId();
+        sessionId =
+                JSONUtils.convertValue(loginHttpResponse.getBody().getData(), LoginResponseData.class).getSessionId();
        projectPage = new ProjectPage(sessionId);
        loginUser = new User();
        loginUser.setUserName("admin");
@ -98,7 +99,8 @@ public class ProjectAPITest {
        List<LinkedHashMap> projects = (List<LinkedHashMap>) queryAllProjectListResponse.getBody().getData();
        Long code = (Long) projects.get(0).get("code");

-        HttpResponse updateProjectResponse = projectPage.updateProject(loginUser, code,"project-new", loginUser.getUserName());
+        HttpResponse updateProjectResponse =
+                projectPage.updateProject(loginUser, code, "project-new", loginUser.getUserName());
        Assertions.assertTrue(updateProjectResponse.getBody().getSuccess());

        queryAllProjectListResponse = projectPage.queryAllProjectList(loginUser);
@ -133,17 +135,21 @@ public class ProjectAPITest {
    @Test
    @Order(6)
    public void testQueryProjectWithAuthorizedLevelListPaging() {
-        HttpResponse queryProjectWithAuthorizedLevelListPagingResponse = projectPage.queryProjectWithAuthorizedLevelListPaging(loginUser, loginUser.getId(),1, 1);
+        HttpResponse queryProjectWithAuthorizedLevelListPagingResponse =
+                projectPage.queryProjectWithAuthorizedLevelListPaging(loginUser, loginUser.getId(), 1, 1);
        Assertions.assertTrue(queryProjectWithAuthorizedLevelListPagingResponse.getBody().getSuccess());
-        Assertions.assertTrue(queryProjectWithAuthorizedLevelListPagingResponse.getBody().getData().toString().contains("project-new"));
+        Assertions.assertTrue(queryProjectWithAuthorizedLevelListPagingResponse.getBody().getData().toString()
+                .contains("project-new"));
    }

    @Test
    @Order(7)
    public void testQueryUnauthorizedProject() {
-        HttpResponse queryUnauthorizedProjectResponse = projectPage.queryUnauthorizedProject(loginUser, loginUser.getId());
+        HttpResponse queryUnauthorizedProjectResponse =
+                projectPage.queryUnauthorizedProject(loginUser, loginUser.getId());
        Assertions.assertTrue(queryUnauthorizedProjectResponse.getBody().getSuccess());
-        // project-new was created by instead of authorized to this user, therefore, it should be in the unauthorized list
+        // project-new was created by instead of authorized to this user, therefore, it should be in the unauthorized
+        // list
        Assertions.assertTrue(queryUnauthorizedProjectResponse.getBody().getData().toString().contains("project-new"));
    }

@ -152,17 +158,21 @@ public class ProjectAPITest {
    public void testQueryAuthorizedProject() {
        HttpResponse queryAuthorizedProjectResponse = projectPage.queryAuthorizedProject(loginUser, loginUser.getId());
        Assertions.assertTrue(queryAuthorizedProjectResponse.getBody().getSuccess());
-        // project-new was created by instead of authorized to this user, therefore, it should not be in the authorized list
+        // project-new was created by instead of authorized to this user, therefore, it should not be in the authorized
+        // list
        Assertions.assertFalse(queryAuthorizedProjectResponse.getBody().getData().toString().contains("project-new"));
    }

    @Test
    @Order(9)
    public void testQueryProjectWithAuthorizedLevel() {
-        HttpResponse queryProjectWithAuthorizedLevelResponse = projectPage.queryProjectWithAuthorizedLevel(loginUser, loginUser.getId());
+        HttpResponse queryProjectWithAuthorizedLevelResponse =
+                projectPage.queryProjectWithAuthorizedLevel(loginUser, loginUser.getId());
        Assertions.assertTrue(queryProjectWithAuthorizedLevelResponse.getBody().getSuccess());
-        // queryProjectWithAuthorizedLevel api returns a joint-set of projects both created by and authorized to the user
-        Assertions.assertTrue(queryProjectWithAuthorizedLevelResponse.getBody().getData().toString().contains("project-new"));
+        // queryProjectWithAuthorizedLevel api returns a joint-set of projects both created by and authorized to the
+        // user
+        Assertions.assertTrue(
+                queryProjectWithAuthorizedLevelResponse.getBody().getData().toString().contains("project-new"));
    }

    @Test
@ -181,10 +191,13 @@ public class ProjectAPITest {
    @Test
    @Order(11)
    public void testQueryProjectCreatedAndAuthorizedByUser() {
-        HttpResponse queryProjectCreatedAndAuthorizedByUserResponse = projectPage.queryProjectCreatedAndAuthorizedByUser(loginUser);
+        HttpResponse queryProjectCreatedAndAuthorizedByUserResponse =
+                projectPage.queryProjectCreatedAndAuthorizedByUser(loginUser);
        Assertions.assertTrue(queryProjectCreatedAndAuthorizedByUserResponse.getBody().getSuccess());
-        // queryProjectCreatedAndAuthorizedByUser api returns a joint-set of projects both created by and authorized to the user
-        Assertions.assertTrue(queryProjectCreatedAndAuthorizedByUserResponse.getBody().getData().toString().contains("project-new"));
+        // queryProjectCreatedAndAuthorizedByUser api returns a joint-set of projects both created by and authorized to
+        // the user
+        Assertions.assertTrue(
+                queryProjectCreatedAndAuthorizedByUserResponse.getBody().getData().toString().contains("project-new"));
    }

    @Test
@ -192,7 +205,8 @@ public class ProjectAPITest {
    public void testQueryAllProjectListForDependent() {
        HttpResponse queryAllProjectListForDependentResponse = projectPage.queryAllProjectListForDependent(loginUser);
        Assertions.assertTrue(queryAllProjectListForDependentResponse.getBody().getSuccess());
-        Assertions.assertTrue(queryAllProjectListForDependentResponse.getBody().getData().toString().contains("project-new"));
+        Assertions.assertTrue(
+                queryAllProjectListForDependentResponse.getBody().getData().toString().contains("project-new"));
    }

    @Test
@ -203,8 +217,7 @@ public class ProjectAPITest {
        Long code = (Long) projects.get(0).get("code");
        HttpResponse queryAllProjectListForDependentResponse = projectPage.deleteProject(loginUser, code);
        Assertions.assertTrue(queryAllProjectListForDependentResponse.getBody().getSuccess());
-        Assertions.assertFalse(queryAllProjectListForDependentResponse.getBody().getData().toString().contains("project-new"));
+        Assertions.assertFalse(
+                queryAllProjectListForDependentResponse.getBody().getData().toString().contains("project-new"));
    }
 }
-
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Wenjun Ruan	8338815a8c	Force check ci on prapare/release branch (#16216 )	2024-07-01 09:20:56 +08:00
xiangzihao	565a91790a	[Chore] [CI] Add api-test and e2e-test to spotless check (#16242 )	2024-06-30 22:39:12 +08:00
Wenjun Ruan	177a001392	Remove unused dependentResult in TaskInstance (#16236 )	2024-06-30 18:56:53 +08:00
blink	d42ac96c55	[Fix-16211] Remove ExecutePath in buildJarCommand to fix Java Task in Jar Mode (#16238 )	2024-06-29 14:34:30 +08:00
xiangzihao	225e969d2d	[DSIP-51][Task] Remove unused pigeon task plugin (#16219 )	2024-06-28 09:51:02 +08:00
Wenjun Ruan	0e2d0fb81e	[Fix-16228] Fix E2E health check url is not correct (#16227 )	2024-06-27 21:49:21 +08:00
Wenjun Ruan	46eff34e69	[Fix-16224] Add Shell using file E2E case (#16220 ) * Add Shell E2E case * Add shell using resource file e2e case * Upgrade checkout from v2 to v4 * Change interval to 500ms * Upgrade actions/upload-artifact --------- Co-authored-by: xiangzihao <460888207@qq.com>	2024-06-27 16:04:03 +08:00
Wenjun Ruan	02bef74296	Fix worker overload will casue task failed (#16221 )	2024-06-27 13:37:13 +08:00
xiangzihao	e8566818b0	[DSIP-50][UDF Manage] Remove unused udf manage function (#16212 ) * Remove unused udf manage function	2024-06-26 21:08:48 +08:00
xiangzihao	c7a0994fb0	[Chore] Add mergeable check (#16217 ) * add mergeable check	2024-06-26 20:05:49 +08:00
xiangzihao	c3d3a14cfc	[Fix-16174] Incorrect cluster installation guide. (#16208 )	2024-06-26 10:34:37 +08:00
xiangzihao	d0229663f9	improve pr title check (#16213 )	2024-06-25 21:16:07 +08:00
Wenjun Ruan	ec6a3e0727	[DSIP-46] Unify the logic task params data structure between front-end and back-end (#16193 )	2024-06-25 13:32:13 +08:00
Wenjun Ruan	f69e06408f	Remove unused SQLIntegrityConstraintViolationException in JdbcOperator (#16200 ) Co-authored-by: xiangzihao <460888207@qq.com>	2024-06-25 10:18:42 +08:00
Wenjun Ruan	b34fe46044	Fix task cannot use workflow's environment (#16199 )	2024-06-24 20:27:25 +08:00
xiangzihao	9a823c4b98	bump up owasp version (#16187 )	2024-06-24 15:08:51 +08:00
Wenjun Ruan	f0e0395b36	[Chore] Use testcontainer origin exposed port rather than generate random port (#16195 )	2024-06-21 22:19:54 +08:00
JohnHuang	4a76a07c9c	[Improvement][Helm] Make configmap of api/master/worker/alert configuration (#16058 ) Update deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml * Update deploy/kubernetes/dolphinscheduler/values.yaml	2024-06-21 16:37:19 +08:00
Wenjun Ruan	2ab5f7dd54	Increase zk connect timeout (#16180 )	2024-06-21 15:58:48 +08:00
Wenjun Ruan	3f3f0cd4cb	[Chore] Disable composite indicator (#16172 )	2024-06-20 10:09:02 +08:00
tinglink	9bfc10d348	Fix admin login tenant unspecified issue after upgrade to v3.2.1 (#16064 )	2024-06-19 16:31:39 +08:00
Wenjun Ruan	e18ed376ac	Fix CommandDaoImplTest might failed (#16175 )	2024-06-19 15:09:01 +08:00
Wenjun Ruan	6644abd5f7	Fix HdfsStorageOperatorTest NPE (#16178 )	2024-06-19 14:32:21 +08:00
Wenjun Ruan	4c5dacf4ac	Fix DelayEntryTest might failed (#16176 ) Co-authored-by: xiangzihao <460888207@qq.com>	2024-06-19 13:42:32 +08:00
Wenjun Ruan	5df4b1cbc3	Fix condition task will cause workflow instance failed (#16152 )	2024-06-19 11:28:35 +08:00
Gallardot	17fdd7a152	[Chore] Add issue link tempate for IDEA (#16158 ) * chore: add issue link tempate for IDEA Signed-off-by: Gallardot <gallardot@apache.org> * chore: add issue link tempate for IDEA Signed-off-by: Gallardot <gallardot@apache.org> --------- Signed-off-by: Gallardot <gallardot@apache.org> Co-authored-by: xiangzihao <460888207@qq.com>	2024-06-18 21:02:15 +08:00
xiangzihao	469c19be08	[CI] Fix ci auto assign error (#16171 ) * fix ci auto assign error * labeler and codeowner improvement	2024-06-18 11:13:03 +08:00
caishunfeng	fc927cea73	update code owner (#16163 ) Co-authored-by: xiangzihao <460888207@qq.com>	2024-06-17 20:35:27 +08:00
xiangzihao	a472d68c5f	[Chore ] CI add auto-assign-action (#16165 ) * add .github/actions/auto-assign-action * add auto assign-action to fix ci error	2024-06-17 17:16:24 +08:00
xiangzihao	6736115f58	[Chore] Improve ci check (#16161 ) * improve ci check	2024-06-17 16:18:45 +08:00
Wenjun Ruan	edeb1b2458	[DSIP-45] Polish the Storage SPI (#16141 )	2024-06-17 15:24:56 +08:00
Cancai Cai	61a6bd0b30	[Fix] Fix typo: tpc -> tcp (#16160 )	2024-06-17 12:06:50 +08:00
Cancai Cai	834c320d72	[Imporve][Master] Refine the doselect annotation of the distribution policy (#16149 )	2024-06-14 11:57:21 +08:00
xiangzihao	8d0202ccaf	[CI][UT] Fix flaky unit test (#16151 )	2024-06-14 10:47:29 +08:00
Cancai Cai	8e53f2fdcb	[Improvement][Worker] Rename workerZKPath to workerRegistryPath (#16144 )	2024-06-13 14:04:45 +08:00
Cancai Cai	a13eacd61c	[Imporvement] Improve the MasterCofnig module comments of dolphinscheduler (#16134 ) Co-authored-by: xiangzihao <460888207@qq.com>	2024-06-12 13:29:23 +08:00
xiangzihao	d8011d857a	improve e2e m1 chip local mode (#16130 ) Co-authored-by: Rick Cheng <rickchengx@gmail.com>	2024-06-11 13:46:21 +08:00
Wenjun Ruan	fd5a182cd6	Add RPC metrics (#16121 )	2024-06-11 10:57:23 +08:00
Wenjun Ruan	d6714bb77a	Fix SqlServer split merge sql will miss ; (#16118 )	2024-06-06 14:10:13 +08:00
Wenjun Ruan	5e4afe6f64	Fix task nodes under switch task will not be skipped (#16108 )	2024-06-05 21:04:23 +08:00
Wenjun Ruan	5867bee95d	Fix task instance which status is dispatch will not be failover (#16107 )	2024-06-05 11:33:41 +08:00
Gallardot	4f6e7159b8	chore: fix a typo (#16104 )	2024-06-04 14:01:06 +08:00
Wenjun Ruan	7ae9ca5a33	Revert "[Improvement] Abnormal characters check (#15824 )" (#16102 ) This reverts commit `e5e7749251`.	2024-05-31 19:45:12 +08:00
Wenjun Ruan	3bc88e32c7	Rename dolphinscheduler-aop to dolphinscheduler-yarn-aop (#16095 )	2024-05-31 17:12:22 +08:00
changxiangshimian/changxiangshimian.github.io	d675c28812	Update WorkflowExecuteRunnable.java (#16092 ) Corrected the following issues https://github.com/apache/dolphinscheduler/issues/15366 https://github.com/apache/dolphinscheduler/issues/16010	2024-05-31 09:22:26 +08:00
rockfang	d8e0178599	[Fix][UI] Fix the message toast issue (#16088 )	2024-05-30 15:35:49 +08:00
rockfang	ac1eacafe0	[Fix][UI] ensure number type field has number type value in alarm-instance-manage (#16089 )	2024-05-30 11:21:14 +08:00
JohnHuang	a7245189a8	[Improvement][Flink] Change Flink command into FLINK_HOME (#16004 )	2024-05-29 13:32:31 +08:00
Sofia Jia	a71ae244af	[Doc] Update ZooKeeper download link (#16085 )	2024-05-29 09:43:28 +08:00
lwyang	ec01df1305	docs: fix several issues in installation md (#16079 ) Co-authored-by: Eric Gao <ericgao.apache@gmail.com>	2024-05-28 14:14:48 +08:00
旺阳	e93ed78c0f	[Fix] Fix audit log parma typo (#16077 )	2024-05-28 13:49:19 +08:00
Wenjun Ruan	e6c57430e3	[DSIP-44] Set a delay time to TaskExecuteRunnable if it dispatched failed (#16069 )	2024-05-27 21:53:11 +08:00
Wenjun Ruan	af55f94cc0	Fix sudo enable is false will still check tenant exist (#16071 ) (cherry picked from commit c5baa75ef93243c6bf88194eb3ad94a48173a003)	2024-05-27 18:34:14 +08:00
Gallardot	fb9172cce8	[helm] remove appversion from labels (#16066 )	2024-05-25 09:55:43 +08:00
sleo	26f2aadb06	Rename variable QUEUE_MAX_SIZE to QUEUE_INITIAL_SIZE (#16040 )	2024-05-24 20:09:10 +08:00
Wenjun Ruan	f754611509	[DSIP-42] Add dolphinscheduler-aws-authentication module (#16043 )	2024-05-24 14:15:03 +08:00
yinxiaolog	baa252a0ed	[DS-16046][fix] Set PreparedStatement parameter type (#16050 ) Fix the PreparedStatement parameter is TIME, set it to java.sql.Time Co-authored-by: Aaron Wang <wangweirao16@gmail.com> Co-authored-by: Rick Cheng <rickchengx@gmail.com>	2024-05-24 13:12:16 +08:00
sleo	581a7edad8	modify log msg (#16062 ) Co-authored-by: xiangzihao <460888207@qq.com>	2024-05-24 11:28:49 +08:00
Wenjun Ruan	5037f0a5e3	Remove OmitStackTraceInFastThrow in start.sh (#16054 )	2024-05-24 10:34:10 +08:00
Wenjun Ruan	6862fe7548	Removed unused StateEventHandleFailure (#16052 )	2024-05-23 11:35:46 +08:00
Wenjun Ruan	56ecec779c	Fix NettyRemotingClient might throw IllegalMonitorStateException (#16038 )	2024-05-22 10:26:04 +08:00
小可耐	0fc2fe971a	[DSIP-39][parameter] Improvement startup parameters/global parameters/project parameters data type (#15967 ) * [Improvement][parameter] New data types and type filtering * [Improvement][parameter] Improvement startup parameters/global parameters data type * fix api interfaces compatible * add project parameter data type default value * [Improvement][parameter] New data types and type filtering * [Improvement][parameter] Improvement startup parameters/global parameters data type * fix api interfaces compatible * add project parameter data type default value * improvement project code * remove useless imports * remove method onClearSearchTaskType * add parameter doc * optimisation logic * code conflict resolution * code conflict resolution * [Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list (#15978) * update * test * add monitor enhance ui * update * update * update doc * fix spotless * update * update * Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java Co-authored-by: Wenjun Ruan <wenjun@apache.org> * Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml Co-authored-by: Wenjun Ruan <wenjun@apache.org> * update * fix spotless * update --------- Co-authored-by: Wenjun Ruan <wenjun@apache.org> * [Improvement][Monitor] Add UT for montor (#15998) * formatting Code	2024-05-21 15:39:43 +08:00
TianXinCoord	cf400b86ba	Correction of Typos in the Chinese Document Appendix for Task Parameters (#16033 ) Co-authored-by: Rick Cheng <rickchengx@gmail.com>	2024-05-21 14:00:52 +08:00
Rick Cheng	dbd790ddac	[Fix][CI] fix the ci error of Values.datasource.profile (#16031 ) Co-authored-by: Eric Gao <ericgao.apache@gmail.com>	2024-05-21 11:16:30 +08:00
Wenjun Ruan	e4df01a033	Increase block-until-connected in ZookeeperRegistryTestCase (#16041 )	2024-05-21 10:32:15 +08:00
Wenjun Ruan	b184364561	Fix WorkerTaskExecutorThreadPool#isOverload is incorrect (#16027 )	2024-05-20 19:13:53 +08:00
Wenjun Ruan	5463d0255a	Fix rpc channel leak due to concurrent operation (#16021 ) * Fix rpc channel leak due to concurrent operation * Throw channel create failed exception --------- Co-authored-by: Rick Cheng <rickchengx@gmail.com>	2024-05-20 12:10:33 +08:00
				`@ -0,0 +1 @@`
				`Subproject commit 288f36f8cea1dded676b9c4477a64ff91e50c104`