同步前端代码并提交相关修复

bin/restart_java_backend.sh

@@ -9,7 +9,9 @@ CONSOLE_LOG="$LOG_DIR/backend-console.log"
 PID_FILE="$LOG_DIR/backend-java.pid"
 TARGET_DIR="$ROOT_DIR/ruoyi-admin/target"
 JAR_NAME="ruoyi-admin.jar"
-SERVER_PORT=8080
+JAVA_HOME_1_8="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home"
+JAVA_BIN="$JAVA_HOME_1_8/bin/java"
+SERVER_PORT=63310
 STOP_WAIT_SECONDS=30
 APP_MARKER="-Dloan.pricing.backend.root=$ROOT_DIR"
 JAVA_OPTS="$APP_MARKER -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
@@ -42,6 +44,18 @@ ensure_command() {
     fi
 }
 
+setup_java_env() {
+    if [ ! -x "$JAVA_BIN" ]; then
+        log_error "未找到 JDK 1.8: $JAVA_BIN"
+        exit 1
+    fi
+
+    JAVA_HOME="$JAVA_HOME_1_8"
+    export JAVA_HOME
+    PATH="$JAVA_HOME/bin:$PATH"
+    export PATH
+}
+
 is_managed_backend_pid() {
     pid="$1"
     if [ -z "${pid:-}" ] || ! kill -0 "$pid" 2>/dev/null; then
@@ -175,7 +189,7 @@ start_backend() {
 
     (
         cd "$TARGET_DIR"
-        nohup java $JAVA_OPTS -jar "$JAR_NAME" >> "$CONSOLE_LOG" 2>&1 &
+        nohup "$JAVA_BIN" $JAVA_OPTS -jar "$JAR_NAME" >> "$CONSOLE_LOG" 2>&1 &
         echo $! > "$PID_FILE"
     )
 
@@ -232,8 +246,8 @@ restart_action() {
 }
 
 main() {
+    setup_java_env
     ensure_command mvn
-    ensure_command java
     ensure_command lsof
     ensure_command ps
     ensure_command tail