2025.12.19 生产部署

.gitea/workflows/prod_build_manual.yaml

@@ -26,10 +26,10 @@ jobs:
         with:
           ref: release/3.1
 
-      - name: 2.Set up JDK 8
+     - name: 2.Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
-          java-version: '8'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: 3.设置JAVA Maven 环境
@@ -61,7 +61,12 @@ jobs:
       - name: 4.构建jar包
         run: |
           echo "===== 开始构建JAR包 ====="
-          mvn -B clean package -DskipTests --file pom.xml 2>&1
+              # 新增：打印当前构建分支（两种方式双重确认）
+          echo "当前工作目录分支：$(git branch --show-current)"
+          echo "Gitea检出分支:${{ github.ref_name }}"
+          echo "预期构建分支:dev/3.1_release_merge"
+          echo "========================"
+          mvn -B clean install -DskipTests -Pdev 2>&1
           # 检查构建是否成功
           if [ $? -ne 0 ]; then
           echo "JAR包构建失败!"
@@ -72,12 +77,13 @@ jobs:
         run: |
           echo "===== 生成Dockerfile ====="
           cat > Dockerfile << 'EOF'
-          FROM openjdk:8
+          FROM openjdk:21-ea-21-jdk-slim
           VOLUME /tmp
           RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
           RUN echo 'Asia/Shanghai' > /etc/timezone
-          ADD ./target/aida-0.0.1-SNAPSHOT.jar /app.jar
+          ADD ./aida-0.0.1-SNAPSHOT.jar /app.jar
           ENTRYPOINT ["java","-jar","/app.jar"]
+          EOF
           echo "Dockerfile内容:"
           cat Dockerfile