From 489e1b93208fabf4bcf521b65c4ac686a4d88329 Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Fri, 15 Nov 2024 15:52:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20mr=20merge=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/service/impl/ApplicationMergeServiceImpl.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
index ef1a408..5367f60 100644
--- a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
@@ -251,7 +251,11 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
                 String srcBranch = entity.getSourceBranch();
                 String tgtBranch = entity.getTargetBranch();
 
-                String message = entity.getTitle();
+                StringBuilder commitMessage = new StringBuilder();
+                commitMessage.append("Merge branch '").append(tgtBranch).append("' into '").append(srcBranch).append("'\n\n");
+                commitMessage.append(entity.getTitle());
+                commitMessage.append("\n");
+
                 String workspaceId = entity.getWorkspaceId();
 
                 // 检查 tgtBranch 是否存在
@@ -261,7 +265,7 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
 
                 // merge
                 try {
-                    gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, message, null);
+                    gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, commitMessage.toString(), null);
                     String latestCommitId = gitService.getLatestCommitId(workspaceId, srcBranch);
                     entity.setEndCommitId(latestCommitId);
                     entity.setStatus(MergeRequestStatus.MERGED.toString());