toor/mirosociety
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: backend fixes + vite config + AppShell cleanup

Browse Source 
- pyproject.toml: add httpx>=0.27.0 dependency.
- frontend/vite.config.js: bind port to 31400, strictPort, proxy /api -> 31401.
- start.sh: rewrite as detached daemon (nohup + disown + PID files);
  re-running is treated as restart.
- .gitignore: ignore .run/ (PID files).
- frontend AppShell.vue: drop unused GitHub Star link.

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
toor
2026-09-17 15:34:14 +08:00
co-authored by Claude
parent 36b0f2b660
commit 0d8c34a2c9
4 changed files with 63 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -28,6 +28,7 @@ frontend/node_modules/.vite/
# 本地启动/部署日志 # 本地启动/部署日志
backend.log backend.log
frontend.log frontend.log
.run/
# 临时文件 # 临时文件
*.swp *.swp
frontend/src/components/AppShell.vue
-12
View File
@@ -29,18 +29,6 @@
> >
Gallery Gallery
</router-link> </router-link>
<a
href="https://github.com/yzaparto/mirosociety"
target="_blank"
rel="noopener noreferrer"
class="flex items-center gap-1.5 text-sm text-slate-500 hover:text-slate-900 px-3 py-1.5 rounded-md hover:bg-gray-50 transition-colors"
>
<svg class="w-4 h-4" viewBox="0 0 16 16" fill="currentColor">
<path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"/>
</svg>
<span>Star</span>
</a>
</nav> </nav>
<main :class="hideShell ? '' : 'flex-1'"> <main :class="hideShell ? '' : 'flex-1'">
frontend/vite.config.js
+3 -2
View File
@@ -4,10 +4,11 @@ import vue from '@vitejs/plugin-vue'
export default defineConfig({ export default defineConfig({
plugins: [vue()], plugins: [vue()],
server: { server: {
port: 3000, port: 31400,
strictPort: true,
proxy: { proxy: {
'/api': { '/api': {
target: 'http://localhost:8000', target: 'http://localhost:31401',
changeOrigin: true, changeOrigin: true,
}, },
}, },
start.sh
+59 -62
View File
@@ -1,54 +1,60 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# MiroSociety 启动脚本 (开发模式) # MiroSociety 后台启动 (开发模式)
# 前置: 请先执行 ./deploy.sh 安装依赖 # 前置: 请先执行 ./deploy.sh 安装依赖
# 前端: http://localhost:31400 后端: http://localhost:31401 # 前端: http://localhost:31400 后端: http://localhost:31401
#
# 直接 ./start.sh 即可启动;已在跑会自动重启。
set -euo pipefail set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
FRONTEND_PORT=31400 FRONTEND_PORT=31400
BACKEND_PORT=31401 BACKEND_PORT=31401
# 解析到脚本所在目录,并使用绝对路径避免子 shell cd 后路径重复
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
VENV_DIR="$SCRIPT_DIR/backend/.venv" VENV_DIR="$SCRIPT_DIR/backend/.venv"
BACKEND_DIR="$SCRIPT_DIR/backend" BACKEND_DIR="$SCRIPT_DIR/backend"
FRONTEND_DIR="$SCRIPT_DIR/frontend" FRONTEND_DIR="$SCRIPT_DIR/frontend"
RUN_DIR="$SCRIPT_DIR/.run"
BACKEND_PID_FILE="$RUN_DIR/backend.pid"
FRONTEND_PID_FILE="$RUN_DIR/frontend.pid"
BACKEND_LOG="$SCRIPT_DIR/backend.log"
FRONTEND_LOG="$SCRIPT_DIR/frontend.log"
# 切到脚本所在目录,确保相对路径正确 cd "$SCRIPT_DIR"
cd "$(dirname "$0")"
# --- 颜色 --- # --- 颜色 ---
RED='\033[0;31m' RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; NC='\033[0m'
GREEN='\033[0;32m'
YELLOW='\033[1;33m'
NC='\033[0m'
log() { echo -e "${GREEN}[start.sh]${NC} $*"; } log() { echo -e "${GREEN}[start.sh]${NC} $*"; }
warn() { echo -e "${YELLOW}[start.sh]${NC} $*"; } warn() { echo -e "${YELLOW}[start.sh]${NC} $*"; }
err() { echo -e "${RED}[start.sh]${NC} $*" >&2; } err() { echo -e "${RED}[start.sh]${NC} $*" >&2; }
# --- 检查命令依赖 --- # --- 检查依赖 ---
for cmd in lsof npm node curl; do for cmd in lsof npm node curl; do
if ! command -v "$cmd" >/dev/null 2>&1; then command -v "$cmd" >/dev/null 2>&1 || { err "缺少依赖命令: $cmd"; exit 1; }
err "缺少依赖命令: $cmd"
exit 1
fi
done done
[[ -x "$VENV_DIR/bin/python3" ]] || { err "未检测到 $VENV_DIR/bin/python3,请先执行 ./deploy.sh"; exit 1; }
"$VENV_DIR/bin/python3" -c "import uvicorn" 2>/dev/null || { err "venv 缺少 uvicorn,请先执行 ./deploy.sh"; exit 1; }
[[ -d "$FRONTEND_DIR/node_modules" ]] || { err "未检测到 frontend/node_modules,请先执行 ./deploy.sh"; exit 1; }
# --- 检查依赖是否已部署 --- mkdir -p "$RUN_DIR"
if [[ ! -x "$VENV_DIR/bin/python3" ]]; then
err "未检测到 $VENV_DIR/bin/python3,请先执行 ./deploy.sh" # --- 已在跑 → 先杀 ---
exit 1 read_pid() { [[ -f "$1" ]] && cat "$1" || echo ""; }
fi kill_pid_file() {
if ! "$VENV_DIR/bin/python3" -c "import uvicorn" 2>/dev/null; then local pid_file="$1" label="$2"
err "venv 缺少 uvicorn,请先执行 ./deploy.sh" local pid
exit 1 pid=$(read_pid "$pid_file")
fi if [[ -n "$pid" ]] && kill -0 "$pid" 2>/dev/null; then
if [[ ! -d frontend/node_modules ]]; then kill "$pid" 2>/dev/null || true
err "未检测到 frontend/node_modules,请先执行 ./deploy.sh" for _ in $(seq 1 10); do
exit 1 kill -0 "$pid" 2>/dev/null || break
fi sleep 0.3
done
kill -9 "$pid" 2>/dev/null || true
log "$label 已停止 (pid=$pid)"
fi
rm -f "$pid_file"
}
# --- 释放端口: kill 占用进程 ---
free_port() { free_port() {
local port="$1" local port="$1"
local pids local pids
@@ -61,39 +67,35 @@ free_port() {
fi fi
} }
free_port "$FRONTEND_PORT" # --- 启动后端 ---
free_port "$BACKEND_PORT" free_port "$BACKEND_PORT"
kill_pid_file "$BACKEND_PID_FILE" "后端"
# --- 清理函数: 退出时杀掉所有子进程 --- log "启动后端 FastAPI @ :$BACKEND_PORT (后台)"
cleanup() { : >"$BACKEND_LOG"
log "正在关闭子进程..."
if [[ -n "${BACKEND_PID:-}" ]]; then kill -9 "$BACKEND_PID" 2>/dev/null || true; fi
if [[ -n "${FRONTEND_PID:-}" ]]; then kill -9 "$FRONTEND_PID" 2>/dev/null || true; fi
exit 0
}
trap cleanup INT TERM EXIT
# --- 启动后端 (后台, 使用 venv 内的 uvicorn) ---
log "启动后端 FastAPI @ :$BACKEND_PORT"
( (
cd "$BACKEND_DIR" cd "$BACKEND_DIR"
HOST=0.0.0.0 PORT="$BACKEND_PORT" \ HOST=0.0.0.0 PORT="$BACKEND_PORT" \
exec "$VENV_DIR/bin/python3" -m uvicorn app.main:app --host 0.0.0.0 --port "$BACKEND_PORT" nohup "$VENV_DIR/bin/python3" -m uvicorn app.main:app \
) >"$SCRIPT_DIR/backend.log" 2>&1 & --host 0.0.0.0 --port "$BACKEND_PORT" \
BACKEND_PID=$! >>"$BACKEND_LOG" 2>&1 &
echo $! >"$BACKEND_PID_FILE"
disown || true
)
# --- 启动前端 (后台, 端口固定为 31400) --- # --- 启动前端 ---
log "启动前端 Vite @ :$FRONTEND_PORT" free_port "$FRONTEND_PORT"
kill_pid_file "$FRONTEND_PID_FILE" "前端"
log "启动前端 Vite @ :$FRONTEND_PORT (后台)"
: >"$FRONTEND_LOG"
( (
cd "$FRONTEND_DIR" cd "$FRONTEND_DIR"
npx vite --port "$FRONTEND_PORT" --strictPort nohup npx vite >>"$FRONTEND_LOG" 2>&1 &
) >"$SCRIPT_DIR/frontend.log" 2>&1 & echo $! >"$FRONTEND_PID_FILE"
FRONTEND_PID=$! disown || true
)
log "后端 pid=$BACKEND_PID 前端 pid=$FRONTEND_PID"
log "等待服务就绪..."
# --- 健康检查 --- # --- 健康检查 ---
log "等待服务就绪..."
wait_for() { wait_for() {
local url="$1" name="$2" local url="$1" name="$2"
for _ in $(seq 1 30); do for _ in $(seq 1 30); do
@@ -107,16 +109,11 @@ wait_for() {
return 1 return 1
} }
wait_for "http://localhost:$BACKEND_PORT/health" "后端" wait_for "http://localhost:$BACKEND_PORT/health" "后端" || true
wait_for "http://localhost:$FRONTEND_PORT" "前端" wait_for "http://localhost:$FRONTEND_PORT" "前端" || true
echo echo
log "全部就绪!" log "全部就绪 ✓"
echo -e " ${GREEN}前端:${NC} http://localhost:$FRONTEND_PORT" echo -e " ${GREEN}前端:${NC} http://localhost:$FRONTEND_PORT"
echo -e " ${GREEN}后端:${NC} http://localhost:$BACKEND_PORT (健康检查: /health)" echo -e " ${GREEN}后端:${NC} http://localhost:$BACKEND_PORT (健康检查: /health)"
echo -e " ${GREEN}日志:${NC} backend.log / frontend.log" echo -e " ${GREEN}日志:${NC} backend.log / frontend.log"
echo
warn "按 Ctrl+C 终止所有服务"
# --- 保持前台,跟随日志 ---
tail -F "$SCRIPT_DIR/backend.log" "$SCRIPT_DIR/frontend.log"