From 0b7338aab97fa2dda4549e4fbb77e6f9f0110fb7 Mon Sep 17 00:00:00 2001
From: jiangh277 <jiangh277@chinaunicom.cn>
Date: Wed, 24 Dec 2025 17:28:47 +0800
Subject: [PATCH] build file edit

---
 Jenkinsfile | 57 ++++++++++++++++-------------------------------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4675151..e13b73f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -90,11 +90,10 @@ pipeline {
             }
         }
 
-        stage('Build Docker Images') {
+        stage('Build and Push Docker Images') {
             steps {
                 script {
                     def services = ['gateway', 'user', 'story', 'file']
-                    def imageTags = [:]
 
                     for (service in services) {
                         def serviceDir = "timeline-${service}-service"
@@ -108,31 +107,9 @@ pipeline {
 
                         // 构建镜像
                         sh "docker build -t ${imageName} -t ${latestImageName} ${serviceDir}/."
-                        imageTags[service] = imageName
-                    }
 
-                    // 使用Groovy的JsonBuilder创建JSON字符串
-                    def jsonBuilder = new groovy.json.JsonBuilder(imageTags)
-                    env.IMAGE_TAGS = jsonBuilder.toString()
-                }
-            }
-        }
-
-        stage('Push Images') {
-            steps {
-                script {
-                    // 使用Groovy的JsonSlurper解析JSON字符串
-                    def jsonSlurper = new groovy.json.JsonSlurper()
-                    def imageTags = jsonSlurper.parseText(env.IMAGE_TAGS)
-
-                    def services = ['gateway', 'user', 'story', 'file']
-
-                    for (service in services) {
-                        def imageName = imageTags[service]
+                        // 推送镜像
                         sh "docker push ${imageName}"
-
-                        // 也推送latest标签
-                        def latestImageName = imageName.toString().replace(BUILD_NUMBER, "latest")
                         sh "docker push ${latestImageName}"
                     }
                 }
@@ -167,11 +144,11 @@ pipeline {
                 sh 'echo "构建和部署成功完成"'
 
                 // 发送成功通知
-                emailext (
-                    subject: "构建成功: ${env.JOB_NAME} - ${env.BUILD_NUMBER}",
-                    body: "构建成功: ${env.BUILD_URL}",
-                    to: "332515344@qq.com"
-                )
+                //emailext (
+                //    subject: "构建成功: ${env.JOB_NAME} - ${env.BUILD_NUMBER}",
+                //    body: "构建成功: ${env.BUILD_URL}",
+                //    to: "332515344@qq.com"
+                //)
             }
         }
         failure {
@@ -179,11 +156,11 @@ pipeline {
                 sh 'echo "构建或部署失败"'
 
                 // 发送失败通知
-                emailext (
-                    subject: "构建失败: ${env.JOB_NAME} - ${env.BUILD_NUMBER}",
-                    body: "构建失败: ${env.BUILD_URL}",
-                    to: "332515344@qq.com"
-                )
+                //emailext (
+                //    subject: "构建失败: ${env.JOB_NAME} - ${env.BUILD_NUMBER}",
+                //    body: "构建失败: ${env.BUILD_URL}",
+                //    to: "332515344@qq.com"
+                //)
             }
         }
         always {
@@ -195,11 +172,11 @@ pipeline {
 // 生成Dockerfile内容的函数
 def getDockerfileContent(serviceDir) {
     return """FROM eclipse-temurin:21-jdk
-VOLUME /tmp
-COPY target/*.jar app.jar
-EXPOSE 8080
-ENTRYPOINT ["java","-jar","/app.jar"]
-"""
+    VOLUME /tmp
+    COPY target/*.jar app.jar
+    EXPOSE 8080
+    ENTRYPOINT ["java","-jar","/app.jar"]
+    """
 }
 
 // 生成docker-compose文件内容的函数