From 5e353cf7fd3bbbf8183f2c0aabe632316900dfcf Mon Sep 17 00:00:00 2001 From: zhangsz Date: Fri, 17 Jan 2025 11:29:02 +0800 Subject: [PATCH] feat:kyc uri --- .../java/org/wfc/system/api/domain/SysFile.java | 14 ++++++++++++++ .../org/wfc/file/controller/SysFileController.java | 2 ++ .../file/service/FastDfsSysFileServiceImpl.java | 2 +- .../wfc/file/service/LocalSysFileServiceImpl.java | 11 +++++++++-- .../wfc/file/service/MinioSysFileServiceImpl.java | 2 +- .../wfc-file/src/main/resources/application.yml | 2 +- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java index c04086b..7a1bc83 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java @@ -15,6 +15,11 @@ public class SysFile */ private String name; + /** + * 文件内部地址 + */ + private String uri; + /** * 文件内部地址 */ @@ -35,6 +40,14 @@ public class SysFile this.name = name; } + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + public String getLocalUrl() { return localUrl; } @@ -57,6 +70,7 @@ public class SysFile public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("name", getName()) + .append("uri", getUri()) .append("localUrl", getLocalUrl()) .append("url", getUrl()) .toString(); diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java index 454caa0..91a22ca 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java @@ -33,8 +33,10 @@ public class SysFileController { // 上传并返回访问地址 FileUploadResult urlResult = sysFileService.uploadFile(file); SysFile sysFile = new SysFile(); + sysFile.setName(FileUtils.getName(urlResult.getUri())); sysFile.setName(FileUtils.getName(urlResult.getLocalUrl())); sysFile.setName(FileUtils.getName(urlResult.getGatewayUrl())); + sysFile.setUri(urlResult.getUri()); sysFile.setLocalUrl(urlResult.getLocalUrl()); sysFile.setUrl(urlResult.getGatewayUrl()); return R.ok(sysFile); diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/FastDfsSysFileServiceImpl.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/FastDfsSysFileServiceImpl.java index 455b21c..b52d33d 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/FastDfsSysFileServiceImpl.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/FastDfsSysFileServiceImpl.java @@ -42,6 +42,6 @@ public class FastDfsSysFileServiceImpl implements ISysFileService FileTypeUtils.getExtension(file), null); IoUtils.closeQuietly(inputStream); String fileUrl = domain + "/" + storePath.getFullPath(); - return new LocalSysFileServiceImpl.FileUploadResult(fileUrl, fileUrl); + return new LocalSysFileServiceImpl.FileUploadResult(fileUrl, fileUrl, fileUrl); } } diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java index 1fa4020..5a42334 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java @@ -49,20 +49,27 @@ public class LocalSysFileServiceImpl implements ISysFileService @Override public FileUploadResult uploadFile(MultipartFile file) throws Exception { String name = FileUploadUtils.upload(localFilePath, file); + String uri = localFilePrefix + name; String localUrl = domain + localFilePrefix + name; String gatewayUrl = gateway + pathPrefix + localFilePrefix + name; - return new FileUploadResult(localUrl, gatewayUrl); + return new FileUploadResult(uri, localUrl, gatewayUrl); } public static class FileUploadResult { + private final String uri; private final String localUrl; private final String gatewayUrl; - public FileUploadResult(String localUrl, String gatewayUrl) { + public FileUploadResult(String uri, String localUrl, String gatewayUrl) { + this.uri = uri; this.localUrl = localUrl; this.gatewayUrl = gatewayUrl; } + public String getUri() { + return uri; + } + public String getLocalUrl() { return localUrl; } diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/MinioSysFileServiceImpl.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/MinioSysFileServiceImpl.java index edecac2..51f7581 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/MinioSysFileServiceImpl.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/MinioSysFileServiceImpl.java @@ -45,6 +45,6 @@ public class MinioSysFileServiceImpl implements ISysFileService client.putObject(args); IoUtils.closeQuietly(inputStream); String fileUrl = minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; - return new LocalSysFileServiceImpl.FileUploadResult(fileUrl, fileUrl); + return new LocalSysFileServiceImpl.FileUploadResult(fileUrl, fileUrl, fileUrl); } } diff --git a/wfc-modules/wfc-file/src/main/resources/application.yml b/wfc-modules/wfc-file/src/main/resources/application.yml index 5644b14..bd6cc2f 100644 --- a/wfc-modules/wfc-file/src/main/resources/application.yml +++ b/wfc-modules/wfc-file/src/main/resources/application.yml @@ -1,6 +1,6 @@ # 本地文件上传 file: - domain: wfc-file:${WFC_FILE_PORT:9201} + domain: ${GATEWAY_SERVER_IP}:{WFC_FILE_PORT:9201} path: /opt/wfc/upload prefix: /kyc gateway: http://${GATEWAY_SERVER_IP}:${GATEWAY_SERVER_PORT} # 新增网关地址配置