|
|
@@ -26,11 +26,6 @@ import java.util.stream.Collectors; |
|
|
@Service("codeConfigService") |
|
|
@Service("codeConfigService") |
|
|
public class CodeConfigServiceImpl implements CodeConfigService { |
|
|
public class CodeConfigServiceImpl implements CodeConfigService { |
|
|
|
|
|
|
|
|
@Value("${git.endpointIp}") |
|
|
|
|
|
private String gitEndpointIp; |
|
|
|
|
|
@Value("${git.cloneEndpointIp}") |
|
|
|
|
|
private String gitCloneEndpointIp; |
|
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
@Resource |
|
|
private CodeConfigDao codeConfigDao; |
|
|
private CodeConfigDao codeConfigDao; |
|
|
@Resource |
|
|
@Resource |
|
|
@@ -66,11 +61,6 @@ public class CodeConfigServiceImpl implements CodeConfigService { |
|
|
codeConfig.setUpdateBy(loginUser.getUsername()); |
|
|
codeConfig.setUpdateBy(loginUser.getUsername()); |
|
|
codeConfig.setCreateTime(new Date()); |
|
|
codeConfig.setCreateTime(new Date()); |
|
|
codeConfig.setUpdateTime(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); |
|
|
this.codeConfigDao.insert(codeConfig); |
|
|
return codeConfig; |
|
|
return codeConfig; |
|
|
} |
|
|
} |
|
|
@@ -91,10 +81,6 @@ public class CodeConfigServiceImpl implements CodeConfigService { |
|
|
codeConfig.setGitPassword(null); |
|
|
codeConfig.setGitPassword(null); |
|
|
codeConfig.setSshKey(null); |
|
|
codeConfig.setSshKey(null); |
|
|
} |
|
|
} |
|
|
String[] split = codeConfig.getGitAccUrl().split(gitEndpointIp); |
|
|
|
|
|
if (split.length != 0) { |
|
|
|
|
|
codeConfig.setGitUrl(gitCloneEndpointIp + "/" + split[1]); |
|
|
|
|
|
} |
|
|
|
|
|
this.codeConfigDao.update(codeConfig); |
|
|
this.codeConfigDao.update(codeConfig); |
|
|
return this.codeConfigDao.queryById(codeConfig.getId()); |
|
|
return this.codeConfigDao.queryById(codeConfig.getId()); |
|
|
} |
|
|
} |
|
|
|