From b1e7aeca43d0bcf79d6068819cd2e79dfcc95845 Mon Sep 17 00:00:00 2001
From: wangys <3401275564@qq.com>
Date: Thu, 8 Jan 2026 15:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/dify/docker-compose.yaml               |  5 +-
 .../nginx/volumes/conf.d/default.conf         | 26 +++++++++
 .../urbanLifeline/serv/config/bootstrap.yml   | 10 +++-
 docker/urbanLifeline/web/nginx.conf           | 57 -------------------
 docker/urbanLifeline/web/web-manager.sh       |  8 +--
 5 files changed, 43 insertions(+), 63 deletions(-)
 delete mode 100644 docker/urbanLifeline/web/nginx.conf

diff --git a/docker/dify/docker-compose.yaml b/docker/dify/docker-compose.yaml
index ed5fc920..45941461 100644
--- a/docker/dify/docker-compose.yaml
+++ b/docker/dify/docker-compose.yaml
@@ -1069,6 +1069,7 @@ services:
     networks:
       - ssrf_proxy_network
       - default
+      - urban-lifeline
 
   # The Weaviate vector store.
   weaviate:
@@ -1542,7 +1543,9 @@ networks:
   opensearch-net:
     driver: bridge
     internal: true
-
+  urban-lifeline:  # 添加外部网络引用
+    external: true
+    name: urban-lifeline
 volumes:
   oradata:
   dify_es01_data:
diff --git a/docker/urbanLifeline/nginx/volumes/conf.d/default.conf b/docker/urbanLifeline/nginx/volumes/conf.d/default.conf
index 1e54c772..4cfc9861 100644
--- a/docker/urbanLifeline/nginx/volumes/conf.d/default.conf
+++ b/docker/urbanLifeline/nginx/volumes/conf.d/default.conf
@@ -84,6 +84,19 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+        
+        # SPA fallback - 404时返回index.html让Vue Router处理
+        proxy_intercept_errors on;
+        error_page 404 = @platform_fallback;
+    }
+    
+    location @platform_fallback {
+        proxy_pass http://platform/index.html;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
     }
 
     # Workcase 工单系统 PC端
@@ -94,6 +107,19 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+        
+        # SPA fallback - 404时返回index.html让Vue Router处理
+        proxy_intercept_errors on;
+        error_page 404 = @workcase_fallback;
+    }
+    
+    location @workcase_fallback {
+        proxy_pass http://workcase-web/index.html;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
     }
 
     # Bidding 招标系统
diff --git a/docker/urbanLifeline/serv/config/bootstrap.yml b/docker/urbanLifeline/serv/config/bootstrap.yml
index 6b203fe0..80262f6a 100644
--- a/docker/urbanLifeline/serv/config/bootstrap.yml
+++ b/docker/urbanLifeline/serv/config/bootstrap.yml
@@ -26,7 +26,15 @@ spring:
       port: ${REDIS_PORT:6379}
       database: ${REDIS_DATABASE:0}
       password: ${REDIS_PASSWORD:}
-
+      
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health,info
+  endpoint:
+    health:
+      show-details: always
 # ================== Security AES ==================
 security:
   aes:
diff --git a/docker/urbanLifeline/web/nginx.conf b/docker/urbanLifeline/web/nginx.conf
deleted file mode 100644
index 849451e7..00000000
--- a/docker/urbanLifeline/web/nginx.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-# ================================================
-# 前端应用 Nginx 配置（单页应用）
-# ================================================
-
-user nginx;
-worker_processes auto;
-error_log /var/log/nginx/error.log warn;
-pid /var/run/nginx.pid;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-                    '$status $body_bytes_sent "$http_referer" '
-                    '"$http_user_agent"';
-
-    access_log /var/log/nginx/access.log main;
-
-    sendfile on;
-    tcp_nopush on;
-    keepalive_timeout 65;
-
-    # Gzip 压缩
-    gzip on;
-    gzip_vary on;
-    gzip_comp_level 6;
-    gzip_types text/plain text/css text/xml application/json application/javascript 
-               application/xml application/xml+rss text/javascript;
-
-    server {
-        listen 80;
-        server_name localhost;
-        root /usr/share/nginx/html;
-        index index.html;
-
-        # SPA 路由支持
-        location / {
-            try_files $uri $uri/ /index.html;
-        }
-
-        # 静态资源缓存
-        location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-            expires 7d;
-            add_header Cache-Control "public, immutable";
-        }
-
-        # 禁止访问隐藏文件
-        location ~ /\. {
-            deny all;
-        }
-    }
-}
diff --git a/docker/urbanLifeline/web/web-manager.sh b/docker/urbanLifeline/web/web-manager.sh
index 15e0a3a5..e2cea06c 100644
--- a/docker/urbanLifeline/web/web-manager.sh
+++ b/docker/urbanLifeline/web/web-manager.sh
@@ -140,12 +140,12 @@ start_web() {
     fi
     
     log_info "启动 $web (端口: $port)..."
-    
-    # 使用 serve 启动静态服务
-    nohup serve -s "$site_dir" -l "$port" > "$log_file" 2>&1 &
+
+    # 使用 serve 启动静态服务，--single 确保SPA路由正确处理
+    nohup serve -s "$site_dir" -l "$port" --single > "$log_file" 2>&1 &
     local pid=$!
     echo $pid > "$pid_file"
-    
+
     log_info "$web 已启动 (PID: $pid)"
 }