From b5a165aa58f8ea2cafb6828866934c0ce976406c Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Tue, 1 Apr 2025 15:08:38 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95docker=20workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-image.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index c06d967ca..03ef15468 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - main-fix
+      - refactor  # 新增 refactor 分支触发
     tags:
       - 'v*'
   workflow_dispatch:
@@ -16,6 +17,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Clone maim_message (refactor branch only)
+        if: github.ref == 'refs/heads/refactor'  # 仅 refactor 分支执行
+        run: git clone https://github.com/MaiM-with-u/maim_message maim_message
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -34,6 +39,8 @@ jobs:
             echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT
           elif [ "${{ github.ref }}" == "refs/heads/main-fix" ]; then
             echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main-fix" >> $GITHUB_OUTPUT
+          elif [ "${{ github.ref }}" == "refs/heads/refactor" ]; then  # 新增 refactor 分支处理
+            echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maim-core:refactor" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and Push Docker Image
@@ -44,5 +51,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.tags.outputs.tags }}
           push: true
-          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maim-core:buildcache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maim-core:buildcache,mode=max
\ No newline at end of file

From 579dffb9c76965c48aa24037bba9e2853ce0ffa5 Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Tue, 1 Apr 2025 16:20:55 +0800
Subject: [PATCH 2/7] =?UTF-8?q?ci(docker):=20=E6=9B=B4=E6=96=B0=20Docker?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA=E5=92=8C=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复 refactor 分支的 Docker镜像标签
- 更新缓存来源和目标的 Docker镜像名称
---
 .github/workflows/docker-image.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 03ef15468..a5a6680cd 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -40,7 +40,7 @@ jobs:
           elif [ "${{ github.ref }}" == "refs/heads/main-fix" ]; then
             echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main-fix" >> $GITHUB_OUTPUT
           elif [ "${{ github.ref }}" == "refs/heads/refactor" ]; then  # 新增 refactor 分支处理
-            echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maim-core:refactor" >> $GITHUB_OUTPUT
+            echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:refactor" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and Push Docker Image
@@ -51,5 +51,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.tags.outputs.tags }}
           push: true
-          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maim-core:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maim-core:buildcache,mode=max
\ No newline at end of file
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max
\ No newline at end of file

From 93b980f333381c23d3b684fa963f84471681edff Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Tue, 1 Apr 2025 16:27:26 +0800
Subject: [PATCH 3/7] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docke?=
 =?UTF-8?q?r=20Compose=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 adapters 和 core 服务的镜像地址从本地修改为远程仓库地址- 移除 napcat 服务的多余端口映射
- 更新 adapters 和 core 服务的镜像版本
---
 docker-compose.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3ad94e067..9c5aa8916 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   adapters:
     container_name: maim-bot-adapters
-    image: maimbot-adapters:latest
+    image: sengokucola/maimbot:adapters
     environment:
       - TZ=Asia/Shanghai
     ports:
@@ -15,7 +15,7 @@ services:
       - maim_bot
   core:
     container_name: maim-bot-core
-    image: maimbot-core:latest
+    image: sengokucola/maimbot:refactor
     environment:
       - TZ=Asia/Shanghai
 #      - EULA_AGREE=35362b6ea30f12891d46ef545122e84a  # 同意EULA
@@ -51,9 +51,6 @@ services:
       - NAPCAT_GID=1000
       - TZ=Asia/Shanghai
     ports:
-      - "3000:3000"
-      - "3001:3001"
-      - "6099:6099"
       - "8095:8095"
     volumes:
       - ./napcat-config:/app/napcat/config # 持久化napcat配置文件

From fd90a3ebbc09ab6c372b023389d35e89fc75899e Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Tue, 1 Apr 2025 18:02:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?build(adapters):=20=E6=9B=B4=E6=96=B0=20Doc?=
 =?UTF-8?q?ker=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 adapters 服务的 Docker 镜像从 sengokucola/maimbot:adapters 修改为 sengokucola/maimbot-adapter:adapter
- 此更新统一了 Docker 镜像的命名格式，确保一致性和清晰性
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9c5aa8916..610791f9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   adapters:
     container_name: maim-bot-adapters
-    image: sengokucola/maimbot:adapters
+    image: sengokucola/maimbot-adapter:adapter
     environment:
       - TZ=Asia/Shanghai
     ports:

From 852ef8e56d4e98aca6bf8d8a070d8670a3e61654 Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Tue, 1 Apr 2025 19:43:21 +0800
Subject: [PATCH 5/7] =?UTF-8?q?build(adapters):=20=E6=9B=B4=E6=96=B0=20Doc?=
 =?UTF-8?q?ker=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 adapters 服务的 Docker 镜像从 sengokucola/maimbot:adapters 修改为 sengokucola/maimbot-adapter:adapter
- 此更新统一了 Docker 镜像的命名格式，确保一致性和清晰性
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 610791f9c..1db925c82 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   adapters:
     container_name: maim-bot-adapters
-    image: sengokucola/maimbot-adapter:adapter
+    image: sengokucola/maimbot-adapter:latest
     environment:
       - TZ=Asia/Shanghai
     ports:

From 6a76d14c7de3d7606deb43bec3a6f8db470aa9f9 Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Tue, 1 Apr 2025 20:12:09 +0800
Subject: [PATCH 6/7] =?UTF-8?q?build(Dockerfile):=20=E5=8D=87=E7=BA=A7=20p?=
 =?UTF-8?q?ip=20=E4=BB=A5=E7=A1=AE=E4=BF=9D=E5=AE=89=E5=85=A8=E6=80=A7?=
 =?UTF-8?q?=E5=92=8C=E6=80=A7=E8=83=BD-=20=E5=9C=A8=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=B9=8B=E5=89=8D=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=20"pip=20install=20--upgrade=20pip"=E6=9D=A5?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=20pip=20-=20=E8=BF=99=E6=A0=B7=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=A1=AE=E4=BF=9D=E4=BD=BF=E7=94=A8=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=20pip=EF=BC=8C=E5=87=8F=E5=B0=91?=
 =?UTF-8?q?=E6=BD=9C=E5=9C=A8=E7=9A=84=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E?=
 =?UTF-8?q?=E5=92=8C=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 483892006..6c6041ff3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ COPY requirements.txt .
 COPY maim_message /maim_message
 
 # 安装依赖
+RUN pip install --upgrade pip
 RUN pip install -e /maim_message
 RUN pip install --upgrade -r requirements.txt
 

From 5c06933b1e37eb45534c4bf17880dc199daad84e Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Tue, 1 Apr 2025 20:38:05 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=88=A0=E5=A4=9A=E4=BA=86,=E9=A1=BA?=
 =?UTF-8?q?=E4=BE=BF=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B=EF=BC=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1db925c82..7b4fcd2d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,8 @@ services:
       - ./adapters/.env:/adapters/.env # 持久化adapters配置文件
       - ./data/qq:/app/.config/QQ # 持久化QQ本体并同步qq表情和图片到adapters
     restart: always
+    depends_on:
+      - mongodb
     networks:
       - maim_bot
   core:
@@ -28,6 +30,8 @@ services:
       - ./mmc-config/bot_config.toml:/MaiMBot/config/bot_config.toml # 持久化bot配置文件
       - ./data/MaiMBot:/MaiMBot/data # NapCat 和 NoneBot 共享此卷，否则发送图片会有问题
     restart: always
+    depends_on:
+      - mongodb
     networks:
       - maim_bot
   mongodb:
@@ -51,6 +55,7 @@ services:
       - NAPCAT_GID=1000
       - TZ=Asia/Shanghai
     ports:
+      - "6099:6099"
       - "8095:8095"
     volumes:
       - ./napcat-config:/app/napcat/config # 持久化napcat配置文件