Merge "Merge "测试nginx.conf""
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/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