From a25b194b2b68cbc2663ed152576b27d576cd86c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Tue, 6 Jan 2026 12:27:38 +0800
Subject: [PATCH 01/19] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20AOP=20?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=AF=E5=BE=84=E5=8F=82=E6=95=B0=E5=B9=B6?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=8B=E8=BD=BD=20AOP=20=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加 aop-project-path 输入参数，支持下载并移动 AOP 工具和生成器到指定路径
---
 actions/setup-flutter/action.yml | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index f2b222c..feb7e9e 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -5,11 +5,11 @@ inputs:
   flutter-version:
     description: The Flutter version to use
     required: true
-    default: '3.x'
+    default: 3.x
   channel:
     description: The Flutter channel to use
     required: false
-    default: 'stable'
+    default: stable
   cache:
     description: Enable caching for Flutter SDK and packages
     required: false
@@ -18,6 +18,9 @@ inputs:
     description: Use AOP registry for Flutter packages
     required: false
     default: 'false'
+  aop-project-path:
+    description: The path to the AOP project
+    required: false
 
 runs:
   using: composite
@@ -29,6 +32,28 @@ runs:
         channel: ${{ inputs.channel }}
         cache: ${{ inputs.cache }}
 
+    - name: Download AOP Tools
+      if: ${{ inputs.aop-registry == 'true' }}
+      shell: bash
+      run: |
+        cd ${{ runner.temp }}
+        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git
+        git clone https://github.com/TDesignOteam/tdesign-flutter-generator.git
+
+    - name: Move aop_tools to ${{ inputs.aop-project-path }}
+      if: ${{ inputs.aop-registry == 'true' }}
+      shell: bash
+      run: |
+        mkdir -p ${{ inputs.aop-project-path }}
+        cp -af ${{ runner.temp }}/tdesign-flutter-aop-registry/_example/aop_tools ${{ inputs.aop-project-path }}
+
+    - name: Move generator to ${{ inputs.aop-project-path }}
+      if: ${{ inputs.aop-registry == 'true' }}
+      shell: bash
+      run: |
+        mkdir -p ${{ inputs.aop-project-path }}
+        cp -af ${{ runner.temp }}/tdesign-flutter-generator ${{ inputs.aop-project-path }}
+
     - name: AOP Registry
       if: ${{ inputs.aop-registry == 'true' }}
       shell: bash
@@ -78,7 +103,7 @@ runs:
         git status
         # 删除SDK/bin/cache/flutter_tools.stamp，使修改生效
         rm ./bin/cache/flutter_tools.stamp
-        
+
         echo "AOP registry setup completed."
 
         flutter --version

From 8cc616743a08df50e1599e79ec347b7254b1936a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Tue, 6 Jan 2026 12:40:16 +0800
Subject: [PATCH 02/19] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84=E7=9B=AE=E5=BD=95=E5=88=9B=E5=BB=BA=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/setup-flutter/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index feb7e9e..c31db21 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -44,15 +44,15 @@ runs:
       if: ${{ inputs.aop-registry == 'true' }}
       shell: bash
       run: |
-        mkdir -p ${{ inputs.aop-project-path }}
         cp -af ${{ runner.temp }}/tdesign-flutter-aop-registry/_example/aop_tools ${{ inputs.aop-project-path }}
+        ls -l ${{ inputs.aop-project-path }}/aop_tools
 
     - name: Move generator to ${{ inputs.aop-project-path }}
       if: ${{ inputs.aop-registry == 'true' }}
       shell: bash
       run: |
-        mkdir -p ${{ inputs.aop-project-path }}
         cp -af ${{ runner.temp }}/tdesign-flutter-generator ${{ inputs.aop-project-path }}
+        ls -l ${{ inputs.aop-project-path }}/tdesign-flutter-generator
 
     - name: AOP Registry
       if: ${{ inputs.aop-registry == 'true' }}

From efdab5ed7d9be345f789a1c02f41f806e45d8508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Tue, 6 Jan 2026 13:26:54 +0800
Subject: [PATCH 03/19] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index c31db21..911ecc2 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -67,7 +67,7 @@ runs:
         git clean -fd
         git status
 
-        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
+        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/lwj-debug/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
         minor_version=$(echo $flutter_version | cut -d. -f2)

From a5a7409e2240b57e198d063a72055d043e530bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Tue, 6 Jan 2026 14:09:40 +0800
Subject: [PATCH 04/19] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 911ecc2..c31db21 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -67,7 +67,7 @@ runs:
         git clean -fd
         git status
 
-        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/lwj-debug/patch_flutter/"
+        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
         minor_version=$(echo $flutter_version | cut -d. -f2)

From d456db8d74ea7af8de4db32aca956bc8bf0e6e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Tue, 6 Jan 2026 15:14:41 +0800
Subject: [PATCH 05/19] d

---
 actions/setup-flutter/action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index c31db21..e1a6a60 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -104,6 +104,8 @@ runs:
         # 删除SDK/bin/cache/flutter_tools.stamp，使修改生效
         rm ./bin/cache/flutter_tools.stamp
 
+        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git ./bin/cache/aop_registry
+
         echo "AOP registry setup completed."
 
         flutter --version

From a08c031e0d4fc7fc1379fe90977178da8adbdc09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Tue, 6 Jan 2026 17:47:54 +0800
Subject: [PATCH 06/19] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index e1a6a60..5d7983d 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -67,7 +67,7 @@ runs:
         git clean -fd
         git status
 
-        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
+        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/lwj-debug/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
         minor_version=$(echo $flutter_version | cut -d. -f2)

From 389a4d3d6cbf016ee3fc459b0610a7b0cc4497d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Tue, 6 Jan 2026 18:03:06 +0800
Subject: [PATCH 07/19] d

---
 actions/setup-flutter/action.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 5d7983d..6367059 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -67,7 +67,7 @@ runs:
         git clean -fd
         git status
 
-        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/lwj-debug/patch_flutter/"
+        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
         minor_version=$(echo $flutter_version | cut -d. -f2)
@@ -101,11 +101,20 @@ runs:
         git status
         git apply $patch_name
         git status
-        # 删除SDK/bin/cache/flutter_tools.stamp，使修改生效
-        rm ./bin/cache/flutter_tools.stamp
 
         git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git ./bin/cache/aop_registry
 
+        # Add debug logging to pub_interceptor.dart
+        dart_file="./packages/flutter_tools/lib/src/aop_tools/interceptor/impl/pub_interceptor.dart"
+        if [ -f "$dart_file" ]; then
+          sed -i.bak '/final Directory aopRegistryProject = fetchAOPRegistry(commandPath);/a\    Logger.d('\''aopRegistryProject.path: ${aopRegistryProject.path}'\'', tag: _tag);' "$dart_file"
+          rm "$dart_file.bak"
+          echo "Added debug logging to pub_interceptor.dart"
+        fi
+
+        # 删除SDK/bin/cache/flutter_tools.stamp，使修改生效
+        rm ./bin/cache/flutter_tools.stamp
+
         echo "AOP registry setup completed."
 
         flutter --version

From da8c48f2856f7c89007a7cb89e8ad7bf987197b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Tue, 6 Jan 2026 18:05:30 +0800
Subject: [PATCH 08/19] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 6367059..96f1fca 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -102,7 +102,7 @@ runs:
         git apply $patch_name
         git status
 
-        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git ./bin/cache/aop_registry
+        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git /opt/hostedtool/cache/aop_registry
 
         # Add debug logging to pub_interceptor.dart
         dart_file="./packages/flutter_tools/lib/src/aop_tools/interceptor/impl/pub_interceptor.dart"

From 30516e6f02e4149f255a521a59da7d81b379fb87 Mon Sep 17 00:00:00 2001
From: liweijie0812 <674416404@qq.com>
Date: Tue, 6 Jan 2026 18:20:43 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20action.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/setup-flutter/action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 96f1fca..57313a9 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -116,5 +116,7 @@ runs:
         rm ./bin/cache/flutter_tools.stamp
 
         echo "AOP registry setup completed."
+        git config --local user.email "github-actions[bot]@users.noreply.github.com"
+        git config --local user.name "github-actions[bot]"
 
         flutter --version

From bf3bf8b04b49055d0c6e44ce06293b1ad80af6d4 Mon Sep 17 00:00:00 2001
From: liweijie0812 <674416404@qq.com>
Date: Tue, 6 Jan 2026 19:33:39 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20action.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/setup-flutter/action.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 57313a9..4623e81 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -61,7 +61,9 @@ runs:
         set -eu
         echo "Setting up AOP registry for Flutter packages..."
         flutter --version
+        flutter config
         cd ${{ env.FLUTTER_ROOT }}
+        pwd
         git status
         git restore .
         git clean -fd
@@ -116,7 +118,7 @@ runs:
         rm ./bin/cache/flutter_tools.stamp
 
         echo "AOP registry setup completed."
-        git config --local user.email "github-actions[bot]@users.noreply.github.com"
-        git config --local user.name "github-actions[bot]"
+        git config --global user.email "github-actions[bot]@users.noreply.github.com"
+        git config --global user.name "github-actions[bot]"
 
         flutter --version

From 9186bf56f7c44e0ce4f80929dbbd4cda86073c1e Mon Sep 17 00:00:00 2001
From: liweijie0812 <674416404@qq.com>
Date: Tue, 6 Jan 2026 19:51:25 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20action.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 4623e81..a7b4c33 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -104,7 +104,7 @@ runs:
         git apply $patch_name
         git status
 
-        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git /opt/hostedtool/cache/aop_registry
+        # git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git /opt/hostedtool/cache/aop_registry
 
         # Add debug logging to pub_interceptor.dart
         dart_file="./packages/flutter_tools/lib/src/aop_tools/interceptor/impl/pub_interceptor.dart"

From 0215ce83aab329d63b87918b9b8c89242ab55988 Mon Sep 17 00:00:00 2001
From: lwj <674416404@qq.com>
Date: Tue, 6 Jan 2026 20:58:40 +0800
Subject: [PATCH 12/19] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E6=97=A5=E5=BF=97=E7=9A=84=E6=B7=BB=E5=8A=A0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/setup-flutter/action.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index a7b4c33..1199d3a 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -107,12 +107,12 @@ runs:
         # git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git /opt/hostedtool/cache/aop_registry
 
         # Add debug logging to pub_interceptor.dart
-        dart_file="./packages/flutter_tools/lib/src/aop_tools/interceptor/impl/pub_interceptor.dart"
-        if [ -f "$dart_file" ]; then
-          sed -i.bak '/final Directory aopRegistryProject = fetchAOPRegistry(commandPath);/a\    Logger.d('\''aopRegistryProject.path: ${aopRegistryProject.path}'\'', tag: _tag);' "$dart_file"
-          rm "$dart_file.bak"
-          echo "Added debug logging to pub_interceptor.dart"
-        fi
+        #dart_file="./packages/flutter_tools/lib/src/aop_tools/interceptor/impl/pub_interceptor.dart"
+        #if [ -f "$dart_file" ]; then
+        #  sed -i.bak '/final Directory aopRegistryProject = fetchAOPRegistry(commandPath);/a\    Logger.d('\''aopRegistryProject.path: ${aopRegistryProject.path}'\'', tag: _tag);' "$dart_file"
+        #  rm "$dart_file.bak"
+        #  echo "Added debug logging to pub_interceptor.dart"
+        #fi
 
         # 删除SDK/bin/cache/flutter_tools.stamp，使修改生效
         rm ./bin/cache/flutter_tools.stamp

From f1c8cf1c4b084ccd3b9ad86f1ba4d4476a46ff0a Mon Sep 17 00:00:00 2001
From: lwj <674416404@qq.com>
Date: Tue, 6 Jan 2026 21:02:59 +0800
Subject: [PATCH 13/19] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84flutter=20config=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/setup-flutter/action.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 1199d3a..60a3d12 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -61,7 +61,6 @@ runs:
         set -eu
         echo "Setting up AOP registry for Flutter packages..."
         flutter --version
-        flutter config
         cd ${{ env.FLUTTER_ROOT }}
         pwd
         git status

From 3c698ac412a3bf6d325e0316ee53b88d2d24d4e0 Mon Sep 17 00:00:00 2001
From: lwj <674416404@qq.com>
Date: Tue, 6 Jan 2026 21:12:08 +0800
Subject: [PATCH 14/19] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0AOP=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E8=A1=A8=E5=85=8B=E9=9A=86=E8=B7=AF=E5=BE=84=E5=B9=B6?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=B0=83=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/setup-flutter/action.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 60a3d12..9e8c28c 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -103,15 +103,8 @@ runs:
         git apply $patch_name
         git status
 
-        # git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git /opt/hostedtool/cache/aop_registry
-
-        # Add debug logging to pub_interceptor.dart
-        #dart_file="./packages/flutter_tools/lib/src/aop_tools/interceptor/impl/pub_interceptor.dart"
-        #if [ -f "$dart_file" ]; then
-        #  sed -i.bak '/final Directory aopRegistryProject = fetchAOPRegistry(commandPath);/a\    Logger.d('\''aopRegistryProject.path: ${aopRegistryProject.path}'\'', tag: _tag);' "$dart_file"
-        #  rm "$dart_file.bak"
-        #  echo "Added debug logging to pub_interceptor.dart"
-        #fi
+        rm -rf ./bin/cache/aop_registry
+        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git ./bin/cache/aop_registry
 
         # 删除SDK/bin/cache/flutter_tools.stamp，使修改生效
         rm ./bin/cache/flutter_tools.stamp

From 0cab66cbfe8662ce35bc96fe02cbc888c6fed045 Mon Sep 17 00:00:00 2001
From: lwj <674416404@qq.com>
Date: Tue, 6 Jan 2026 21:18:55 +0800
Subject: [PATCH 15/19] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4AOP?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E8=A1=A8=E6=B8=85=E7=90=86=E5=92=8C=E5=85=8B?=
 =?UTF-8?q?=E9=9A=86=E6=93=8D=E4=BD=9C=E7=9A=84=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/setup-flutter/action.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 9e8c28c..934968b 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -103,12 +103,12 @@ runs:
         git apply $patch_name
         git status
 
-        rm -rf ./bin/cache/aop_registry
-        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git ./bin/cache/aop_registry
-
         # 删除SDK/bin/cache/flutter_tools.stamp，使修改生效
         rm ./bin/cache/flutter_tools.stamp
 
+        rm -rf ./bin/cache/aop_registry
+        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git ./bin/cache/aop_registry
+
         echo "AOP registry setup completed."
         git config --global user.email "github-actions[bot]@users.noreply.github.com"
         git config --global user.name "github-actions[bot]"

From 7a06b581c91caf2e2df19bbdde3d12a00a8982d6 Mon Sep 17 00:00:00 2001
From: lwj <674416404@qq.com>
Date: Tue, 6 Jan 2026 22:59:34 +0800
Subject: [PATCH 16/19] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 934968b..dfb0a60 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -68,7 +68,7 @@ runs:
         git clean -fd
         git status
 
-        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/main/patch_flutter/"
+        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/lwj-debug/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
         minor_version=$(echo $flutter_version | cut -d. -f2)

From 6dfa16c6dea587e9729e273bd432880c09c0332e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Wed, 7 Jan 2026 10:23:01 +0800
Subject: [PATCH 17/19] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index dfb0a60..533c8eb 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -68,7 +68,7 @@ runs:
         git clean -fd
         git status
 
-        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/lwj-debug/patch_flutter/"
+        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/rss1102/fix/git-clone-repo/patch_flutter/"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
         minor_version=$(echo $flutter_version | cut -d. -f2)

From 8fd14d4f0aa3492c9d1b94f778450520a9476ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Wed, 7 Jan 2026 12:28:24 +0800
Subject: [PATCH 18/19] d

---
 actions/setup-flutter/action.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 533c8eb..075b5f0 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -21,6 +21,14 @@ inputs:
   aop-project-path:
     description: The path to the AOP project
     required: false
+  aop-repo:
+    description: The URL of the AOP repository
+    required: false
+    default: 'https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git'
+  aop-repo-branch:
+    description: The branch of the AOP repository
+    required: false
+    default: rss1102/fix/git-clone-repo
 
 runs:
   using: composite
@@ -37,7 +45,7 @@ runs:
       shell: bash
       run: |
         cd ${{ runner.temp }}
-        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git
+        git clone ${{ inputs.aop-repo }} -b ${{ inputs.aop-repo-branch }}
         git clone https://github.com/TDesignOteam/tdesign-flutter-generator.git
 
     - name: Move aop_tools to ${{ inputs.aop-project-path }}
@@ -68,7 +76,7 @@ runs:
         git clean -fd
         git status
 
-        patch_prefix="https://raw.githubusercontent.com/TDesignOteam/tdesign-flutter-aop-registry/refs/heads/rss1102/fix/git-clone-repo/patch_flutter/"
+        aop_patch_path="${{ runner.temp }}/tdesign-flutter-aop-registry/patch_flutter"
         flutter_version=$(flutter --version | head -n 1 | awk '{print $2}')
         major_version=$(echo $flutter_version | cut -d. -f1)
         minor_version=$(echo $flutter_version | cut -d. -f2)
@@ -96,19 +104,16 @@ runs:
           fi
         fi
         echo "patch_name: $patch_name"
-        patch_url="$patch_prefix$patch_name"
-        echo "patch_url: $patch_url"
-        wget $patch_url
+        echo "aop_patch_path: $aop_patch_path"
+        patch="$aop_patch_path/$patch_name"
+        echo "patch: $patch"
         git status
-        git apply $patch_name
+        git apply $patch
         git status
 
         # 删除SDK/bin/cache/flutter_tools.stamp，使修改生效
         rm ./bin/cache/flutter_tools.stamp
 
-        rm -rf ./bin/cache/aop_registry
-        git clone https://github.com/TDesignOteam/tdesign-flutter-aop-registry.git ./bin/cache/aop_registry
-
         echo "AOP registry setup completed."
         git config --global user.email "github-actions[bot]@users.noreply.github.com"
         git config --global user.name "github-actions[bot]"

From a6796257e13309e25667c30a43ec8fb8c3a5a5de Mon Sep 17 00:00:00 2001
From: liweijie0812 <674416404@qq.com>
Date: Thu, 15 Jan 2026 16:22:31 +0800
Subject: [PATCH 19/19] d

---
 actions/setup-flutter/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/setup-flutter/action.yml b/actions/setup-flutter/action.yml
index 075b5f0..94eed53 100644
--- a/actions/setup-flutter/action.yml
+++ b/actions/setup-flutter/action.yml
@@ -28,7 +28,7 @@ inputs:
   aop-repo-branch:
     description: The branch of the AOP repository
     required: false
-    default: rss1102/fix/git-clone-repo
+    default: main
 
 runs:
   using: composite