commit c8584eed27ec70586191bd5a282add3f52bc7019
author 22301102 <22301102@bjtu.edu.cn> Sat Jun 07 10:37:33 2025 +0800
committer 22301102 <22301102@bjtu.edu.cn> Sat Jun 07 10:51:16 2025 +0800
tree 24f24a2a9c10a350490553045791841f0d3f187a
parent 3be803e275e9c54311e8f5ffbe592a7e90e20f94
parent 84c5562861944173a2331bac2ffe2847c4b558d0

测试nginx.conf

Change-Id: I80320616e6cf36ae7ffe594783138530271043ea

G12Project

diff --git a/G12Project b/G12Project
new file mode 160000
index 0000000..af6e08a
--- /dev/null
+++ b/G12Project
@@ -0,0 +1 @@
+Subproject commit af6e08a2d39246df8c2e77c997e666a833794131

docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index f10b96e..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: '3.8'
-
-services:
-  backend:
-    build:
-      context: ./G12Project
-      dockerfile: Dockerfile
-      target: final
-    container_name: g12-backend
-    ports:
-      - "8080:8080"
-    environment:
-      - SPRING_DATASOURCE_URL=jdbc:mysql://202.205.102.121:3306/g12develop
-      - SPRING_DATASOURCE_USERNAME=team12
-      - SPRING_DATASOURCE_PASSWORD=123456abc
-    restart: unless-stopped
-    networks:
-      - g12-network
-
-  frontend:
-    build:
-      context: ./G12-Frontend
-      dockerfile: Dockerfile
-    container_name: g12-frontend
-    ports:
-      - "80:80"
-    depends_on:
-      - backend
-    restart: unless-stopped
-    networks:
-      - g12-network
-
-networks:
-  g12-network:
-    driver: bridge 
\ No newline at end of file

nginx.conf

diff --git a/nginx.conf b/nginx.conf
index 7057dbd..04983a9 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -3,18 +3,18 @@
     server_name team12.10813352.xyz;  # 替换为你的域名
 
     location /api/ {
-        proxy_pass http://localhost:8080;
-        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_pass http://localhost:8080;
+        # 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_http_version 1.1;
-         proxy_set_header Connection "";
-
-         # 超时设置
-         proxy_connect_timeout 60s;
-         proxy_send_timeout 60s;
-         proxy_read_timeout 60s;
+        # # 长连接支持
+        # proxy_http_version 1.1;
+        # proxy_set_header Connection "";
+        # # 超时设置
+        # proxy_connect_timeout 60s;
+        # proxy_send_timeout 60s;
+        # proxy_read_timeout 60s;
+        return 200 'API endpoint is under construction';
     }
 }
\ No newline at end of file