diff --git a/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysFileInfo.java b/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysFileInfo.java
index 2bea71571..de2fee792 100644
--- a/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysFileInfo.java
+++ b/microservices-api/microservices-api-system/src/main/java/com/microservices/system/api/domain/SysFileInfo.java
@@ -106,6 +106,9 @@ public class SysFileInfo extends BaseEntity {
@ApiModelProperty(value = "是否部分匹配")
private Integer isPartialMatch;
+ @ApiModelProperty(value = "是否为Nexus文件")
+ private Boolean isNexusFile;
+
public SysFileInfo() {
}
diff --git a/microservices-modules/microservices-modules-file/src/main/java/com/microservices/file/service/impl/SysFileInfoServiceImpl.java b/microservices-modules/microservices-modules-file/src/main/java/com/microservices/file/service/impl/SysFileInfoServiceImpl.java
index 41256f292..96ace599d 100644
--- a/microservices-modules/microservices-modules-file/src/main/java/com/microservices/file/service/impl/SysFileInfoServiceImpl.java
+++ b/microservices-modules/microservices-modules-file/src/main/java/com/microservices/file/service/impl/SysFileInfoServiceImpl.java
@@ -469,6 +469,11 @@ public class SysFileInfoServiceImpl implements ISysFileInfoService {
baseFilePath += "/" + fileType + "/";
isCommonFileType = false;
isUploadNexus = nexusStorageEnable;
+ if (nexusStorageEnable) {
+ // nexus上传地址不需要增加基础路径
+ baseFilePath = "/" + fileType + "/";
+ sysFileInfo.setIsNexusFile(true);
+ }
break;
}
case "zone-identifier": {
@@ -503,9 +508,9 @@ public class SysFileInfoServiceImpl implements ISysFileInfoService {
if (isLocalUpload) {
// 上传并返回新文件名称
String filePath;
- if(isUploadNexus){
+ if (isUploadNexus) {
filePath = uploadNexus(baseFilePath, file);
- }else{
+ } else {
filePath = upload(baseFilePath, file);
}
diff --git a/microservices-modules/microservices-modules-file/src/main/resources/mapper/file/SysFileInfoMapper.xml b/microservices-modules/microservices-modules-file/src/main/resources/mapper/file/SysFileInfoMapper.xml
index 16ff37e0a..d0d7470c5 100644
--- a/microservices-modules/microservices-modules-file/src/main/resources/mapper/file/SysFileInfoMapper.xml
+++ b/microservices-modules/microservices-modules-file/src/main/resources/mapper/file/SysFileInfoMapper.xml
@@ -23,6 +23,7 @@
+
@@ -43,6 +44,7 @@
content_type_name,
content_type_message,
mime_type,
+ is_nexus_file,
is_partial_match
from sys_file_info
@@ -97,6 +99,7 @@
content_type_message,
mime_type,
is_partial_match,
+ is_nexus_file,
#{fileOriginName},
@@ -115,6 +118,7 @@
#{contentTypeMessage},
#{mimeType},
#{isPartialMatch},
+ #{isNexusFile},
@@ -138,6 +142,7 @@
content_type_message = #{contentTypeMessage},
mime_type = #{mimeType},
is_partial_match = #{isPartialMatch},
+ is_nexus_file = #{isNexusFile},
where file_id = #{fileId}