合并解决冲突

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

@@ -1,11 +1,11 @@
 package com.ruoyi.platform.service.impl;
 
-import com.ruoyi.platform.constant.Constant;
 import com.ruoyi.platform.domain.ActiveLearn;
 import com.ruoyi.platform.domain.ActiveLearnIns;
 import com.ruoyi.platform.mapper.ActiveLearnDao;
 import com.ruoyi.platform.mapper.ActiveLearnInsDao;
 import com.ruoyi.platform.service.ActiveLearnInsService;
+import com.ruoyi.system.api.constant.Constant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;

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

@@ -1,13 +1,13 @@
 package com.ruoyi.platform.service.impl;
 
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.platform.constant.Constant;
 import com.ruoyi.platform.domain.ActiveLearn;
 import com.ruoyi.platform.mapper.ActiveLearnDao;
 import com.ruoyi.platform.service.ActiveLearnService;
 import com.ruoyi.platform.utils.JacksonUtil;
 import com.ruoyi.platform.utils.JsonUtils;
 import com.ruoyi.platform.vo.ActiveLearnVo;
+import com.ruoyi.system.api.constant.Constant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;

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

@@ -2,7 +2,6 @@ package com.ruoyi.platform.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.platform.constant.Constant;
 import com.ruoyi.platform.domain.ActiveLearn;
 import com.ruoyi.platform.domain.AssetWorkflow;
 import com.ruoyi.platform.domain.CodeConfig;
@@ -12,6 +11,7 @@ import com.ruoyi.platform.mapper.AssetWorkflowDao;
 import com.ruoyi.platform.mapper.CodeConfigDao;
 import com.ruoyi.platform.mapper.RayDao;
 import com.ruoyi.platform.service.CodeConfigService;
+import com.ruoyi.system.api.constant.Constant;
 import com.ruoyi.system.api.model.LoginUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.util.DateUtils;
 import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.platform.constant.Constant;
 import com.ruoyi.platform.domain.*;
 import com.ruoyi.platform.mapper.*;
 import com.ruoyi.platform.domain.*;

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

@@ -1,6 +1,7 @@
 package com.ruoyi.platform.service.impl;
 
 import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.domain.*;
 import com.ruoyi.platform.mapper.*;

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

@@ -107,6 +107,8 @@ public class ModelsServiceImpl implements ModelsService {
     private Integer redisPort;
     @Value("${git.endpoint}")
     String gitendpoint;
+    @Value("${git.cloneEndpoint}")
+    String gitCloneEndpoint;
     @Value("${git.localPath}")
     String localPath;
     @Value("${minio.accessKey}")

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.domain.*;
+import com.ruoyi.platform.mapper.ActiveLearnDao;
 import com.ruoyi.platform.mapper.AssetWorkflowDao;
 import com.ruoyi.platform.mapper.AutoMlDao;
 import com.ruoyi.platform.mapper.RayDao;