Merge remote-tracking branch 'origin/dev'

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/CodeConfig.java

@@ -21,6 +21,9 @@ public class CodeConfig implements Serializable {
     @ApiModelProperty(name = "code_repo_vis", value = "代码仓库可见性(1-公开，0-私有)")
     private Integer codeRepoVis;
 
+    @ApiModelProperty(name = "is_public", value = "1-公开，0-私有)")
+    private Integer isPublic;
+
     @ApiModelProperty(name = "git_url", value = "Git地址")
     private String gitUrl;
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java

@@ -466,7 +466,7 @@ public class ImageServiceImpl implements ImageService {
             imageVo.setValue(resultMap.get("imageName"));
             imageVo.setVersion(String.valueOf(imageVersion.getId()));
 
-            resultMap.put("id", String.valueOf(oldImage.getId()));
+            resultMap.put("id", String.valueOf(image.getId()));
             resultMap.put("version", String.valueOf(imageVersion.getId()));
             resultMap.put("value",resultMap.get("imageName"));
 

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/CodeConfigDaoMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.ruoyi.platform.mapper.CodeConfigDao">
 
     <insert id="insert">
-        insert into code_config(code_repo_name, code_repo_vis, git_url, git_branch, verify_mode, git_user_name,
+        insert into code_config(code_repo_name, is_public, git_url, git_branch, verify_mode, git_user_name,
                                 git_password, ssh_key, create_by, create_time, update_by, update_time)
-        values (#{codeConfig.codeRepoName}, #{codeConfig.codeRepoVis}, #{codeConfig.gitUrl}, #{codeConfig.gitBranch},
+        values (#{codeConfig.codeRepoName}, #{codeConfig.isPublic}, #{codeConfig.gitUrl}, #{codeConfig.gitBranch},
                 #{codeConfig.verifyMode}, #{codeConfig.gitUserName}, #{codeConfig.gitPassword},
                 #{codeConfig.sshKey}, #{codeConfig.createBy}, #{codeConfig.createTime}, #{codeConfig.updateBy},
                 #{codeConfig.updateTime})
@@ -17,8 +17,8 @@
             <if test="codeConfig.codeRepoName != null and codeConfig.codeRepoName != ''">
                 code_repo_name = #{codeConfig.codeRepoName},
             </if>
-            <if test="codeConfig.codeRepoVis != null">
-                code_repo_vis = #{codeConfig.codeRepoVis},
+            <if test="codeConfig.isPublic != null">
+                is_public = #{codeConfig.isPublic},
             </if>
             <if test="codeConfig.gitUrl != null">
                 git_url = #{codeConfig.gitUrl},
@@ -78,6 +78,7 @@
     <sql id="common_condition">
         <where>
             state = 1
+            and code_repo_vis = 1
             <if test="codeConfig.id != null">
                 and id = #{codeConfig.id}
             </if>
@@ -85,7 +86,7 @@
                 and code_repo_name LIKE CONCAT('%', #{codeConfig.codeRepoName}, '%')
             </if>
             <if test="codeConfig.codeRepoVis != null">
-                and code_repo_vis = #{codeConfig.codeRepoVis}
+                and is_public = #{codeConfig.isPublic}
             </if>
             <if test="codeConfig.gitUrl != null">
                 and git_url = #{codeConfig.gitUrl}