fix: support panel-managed deployment safely

deploy/baota-start.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+die() {
+  printf '[kaidi-baota] ERROR: %s\n' "$1" >&2
+  exit 1
+}
+
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+RELEASE_ROOT=$(cd "$SCRIPT_DIR/.." && pwd)
+APP_JAR="$RELEASE_ROOT/app.jar"
+PUBLIC_INDEX="$RELEASE_ROOT/public/index.html"
+VERSION_FILE="$RELEASE_ROOT/VERSION"
+
+[ -s "$APP_JAR" ] || die "app.jar is missing from $RELEASE_ROOT"
+[ -s "$PUBLIC_INDEX" ] || die "public/index.html is missing from $RELEASE_ROOT"
+[ -s "$VERSION_FILE" ] || die "VERSION is missing from $RELEASE_ROOT"
+
+JAVA_BIN=${KAIDI_JAVA_BIN:-}
+if [ -z "$JAVA_BIN" ] && [ -n "${JAVA_HOME:-}" ]; then
+  JAVA_BIN="$JAVA_HOME/bin/java"
+fi
+if [ -z "$JAVA_BIN" ]; then
+  JAVA_BIN=$(command -v java 2>/dev/null || true)
+fi
+[ -n "$JAVA_BIN" ] || die "Java 17 or newer was not found"
+if [[ "$JAVA_BIN" == */* ]]; then
+  [ -x "$JAVA_BIN" ] || die "Java executable is not available at $JAVA_BIN"
+else
+  command -v "$JAVA_BIN" >/dev/null 2>&1 || die "Java executable $JAVA_BIN is not available"
+fi
+
+export SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE:-production}
+export SERVER_ADDRESS=${SERVER_ADDRESS:-127.0.0.1}
+export SERVER_PORT=${SERVER_PORT:-18080}
+export FINANCE_SETUP_ENABLED=${FINANCE_SETUP_ENABLED:-false}
+export FINANCE_BOOTSTRAP_ENABLED=${FINANCE_BOOTSTRAP_ENABLED:-false}
+export FINANCE_UPDATE_ENABLED=${FINANCE_UPDATE_ENABLED:-false}
+export FILE_SCANNER_ENABLED=${FILE_SCANNER_ENABLED:-false}
+export FINANCE_STATIC_LOCATIONS=${FINANCE_STATIC_LOCATIONS:-file:$RELEASE_ROOT/public/}
+export UPDATE_CURRENT_VERSION_FILE=${UPDATE_CURRENT_VERSION_FILE:-$VERSION_FILE}
+export APP_VERSION=${APP_VERSION:-$(tr -d '\r\n' < "$VERSION_FILE")}
+
+if [ "$FINANCE_SETUP_ENABLED" != true ]; then
+  for name in DB_URL DB_USERNAME DB_PASSWORD FIELD_ENCRYPTION_KEY FILE_STORAGE_ROOT FILE_STORAGE_TEMP; do
+    [ -n "${!name:-}" ] || die "$name must be configured in the Baota project environment"
+  done
+  for directory in "$FILE_STORAGE_ROOT" "$FILE_STORAGE_TEMP"; do
+    [ -d "$directory" ] || die "Storage directory $directory does not exist"
+    [ -w "$directory" ] || die "Startup user cannot write storage directory $directory"
+  done
+fi
+
+cd "$RELEASE_ROOT"
+exec "$JAVA_BIN" -XX:MaxRAMPercentage=70 -Dfile.encoding=UTF-8 -jar "$APP_JAR"

deploy/baota.env.example

@@ -0,0 +1,14 @@
+SPRING_PROFILES_ACTIVE=production
+SERVER_ADDRESS=127.0.0.1
+SERVER_PORT=18080
+SESSION_COOKIE_SECURE=false
+DB_URL=jdbc:mysql://MYSQL_HOST:3306/kaidi_finance?useUnicode=true&characterEncoding=utf8&connectionTimeZone=UTC&serverTimezone=UTC
+DB_USERNAME=MYSQL_USERNAME
+DB_PASSWORD=MYSQL_PASSWORD
+FIELD_ENCRYPTION_KEY=EXISTING_FIELD_ENCRYPTION_KEY
+FILE_STORAGE_ROOT=/var/lib/kaidi/files
+FILE_STORAGE_TEMP=/var/lib/kaidi/tmp
+FILE_SCANNER_ENABLED=false
+FINANCE_BOOTSTRAP_ENABLED=false
+FINANCE_SETUP_ENABLED=false
+FINANCE_UPDATE_ENABLED=false

deploy/install.sh

@@ -344,7 +344,7 @@ secure_release_tree() {
   chown -R root:"$SERVICE_GROUP" "$release_dir"
   find "$release_dir" -type d -exec chmod 0750 {} +
   find "$release_dir" -type f -exec chmod 0640 {} +
-  chmod 0750 "$release_dir/ops/update.sh"
+  chmod 0750 "$release_dir/ops/update.sh" "$release_dir/ops/baota-start.sh"
 }
 
 restore_security_contexts() {
@@ -848,6 +848,8 @@ find "$WORK_DIR/extracted" -type l -print -quit | grep -q . \
 [ -s "$WORK_DIR/extracted/public/index.html" ] || die "Release frontend is missing"
 [ "$(cat "$WORK_DIR/extracted/VERSION")" = "$VERSION" ] || die "Release version mismatch"
 [ -x "$WORK_DIR/extracted/ops/update.sh" ] || die "Release updater is missing"
+[ -x "$WORK_DIR/extracted/ops/baota-start.sh" ] || die "Baota Spring Boot launcher is missing"
+bash -n "$WORK_DIR/extracted/ops/baota-start.sh" || die "Baota Spring Boot launcher is invalid"
 
 configure_database
 preflight_database

deploy/systemd/kaidi-update.path

@@ -4,8 +4,6 @@ Description=Watch for Kaidi Finance update requests
 [Path]
 PathChanged=/var/lib/kaidi-update/inbox
 PathExists=/var/lib/kaidi-update/inbox/request.json
-PathChanged=/var/lib/kaidi-update/processing
-PathExists=/var/lib/kaidi-update/processing/request.json
 Unit=kaidi-update.service
 
 [Install]

deploy/systemd/kaidi-update.service

@@ -12,8 +12,7 @@ Group=root
 EnvironmentFile=/etc/kaidi/update.env
 EnvironmentFile=-/var/lib/kaidi/setup/application.env
 ExecStart=/opt/kaidi/bin/update.sh
-Restart=on-failure
-RestartSec=15
+Restart=no
 Nice=10
 IOSchedulingClass=best-effort
 IOSchedulingPriority=6

deploy/update.sh

@@ -102,7 +102,7 @@ secure_release_tree() {
   chown -R root:"$SERVICE_GROUP" "$release_dir" || return 1
   find "$release_dir" -type d -exec chmod 0750 {} + || return 1
   find "$release_dir" -type f -exec chmod 0640 {} + || return 1
-  chmod 0750 "$release_dir/ops/update.sh"
+  chmod 0750 "$release_dir/ops/update.sh" "$release_dir/ops/baota-start.sh"
 }
 
 verify_release_access() {
@@ -379,7 +379,6 @@ rollback_active_transaction() {
   link_restored=true
   operations_restored=true
 
-  systemctl stop "$SERVICE_NAME" || true
   if [ -n "$previous_target" ] && [ -d "$previous_target" ]; then
     if ! ln -sfn "$previous_target" "$APP_ROOT/current.next" \
       || ! mv -Tf "$APP_ROOT/current.next" "$APP_ROOT/current"; then
@@ -390,7 +389,7 @@ rollback_active_transaction() {
   fi
   restore_operations || operations_restored=false
   systemctl reset-failed "$SERVICE_NAME" >/dev/null 2>&1 || true
-  systemctl start "$SERVICE_NAME" || true
+  systemctl restart "$SERVICE_NAME" || systemctl start "$SERVICE_NAME" || true
   if [ "$link_restored" = true ] && verify_app_surface; then
     remove_failed_release "$failed_release"
     rm -rf "$ACTIVE_TRANSACTION"
@@ -400,8 +399,11 @@ rollback_active_transaction() {
     fail "$reason; previous release is running, but operations restoration requires manual review"
   fi
   TERMINAL_STATUS_WRITTEN=true
-  status FAILED "$reason; rollback is incomplete and will be retried" "${TARGET_VERSION:-}"
-  printf '%s\n' "$reason; rollback is incomplete and will be retried" >&2
+  status FAILED "$reason; rollback is incomplete and manual recovery is required" "${TARGET_VERSION:-}"
+  if ! archive_processing_request; then
+    printf '%s\n' "Update request could not be archived after an incomplete rollback" >&2
+  fi
+  printf '%s\n' "$reason; rollback is incomplete and manual recovery is required" >&2
   exit 1
 }
 
@@ -427,6 +429,7 @@ recover_interrupted_transaction() {
 
 validate_release_operations() {
   sh -n "$WORK_DIR/extracted/ops/update.sh" || return 1
+  bash -n "$WORK_DIR/extracted/ops/baota-start.sh" || return 1
   command -v systemd-analyze >/dev/null 2>&1 || return 1
   systemd-analyze verify \
     "$WORK_DIR/extracted/ops/kaidi-finance.service" \
@@ -613,7 +616,6 @@ apply_operations || rollback_active_transaction "Release operations files could
 write_transaction_value phase OPS_APPLIED
 
 write_transaction_value phase APP_SWITCHING
-systemctl stop "$SERVICE_NAME" || rollback_active_transaction "Application service could not be stopped"
 if ! ln -sfn "$RELEASE_DIR" "$APP_ROOT/current.next" \
   || ! mv -Tf "$APP_ROOT/current.next" "$APP_ROOT/current"; then
   rollback_active_transaction "Release application link could not be activated"
@@ -623,7 +625,7 @@ write_transaction_value phase APP_SWITCHED
 status RUNNING "Starting and verifying release $TARGET_VERSION" "$TARGET_VERSION"
 write_transaction_value phase HEALTH_CHECKING
 systemctl reset-failed "$SERVICE_NAME" >/dev/null 2>&1 || true
-systemctl start "$SERVICE_NAME" || true
+systemctl restart "$SERVICE_NAME" || systemctl start "$SERVICE_NAME" || true
 if verify_app_surface; then
   success_message="Release $TARGET_VERSION is running"
   if ! systemctl start "$UPDATE_PATH_NAME" >/dev/null 2>&1; then