diff --git a/commit.ref b/commit.ref
index 4b4d0b92a3..9c2a290012 160000
--- a/commit.ref
+++ b/commit.ref
@@ -1 +1 @@
-Subproject commit 4b4d0b92a3f48b31dae13f4bae9d5aa1f44b64c3
+Subproject commit 9c2a2900121c6a372b306a76874ae364da8b8c08
diff --git a/commit.yml b/commit.yml
index b0531f3f6a..d0edecfc58 100644
--- a/commit.yml
+++ b/commit.yml
@@ -2,187 +2,86 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-api:
-    newFile: !uuid 'f88738f557a71503634f75cd40e5a422d714eabe'
-    oldFile: !uuid '0acecaafc0c6c15d9097b650b8ad177e9e6696b8'
-  /dolphinscheduler-api/src:
-    newFile: !uuid '3c896a42c1263af48c09c223bc74e7c0da90270b'
-    oldFile: !uuid 'f13929d0ead781a673f8e8832443d4c876bce349'
-  /dolphinscheduler-api/src/main:
-    newFile: !uuid '24d0d04c61d9f0db8b2aa33613c455e390845889'
-    oldFile: !uuid 'ccfe22209fdaa62392345525f3da71faea24a9e8'
-  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid 'c727bd92b29cbff2e85ddeae89660a67955022c2'
-    oldFile: !uuid '23ba4cb18ad7866d19e9911a41bb0f94ad244796'
-  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid '49d8cf6922a911795ae3bc85e13b62bee4caf3fa'
-    oldFile: !uuid '355efdebbe33c35082c64bb6845560e76ce339f0'
-  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '1315e4ecf800b332ef45bcf3b3db9ef165c978c5'
-    oldFile: !uuid '73082cd675f45310e92e022b7709ba9ab946959b'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '37f3fd09022589a2cd7ae2155f1a443e2d8f93c1'
-    oldFile: !uuid 'd05172dad6c436ef5f71d95418f9f4a049ae9473'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid 'ad985fc91d36734008dbfeccbea66ff053042acb'
-    oldFile: !uuid '684c91310e4c507d73973211333197dc9651c54c'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller:
-    newFile: !uuid '21b696ddeb46fdb7539d121888fd210740b1e35e'
-    oldFile: !uuid 'a4cef4099728316c6b84337330ea80e56954afc5'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/FavTaskController.java:
-    newFile: !uuid '35b11627b329d65bf200a09e5c5ba4625e9ed3ff'
-    oldFile: !uuid '2051d03f7456137fa17057993e1d3ee0296c3ed6'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto:
-    newFile: !uuid '8cc83bcf8ec71a2fd80c2871e9f0de957250723d'
-    oldFile: !uuid 'a41c04543aa4484a9b611f8d02f6eea4c05e0132'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/FavTaskDto.java:
-    newFile: !uuid '9c88225e6ee62e4aa5392cb43193466e58155d7e'
-    oldFile: !uuid '71a8b5299dd9c25a940a92655859146a508166e8'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid 'b14d60c90046e06d61bfe8e6d9339e53380d3ccd'
-    oldFile: !uuid 'bd21b0f1770ab33e348a54b36b81bdf698787f04'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/FavTaskService.java:
-    newFile: !uuid 'f10bf3b64211fc3e9afecffd40ce85e495aa7157'
-    oldFile: !uuid 'a6c24fdac8b347dce5535834cbf845d29f247e86'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid 'cf4741bd9839f41cd783f8b03ec46cab528b0002'
-    oldFile: !uuid '7ac035a1a648979c26887e58593a915af2048edb'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/FavTaskServiceImpl.java:
-    newFile: !uuid 'd8692a7f8fd684566cda1f68cd610e1117fbf346'
-    oldFile: !uuid '21e3737101a0ec8ce855af51246d46bd32c32ec0'
-  /dolphinscheduler-dao:
-    newFile: !uuid '4c7b8afffbc348169bc835f30f6caeef674683c7'
-    oldFile: !uuid 'fb999d9d6ef05aebb4aaabb125f7b41c42bfa3fa'
-  /dolphinscheduler-dao/src:
-    newFile: !uuid '9a70386efb6e6c1d6dbf11ea774e502a656bb804'
-    oldFile: !uuid 'f2357f9b6a72bed6a5e7263d6808e6d53005fa60'
-  /dolphinscheduler-dao/src/main:
-    newFile: !uuid '2df274b182fb20ff67599fff5677b00f6fcc3f19'
-    oldFile: !uuid '86703d6f3ebb3a34b9d2850ded9a44ee8d7073db'
-  /dolphinscheduler-dao/src/main/java:
-    newFile: !uuid '6dade4e6c07a46bec3ff9ac996eef8c440af5bbb'
-    oldFile: !uuid 'ee6cdfd6f2bfa9c59a5e48132a33d81b20334531'
-  /dolphinscheduler-dao/src/main/java/org:
-    newFile: !uuid '0543fc11be1ab924217a368dcbcfa278cd71fe13'
-    oldFile: !uuid '5ca68335e1834b702c3bee52e3e5cac1a19b3429'
-  /dolphinscheduler-dao/src/main/java/org/apache:
-    newFile: !uuid 'f1b6e9742bba7b1b4d1d801babdefb687657275d'
-    oldFile: !uuid '6f526db38eb022bab3533b0df3a2f76bb37c5789'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid 'b90f9a654f94da7a7a7f58ef11d1624e4542cbca'
-    oldFile: !uuid '211f95c5658c46b5c14262cde9a829d21b7a2a40'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
-    newFile: !uuid 'ebad2289b28720498871595abc46523539f298c4'
-    oldFile: !uuid '6cb8ea48f0b6e4c000c2ad1bf9f4d67d127e2769'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity:
-    newFile: !uuid '63c68b8a29458ee663d58ac2127373729b795aa1'
-    oldFile: !uuid '4b2a9dbfaf506dcbfb49b070327f53b0cd61112d'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/FavTask.java:
-    newFile: !uuid '8bddc05c7ded30d5ff4aa9ea05c5a46ad14ed394'
-    oldFile: !uuid 'e9e3c886422101e2666134dd1d8216778c94feae'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid '37a120eb819e481b5e2ee252d69b9f73aa412b21'
-    oldFile: !uuid '62cf28e7d24bdcd34c885456e83b153610f00e39'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/FavTaskMapper.java:
-    newFile: !uuid '2013ac707e17c8a76514c82985956440e3a03e60'
-    oldFile: !uuid '8ea39dd7d8b82f4018d3c04ced537ca914bf9645'
-  /dolphinscheduler-dao/src/main/resources:
-    newFile: !uuid '6e687ab666c10ed210c9a2df43f7fcbe669ecc22'
-    oldFile: !uuid '9fa50086dafbd19e2f8b452e85ebd02dfdf0b443'
-  /dolphinscheduler-dao/src/main/resources/org:
-    newFile: !uuid '577db872bf55fcfaeb9793925ec47460175fac37'
-    oldFile: !uuid 'ff3d2a026728b0dc0843fd3d0d1508bca7fc2f68'
-  /dolphinscheduler-dao/src/main/resources/org/apache:
-    newFile: !uuid '3924e632c19e340b82690b557c11834e7ac09c98'
-    oldFile: !uuid '1c5d9180e81406980ecc2e721f8aa1f1cf9fd57b'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
-    newFile: !uuid '4be782d4c684b39af74312232a0c51202259d554'
-    oldFile: !uuid 'ef4ead97428e866388ad7ab86998f244de534bd7'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '75a17c9be323529eea9de82d912d18065507136d'
-    oldFile: !uuid 'adb9af2ae0dada63b50ef57617bef1a2c748a2be'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid '84e2f72d1f9e3fe39417075f25641af27816bc4a'
-    oldFile: !uuid '7dc2a53190cb6f650acc4b454deb9a1160e1137b'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/FavTaskMapper.xml:
-    newFile: !uuid 'cb49072806e1640d0bcabff705b103c3b1ee4da1'
-    oldFile: !uuid '891529bb046dcd19c1dd2dbadb4990a1c3dedeb3'
-  /dolphinscheduler-dao/src/main/resources/sql:
-    newFile: !uuid 'c1c034c3aaf788691440ad5353df1755d6483c5e'
-    oldFile: !uuid '30e2da8254c55df493562f463ebdba307efb238c'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql:
-    newFile: !uuid 'b1511c2511f1375a390101bf710123a810dd670c'
-    oldFile: !uuid 'd396b5c5e8c9b83f5b0716e141297ee8decbc1db'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql:
-    newFile: !uuid 'e7a0c8ce0d11d2a6e4328407fd803206d7ef8021'
-    oldFile: !uuid '9c690ddb45fa10bffaca47f6946a967e0e561573'
-  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql:
-    newFile: !uuid 'e97da2c29b34de61dcdc79ea1cce49fa31cc33bd'
-    oldFile: !uuid '89f3d06a74829988d639aeccaf16689c17e9f5d5'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade:
-    newFile: !uuid '5b107159ae092f4f310d467fb728c65c9b536ccd'
-    oldFile: !uuid 'cc03d5e93eb652eef66854c41adb9cea9fcb2275'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema:
-    newFile: !uuid '53b3f7831870daf96d7d38ba8c5e01520a4d21da'
-    oldFile: !uuid 'dc2591921e921c18cbb83e30085bd4a3e6aba7b6'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/mysql:
-    newFile: !uuid 'fdc343d3b2eec1693183b58092c46821f18f2d51'
-    oldFile: !uuid 'bf0201cbb59d0fab0efc2b179a65c049d5429f7f'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/mysql/dolphinscheduler_dml.sql:
-    newFile: !uuid '4a14f326b985fdbdba5cb08b9d7822d5bc8d4225'
-    oldFile: !uuid '5f26e3515d6775a3fb948aa5db70954eb83b4a1e'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema:
-    newFile: !uuid 'f71560a4b4085722c80bc88d2e5b54f0ee681296'
-    oldFile: !uuid 'f161782dbd7d788dadcc01fe98f99c5143c26dab'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql:
-    newFile: !uuid 'f93c477ad47072d3d98ca97642feaacd93167780'
-    oldFile: !uuid 'be5828312fa37b01973bd01b02b63a539c68fb38'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql/dolphinscheduler_ddl.sql:
-    newFile: !uuid '978f1bf39f64b812210f96e4a159722779c621a8'
-    oldFile: !uuid '0008af69c7d8b4d52413b3fe3f8d7aea8d5ec96a'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/postgresql:
-    newFile: !uuid '1b5daac821e8e77d85b44ad10be9ec6183ec2c4b'
-    oldFile: !uuid 'dce9e38a2f5b0ab53818ac6e8885b687a57036e5'
-  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/postgresql/dolphinscheduler_ddl.sql:
-    newFile: !uuid 'fd465802ec9150cc66ea2b3857269eb8e223494c'
-    oldFile: !uuid '1d10ad01d0ecf8ea9f76d7b1a5f157ea7803cb47'
   /dolphinscheduler-ui:
-    newFile: !uuid '5c82edff2fcd116fff307aed6e60d205897686c8'
-    oldFile: !uuid '66d3763767050b395231dafa7b5fa2cea57c19e4'
+    newFile: !uuid '9e936146b3daedb1350893660eb9d7452315bb45'
+    oldFile: !uuid '5c82edff2fcd116fff307aed6e60d205897686c8'
   /dolphinscheduler-ui/src:
-    newFile: !uuid 'af2bdafc42aecf54bd0ede2914956f0499278592'
-    oldFile: !uuid '33206b5d288728bcb3f7abf2eeab625673cf9331'
-  /dolphinscheduler-ui/src/service:
-    newFile: !uuid '2931e2ae7096f1b84e9b47d75b78a6110e81f588'
-    oldFile: !uuid '641834bad02188d18c6435f63b04d3b2c318c371'
-  /dolphinscheduler-ui/src/service/modules:
-    newFile: !uuid '08b52b894819358eff0b602e012ee6c302edae31'
-    oldFile: !uuid '661f82bb4147f2218aad0e16485a516fbe8acd66'
-  /dolphinscheduler-ui/src/service/modules/dag-menu:
-    newFile: !uuid '110317c001f67144b0f06d7f2815f3b753af48a9'
-    oldFile: !uuid 'f41ed7ad10954b7e6b8085ca1dd1d4c6afcdff5f'
-  /dolphinscheduler-ui/src/service/modules/dag-menu/index.ts:
-    newFile: !uuid '3cadace17f23dbc3477a5bf6dafe8dddacfb7bfd'
-    oldFile: !uuid 'b107ed2caa641aa61a0ba2c1a3a100b6d9436fae'
+    newFile: !uuid 'a28f695526a6efe0e5fe7b43d405e5bff1f6df57'
+    oldFile: !uuid 'af2bdafc42aecf54bd0ede2914956f0499278592'
+  /dolphinscheduler-ui/src/locales:
+    newFile: !uuid '6fe23c87cc82854d91be21234f7296551a1bc3cf'
+    oldFile: !uuid '8fdc2caf7611931f9de5490e59e2c693cd00ee01'
+  /dolphinscheduler-ui/src/locales/en_US:
+    newFile: !uuid '863bdc6a78754f2d6f5e97f30ff5403a5fa62018'
+    oldFile: !uuid 'a71f624a251c6011787057eee3de9aa3b552c036'
+  /dolphinscheduler-ui/src/locales/en_US/ui_setting.ts:
+    newFile: !uuid '9a28e1da126382dd3cdf796f945499e90b14f5eb'
+    oldFile: !uuid '7ab6413353ec0ed8fd683fb89d9f65cef22bada6'
+  /dolphinscheduler-ui/src/locales/zh_CN:
+    newFile: !uuid 'f798c31c3799052ba0d963087a53858e2ed61e48'
+    oldFile: !uuid '8edb6f1d58ab5703f45fde814abf6d2845d8e011'
+  /dolphinscheduler-ui/src/locales/zh_CN/ui_setting.ts:
+    newFile: !uuid '06c183707cc296f01af435b241b93dff1a356f93'
+    oldFile: !uuid '14c556d369794eb94558846c51b68686c896295f'
+  /dolphinscheduler-ui/src/store:
+    newFile: !uuid '340c7f022c9472f39f14e75d684bcb8843d6d23f'
+    oldFile: !uuid 'd0fd4526cfcaf4993a5b816c653d7370d28ed8b8'
+  /dolphinscheduler-ui/src/store/logTimer:
+    newFile: null
+    oldFile: !uuid '9ebd3f3ce253b8cb35372f655ad426cf7aef76c8'
+  /dolphinscheduler-ui/src/store/logTimer/logTimer.ts:
+    newFile: null
+    oldFile: !uuid 'f7d47e02aee1cc55dbe56245dcf40f8add1ebf2c'
+  /dolphinscheduler-ui/src/store/logTimer/types.ts:
+    newFile: null
+    oldFile: !uuid 'c2d105e96d6fbaeeeb8d4238f845d0bfa70b2559'
+  /dolphinscheduler-ui/src/store/ui-setting:
+    newFile: !uuid '31e4b5ed8b54e2659521d9b0c7a74683d82fe59d'
+    oldFile: null
+  /dolphinscheduler-ui/src/store/ui-setting/types.ts:
+    newFile: !uuid 'd38d0c7e5ec1d040cc0d3bf56dfdc0e282896a47'
+    oldFile: null
+  /dolphinscheduler-ui/src/store/ui-setting/ui-setting.ts:
+    newFile: !uuid 'bf392dacae1a24213df56b46012198e8aa53d8a1'
+    oldFile: null
   /dolphinscheduler-ui/src/views:
-    newFile: !uuid '7c743fa4a56ddd46f4a986185641c9afa1f64c4b'
-    oldFile: !uuid 'e45b8eef90f489bd755a7d0488aedd0cbb12857b'
+    newFile: !uuid '8678e148737e4d02768f0fc7f9631013ffc5a81a'
+    oldFile: !uuid '7c743fa4a56ddd46f4a986185641c9afa1f64c4b'
   /dolphinscheduler-ui/src/views/projects:
-    newFile: !uuid 'dae046b9f536804946d837dc010c043b8cef3939'
-    oldFile: !uuid '179fef27ac3351b334f5dcb6e3304886ae9d45bc'
+    newFile: !uuid 'a9fb1ec98146f7d1a24689bba2a06807447c706b'
+    oldFile: !uuid 'dae046b9f536804946d837dc010c043b8cef3939'
+  /dolphinscheduler-ui/src/views/projects/task:
+    newFile: !uuid '2cb411dee4b500a892c4fa8849b79ab1bb99f48d'
+    oldFile: !uuid '28192af162e689d37811e6131a2bc8b15fec799f'
+  /dolphinscheduler-ui/src/views/projects/task/instance:
+    newFile: !uuid 'a0a6c486db526c3f2d37163442b925860c2523ff'
+    oldFile: !uuid '6999ea196977ff76aa8b696cf2fe9ee486910864'
+  /dolphinscheduler-ui/src/views/projects/task/instance/batch-task.tsx:
+    newFile: !uuid '84c51f70312a19e7ab626bbd57123e9df0e455e6'
+    oldFile: !uuid '3dd77786f150b0fccbfd3c5bee8718f0cff7b6b8'
+  /dolphinscheduler-ui/src/views/projects/task/instance/stream-task.tsx:
+    newFile: !uuid 'b509d107df4954ed4171efa9434356044cd1dd9e'
+    oldFile: !uuid 'c67462b3eccb983060e3a9705cde7617cb39f2cc'
   /dolphinscheduler-ui/src/views/projects/workflow:
-    newFile: !uuid '2163d68f5f72cc4b99c7154ae7703055cd035680'
-    oldFile: !uuid 'ad60a4532caa7ec0846e3df8560e0a6a9968c191'
+    newFile: !uuid 'fc7d062ae4da1c117430e8405653038404e17a1d'
+    oldFile: !uuid '2163d68f5f72cc4b99c7154ae7703055cd035680'
   /dolphinscheduler-ui/src/views/projects/workflow/components:
-    newFile: !uuid '6206280e10ae1e1bbe1ca82144cc6469d09a1646'
-    oldFile: !uuid '552c36b43862188457720701487dd96f23081980'
+    newFile: !uuid '06299422e9d257fe1de080960edd449a0c8046ee'
+    oldFile: !uuid '6206280e10ae1e1bbe1ca82144cc6469d09a1646'
   /dolphinscheduler-ui/src/views/projects/workflow/components/dag:
-    newFile: !uuid '7eb240db9ca612c4955eba56b9efb873baa20910'
-    oldFile: !uuid '4a646c26a3fef80e713853f832fa1b28c62af71a'
-  /dolphinscheduler-ui/src/views/projects/workflow/components/dag/dag-sidebar.tsx:
-    newFile: !uuid '7420525514c38e21222fc1fc97fdcc131fec4259'
-    oldFile: !uuid 'a45ef02ce8559405b5e4af7dc15160edad44cdad'
-gitCommitId: !uuid '4b4d0b92a3f48b31dae13f4bae9d5aa1f44b64c3'
-renames: {
-  }
-revisionId: 3661
+    newFile: !uuid 'be355c0db3f8ff65a7ee3633b14093317268eabc'
+    oldFile: !uuid '7eb240db9ca612c4955eba56b9efb873baa20910'
+  /dolphinscheduler-ui/src/views/projects/workflow/components/dag/index.tsx:
+    newFile: !uuid 'e0a6f62c66583f59ba71b3e47f925cca7783363b'
+    oldFile: !uuid 'a255f22a54a4083e52142c87ddee6eaa67b97f5a'
+  /dolphinscheduler-ui/src/views/ui-setting:
+    newFile: !uuid 'afef09ad6b9e11590ebb529562fc00f699ff7f78'
+    oldFile: !uuid '43b801a3f44d5a609c6b8d6fd5d36fb7254a9cd6'
+  /dolphinscheduler-ui/src/views/ui-setting/index.tsx:
+    newFile: !uuid '10799c265e06cbe080967c6ab066d2de76678516'
+    oldFile: !uuid '61c44706c0ad0da37eb08ae39b2051324c9afd13'
+gitCommitId: !uuid '9c2a2900121c6a372b306a76874ae364da8b8c08'
+renames:
+  /dolphinscheduler-ui/src/store/ui-setting/types.ts: /dolphinscheduler-ui/src/store/logTimer/types.ts
+  /dolphinscheduler-ui/src/store/ui-setting/ui-setting.ts: /dolphinscheduler-ui/src/store/logTimer/logTimer.ts
+revisionId: 3662