#2213: pick 8270/8308 (#8355)

commit.ref

@@ -1 +1 @@
-Subproject commit cf5d253d5f5b18dd77be1ee6a4b6b30569409045
+Subproject commit 4a4e72b0d271dc2a5b6e488257ce1a28628f52f7

commit.yml

@@ -2,55 +2,49 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-ui-next:
-    newFile: !uuid '926bea3c506fd08c63ec3030bad0b0e18834fc83'
-    oldFile: !uuid '0d8e2a725df9881f3826824b05d30db758c99b77'
-  /dolphinscheduler-ui-next/src:
-    newFile: !uuid 'f47bbc8a24fd5204957caf4cd3024537edc3ab6e'
-    oldFile: !uuid '31e8aa0efff9e1c9911fd60cdde42bb4be88c27c'
-  /dolphinscheduler-ui-next/src/layouts:
-    newFile: !uuid '2dfa1b79e15417a7731f46b7076af80d6b6610c2'
-    oldFile: !uuid '8ba72e5d8ff28fb029fb29d2db51d95e74c3f97b'
-  /dolphinscheduler-ui-next/src/layouts/content:
-    newFile: !uuid 'bd3cf6ae482bdd5a931de0023541510f2fb8b223'
-    oldFile: !uuid '858b513f03ede7620b6aac12128c797da65b7f0d'
-  /dolphinscheduler-ui-next/src/layouts/content/index.tsx:
-    newFile: !uuid '9aa5602d517c5454c2e18747eb6c57fc7d88cc8f'
-    oldFile: !uuid 'ad0e83d6d74596ba8335ec4b05e583178e37c7ca'
-  /dolphinscheduler-ui-next/src/layouts/content/use-dataList.ts:
-    newFile: !uuid '69c5f8485c86373c9c77d31fa4c71668c2fe9743'
-    oldFile: !uuid 'b2aa0cb40a22a36565228eb32a0ae25f83c8aff5'
-  /dolphinscheduler-ui-next/src/router:
-    newFile: !uuid '14923d371a0404e6ba31042415d5bdeef9458885'
-    oldFile: !uuid '6492525d9169c44afa5910e79c85a3c14670c46c'
-  /dolphinscheduler-ui-next/src/router/index.ts:
-    newFile: !uuid '6b3e4861cb2c4dc3089b698d43feb8e7b354d8be'
-    oldFile: !uuid 'eb4c8b183ab43d9300f8f739d0a61268ba9d41ea'
-  /dolphinscheduler-ui-next/src/router/modules:
-    newFile: !uuid '085fd7eb6896a1267778a89721c881d10b8e1e91'
-    oldFile: !uuid 'e7f442ffe1eface68834a7a6fd16ce7fdd8ef088'
-  /dolphinscheduler-ui-next/src/router/modules/data-quality.ts:
-    newFile: !uuid '67ccc0a07ed0e812685124e9aaa0971684bf887d'
-    oldFile: !uuid 'e154ccc4755ee18a6b8f867d43359f7943b86db9'
-  /dolphinscheduler-ui-next/src/router/modules/datasource.ts:
-    newFile: !uuid '1c39c5db875523e6ea500fc354cd07a2a7529a5b'
-    oldFile: !uuid 'f25e00b0fc1885ce6da135813b2a94edca3099e3'
-  /dolphinscheduler-ui-next/src/router/modules/monitor.ts:
-    newFile: !uuid '9a45b336df4600016e049768d8568bbad7aab162'
-    oldFile: !uuid '3d54f10c47b519a6b875508c7db281fb9444c569'
-  /dolphinscheduler-ui-next/src/router/modules/projects.ts:
-    newFile: !uuid 'b7f45c127006278e741cc517cf439b0701b4fad5'
-    oldFile: !uuid '9c0b2a4ed6e4f8e0fae285467ac7f424603278d6'
-  /dolphinscheduler-ui-next/src/router/modules/resources.ts:
-    newFile: !uuid '7ec2ab12b098fcf5639b3661bbd528366c7a1367'
-    oldFile: !uuid 'e88cde526daae5041b9935b0f81ce01c82998293'
-  /dolphinscheduler-ui-next/src/router/modules/security.ts:
-    newFile: !uuid 'bc694a12595c2562df98c258b35886a1325f01e8'
-    oldFile: !uuid '6750b813cd389222b08edc461371fea17bddc7de'
-  /dolphinscheduler-ui-next/src/router/routes.ts:
-    newFile: !uuid 'a7af8f9144e51dadfb6ee0caf1c29ce91022c790'
-    oldFile: !uuid '2c2506a8c8643fd295ca6e4accec514a5de4b155'
-gitCommitId: !uuid 'cf5d253d5f5b18dd77be1ee6a4b6b30569409045'
+  /dolphinscheduler-api:
+    newFile: !uuid 'c488f8fe7b00a3b54ccd65651ab6d6a8b6a8b51b'
+    oldFile: !uuid 'd2c21f4064a804557f13be31f25ce85ab4ccd8c2'
+  /dolphinscheduler-api/src:
+    newFile: !uuid 'be1b166156557e654e3b6e484117580127f04204'
+    oldFile: !uuid '4b01cf0bc9c03e1709b14a95b8dbdc0a120a45a9'
+  /dolphinscheduler-api/src/main:
+    newFile: !uuid 'aeee70727886ec7a5f74dec23c493fdc233ea887'
+    oldFile: !uuid '409fb6a71d1f3517d90e7eb6d0f4f60f802b985a'
+  /dolphinscheduler-api/src/main/java:
+    newFile: !uuid '2f3b574d9e79657913115b63d5c62c8123cb5078'
+    oldFile: !uuid '1ce22338798617084e21ae6332df1eced56244da'
+  /dolphinscheduler-api/src/main/java/org:
+    newFile: !uuid 'de01a0eaab1f457a7da8a4eba397f932ef38bbdd'
+    oldFile: !uuid '73ef96183e8d286e6f998e11a783afd587d7f8aa'
+  /dolphinscheduler-api/src/main/java/org/apache:
+    newFile: !uuid '1eebbac2871e31e19ef3a713e7de18e668b9e2ea'
+    oldFile: !uuid 'bfb77c9acb54ff509e47b61523bdf9ceb48ad765'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'f6c9fdf36e1ee31c7343fc29952b7c9b835bfdd0'
+    oldFile: !uuid '948ed28a4412c81af6aa6bbfda088d7281a1095d'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
+    newFile: !uuid '65368cb0a4ba2c55445f37e399edc4da1c779903'
+    oldFile: !uuid '786675845f2352015958b99d30600c32413961a9'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller:
+    newFile: !uuid '754256191632599e6c85d599f9649d75007a9bd8'
+    oldFile: !uuid 'ae0cac10fd69eb4566e488abe1e6981da01bc39a'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java:
+    newFile: !uuid '9e59c3932c256b87cdf848003205786e8dc99b3d'
+    oldFile: !uuid 'd00a05282c679278096661dc6f66cbd1755b446d'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
+    newFile: !uuid '3b6a2bc9da10e5fac7181bc3f16ba90d667c2205'
+    oldFile: !uuid '3b3b4d135ec227da1914122fea049ce162a25be7'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
+    newFile: !uuid '3c2973f60493b555e6fc3806dfd7ae049d2eb5d2'
+    oldFile: !uuid '4938b1d877352a51f6f0e6ac738a4037913aaf11'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessTaskRelationServiceImpl.java:
+    newFile: !uuid '5761584a7253b18bdbcb90f58ab9c397cf68818d'
+    oldFile: !uuid 'a864c61cd478b027d8e7234ef09d5235673ee1f4'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java:
+    newFile: !uuid '54709697de722dfa85bf31dc22b8880d876ead91'
+    oldFile: !uuid '8b07435dcc65b08380b3bf60457b1e7cecd44787'
+gitCommitId: !uuid '4a4e72b0d271dc2a5b6e488257ce1a28628f52f7'
 renames: {
   }
-revisionId: 2212
+revisionId: 2213