feat:kyc uri

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();

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);

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);
     }
 }

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;
         }

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);
     }
 }

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} # 新增网关地址配置