commit aebeb2f33f3f1e3799aef20d9be23f3151a8db37
author 22301071 <22301071@bjtu.edu.cn> Tue Jun 03 23:24:46 2025 +0800
committer 22301071 <22301071@bjtu.edu.cn> Tue Jun 03 23:24:46 2025 +0800
tree ba7abbe66ef7f1c545c6e1ba58d417558a956ba6
parent 00a6983ddb62963a30330108d930c45e2a22f81d
parent 7f16eef324864cf7145354ac3a336bcfc9239ae4

Merge branch 'master' into muzhi

Change-Id: I7cddae202f53bf983a06068a92c3c343d8ab05db

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 497f1e0..b4651a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,9 @@
-# 使用官方OpenJDK基础镜像（推荐Alpine轻量版）
 FROM eclipse-temurin:17-jdk-alpine
 
-# 设置工作目录
 WORKDIR /app
 
-# 复制构建好的JAR文件到镜像中
 COPY target/G8Backend-0.0.1-SNAPSHOT.jar app.jar
 
-# 暴露Spring Boot默认端口（根据实际项目修改）
 EXPOSE 8080
 
-# 启动命令
 ENTRYPOINT ["java", "-jar", "app.jar"]
\ No newline at end of file

docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 4fac612..5dd8f0d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,16 @@
 version: '3.8'
 
 services:
+  backend:
+    build: .
+    container_name: springboot-app
+    ports:
+      - "8080:8080"
+    environment:
+      - SPRING_REDIS_HOST=redis
+    depends_on:
+      - redis
+
   redis:
     image: "redis:alpine"
     container_name: "redis-server"

src/main/resources/application.properties

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 19ff0b5..9c851a3 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -7,7 +7,8 @@
 
 mybatis-plus.mapper-locations=classpath*:/mapper/**/*.xml
 
-spring.data.redis.host = 127.0.0.1
+#spring.data.redis.host = 127.0.0.1
+spring.data.redis.host = redis
 spring.data.redis.port = 6379
 
 spring.mail.host=smtp.qq.com