修改字段 登陆

bin/prod/restart_java.sh

@@ -5,7 +5,7 @@ set -eu
 WEBAPP_ROOT="/home/webapp"
 ENV_ROOT="$WEBAPP_ROOT/env"
 APP_ROOT="$WEBAPP_ROOT/loan-pricing"
-JAVA_HOME="$ENV_ROOT/jdk"
+JAVA_HOME="$ENV_ROOT/java"
 BACKEND_DIR="$APP_ROOT/backend"
 LOG_DIR="$APP_ROOT/logs"
 RUN_DIR="$APP_ROOT/run"
@@ -37,13 +37,6 @@ usage() {
 EOF
 }
 
-require_root() {
-    if [ "$(id -u)" -ne 0 ]; then
-        log_error "请使用 root 用户执行脚本"
-        exit 1
-    fi
-}
-
 ensure_runtime_dirs() {
     mkdir -p "$BACKEND_DIR" "$LOG_DIR" "$RUN_DIR"
 }
@@ -133,8 +126,10 @@ stop_backend() {
 }
 
 start_backend() {
+    ensure_runtime_dirs
+
     if [ ! -x "$JAVA_HOME/bin/java" ]; then
-        log_error "未检测到 Java，可先执行 /home/webapp/install_env.sh"
+        log_error "未检测到可执行 Java: $JAVA_HOME/bin/java"
         exit 1
     fi
 
@@ -164,19 +159,7 @@ start_backend() {
         exit 1
     fi
 
-    wait_seconds=0
-    while [ "$wait_seconds" -lt 30 ]; do
-        if ss -lnt 2>/dev/null | grep -q ":$BACKEND_PORT "; then
-            log_info "后端已监听端口: $BACKEND_PORT"
-            return 0
-        fi
-
-        sleep 1
-        wait_seconds=$((wait_seconds + 1))
-    done
-
-    log_error "后端未在预期时间内监听端口 $BACKEND_PORT"
-    exit 1
+    log_info "后端已启动，PID: $backend_pid"
 }
 
 status_backend() {
@@ -186,11 +169,6 @@ status_backend() {
         return 0
     fi
 
-    if ss -lnt 2>/dev/null | grep -q ":$BACKEND_PORT "; then
-        log_info "未识别到脚本托管进程，但端口 $BACKEND_PORT 已被占用"
-        return 0
-    fi
-
     log_info "后端未运行"
 }
 

bin/prod/restart_java_test.sh

@@ -0,0 +1,114 @@
+#!/bin/sh
+
+set -eu
+
+ROOT_DIR=$(CDPATH= cd -- "$(dirname "$0")/../.." && pwd)
+SCRIPT_UNDER_TEST="$ROOT_DIR/bin/prod/restart_java.sh"
+
+fail() {
+    printf 'FAIL: %s\n' "$1" >&2
+    exit 1
+}
+
+assert_grep() {
+    pattern="$1"
+    target="$2"
+    if ! grep -Eq -- "$pattern" "$target"; then
+        fail "expected pattern [$pattern] in $target"
+    fi
+}
+
+assert_not_grep() {
+    pattern="$1"
+    target="$2"
+    if grep -Eq -- "$pattern" "$target"; then
+        fail "did not expect pattern [$pattern] in $target"
+    fi
+}
+
+create_fake_java() {
+    fake_java="$1"
+
+    cat > "$fake_java" <<'EOF'
+#!/bin/sh
+set -eu
+
+while :; do
+    sleep 1
+done
+EOF
+
+    chmod +x "$fake_java"
+}
+
+prepare_script_env() {
+    work_dir="$1"
+
+    mkdir -p "$work_dir/env/java/bin" "$work_dir/loan-pricing/backend" "$work_dir/loan-pricing/logs" "$work_dir/loan-pricing/run"
+    create_fake_java "$work_dir/env/java/bin/java"
+    printf 'fake-jar\n' > "$work_dir/loan-pricing/backend/ruoyi-admin.jar"
+    cp "$SCRIPT_UNDER_TEST" "$work_dir/restart_java.sh"
+    perl -0pi -e "s#WEBAPP_ROOT=\"/home/webapp\"#WEBAPP_ROOT=\"$work_dir\"#" "$work_dir/restart_java.sh"
+    chmod +x "$work_dir/restart_java.sh"
+}
+
+cleanup_work_dir() {
+    work_dir="$1"
+
+    if [ -f "$work_dir/loan-pricing/run/backend.pid" ]; then
+        backend_pid=$(cat "$work_dir/loan-pricing/run/backend.pid" 2>/dev/null || true)
+        if [ -n "${backend_pid:-}" ]; then
+            kill "$backend_pid" 2>/dev/null || true
+            wait "$backend_pid" 2>/dev/null || true
+        fi
+    fi
+
+    rm -rf "$work_dir"
+}
+
+test_script_contract() {
+    assert_grep 'JAVA_HOME="\$ENV_ROOT/java"' "$SCRIPT_UNDER_TEST"
+    assert_grep '--spring\.profiles\.active=pro' "$SCRIPT_UNDER_TEST"
+    assert_not_grep 'mvn' "$SCRIPT_UNDER_TEST"
+    assert_not_grep 'require_root' "$SCRIPT_UNDER_TEST"
+    assert_not_grep '\b(ss|lsof|netstat)\b' "$SCRIPT_UNDER_TEST"
+}
+
+test_restart_flow() {
+    work_dir=$(mktemp -d)
+    trap 'cleanup_work_dir "$work_dir"' EXIT INT TERM
+
+    prepare_script_env "$work_dir"
+
+    "$work_dir/restart_java.sh" start
+    if [ ! -f "$work_dir/loan-pricing/run/backend.pid" ]; then
+        fail "expected backend pid file after start"
+    fi
+
+    backend_pid=$(cat "$work_dir/loan-pricing/run/backend.pid")
+    kill -0 "$backend_pid" 2>/dev/null || fail "expected backend process to be running after start"
+
+    status_output=$("$work_dir/restart_java.sh" status 2>&1 || true)
+    printf '%s\n' "$status_output" | grep -q '后端正在运行' || fail "expected status output to show running"
+
+    "$work_dir/restart_java.sh" restart
+    restarted_pid=$(cat "$work_dir/loan-pricing/run/backend.pid")
+    kill -0 "$restarted_pid" 2>/dev/null || fail "expected backend process to be running after restart"
+
+    "$work_dir/restart_java.sh" stop
+    if [ -f "$work_dir/loan-pricing/run/backend.pid" ]; then
+        fail "expected backend pid file to be removed after stop"
+    fi
+
+    trap - EXIT INT TERM
+    cleanup_work_dir "$work_dir"
+}
+
+main() {
+    [ -f "$SCRIPT_UNDER_TEST" ] || fail "script under test not found: $SCRIPT_UNDER_TEST"
+    test_script_contract
+    test_restart_flow
+    printf 'PASS: restart_java tests\n'
+}
+
+main "$@"