From 4a49e789971b41cb6ed3200f234ddf79259ddd29 Mon Sep 17 00:00:00 2001
From: wanghu <wanghu@yuanhai.com>
Date: Tue, 8 Sep 2026 10:42:46 +0800
Subject: [PATCH] git

---
 docker/Dockerfile                     | 19 ++++++++++---------
 pom.xml                               | 20 +++++++++++++++++---
 src/main/resources/application.yml    |  5 -----
 src/main/resources/logback-spring.xml |  4 ++--
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 92ab9b7..855d0f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,5 @@
-# 由 projman 注入的 Spring Boot 运行镜像（单阶段，jar 预构建）
-# CI 已先 mvn package，并在容器内把产物 cp 成固定名 target/app.jar
-# 构建上下文 = 仓库根：docker build -f docker/Dockerfile .
-# 健康检查依赖 curl（projman 部署用 curl 探 /actuator/health）——应用需含 spring-boot-starter-actuator
-# 时区 Asia/Shanghai；JAVA_OPTS 由 projman 渲染器注入（OOM 退出参数 + MaxRAMPercentage=75（设内存上限时）
-# + 用户自定义参数），未注入时容器内兜底 -Xms512m -Xmx1024m
+# BschClass 后端镜像（基于已构建好的 target/BschClass-0.1.jar）
+# 构建上下文 = 仓库根目录： docker build -f docker/Dockerfile -t <img> .
 FROM eclipse-temurin:8-jre
 
 RUN apt-get update \
@@ -13,7 +9,12 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
-COPY target/app.jar /app/app.jar
+COPY target/BschClass-0.1.jar /app/BschClass-0.1.jar
+# 镜像内 application-prod.yml 仅作「nacos 不可达时的兜底默认」；
+# 正常启动由 run-app.sh 从 nacos 拉取线上配置（主 dataId=bschclassmanage.yaml，group=SCHCLASSMANAGE，prod 命名空间）后覆盖。
+COPY docker/application-prod.yml /app/config/application-prod.yml
+COPY docker/run-app.sh /app/run-app.sh
+RUN chmod +x /app/run-app.sh && mkdir -p /data/upload
 
-EXPOSE 10004
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS:--Xms512m -Xmx1024m} -Dfile.encoding=UTF-8 -jar /app/app.jar"]
+EXPOSE 8087
+ENTRYPOINT ["/app/run-app.sh"]
diff --git a/pom.xml b/pom.xml
index f9a77ce..6e70a24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,14 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Spring Cloud Alibaba（Nacos 配置中心，对齐 Boot 2.7） -->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>2021.0.5.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -45,10 +53,16 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
 
-        <!-- 健康检查：projman 平台探活/compose healthcheck 默认探 {contextPath}/actuator/health -->
+        <!-- Nacos 配置中心（替代 Spring Cloud Config）。Spring Cloud Alibaba 2021.0.5 适配 Boot 2.7 -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <!-- Boot 2.4+ 默认不再处理 bootstrap.yml，需显式引入以继续从 Nacos 拉取配置 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+            <version>3.1.8</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 65de5c7..8fbdb55 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,4 @@
 spring:
-  application:
-    name: bschclassmanage
-  # 本地默认 local（纯走本文件）；线上由平台注入 SPRING_PROFILES_ACTIVE=prod（容器 env）
-  profiles:
-    active: ${SPRING_PROFILES_ACTIVE:local}
   mvc:
     date-format: yyyy-MM-dd HH:mm:ss
   servlet:
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 91c0f5f..20612de 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -16,8 +16,8 @@
         <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
             <file>/app/logs/app.log</file>
             <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <fileNamePattern>/app/logs/app.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
-                <maxHistory>60</maxHistory>
+                <fileNamePattern>/app/logs/app.%d{yyyy-MM-dd}.log</fileNamePattern>
+                <maxHistory>30</maxHistory>
                 <totalSizeCap>5GB</totalSizeCap>
             </rollingPolicy>
             <encoder>