From 420a7ee7488a70d60ff34fba5955c2d873adb2cf Mon Sep 17 00:00:00 2001 From: Tianmoy <95174435+Tianmoy@users.noreply.github.com> Date: Tue, 25 Mar 2025 08:24:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Ddocs=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docker_deploy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docker_deploy.md b/docs/docker_deploy.md index f78f73dc..38eb5444 100644 --- a/docs/docker_deploy.md +++ b/docs/docker_deploy.md @@ -41,7 +41,7 @@ NAPCAT_UID=$(id -u) NAPCAT_GID=$(id -g) docker-compose up -d ### 3. 修改配置并重启Docker -- 请前往 [🎀 新手配置指南](docs/installation_cute.md) 或 [⚙️ 标准配置指南](docs/installation_standard.md) 完成`.env.prod`与`bot_config.toml`配置文件的编写\ +- 请前往 [🎀 新手配置指南](./installation_cute.md) 或 [⚙️ 标准配置指南](./installation_standard.md) 完成`.env.prod`与`bot_config.toml`配置文件的编写\ **需要注意`.env.prod`中HOST处IP的填写,Docker中部署和系统中直接安装的配置会有所不同** - 重启Docker容器: From 2359afc9c7d92a053e48dab9bb05d63ac0eef6bc Mon Sep 17 00:00:00 2001 From: Tianmoy <95174435+Tianmoy@users.noreply.github.com> Date: Tue, 25 Mar 2025 08:59:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0conda?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=90=8D=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MaiLauncher.bat | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/MaiLauncher.bat b/MaiLauncher.bat index 619f9c65..03e59b59 100644 --- a/MaiLauncher.bat +++ b/MaiLauncher.bat @@ -277,6 +277,19 @@ if defined VIRTUAL_ENV ( goto menu ) +if exist "%_root%\config\conda_env" ( + set /p CONDA_ENV=<"%_root%\config\conda_env" + call conda activate !CONDA_ENV! || ( + echo 激活失败,可能原因: + echo 1. 环境不存在 + echo 2. conda配置异常 + pause + goto conda_menu + ) + echo 成功激活conda环境:!CONDA_ENV! + goto menu +) + echo ===================================== echo 虚拟环境检测警告: echo 当前使用系统Python路径:!PYTHON_HOME! @@ -390,6 +403,7 @@ call conda activate !CONDA_ENV! || ( goto conda_menu ) echo 成功激活conda环境:!CONDA_ENV! +echo !CONDA_ENV! > "%_root%\config\conda_env" echo 要安装依赖吗? set /p install_confirm="继续?(Y/N): " if /i "!install_confirm!"=="Y" (