From d2c6e9a77ea1c4de3acb437cd2804bb7ae5ebefa Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Thu, 29 Aug 2024 16:54:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/platform/constant/Constant.java    |  3 +++
 .../service/impl/CodeConfigServiceImpl.java      |  9 ++++++++-
 .../managementPlatform/CodeConfigDaoMapper.xml   | 16 ++++------------
 3 files changed, 15 insertions(+), 13 deletions(-)

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 @@
             <if test="codeConfig.gitBranch != null and codeConfig.gitBranch != ''">
                 git_branch = #{codeConfig.gitBranch},
             </if>
-            <if test="codeConfig.verifyMode != null">
-                verify_mode = #{codeConfig.verifyMode},
-            </if>
-            <if test="codeConfig.gitUserName != null and codeConfig.gitUserName != ''">
-                git_user_name = #{codeConfig.gitUserName},
-            </if>
-            <if test="codeConfig.gitPassword != null and codeConfig.gitPassword != ''">
-                git_password = #{codeConfig.gitPassword},
-            </if>
-            <if test="codeConfig.sshKey != null and codeConfig.sshKey != ''">
-                ssh_key = #{codeConfig.sshKey},
-            </if>
+            verify_mode = #{codeConfig.verifyMode},
+            git_user_name = #{codeConfig.gitUserName},
+            git_password = #{codeConfig.gitPassword},
+            ssh_key = #{codeConfig.sshKey},
             <if test="codeConfig.createBy != null and codeConfig.createBy != ''">
                 create_by = #{codeConfig.createBy},
             </if>