From 55fd9d7271fc00eb03d54f30e39f2fcbb2d33ea2 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 19 May 2025 14:07:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/domain/CodeConfig.java | 3 +++ .../service/impl/CodeConfigServiceImpl.java | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java index 9d00b8e6..14557404 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java @@ -24,6 +24,9 @@ public class CodeConfig implements Serializable { @ApiModelProperty(name = "is_public", value = "1-公开,0-私有)") private Boolean isPublic; + @ApiModelProperty(name = "git_acc_url", value = "Git访问地址") + private String gitAccUrl; + @ApiModelProperty(name = "git_url", value = "Git地址") private String gitUrl; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java index 8dbd0fb6..ee98caac 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.platform.domain.CodeConfig; import com.ruoyi.platform.service.CodeConfigService; import com.ruoyi.system.api.model.LoginUser; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; @@ -25,6 +26,11 @@ import java.util.stream.Collectors; @Service("codeConfigService") public class CodeConfigServiceImpl implements CodeConfigService { + @Value("${git.endpointIp}") + private String gitEndpointIp; + @Value("${git.cloneEndpointIp}") + private String gitCloneEndpointIp; + @Resource private CodeConfigDao codeConfigDao; @Resource @@ -52,7 +58,7 @@ public class CodeConfigServiceImpl implements CodeConfigService { @Override public CodeConfig insert(CodeConfig codeConfig) { Long id = this.codeConfigDao.queryByCodeRepoName(codeConfig.getCodeRepoName()); - if(id != null){ + if (id != null) { throw new IllegalStateException("代码仓库名称已存在"); } LoginUser loginUser = SecurityUtils.getLoginUser(); @@ -60,6 +66,11 @@ public class CodeConfigServiceImpl implements CodeConfigService { codeConfig.setUpdateBy(loginUser.getUsername()); codeConfig.setCreateTime(new Date()); codeConfig.setUpdateTime(new Date()); + + String[] split = codeConfig.getGitAccUrl().split(gitEndpointIp); + if (split.length != 0) { + codeConfig.setGitUrl(gitCloneEndpointIp + "/" + split[1]); + } this.codeConfigDao.insert(codeConfig); return codeConfig; } @@ -67,7 +78,7 @@ public class CodeConfigServiceImpl implements CodeConfigService { @Override public CodeConfig update(CodeConfig codeConfig) { Long id = this.codeConfigDao.queryByCodeRepoName(codeConfig.getCodeRepoName()); - if(id != null && !id.equals(codeConfig.getId())){ + if (id != null && !id.equals(codeConfig.getId())) { throw new IllegalStateException("代码仓库名称已存在"); } @@ -80,6 +91,10 @@ public class CodeConfigServiceImpl implements CodeConfigService { codeConfig.setGitPassword(null); codeConfig.setSshKey(null); } + String[] split = codeConfig.getGitAccUrl().split(gitEndpointIp); + if (split.length != 0) { + codeConfig.setGitUrl(gitCloneEndpointIp + "/" + split[1]); + } this.codeConfigDao.update(codeConfig); return this.codeConfigDao.queryById(codeConfig.getId()); }