统一个人测算入参与重启脚本进程识别

bin/prod/restart_java.sh

@@ -71,7 +71,16 @@ collect_backend_pids() {
         fi
     fi
 
-    marker_pids=$(pgrep -f "$BACKEND_MARKER" 2>/dev/null || true)
+    marker_pids=$(ps -ef | awk -v marker="$BACKEND_MARKER" -v jar="$BACKEND_JAR" '
+        index($0, "<defunct>") == 0 && index($0, marker) > 0 {
+            for (i = 1; i < NF; i++) {
+                if ($i == "-jar" && $(i + 1) == jar) {
+                    print $2
+                    break
+                }
+            }
+        }
+    ' | xargs 2>/dev/null || true)
     if [ -n "${marker_pids:-}" ]; then
         for pid in $marker_pids; do
             if is_managed_backend_pid "$pid"; then

bin/prod/restart_java_test.sh

@@ -44,8 +44,8 @@ EOF
 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"
+    mkdir -p "$work_dir/env/jdk/bin" "$work_dir/loan-pricing/backend" "$work_dir/loan-pricing/logs" "$work_dir/loan-pricing/run"
+    create_fake_java "$work_dir/env/jdk/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"
@@ -67,8 +67,10 @@ cleanup_work_dir() {
 }
 
 test_script_contract() {
-    assert_grep 'JAVA_HOME="\$ENV_ROOT/java"' "$SCRIPT_UNDER_TEST"
+    assert_grep 'JAVA_HOME="\$ENV_ROOT/jdk"' "$SCRIPT_UNDER_TEST"
     assert_grep '--spring\.profiles\.active=pro' "$SCRIPT_UNDER_TEST"
+    assert_grep 'ps -ef' "$SCRIPT_UNDER_TEST"
+    assert_not_grep 'pgrep' "$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"

bin/restart_java_backend.sh

@@ -83,7 +83,16 @@ collect_pids() {
         fi
     fi
 
-    marker_pids=$(pgrep -f "$APP_MARKER" 2>/dev/null || true)
+    marker_pids=$(ps -ef | awk -v marker="$APP_MARKER" -v jar="$JAR_NAME" '
+        index($0, "<defunct>") == 0 && index($0, marker) > 0 {
+            for (i = 1; i < NF; i++) {
+                if ($i == "-jar" && $(i + 1) == jar) {
+                    print $2
+                    break
+                }
+            }
+        }
+    ' | xargs 2>/dev/null || true)
     if [ -n "${marker_pids:-}" ]; then
         for pid in $marker_pids; do
             if is_managed_backend_pid "$pid"; then
@@ -225,7 +234,6 @@ restart_action() {
 main() {
     ensure_command mvn
     ensure_command lsof
-    ensure_command pgrep
     ensure_command ps
     ensure_command tail
 

bin/restart_java_backend_test.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -eu
+
+ROOT_DIR=$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)
+SCRIPT_UNDER_TEST="$ROOT_DIR/bin/restart_java_backend.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
+}
+
+test_script_contract() {
+    assert_grep 'ps -ef' "$SCRIPT_UNDER_TEST"
+    assert_not_grep 'pgrep' "$SCRIPT_UNDER_TEST"
+    assert_grep 'APP_MARKER=' "$SCRIPT_UNDER_TEST"
+    assert_grep 'status_backend\(\)' "$SCRIPT_UNDER_TEST"
+}
+
+main() {
+    [ -f "$SCRIPT_UNDER_TEST" ] || fail "script under test not found: $SCRIPT_UNDER_TEST"
+    test_script_contract
+    printf 'PASS: restart_java_backend tests\n'
+}
+
+main "$@"