修改公开模型路径测试

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

@@ -580,7 +580,7 @@ public class ModelsServiceImpl implements ModelsService {
             String decryptGitLinkPassword = decrypt(gitLinkPassword);
             Integer userId = (Integer) userInfo.get("user_id");
 
-            ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : ci4sUsername;
+//            ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : ci4sUsername;
             String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier();
             ModelDependency1 modelDependency = new ModelDependency1();
             List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryModelDependency(modelsVo.getName(), null, gitLinkUsername);
@@ -704,7 +704,7 @@ public class ModelsServiceImpl implements ModelsService {
             String nextVersion = incrementVersion(versionList);
             modelsVo.setVersion(nextVersion);
         }
-        ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
+//        ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier();
         ModelDependency1 modelDependency = new ModelDependency1();
         List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryModelDependency(modelsVo.getName(), modelsVo.getId(), gitLinkUsername);
@@ -871,7 +871,8 @@ public class ModelsServiceImpl implements ModelsService {
     @Override
     public String updateVersionDesc(ModelsVo modelsVo) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
+        String ci4sUsername = loginUser.getUsername();
+//        String ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String gitLinkUsername = loginUser.getSysUser().getUserName();
         String gitLinkPassword = decrypt(loginUser.getSysUser().getOriginPassword());
         String repositoryName = modelsVo.getIdentifier();
@@ -915,7 +916,8 @@ public class ModelsServiceImpl implements ModelsService {
     @Override
     public ResponseEntity<InputStreamResource> downloadAllModelFilesNew(String name, String identifier, Integer id, String version, Boolean isPublic) throws Exception {
         // 命令行操作 git clone 项目地址
-        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
+        String ci4sUsername = SecurityUtils.getLoginUser().getUsername();
+//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
 
         String localPath1 = localPath + ci4sUsername + "/model/" + id + "/" + identifier + "/" + version;
         // 打包 data 文件夹
@@ -1116,7 +1118,8 @@ public class ModelsServiceImpl implements ModelsService {
 
     @Override
     public ModelsVo getModelDetail(Integer id, String identifier, String owner, String version, Boolean isPublic) throws Exception {
-        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
+        String ci4sUsername = SecurityUtils.getLoginUser().getUsername();;
+//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
 
         if (StringUtils.isEmpty(version)) {
             version = "origin";
@@ -1213,7 +1216,8 @@ public class ModelsServiceImpl implements ModelsService {
         String parentModel = JSON.toJSONString(map);
         modelDependency1Dao.deleteModelDependency(parentModel);
 
-        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
+        String ci4sUsername = SecurityUtils.getLoginUser().getUsername();
+//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
         dvcUtils.deleteDirectory(localPath + "/" + ci4sUsername + "/model/" + repoId + "/" + identifier);
     }