解决合并冲突

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

@@ -521,12 +521,14 @@ public class ModelsServiceImpl implements ModelsService {
             try {
                 LoginUser loginUser = SecurityUtils.getLoginUser();
                 String ci4sUsername = loginUser.getUsername();
+                String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername();
+                String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword();
                 Jedis jedis = new Jedis(redisHost);
                 String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
                 Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
                 Integer userId = (Integer) userInfo.get("user_id");
 
-                String token = gitService.login(modelsVo.getGitLinkUsername(), modelsVo.getGitLinkPassword());
+                String token = gitService.login(gitLinkUsername, gitLinkPassword);
                 String repositoryName = modelsVo.getRepositoryName() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getRepositoryName();
                 ModelDependency1 modelDependency = new ModelDependency1();
                 List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryByModelName(modelsVo.getName());
@@ -537,7 +539,7 @@ public class ModelsServiceImpl implements ModelsService {
                     }
 
                     //新建版本
-                    commonDvc(token, userInfo, ci4sUsername, modelsVo.getRepositoryName(), modelsVo, "CreateModelFromPipeline");
+                    commonDvc(token, userInfo, ci4sUsername, modelsVo.getRepositoryName(), modelsVo, gitLinkUsername, gitLinkPassword, "CreateModelFromPipeline");
                     modelDependency.setRepoId(modelsVo.getRepoId());
                 } else {
                     //新建模型
@@ -556,7 +558,7 @@ public class ModelsServiceImpl implements ModelsService {
                     gitService.createTopic(token, (Integer) project.get("id"), "ci4s_model");
                     gitService.createTopic(token, (Integer) project.get("id"), "modeltag_" + modelsVo.getModelTag());
                     gitService.createTopic(token, (Integer) project.get("id"), "modeltype_" + modelsVo.getModelType());
-                    commonDvc(token, userInfo, ci4sUsername, repositoryName, modelsVo, "createModel");
+                    commonDvc(token, userInfo, ci4sUsername, repositoryName, modelsVo, gitLinkUsername, gitLinkPassword, "createModel");
                 }
 
                 //保存模型依赖
@@ -659,7 +661,9 @@ public class ModelsServiceImpl implements ModelsService {
     public Page<ModelsVo> newPubilcQueryByPage(ModelsVo modelsVo, PageRequest pageRequest) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String ci4sUsername = loginUser.getUsername();
-        String token = gitService.login(modelsVo.getGitLinkUsername(), modelsVo.getGitLinkPassword());
+        String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername();
+        String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword();
+        String token = gitService.login(gitLinkUsername, gitLinkPassword);
         Jedis jedis = new Jedis(redisHost);
         String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
         Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
@@ -681,7 +685,9 @@ public class ModelsServiceImpl implements ModelsService {
     public Page<ModelsVo> newPersonalQueryByPage(ModelsVo modelsVo, PageRequest pageRequest) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String ci4sUsername = loginUser.getUsername();
-        String token = gitService.login(modelsVo.getGitLinkUsername(), modelsVo.getGitLinkPassword());
+        String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername();
+        String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword();
+        String token = gitService.login(gitLinkUsername, gitLinkPassword);
         Jedis jedis = new Jedis(redisHost);
         String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
         Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
@@ -711,8 +717,10 @@ public class ModelsServiceImpl implements ModelsService {
     public ModelMetaVo getModelMeta(String modelName, String version) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String ci4sUsername = loginUser.getUsername();
+        String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername();
+        String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword();
         // git pull操作，然后读取里面的文件列表，列出每个文件的大小和名称，封装成MAP
-        List<Map<String, Object>> fileDetailsAfterGitPull = DVCUtils.getFileDetailsAfterGitPull(localPath + ci4sUsername + "/model/", modelName, version, "model");
+        List<Map<String, Object>> fileDetailsAfterGitPull = DVCUtils.getFileDetailsAfterGitPull(localPath + ci4sUsername + "/model/", modelName, version, "model", gitLinkUsername, gitLinkPassword);
 
         Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPath + ci4sUsername + "/model/" + modelName + "/" + version + "/metadata/metadata.yaml");
         return ConvertUtil.convertMapToObject(stringObjectMap, ModelMetaVo.class);
@@ -735,7 +743,7 @@ public class ModelsServiceImpl implements ModelsService {
         return modelDependency1TreeVo;
     }
 
-    void commonDvc(String token, Map<String, Object> userInfo, String username, String repositoryName, ModelsVo modelsVo, String type) throws Exception {
+    void commonDvc(String token, Map<String, Object> userInfo, String username, String repositoryName, ModelsVo modelsVo, String gitLinkUsername, String gitLinkPassword, String type) throws Exception {
         String branchName = modelsVo.getVersion();
 
         // 创建分支
@@ -750,7 +758,7 @@ public class ModelsServiceImpl implements ModelsService {
 
 
         if (type.equals("CreateModelFromPipeline") && FileUtil.checkDirectoryExists(rootPath)) {
-            DVCUtils.gitFetch(rootPath);
+            DVCUtils.gitFetch(rootPath, gitLinkUsername, gitLinkPassword);
             DVCUtils.gitCheckoutBranch(rootPath, branchName);
         } else {
             DVCUtils.gitClone(rootPath, projectUrl, branchName, modelsVo.getGitLinkUsername(), modelsVo.getGitLinkPassword());

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java

@@ -193,7 +193,7 @@ public class DVCUtils {
      * @param branch     分支名称
      * @return 包含文件路径、名称和大小的List<Map<String, Object>>
      */
-    public static List<Map<String, Object>> getFileDetailsAfterGitPull(String localPath, String repoFolder, String branch,String username, String password) {
+    public static List<Map<String, Object>> getFileDetailsAfterGitPull(String localPath, String repoFolder, String branch, String filePath , String username, String password) {
         List<Map<String, Object>> fileInfoList = new ArrayList<>();
 
         try {