From b4ab8ffa78c79f22f9b6bc9d4d9d7c0530ca9738 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Jul 2025 14:14:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=BA=95?= =?UTF-8?q?=E5=B1=82=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7dee666..d50a5f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13.2-slim +FROM python:3.13.5-slim LABEL authors="infinitycat233" # Copy uv and maim_message From f93572c1f755036250f6dd73d9fd61d555f754ec Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Jul 2025 14:16:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ci(docker):=20=E6=9B=B4=E6=96=B0dev?= =?UTF-8?q?=E5=88=86=E6=94=AF=E9=95=9C=E5=83=8F=E8=87=AA=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b73a361..fc40c97 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,7 +2,7 @@ name: Docker Image CI on: push: - branches: [ "main" ] + branches: [ "main", "dev" ] jobs: @@ -32,7 +32,11 @@ jobs: - name: Determine Image Tags id: tags run: | - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:latest,${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:main-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT + if [ "${{ github.ref_name }}" == "main" ]; then + echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:latest,${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:main-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT + elif [ "${{ github.ref_name }}" == "dev" ]; then + echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:dev,${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:dev-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT + fi - name: Build and Push Docker Image uses: docker/build-push-action@v5 @@ -42,8 +46,8 @@ jobs: platforms: linux/amd64,linux/arm64 tags: ${{ steps.tags.outputs.tags }} push: true - cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:buildcache - cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:buildcache,mode=max + cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:buildcache-${{ github.ref_name }} + cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:buildcache-${{ github.ref_name }},mode=max labels: | org.opencontainers.image.created=${{ steps.tags.outputs.date_tag }} org.opencontainers.image.revision=${{ github.sha }} \ No newline at end of file From fc3391947dff0032b501134b0fcd286dcf98e747 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Jul 2025 15:08:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=A4=87=E4=BB=BD=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=94=BE=E5=85=A5=E5=88=B0=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=94=B9=E4=B8=BA=E8=A6=86=E5=86=99=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/config.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/config/config.py b/src/config/config.py index a219078..5143f39 100644 --- a/src/config/config.py +++ b/src/config/config.py @@ -1,5 +1,6 @@ import os from dataclasses import dataclass +from datetime import datetime import tomlkit import shutil @@ -56,11 +57,16 @@ def update_config(): else: logger.info("已有配置文件未检测到版本号,可能是旧版本。将进行更新") + # 创建备份文件夹 + backup_dir = "config_backup" + os.makedirs(backup_dir, exist_ok=True) + # 备份文件名 - old_backup_path = "config.toml.back" + timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") + old_backup_path = os.path.join(backup_dir, f"config.toml.bak.{timestamp}") # 备份旧配置文件 - shutil.move(old_config_path, old_backup_path) + shutil.copy2(old_config_path, old_backup_path) logger.info(f"已备份旧配置文件到: {old_backup_path}") # 复制模板文件到配置目录