From 7d92b7050c5faeffb1ab12397ec5cdbfb8849caf Mon Sep 17 00:00:00 2001
From: ddmte32 <dmmte32>
Date: Sat, 21 Jun 2025 09:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=E4=BB=A3=E7=A0=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DevEnvironmentServiceImpl.java      |  2 +-
 .../java/com/ruoyi/platform/utils/K8sClientUtil.java |  8 ++++----
 .../managementPlatform/DevEnvironmentDaoMapper.xml   | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java
index d64a45a5..925437df 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java
@@ -222,7 +222,7 @@ public class DevEnvironmentServiceImpl implements DevEnvironmentService {
             dvcUtils.gitClone(localPath, codeConfig.getGitUrl(), codeConfig.getGitBranch(), gitLinkUsername, gitLinkPassword);
 
         } catch (Exception e) {
-            log.error("[returnCodeConfig error,codeConfigId={}]", codeConfigId);
+            log.error("[returnCodeConfig error,e={},codeConfigId={}]",e.getMessage(),codeConfigId);
         }
         return localPath;
     }
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
index 99e170c1..eb570bc3 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java
@@ -73,10 +73,10 @@ public class K8sClientUtil {
         this.http = http;
         this.token = token;
         try {
-            this.apiClient = new ClientBuilder().
-                    setBasePath(http).setVerifyingSsl(false).
-                    setAuthentication(new AccessTokenAuthentication(token)).build();
-//            this.apiClient = Config.fromCluster();
+//            this.apiClient = new ClientBuilder().
+//                    setBasePath(http).setVerifyingSsl(false).
+//                    setAuthentication(new AccessTokenAuthentication(token)).build();
+            this.apiClient = Config.fromCluster();
         } catch (Exception e) {
             log.error("构建K8s-Client异常", e);
             throw new RuntimeException("构建K8s-Client异常");
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml
index b09ab9a5..71a0de1f 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DevEnvironmentDaoMapper.xml
@@ -4,7 +4,7 @@
     <!--查询单个-->
     <select id="queryById" resultType="com.ruoyi.platform.domain.DevEnvironment">
         select
-        id,name,status,computing_resource,computing_resource_id, standard,env_variable,image,dataset,model,url,alt_field2,create_by,create_time,update_by,update_time,state
+        id,name,status,computing_resource,computing_resource_id, standard,env_variable,image,dataset,model,url,code_path,create_by,create_time,update_by,update_time,state
         from dev_environment
         where id = #{id} and state = 1
     </select>
@@ -12,7 +12,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultType="com.ruoyi.platform.domain.DevEnvironment">
         select
-        id,name,status,computing_resource,computing_resource_id,standard,env_variable,image,dataset,model,url,alt_field2,create_by,create_time,update_by,update_time,state
+        id,name,status,computing_resource,computing_resource_id,standard,env_variable,image,dataset,model,url,code_path,create_by,create_time,update_by,update_time,state
         from dev_environment
         <where>
             state = 1
@@ -47,7 +47,7 @@
                 and url = #{devEnvironment.url}
             </if>
             <if test="devEnvironment.codePath != null and devEnvironment.codePath != ''">
-                and alt_field2 = #{devEnvironment.codePath}
+                and code_path = #{devEnvironment.codePath}
             </if>
             <if test="devEnvironment.createBy != null and devEnvironment.createBy != ''">
                 and create_by = #{devEnvironment.createBy}
@@ -106,7 +106,7 @@
                 and url = #{devEnvironment.url}
             </if>
             <if test="devEnvironment.codePath != null and devEnvironment.codePath != ''">
-                and alt_field2 = #{devEnvironment.codePath}
+                and code_path = #{devEnvironment.codePath}
             </if>
             <if test="devEnvironment.createBy != null and devEnvironment.createBy != ''">
                 and create_by = #{devEnvironment.createBy}
@@ -132,7 +132,7 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into dev_environment(name,status,computing_resource,computing_resource_id,standard,env_variable,image,dataset,model,url,alt_field2,create_by,create_time,update_by,update_time,state)
+        insert into dev_environment(name,status,computing_resource,computing_resource_id,standard,env_variable,image,dataset,model,url,code_path,create_by,create_time,update_by,update_time,state)
         values (#{devEnvironment.name},
                 #{devEnvironment.status},
                 #{devEnvironment.computingResource},
@@ -187,7 +187,7 @@
                 url = #{devEnvironment.url},
             </if>
             <if test="devEnvironment.codePath != null and devEnvironment.codePath != ''">
-                alt_field2 = #{devEnvironment.codePath},
+                code_path = #{devEnvironment.codePath},
             </if>
             <if test="devEnvironment.createBy != null and devEnvironment.createBy != ''">
                 create_by = #{devEnvironment.createBy},