diff --git a/backend/src/main/java/io/metersphere/metadata/service/FileMetadataService.java b/backend/src/main/java/io/metersphere/metadata/service/FileMetadataService.java index 38a50c8129..48ab08380a 100644 --- a/backend/src/main/java/io/metersphere/metadata/service/FileMetadataService.java +++ b/backend/src/main/java/io/metersphere/metadata/service/FileMetadataService.java @@ -302,14 +302,16 @@ public class FileMetadataService { private void checkName(FileMetadata fileMetadata) { - FileMetadataExample example = new FileMetadataExample(); - FileMetadataExample.Criteria criteria = example.createCriteria(); - criteria.andNameEqualTo(fileMetadata.getName()) - .andProjectIdEqualTo(fileMetadata.getProjectId()) - .andIdNotEqualTo(fileMetadata.getId()); - - if (fileMetadataMapper.countByExample(example) > 0) { - MSException.throwException(Translator.get("project_file_already_exists")); + //文件库的名字不用判断是否唯一.是根据文件库路径自动解析生成的。 + if (!StringUtils.equals(StorageConstants.GIT.name(), fileMetadata.getStorage())) { + FileMetadataExample example = new FileMetadataExample(); + FileMetadataExample.Criteria criteria = example.createCriteria(); + criteria.andNameEqualTo(fileMetadata.getName()) + .andProjectIdEqualTo(fileMetadata.getProjectId()) + .andIdNotEqualTo(fileMetadata.getId()); + if (fileMetadataMapper.countByExample(example) > 0) { + MSException.throwException(Translator.get("project_file_already_exists")); + } } } diff --git a/backend/src/main/java/io/metersphere/metadata/utils/GitRepositoryUtils.java b/backend/src/main/java/io/metersphere/metadata/utils/GitRepositoryUtils.java index 53740670cf..093d38babd 100644 --- a/backend/src/main/java/io/metersphere/metadata/utils/GitRepositoryUtils.java +++ b/backend/src/main/java/io/metersphere/metadata/utils/GitRepositoryUtils.java @@ -135,6 +135,7 @@ public class GitRepositoryUtils { } } catch (Exception e) { LogUtil.error("获取文件库文件报错!", e); + MSException.throwException("Connect repository error!"); } finally { this.closeConnection(repo); } diff --git a/frontend/src/business/components/project/menu/file/edit/EditFileMetadata.vue b/frontend/src/business/components/project/menu/file/edit/EditFileMetadata.vue index be0146f4c8..d7100d1ac0 100644 --- a/frontend/src/business/components/project/menu/file/edit/EditFileMetadata.vue +++ b/frontend/src/business/components/project/menu/file/edit/EditFileMetadata.vue @@ -41,13 +41,6 @@ - - - - - + + + {{ data.type }} - {{ formatFileSize(data.size) }}