chore: 恢复旧布局基线（迁移改动丢失后重建，apps/packages 布局暂存）
This commit is contained in:
logan committed
1 parent
a9510235bb
commit
456fa6954b
203 files changed
+18787
-48
No files matched your search
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# ./run.sh # = web：仅 Gin 官网 + docs（:8788）
|
||||
# ./run.sh web # 同上（浏览器不当客户端）
|
||||
# ./run.sh gui # 桌面唯一操作入口：Vite(本机给 Tauri) + Tauri + 默认 Gin
|
||||
# ./run.sh gui # 桌面唯一操作入口：临时 .app（Dock 名 OpsxDB）+ 默认 Gin
|
||||
# ./run.sh all # 同 gui（兼容旧命令；不再起「浏览器工作台产品」）
|
||||
# ./run.sh server|desktop # 单组件
|
||||
# ./run.sh package # Tauri 安装包 + sidecar
|
||||
@@ -40,6 +40,9 @@ SERVER_LOG="$LOG_DIR/server.log"
|
||||
WEB_LOG="$LOG_DIR/web.log"
|
||||
DESKTOP_LOG="$LOG_DIR/desktop.log"
|
||||
|
||||
# shellcheck source=scripts/gui-dev-app.sh
|
||||
source "$SCRIPT_DIR/scripts/gui-dev-app.sh"
|
||||
|
||||
# node/npm 不在此强制注入,由 detect_node 按需探测(start_web/start_desktop 前调用)。
|
||||
export PATH="/opt/homebrew/bin:/usr/local/bin:${HOME}/.cargo/bin:$PATH"
|
||||
|
||||
@@ -175,14 +178,14 @@ start_vite_for_desktop() {
|
||||
success "桌面 UI(Vite) 已在运行 :$WEB_PORT"
|
||||
return 0
|
||||
fi
|
||||
info "启动桌面 UI 源 :$WEB_PORT（仅本机给 Tauri，勿当浏览器客户端）..."
|
||||
info "启动桌面 UI 源 :${WEB_PORT}（仅本机给 Tauri，勿当浏览器客户端）..."
|
||||
: >"$WEB_LOG"
|
||||
ensure_npm
|
||||
kill_port "$WEB_PORT"
|
||||
start_detached "$WEB_LABEL" "$WEB_LOG" \
|
||||
"export PATH=\"$NODE_BIN_DIR:/opt/homebrew/bin:/usr/local/bin:\$PATH\"; cd \"$SCRIPT_DIR\" && exec npm run dev -w @opsxdb/web"
|
||||
# Vite 用 nohup：launchctl submit 在本机对 npm -w 经常交不出进程（web.log 空、40s 超时）
|
||||
nohup /bin/bash -lc "export PATH=\"$NODE_BIN_DIR:/opt/homebrew/bin:/usr/local/bin:\$PATH\"; cd \"$SCRIPT_DIR\" && exec npm run dev -w @opsxdb/web" >>"$WEB_LOG" 2>&1 </dev/null &
|
||||
wait_http "http://127.0.0.1:$WEB_PORT/" "Web UI" 80
|
||||
success "桌面 UI(Vite) UP http://127.0.0.1:$WEB_PORT（请用 ./run.sh gui，勿当工作台）"
|
||||
success "桌面 UI(Vite) UP http://127.0.0.1:${WEB_PORT}（请用 ./run.sh gui，勿当工作台）"
|
||||
}
|
||||
|
||||
# 兼容旧名
|
||||
@@ -195,32 +198,25 @@ stop_web() {
|
||||
}
|
||||
|
||||
start_desktop() {
|
||||
# GUI 依赖同一份 Vite 源；先保证 5174（仅本机）
|
||||
start_vite_for_desktop
|
||||
info "启动桌面 OpsxDB ..."
|
||||
info "启动桌面 OpsxDB（临时 .app + 当前图标）..."
|
||||
: >"$DESKTOP_LOG"
|
||||
ensure_npm
|
||||
# 清掉旧的 debug 进程（二进制名 OpsxDB）
|
||||
pkill -f 'target/debug/OpsxDB' 2>/dev/null || true
|
||||
pkill -f 'target/debug/opsxdb-desktop' 2>/dev/null || true
|
||||
stop_detached "$DESKTOP_LABEL"
|
||||
start_detached "$DESKTOP_LABEL" "$DESKTOP_LOG" \
|
||||
"export PATH=\"$NODE_BIN_DIR:/opt/homebrew/bin:/usr/local/bin:\$HOME/.cargo/bin:\$PATH\"; cd \"$SCRIPT_DIR/apps/desktop\" && exec npm run tauri -- dev"
|
||||
kill_opsxdb_gui
|
||||
ensure_gui_dev_app || return 1
|
||||
if [ "${GUI_DEV_NEEDS_VITE:-0}" = "1" ]; then
|
||||
start_vite_for_desktop
|
||||
fi
|
||||
open "$GUI_APP" 2>>"$DESKTOP_LOG" || { error "open 失败，见 $DESKTOP_LOG"; return 1; }
|
||||
|
||||
local i=0
|
||||
while true; do
|
||||
if pgrep -f 'target/debug/OpsxDB' >/dev/null 2>&1 \
|
||||
|| pgrep -f 'target/debug/opsxdb-desktop' >/dev/null 2>&1; then
|
||||
success "桌面 OpsxDB 已启动（Dock 名应为 OpsxDB）"
|
||||
if gui_is_running; then
|
||||
success "桌面 OpsxDB 已启动（临时 .app，Dock 用 icon.icns / 名称 OpsxDB）"
|
||||
info "路径: $GUI_APP"
|
||||
return 0
|
||||
fi
|
||||
if grep -Eiq 'error:|panicked|could not compile' "$DESKTOP_LOG" 2>/dev/null; then
|
||||
error "桌面启动失败，见 $DESKTOP_LOG"
|
||||
tail -n 40 "$DESKTOP_LOG" || true
|
||||
return 1
|
||||
fi
|
||||
i=$((i + 1))
|
||||
if [ "$i" -ge 120 ]; then
|
||||
if [ "$i" -ge 30 ]; then
|
||||
error "桌面启动超时，见 $DESKTOP_LOG"
|
||||
tail -n 40 "$DESKTOP_LOG" || true
|
||||
return 1
|
||||
@@ -230,10 +226,7 @@ start_desktop() {
|
||||
}
|
||||
|
||||
stop_desktop() {
|
||||
stop_detached "$DESKTOP_LABEL"
|
||||
pkill -f 'target/debug/OpsxDB' 2>/dev/null || true
|
||||
pkill -f 'target/debug/opsxdb-desktop' 2>/dev/null || true
|
||||
pkill -f 'apps/desktop/node_modules/.bin/tauri' 2>/dev/null || true
|
||||
kill_opsxdb_gui
|
||||
success "桌面已停止"
|
||||
}
|
||||
|
||||
@@ -245,7 +238,7 @@ status() {
|
||||
warning "server :$SERVER_PORT DOWN"
|
||||
fi
|
||||
if curl -fsS "http://127.0.0.1:$WEB_PORT/" >/dev/null 2>&1; then
|
||||
success "vite :$WEB_PORT UP（桌面源，非浏览器产品）"
|
||||
success "vite :${WEB_PORT} UP（桌面源，非浏览器产品）"
|
||||
else
|
||||
warning "vite :$WEB_PORT DOWN"
|
||||
fi
|
||||
@@ -253,8 +246,7 @@ status() {
|
||||
|| curl -fsS "http://127.0.0.1:$SERVER_PORT/docs" >/dev/null 2>&1; then
|
||||
success "site :$SERVER_PORT 官网/docs 可达"
|
||||
fi
|
||||
if pgrep -f 'target/debug/OpsxDB' >/dev/null 2>&1 \
|
||||
|| pgrep -f 'target/debug/opsxdb-desktop' >/dev/null 2>&1; then
|
||||
if gui_is_running; then
|
||||
success "gui OpsxDB UP"
|
||||
else
|
||||
warning "gui OpsxDB DOWN"
|
||||
@@ -291,7 +283,7 @@ $PROJECT_NAME 启动脚本（产品形态：浏览器=官网/docs · 操作=桌
|
||||
|
||||
./run.sh # 同 web
|
||||
./run.sh web # 仅 Gin：官网 + docs → http://127.0.0.1:$SERVER_PORT/
|
||||
./run.sh gui # 桌面唯一操作入口（Vite 本机源 + Tauri；默认也起 Gin）
|
||||
./run.sh gui # 桌面：临时 .app（Dock=OpsxDB / icon.icns；默认也起 Gin）
|
||||
./run.sh all # 同 gui（兼容旧名）
|
||||
|
||||
./run.sh server # 只 Gin（官网/docs + API）
|
||||
@@ -300,7 +292,7 @@ $PROJECT_NAME 启动脚本（产品形态：浏览器=官网/docs · 操作=桌
|
||||
|
||||
./run.sh stop | restart | status | help
|
||||
|
||||
端口: Gin/官网 $SERVER_PORT · 桌面 Vite 源 $WEB_PORT（不对外当客户端）
|
||||
端口: Gin/官网 $SERVER_PORT · 桌面 Vite 源 ${WEB_PORT}（不对外当客户端）
|
||||
日志: logs/{server,web,desktop}.log
|
||||
USAGE
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user