diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/constant/Constant.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/constant/Constant.java index 9d14aa30..0c7a09fc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/constant/Constant.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/constant/Constant.java @@ -5,6 +5,9 @@ public class Constant { public final static int Image_Type_Pub = 1; // 公共镜像 public final static int Image_Type_Pri = 0; // 私有镜像 + public final static int Code_Repo_Pub = 1; // 代码仓库可见性-公开 + public final static int Code_Repo_Pri = 0; // 代码仓库可见性-私有 + public final static int State_valid = 1; // 有效 public final static int State_invalid = 0; // 无效 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 664777da..c857374d 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 @@ -49,9 +49,16 @@ public class CodeConfigServiceImpl implements CodeConfigService { @Override public CodeConfig update(CodeConfig codeConfig) { + LoginUser loginUser = SecurityUtils.getLoginUser(); codeConfig.setUpdateBy(loginUser.getUsername()); - codeConfig.setUpdateTime(new Date()); + + if (codeConfig.getCodeRepoVis().equals(Constant.Code_Repo_Pub)) { + codeConfig.setVerifyMode(null); + codeConfig.setGitUserName(null); + codeConfig.setGitPassword(null); + codeConfig.setSshKey(null); + } this.codeConfigDao.update(codeConfig); return this.codeConfigDao.queryById(codeConfig.getId()); } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml index f714f9e7..1056bf8f 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml @@ -23,18 +23,10 @@ git_branch = #{codeConfig.gitBranch}, - - verify_mode = #{codeConfig.verifyMode}, - - - git_user_name = #{codeConfig.gitUserName}, - - - git_password = #{codeConfig.gitPassword}, - - - ssh_key = #{codeConfig.sshKey}, - + verify_mode = #{codeConfig.verifyMode}, + git_user_name = #{codeConfig.gitUserName}, + git_password = #{codeConfig.gitPassword}, + ssh_key = #{codeConfig.sshKey}, create_by = #{codeConfig.createBy},