|
|
@@ -35,6 +35,9 @@ public class MinioUtil extends CommonAbstract { |
|
|
|
@Value("${vmi-minio.url}") |
|
|
|
private String url; //内网访问地址 |
|
|
|
|
|
|
|
@Value("${vmi-minio.proxyNetworkAddr}") |
|
|
|
private String proxyUrl;//代理地址,外网访问 |
|
|
|
|
|
|
|
@Value("${vmi-minio.defaultBucket}") |
|
|
|
private String defaultBucket; |
|
|
|
@Value("${vmi-minio.accessKey}") |
|
|
@@ -54,7 +57,7 @@ public class MinioUtil extends CommonAbstract { |
|
|
|
|
|
|
|
public File getFileByUrl(String excelUrl) throws ManagerException { |
|
|
|
// minioDownloadUrl = "https://qtzl.etcjz.cn"; |
|
|
|
String urlStr = url + StrUtil.SLASH + excelUrl; |
|
|
|
String urlStr = getInnerUrl(excelUrl); |
|
|
|
// String[] split = excelUrl.split("/"); |
|
|
|
// for (int i = 0; i < split.length; i++) { |
|
|
|
// if (i == 0) { |
|
|
@@ -154,4 +157,13 @@ public class MinioUtil extends CommonAbstract { |
|
|
|
String uuid = UUID.randomUUID().toString().replace(StrUtil.DASHED, "").substring(0, 24); |
|
|
|
return DateUtil.format(new Date(), "yyyyMMdd") + StrUtil.SLASH + busCode.getCode() + StrUtil.SLASH + uuid + "_" + fileName; |
|
|
|
} |
|
|
|
|
|
|
|
//内网访问 |
|
|
|
private String getInnerUrl(String fileUrl) { |
|
|
|
return url + StrUtil.SLASH + fileUrl; |
|
|
|
} |
|
|
|
//外网访问 |
|
|
|
private String getOuterUrl(String fileUrl) { |
|
|
|
return proxyUrl + fileUrl; |
|
|
|
} |
|
|
|
} |