From 4bfc19c91991d94867c873012c5cd3fc672782b2 Mon Sep 17 00:00:00 2001 From: cui-gaoleng <562344211@qq.com> Date: Tue, 9 Dec 2025 16:21:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oe_cli_mcp_server/requirements.txt | 10 ----- mcp_center/servers/oe_cli_mcp_server/run.sh | 40 +------------------ 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 mcp_center/servers/oe_cli_mcp_server/requirements.txt diff --git a/mcp_center/servers/oe_cli_mcp_server/requirements.txt b/mcp_center/servers/oe_cli_mcp_server/requirements.txt deleted file mode 100644 index 1fc467fed..000000000 --- a/mcp_center/servers/oe_cli_mcp_server/requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -# requirements.txt -paramiko==3.4.0 -typing_extensions==4.12.2 -psutil==5.9.5 -toml == 0.10.2 -fastapi==0.115.12 -uvicorn==0.34.0 -requests==2.31.0 -pydantic==2.11.7 -mcp==1.17.0 \ No newline at end of file diff --git a/mcp_center/servers/oe_cli_mcp_server/run.sh b/mcp_center/servers/oe_cli_mcp_server/run.sh index a5df71b83..0de61689d 100755 --- a/mcp_center/servers/oe_cli_mcp_server/run.sh +++ b/mcp_center/servers/oe_cli_mcp_server/run.sh @@ -2,9 +2,7 @@ set -e # 关键路径(只改这里就行) -VENV_PATH="/usr/lib/sysagent/mcp_center/servers/oe_cli_mcp_server/venv/global" -REQUIREMENTS="/usr/lib/sysagent/mcp_center/servers/oe_cli_mcp_server/requirements.txt" -PIP_MIRROR="https://pypi.tuna.tsinghua.edu.cn/simple" # 镜像源(保持原有) +VENV_PATH="/usr/lib/sysagent/mcp_center/servers/oe_cli_mcp_server/venv/global"# 镜像源(保持原有) # 新增1:安装创建虚拟环境的必需工具(解决隐性创建失败) yum install -y python3-venv --skip-broken >/dev/null 2>&1 @@ -27,45 +25,9 @@ fi source "$VENV_PATH/bin/activate" echo "=== 虚拟环境激活成功:$VIRTUAL_ENV ===" -# 3. 升级 pip(新增:有网才升级,无网跳过) -echo -e "\n=== 升级 pip ===" -if curl -s --connect-timeout 3 "$PIP_MIRROR" >/dev/null 2>&1; then - pip install --upgrade pip -i "$PIP_MIRROR" --trusted-host pypi.tuna.tsinghua.edu.cn -else - echo "❌ 无网络连接,跳过 pip 升级" -fi - -# 4. 安装依赖(新增:有网才装,且只装系统/RPM 没有的包) -echo -e "\n=== 安装项目依赖 ===" -if [ -f "$REQUIREMENTS" ]; then - if curl -s --connect-timeout 3 "$PIP_MIRROR" >/dev/null 2>&1; then - echo "✅ 网络正常,从镜像源安装缺失依赖" - - # 遍历 requirements.txt,只安装系统/RPM 未有的包 - while IFS= read -r pkg; do - [[ -z "$pkg" || "$pkg" =~ ^# ]] && continue # 跳过注释、空行 - # 提取包名(忽略版本号) - pkg_name=$(echo "$pkg" | sed -E 's/[<>=~].*//g' | xargs) - # 检查包是否已通过系统 RPM 安装(虚拟环境继承) - if ! python3 -c "import $pkg_name" 2>/dev/null; then - echo "⚠️ 系统未找到 $pkg_name,通过 pip 安装..." - pip install "$pkg" -i "$PIP_MIRROR" --trusted-host pypi.tuna.tsinghua.edu.cn - else - echo "✅ $pkg_name(系统 RPM 已安装,跳过)" - fi - done < "$REQUIREMENTS" - - else - echo "❌ 无网络连接,跳过依赖安装" - echo "✅ 系统 RPM 依赖已通过虚拟环境继承,可直接使用" - fi -else - echo "❌ 未找到依赖文件:$REQUIREMENTS" -fi -echo -e "\n=== 环境配置完成!===" # 3. 部署systemd服务 cp /usr/lib/sysagent/mcp_center/servers/oe_cli_mcp_server/mcp-server.service /etc/systemd/system/ -- Gitee From 2884674d3f7f6559c87aa36cb9bd9503a316eb3c Mon Sep 17 00:00:00 2001 From: cui-gaoleng <562344211@qq.com> Date: Tue, 9 Dec 2025 16:38:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mcp_center/servers/oe_cli_mcp_server/run.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mcp_center/servers/oe_cli_mcp_server/run.sh b/mcp_center/servers/oe_cli_mcp_server/run.sh index 0de61689d..726cf02c8 100755 --- a/mcp_center/servers/oe_cli_mcp_server/run.sh +++ b/mcp_center/servers/oe_cli_mcp_server/run.sh @@ -2,9 +2,11 @@ set -e # 关键路径(只改这里就行) -VENV_PATH="/usr/lib/sysagent/mcp_center/servers/oe_cli_mcp_server/venv/global"# 镜像源(保持原有) +VENV_PATH="/usr/lib/sysagent/mcp_center/servers/oe_cli_mcp_server/venv/global" + # 新增1:安装创建虚拟环境的必需工具(解决隐性创建失败) +echo "=== 安装 python3-venv ===" yum install -y python3-venv --skip-broken >/dev/null 2>&1 # 新增2:创建虚拟环境父目录(避免二级目录创建失败) @@ -26,9 +28,6 @@ source "$VENV_PATH/bin/activate" echo "=== 虚拟环境激活成功:$VIRTUAL_ENV ===" - - - # 3. 部署systemd服务 cp /usr/lib/sysagent/mcp_center/servers/oe_cli_mcp_server/mcp-server.service /etc/systemd/system/ # 新增:替换服务文件中的 Python 路径(确保与虚拟环境一致) -- Gitee