Merge "测试nginx.conf"
Change-Id: I29c27f4d0317de42aa61e07b79c7c959675e5e1b
diff --git a/Dockerfile b/Dockerfile
index b646295..abbe549 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,8 @@
# 复制 JAR 文件到容器
COPY target/*.jar team12.jar
+COPY nginx.conf /etc/nginx/conf.d/g12b.conf
+
# 暴露端口（与 application.yml/server.port 一致）
EXPOSE 8080
diff --git a/nginx.conf b/nginx.conf
index 7057dbd..d1ccc05 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,20 +1,15 @@
-server {
+server{
listen 80;
- 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_http_version 1.1;
- proxy_set_header Connection "";
-
- # 超时设置
- proxy_connect_timeout 60s;
- proxy_send_timeout 60s;
- proxy_read_timeout 60s;
+ server_name team12.10813352.xyz;
+
+ # 解决 React Router 单页应用路由问题
+ location / {
+ return 200 "Hello, World!"
}
+
+ # API 请求代理到后端
+ location /api/ {
+
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/pt/controller/TrackerController.java b/src/main/java/com/pt/controller/TrackerController.java
index 1e0302d..edae09f 100644
--- a/src/main/java/com/pt/controller/TrackerController.java
+++ b/src/main/java/com/pt/controller/TrackerController.java
@@ -10,6 +10,8 @@
import java.util.Map;
@RestController
+@CrossOrigin(origins = "*")
+@RequestMapping("/api/tracker")
public class TrackerController {
@Autowired