WFC/be.wfc
2
0
Fork 0
Code Activity

fix: kyc return relative directory

Browse Source
This commit is contained in:
zhangsz
2025-01-17 17:08:01 +08:00
parent 7df3b8d643
commit bbb9542433
3 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java
View File

@@ -16,9 +16,9 @@ public class SysFile
private String name; private String name;
/** /**
* 文件内部地址 * 文件相对地址
*/ */
private String uri; private String url;
/** /**
* 文件内部地址 * 文件内部地址
@@ -26,9 +26,9 @@ public class SysFile
private String localUrl; private String localUrl;
/** /**
* 文件地址 * 文件gateway地址
*/ */
private String url; private String gatewayUrl;
public String getName() public String getName()
{ {
@@ -40,12 +40,12 @@ public class SysFile
this.name = name; this.name = name;
} }
public String getUri() { public String getUrl() {
return uri; return url;
} }
public void setUri(String uri) { public void setUrl(String url) {
this.uri = uri; this.url = url;
} }
public String getLocalUrl() { public String getLocalUrl() {
@@ -56,23 +56,21 @@ public class SysFile
this.localUrl = localUrl; this.localUrl = localUrl;
} }
public String getUrl() public String getGatewayUrl() {
{ return gatewayUrl;
return url;
} }
public void setUrl(String url) public void setGatewayUrl(String gatewayUrl) {
{ this.gatewayUrl = gatewayUrl;
this.url = url;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("name", getName()) .append("name", getName())
.append("uri", getUri())
.append("localUrl", getLocalUrl())
.append("url", getUrl()) .append("url", getUrl())
.append("localUrl", getLocalUrl())
.append("gatewayUrl", getGatewayUrl())
.toString(); .toString();
} }
} }

6
wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java
View File

@@ -33,12 +33,12 @@ public class SysFileController {
// 上传并返回访问地址 // 上传并返回访问地址
FileUploadResult urlResult = sysFileService.uploadFile(file); FileUploadResult urlResult = sysFileService.uploadFile(file);
SysFile sysFile = new SysFile(); SysFile sysFile = new SysFile();
sysFile.setName(FileUtils.getName(urlResult.getUri())); sysFile.setName(FileUtils.getName(urlResult.getUrl()));
sysFile.setName(FileUtils.getName(urlResult.getLocalUrl())); sysFile.setName(FileUtils.getName(urlResult.getLocalUrl()));
sysFile.setName(FileUtils.getName(urlResult.getGatewayUrl())); sysFile.setName(FileUtils.getName(urlResult.getGatewayUrl()));
sysFile.setUri(urlResult.getUri()); sysFile.setUrl(urlResult.getUrl());
sysFile.setLocalUrl(urlResult.getLocalUrl()); sysFile.setLocalUrl(urlResult.getLocalUrl());
sysFile.setUrl(urlResult.getGatewayUrl()); sysFile.setGatewayUrl(urlResult.getGatewayUrl());
return R.ok(sysFile); return R.ok(sysFile);
} catch (Exception e) { } catch (Exception e) {
log.error("上传文件失败", e); log.error("上传文件失败", e);

14
wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java
View File

@@ -49,25 +49,25 @@ public class LocalSysFileServiceImpl implements ISysFileService
@Override @Override
public FileUploadResult uploadFile(MultipartFile file) throws Exception { public FileUploadResult uploadFile(MultipartFile file) throws Exception {
String name = FileUploadUtils.upload(localFilePath, file); String name = FileUploadUtils.upload(localFilePath, file);
String uri = localFilePrefix + name; String url = localFilePrefix + name;
String localUrl = domain + localFilePrefix + name; String localUrl = domain + localFilePrefix + name;
String gatewayUrl = gateway + pathPrefix + localFilePrefix + name; String gatewayUrl = gateway + pathPrefix + localFilePrefix + name;
return new FileUploadResult(uri, localUrl, gatewayUrl); return new FileUploadResult(url, localUrl, gatewayUrl);
} }
public static class FileUploadResult { public static class FileUploadResult {
private final String uri; private final String url;
private final String localUrl; private final String localUrl;
private final String gatewayUrl; private final String gatewayUrl;
public FileUploadResult(String uri, String localUrl, String gatewayUrl) { public FileUploadResult(String url, String localUrl, String gatewayUrl) {
this.uri = uri; this.url = url;
this.localUrl = localUrl; this.localUrl = localUrl;
this.gatewayUrl = gatewayUrl; this.gatewayUrl = gatewayUrl;
} }
public String getUri() { public String getUrl() {
return uri; return url;
} }
public String getLocalUrl() { public String getLocalUrl() {