Merge branch 'master' of ssh://gerrit.lilingkun.com:29418/G12Project
Change-Id: I0417e545275dca24efdf296442f4cbfb0ff69c7e
diff --git a/Dockerfile b/Dockerfile
index 2d4db7a..b646295 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,41 +1,14 @@
-# 构建阶段
-FROM maven:3.9.6-amazoncorretto-17 AS build
-
-# 设置工作目录
-WORKDIR /build
-
-# 复制 pom.xml
-COPY pom.xml .
-
-# 下载依赖
-RUN mvn dependency:go-offline
-
-# 复制源代码
-COPY src ./src
-
-# 构建项目
-RUN mvn clean package -DskipTests
-
-# 运行阶段
-FROM amazoncorretto:17 AS final
+# 使用官方 OpenJDK 镜像
+FROM eclipse-temurin:17-jdk-jammy
# 设置工作目录
WORKDIR /team12
-# 设置时区
-ENV TZ=Asia/Shanghai
-RUN yum update -y && \
- yum install -y tzdata && \
- ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \
- echo $TZ > /etc/timezone && \
- yum clean all && \
- rm -rf /var/cache/yum
+# 复制 JAR 文件到容器
+COPY target/*.jar team12.jar
-# 从构建阶段复制构建好的 jar 文件
-COPY --from=build /build/target/*.jar team12.jar
-
-# 暴露端口
+# 暴露端口（与 application.yml/server.port 一致）
EXPOSE 8080
-# 启动命令
+# 启动应用
ENTRYPOINT ["java", "-jar", "team12.jar"]
\ No newline at end of file
diff --git a/G12Project b/G12Project
new file mode 160000
index 0000000..af6e08a
--- /dev/null
+++ b/G12Project
@@ -0,0 +1 @@
+Subproject commit af6e08a2d39246df8c2e77c997e666a833794131
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
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..d1ccc05
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,15 @@
+server{
+ listen 80;
+ 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/testResponse/TestController.java b/src/main/java/com/pt/testResponse/TestController.java
new file mode 100644
index 0000000..a0dbae9
--- /dev/null
+++ b/src/main/java/com/pt/testResponse/TestController.java
@@ -0,0 +1,15 @@
+package com.pt.testResponse;
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@CrossOrigin(origins = "*")
+public class TestController {
+
+ @GetMapping("/api/test")
+ public String testResponse() {
+ return "Hello, world!";
+ }
+}