From cd61c898e5c320d4c995651b2bd949b7ba1d5738 Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Wed, 13 Nov 2024 10:37:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20merge=20=E5=8A=A8=E4=BD=9C=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=85=8B=E9=9A=86=E5=88=B0=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=90=8E=EF=BC=8C=E8=AE=BE=E7=BD=AE=20config.name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asw/module/app/service/impl/GitServiceImpl.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
index 46ff927..dcb15a0 100644
--- a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
@@ -455,7 +455,13 @@ public class GitServiceImpl implements IGitService {
                 .setURI(repoDir.getAbsolutePath())
                 .setDirectory(localPath)
                 .setCredentialsProvider(null)
-                .call()) {
+                .call();
+             Repository repository = git.getRepository();) {
+            StoredConfig config = repository.getConfig();
+            SysUserEntity loginUserEntity = userService.getById(StpUtil.getLoginIdAsString());
+            config.setString("user", null, "name", loginUserEntity.getName());
+            config.setString("user", null, "email", "asw@geedgenetworks.com");
+            config.save();
 
             // git fetch
             git.fetch().call();
@@ -474,7 +480,7 @@ public class GitServiceImpl implements IGitService {
                     .setMessage(message)
                     .setStrategy(MergeStrategy.RECURSIVE)
                     .setFastForward(MergeCommand.FastForwardMode.NO_FF)
-                    .include(git.getRepository().findRef("origin/" + srcBranch))
+                    .include(repository.findRef("origin/" + srcBranch))
                     .call();
 
             MergeResult.MergeStatus mergeStatus = mergeResult.getMergeStatus();