From 062b65143f404634435be97d96e52092d5394c6d Mon Sep 17 00:00:00 2001
From: changjunqiang <344656718@qq.com>
Date: Thu, 18 Jun 2026 14:10:35 +0800
Subject: [PATCH] success

---
 Dockerfile                                    | 10 ++--
 Jenkinsfile                                   | 53 ++++++++++---------
 docker-compose.yml                            |  3 +-
 .../com/rszhihui/web/RongShuoApplication.java |  2 +-
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4e039d0..6dbd2ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,7 @@
 FROM openjdk:8
 EXPOSE 8088
-VOLUME /tmp
-#ADD ./rongshuo.jar /rongshuo.jar 已挂载
-HEALTHCHECK --interval=30s --timeout=3s \
-    CMD curl -f http://localhost:8088 || exit 1
-RUN bash -c 'touch /app/rongshuo/rongshuo.jar'
 
-ENTRYPOINT ["java","-jar","/app/rongshuo/rongshuo.jar","--spring.profiles.active=prod"]
+# ⭐ 不要用 volumes 挂载！直接构建时复制
+COPY rongshuo.jar /rongshuo.jar
+
+ENTRYPOINT ["java","-jar","/rongshuo.jar","--spring.profiles.active=prod"]
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 44d3d7e..b2e43ae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,39 +1,44 @@
 pipeline {
     agent any
-
     stages {
         stage('清理工作空间') {
-                   steps {
-                       deleteDir()
-                   }
-               }
-       stage('拉取代码') {
-                   steps {
-                       git url:'http://118.25.129.153:3000/zhihui/rongshuo.git',branch:'main'
-                   }
-               }
-        stage('使用MAVNE构建') {
+            steps { deleteDir() }
+        }
+        stage('拉取代码') {
+            steps {
+                git url:'http://118.25.129.153:3000/zhihui/rongshuo.git', branch:'main'
+            }
+        }
+        stage('MAVEN构建') {
             steps {
                 withMaven(maven: 'Maven3') {
                     sh 'mvn clean package -DskipTests'
                 }
+                sh 'ls -lh target/rongshuo.jar'
             }
         }
-
-        stage('复制Jar包') {
+        stage('复制+修复权限') {
             steps {
-                sh 'cp target/rongshuo.jar /app/rongshuo.jar'  // ✅ 添加 sh
+                sh '''
+                    # 复制到挂载目录（对应宿主机 /mydata/docker/rongshuo）
+                    cp target/rongshuo.jar /app/rongshuo/rongshuo.jar
+                    # ⭐ 关键：给所有用户读权限，解决 Jenkins uid 问题
+                    chmod 644 /app/rongshuo/rongshuo.jar
+                    ls -lh /app/rongshuo/
+                '''
+            }
+        }
+        stage('Docker部署') {
+            steps {
+                dir('/app/rongshuo') {
+                    sh '''
+                        docker compose down
+                        docker compose up -d --build
+                        sleep 3
+                        docker compose logs --tail=20
+                    '''
+                }
             }
         }
-
-//        stage('Docker Compose 发布 root') {
-//            steps {
-//                sh '''
-//                    cd /mydata/docker/rongshuo
-//                    docker compose down
-//                    docker compose up -d
-//                '''
-//            }
-//        }
     }
 }
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 285ca1a..1ad8a9b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,5 +4,4 @@ services:
     ports:
       - "8088:8088"
     restart: unless-stopped
-    volumes:
-      - ./rongshuo.jar:/app/rongshuo/rongshuo.jar
\ No newline at end of file
+    # volumes 删掉！不要挂载 jar 包
\ No newline at end of file
diff --git a/src/main/java/com/rszhihui/web/RongShuoApplication.java b/src/main/java/com/rszhihui/web/RongShuoApplication.java
index 4be5973..e930026 100644
--- a/src/main/java/com/rszhihui/web/RongShuoApplication.java
+++ b/src/main/java/com/rszhihui/web/RongShuoApplication.java
@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class RongShuoApplication {
     public static void main(String[] args) {
-        System.out.println(">>北京融硕官网开始启动...");
+        System.out.println(">>北京融硕官网启动开始...");
             SpringApplication.run(RongShuoApplication.class,args);
         System.out.println(">>融硕官网启动成功 :-) \n" +
                 "    ____                    _____ __              \n" +