From ee61a75512319e4afd0a3c0244a10db8e3207262 Mon Sep 17 00:00:00 2001 From: zhangsan <646228430@qq.com> Date: Tue, 8 Jul 2025 18:08:38 +0800 Subject: [PATCH] =?UTF-8?q?7.8=20=E9=83=A8=E7=BD=B2=E4=BA=91=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .mvn/settings.xml | 14 ++++++++++++++ docs/dev-ops/docker-compose-app.yml | 15 +++++++-------- group-buying-sys-app/Dockerfile | 5 ++++- 3 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 .mvn/settings.xml diff --git a/.mvn/settings.xml b/.mvn/settings.xml new file mode 100644 index 0000000..4451621 --- /dev/null +++ b/.mvn/settings.xml @@ -0,0 +1,14 @@ + + + + aliyun + aliyun maven + https://maven.aliyun.com/repository/public + central,apache.snapshots + + + + diff --git a/docs/dev-ops/docker-compose-app.yml b/docs/dev-ops/docker-compose-app.yml index c478f0c..ed0e666 100644 --- a/docs/dev-ops/docker-compose-app.yml +++ b/docs/dev-ops/docker-compose-app.yml @@ -29,7 +29,7 @@ services: TZ: Asia/Shanghai MYSQL_ROOT_PASSWORD: 123456 ports: - - '13306:3306' # 宿主机访问用 13306 + - '13306:3306' volumes: - ./mysql/my.cnf:/etc/mysql/conf.d/mysql.cnf:ro - ./mysql/sql:/docker-entrypoint-initdb.d @@ -49,7 +49,7 @@ services: restart: always hostname: redis ports: - - '16379:6379' # 宿主机访问用 16379 + - '16379:6379' volumes: - ./redis/redis.conf:/usr/local/etc/redis/redis.conf command: redis-server /usr/local/etc/redis/redis.conf @@ -64,7 +64,7 @@ services: # 4. Java 后端 group-buying-sys: build: - context: ../.. # 从 docs/ 回到项目根 + context: ../.. # 从 docs/dev-ops 回到项目根 dockerfile: group-buying-sys-app/Dockerfile image: smile/group-buying-sys:latest container_name: group-buying-sys @@ -77,16 +77,13 @@ services: ports: - '8091:8091' environment: - # 时区 & 端口 - TZ=PRC - SERVER_PORT=8091 - # —— MySQL —— - SPRING_DATASOURCE_USERNAME=root - SPRING_DATASOURCE_PASSWORD=123456 - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/big_market?useUnicode=true&characterEncoding=utf8&autoReconnect=true&serverTimezone=Asia/Shanghai&useSSL=false - SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver - SPRING_HIKARI_POOL_NAME=Retail_HikariCP - # —— Redis —— - REDIS_SDK_CONFIG_HOST=redis - REDIS_SDK_CONFIG_PORT=6379 volumes: @@ -99,7 +96,7 @@ services: networks: - my-network - # 5. phpMyAdmin + # 5. phpMyAdmin(只有在 webui profile 下才启动) phpmyadmin: image: phpmyadmin:5.2.1 container_name: phpmyadmin @@ -115,8 +112,9 @@ services: - MYSQL_ROOT_PASSWORD=123456 networks: - my-network + profiles: ["webui"] - # 6. Redis Commander + # 6. Redis Commander(只有在 webui profile 下才启动) redis-admin: image: spryker/redis-commander:0.8.0 container_name: redis-admin @@ -133,3 +131,4 @@ services: - HTTP_PASSWORD=admin networks: - my-network + profiles: ["webui"] diff --git a/group-buying-sys-app/Dockerfile b/group-buying-sys-app/Dockerfile index 66705c3..4fcb47b 100644 --- a/group-buying-sys-app/Dockerfile +++ b/group-buying-sys-app/Dockerfile @@ -1,7 +1,10 @@ # —— 第一阶段:Maven 构建 —— -FROM maven:3.8.7-openjdk-8-slim AS builder +FROM maven:3.8.7-eclipse-temurin-17-alpine AS builder WORKDIR /workspace +# 把项目级 settings.xml 复制到容器里 +COPY .mvn/settings.xml /root/.m2/settings.xml + # 1. 先只拷贝父 POM 及各模块的 pom.xml,加速依赖下载 COPY pom.xml ./pom.xml COPY group-buying-sys-api/pom.xml ./group-buying-sys-api/pom.xml