增加了启动时可以指定web端口的功能;将主页运行结果按钮挪到了拓展分析title的后方
This commit is contained in:
@@ -1365,6 +1365,7 @@
|
|||||||
<el-tooltip content="上传已跑通过的代码和测试数据;执行通过自然语言触发。" placement="top">
|
<el-tooltip content="上传已跑通过的代码和测试数据;执行通过自然语言触发。" placement="top">
|
||||||
<h4 style="margin:0; color:#303133; cursor:help;">拓展分析阶段</h4>
|
<h4 style="margin:0; color:#303133; cursor:help;">拓展分析阶段</h4>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
<el-button size="small" @click="loadExtensionRuns(); extensionResultDialogVisible = true">运行结果</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div style="display:grid; grid-template-columns:72px 1fr; gap:7px; align-items:center; font-size:12px;">
|
<div style="display:grid; grid-template-columns:72px 1fr; gap:7px; align-items:center; font-size:12px;">
|
||||||
<span>已写阶段</span>
|
<span>已写阶段</span>
|
||||||
@@ -1425,7 +1426,6 @@
|
|||||||
<el-button v-if="isLightweightExtensionSelected" size="small" type="success" @click="openLightweightRuntimeCard()">
|
<el-button v-if="isLightweightExtensionSelected" size="small" type="success" @click="openLightweightRuntimeCard()">
|
||||||
运行已发布
|
运行已发布
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button size="small" @click="loadExtensionRuns(); extensionResultDialogVisible = true">运行结果</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
+35
-11
@@ -1,22 +1,46 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# PlantAI-dev 9000 服务管理脚本
|
# PlantAI-dev 9000 服务管理脚本
|
||||||
# 用法: bash manage_plantai.sh {start|stop|restart|status}
|
# 用法: bash manage_plantai.sh {start|stop|restart|status} [--port PORT]
|
||||||
|
# 默认端口: 9000
|
||||||
#
|
#
|
||||||
# 项目: /home/xzq/5090/teamWorkspace/zh/PlantAI-dev
|
# 项目: /home/xzq/5090/teamWorkspace/zh/PlantAI-dev
|
||||||
# 端口: 9000 (web), Redis DB 14 (queue prefix: plantai_dev_9002)
|
# 端口: 9000 (web), Redis DB 14 (queue prefix: plantai_dev_9002)
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
# 解析命令行参数:第一个参数是命令,后面可选 --port / -p
|
||||||
|
CMD=""
|
||||||
|
WEB_PORT="9000"
|
||||||
|
for arg in "$@"; do
|
||||||
|
case "$arg" in
|
||||||
|
start|stop|restart|status)
|
||||||
|
CMD="$arg"
|
||||||
|
;;
|
||||||
|
--port|-p)
|
||||||
|
WEB_PORT=""
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
if [ -z "$WEB_PORT" ] && [[ "$arg" =~ ^[0-9]+$ ]]; then
|
||||||
|
WEB_PORT="$arg"
|
||||||
|
elif [ -z "$CMD" ]; then
|
||||||
|
echo "错误: 未知命令 '$arg'"
|
||||||
|
echo "用法: bash manage_plantai.sh {start|stop|restart|status} [--port PORT]"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
CMD="${CMD:-status}"
|
||||||
|
|
||||||
# Conda 环境:启动脚本内部也依赖这个环境
|
# Conda 环境:启动脚本内部也依赖这个环境
|
||||||
CONDA_ENV="${CONDA_ENV:-/home/xzq/miniconda3/envs/test4py311}"
|
CONDA_ENV="${CONDA_ENV:-/home/xzq/miniconda3/envs/test4py311}"
|
||||||
export PATH="$CONDA_ENV/bin:$PATH"
|
export PATH="$CONDA_ENV/bin:$PATH"
|
||||||
|
|
||||||
# 项目配置(与 .env 和启动脚本保持一致)
|
# 项目配置(与 .env 和启动脚本保持一致)
|
||||||
PROJECT_DIR="/home/xzq/5090/teamWorkspace/zh/PlantAI-dev"
|
PROJECT_DIR="/home/xzq/5090/teamWorkspace/zh/PlantAI-dev"
|
||||||
WEB_PORT="9000"
|
|
||||||
QUEUE_PREFIX="plantai_dev_9002"
|
QUEUE_PREFIX="plantai_dev_9002"
|
||||||
WEB_LOG="/tmp/plantai_9000.log"
|
WEB_LOG="/tmp/plantai_${WEB_PORT}.log"
|
||||||
CELERY_LOG="/tmp/celery_9000.log"
|
CELERY_LOG="/tmp/celery_${WEB_PORT}.log"
|
||||||
|
|
||||||
red() { echo -e "\033[31m$*\033[0m"; }
|
red() { echo -e "\033[31m$*\033[0m"; }
|
||||||
green(){ echo -e "\033[32m$*\033[0m"; }
|
green(){ echo -e "\033[32m$*\033[0m"; }
|
||||||
@@ -24,7 +48,7 @@ cyan() { echo -e "\033[36m$*\033[0m"; }
|
|||||||
|
|
||||||
status() {
|
status() {
|
||||||
echo ""
|
echo ""
|
||||||
cyan "=== PlantAI-dev 9000 服务状态 ==="
|
cyan "=== PlantAI-dev ${WEB_PORT} 服务状态 ==="
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Web 服务
|
# Web 服务
|
||||||
@@ -58,7 +82,7 @@ status() {
|
|||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
echo ""
|
echo ""
|
||||||
cyan "=== 停止 PlantAI-dev 9000 服务 ==="
|
cyan "=== 停止 PlantAI-dev ${WEB_PORT} 服务 ==="
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# 停止 Web 服务
|
# 停止 Web 服务
|
||||||
@@ -97,7 +121,7 @@ stop() {
|
|||||||
|
|
||||||
start() {
|
start() {
|
||||||
echo ""
|
echo ""
|
||||||
cyan "=== 启动 PlantAI-dev 9000 服务 ==="
|
cyan "=== 启动 PlantAI-dev ${WEB_PORT} 服务 ==="
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# 检查是否已在运行
|
# 检查是否已在运行
|
||||||
@@ -126,7 +150,7 @@ start() {
|
|||||||
|
|
||||||
# 启动 Web 服务
|
# 启动 Web 服务
|
||||||
echo "正在启动 Web 服务..."
|
echo "正在启动 Web 服务..."
|
||||||
nohup bash start_plantai_9000.sh > "$WEB_LOG" 2>&1 &
|
nohup bash start_plantai_9000.sh --port "$WEB_PORT" > "$WEB_LOG" 2>&1 &
|
||||||
sleep 3
|
sleep 3
|
||||||
if ss -tlnp 2>/dev/null | grep -q ":$WEB_PORT"; then
|
if ss -tlnp 2>/dev/null | grep -q ":$WEB_PORT"; then
|
||||||
green " [✓] Web 服务已启动 (http://0.0.0.0:$WEB_PORT)"
|
green " [✓] Web 服务已启动 (http://0.0.0.0:$WEB_PORT)"
|
||||||
@@ -139,7 +163,7 @@ start() {
|
|||||||
echo "日志文件:"
|
echo "日志文件:"
|
||||||
echo " Web: $WEB_LOG"
|
echo " Web: $WEB_LOG"
|
||||||
echo " Celery: $CELERY_LOG"
|
echo " Celery: $CELERY_LOG"
|
||||||
echo " Worker: $PROJECT_DIR/logs/celery_plantai_dev_9000/"
|
echo " Worker: $PROJECT_DIR/logs/celery_${QUEUE_PREFIX}/"
|
||||||
echo ""
|
echo ""
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,13 +173,13 @@ restart() {
|
|||||||
start
|
start
|
||||||
}
|
}
|
||||||
|
|
||||||
case "${1:-status}" in
|
case "$CMD" in
|
||||||
start) start ;;
|
start) start ;;
|
||||||
stop) stop ;;
|
stop) stop ;;
|
||||||
restart) restart ;;
|
restart) restart ;;
|
||||||
status) status ;;
|
status) status ;;
|
||||||
*)
|
*)
|
||||||
echo "用法: bash manage_plantai.sh {start|stop|restart|status}"
|
echo "用法: bash manage_plantai.sh {start|stop|restart|status} [--port PORT]"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
Executable
+24
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Project restart script — called by /api/admin/restart-project
|
||||||
|
# 用法: bash restart_plantai_9000.sh [--port PORT]
|
||||||
|
# 从环境变量 PLANTAI_WEB_PORT 或参数获取端口,默认 9000
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
|
||||||
|
PORT="${PLANTAI_WEB_PORT:-9000}"
|
||||||
|
while [[ $# -gt 0 ]]; do
|
||||||
|
case "$1" in
|
||||||
|
--port|-p)
|
||||||
|
PORT="${2:?错误: --port 需要指定端口号}"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
cd "$SCRIPT_DIR"
|
||||||
|
exec bash manage_plantai.sh restart --port "$PORT"
|
||||||
+21
-2
@@ -1,8 +1,26 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Start the PlantAI-dev web service on port 9000.
|
# Start the PlantAI-dev web service.
|
||||||
|
# 用法: bash start_plantai_9000.sh [--port PORT]
|
||||||
|
# 默认端口: 9000
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
# 解析命令行参数
|
||||||
|
PORT="9000"
|
||||||
|
while [[ $# -gt 0 ]]; do
|
||||||
|
case "$1" in
|
||||||
|
--port|-p)
|
||||||
|
PORT="${2:?错误: --port 需要指定端口号}"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "未知参数: $1"
|
||||||
|
echo "用法: bash start_plantai_9000.sh [--port PORT]"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
cd "$SCRIPT_DIR"
|
cd "$SCRIPT_DIR"
|
||||||
|
|
||||||
@@ -26,7 +44,8 @@ export BBAV5_LIGHTWEIGHT_INPUT="${BBAV5_LIGHTWEIGHT_INPUT:-$SCRIPT_DIR/input}"
|
|||||||
export BBAV5_LIGHTWEIGHT_WORKSPACE="${BBAV5_LIGHTWEIGHT_WORKSPACE:-$SCRIPT_DIR/workspace}"
|
export BBAV5_LIGHTWEIGHT_WORKSPACE="${BBAV5_LIGHTWEIGHT_WORKSPACE:-$SCRIPT_DIR/workspace}"
|
||||||
export BBAV5_QUEUE_PREFIX="${BBAV5_QUEUE_PREFIX:-plantai_dev_9000}"
|
export BBAV5_QUEUE_PREFIX="${BBAV5_QUEUE_PREFIX:-plantai_dev_9000}"
|
||||||
export BBAV5_REDIS_URL="${BBAV5_REDIS_URL:-redis://localhost:6379/10}"
|
export BBAV5_REDIS_URL="${BBAV5_REDIS_URL:-redis://localhost:6379/10}"
|
||||||
export PLANTAI_WEB_PORT="9000"
|
export PLANTAI_WEB_PORT="$PORT"
|
||||||
|
export PLANTAI_RESTART_SCRIPT="$SCRIPT_DIR/restart_plantai_9000.sh"
|
||||||
export GENE_FAMILY_MAS_API="http://127.0.0.1:7926"
|
export GENE_FAMILY_MAS_API="http://127.0.0.1:7926"
|
||||||
export DUAL_KB_QA_BASE_URL="http://127.0.0.1:7926"
|
export DUAL_KB_QA_BASE_URL="http://127.0.0.1:7926"
|
||||||
export RAG_API_URL="http://127.0.0.1:7926/api/v1/qa-v1-1-73/chat"
|
export RAG_API_URL="http://127.0.0.1:7926/api/v1/qa-v1-1-73/chat"
|
||||||
|
|||||||
Reference in New Issue
Block a user