diff --git a/api/src/main/resources/config/application.yml b/api/src/main/resources/config/application.yml index 5a93740..1ecef8c 100644 --- a/api/src/main/resources/config/application.yml +++ b/api/src/main/resources/config/application.yml @@ -15,7 +15,6 @@ spring: profiles: include: -development - -test -production active: development diff --git a/oms/src/main/resources/config/application.yml b/oms/src/main/resources/config/application.yml index 971c8b5..a9347fa 100644 --- a/oms/src/main/resources/config/application.yml +++ b/oms/src/main/resources/config/application.yml @@ -17,7 +17,6 @@ spring: profiles: include: -development - -test -production active: development diff --git a/service/src/main/java/com/sv/service/common/OSSClientUtil.java b/service/src/main/java/com/sv/service/common/OSSClientUtil.java index 57971bc..594a17b 100644 --- a/service/src/main/java/com/sv/service/common/OSSClientUtil.java +++ b/service/src/main/java/com/sv/service/common/OSSClientUtil.java @@ -97,7 +97,7 @@ public class OSSClientUtil { boolean uploadResult = ossClient.doesObjectExist(bucketName, backUrl); if (uploadResult) { - backUrl = getImgUrl(name); + backUrl = getImgUrl(path,name); } else { backUrl = ""; } @@ -191,13 +191,12 @@ public class OSSClientUtil { /** * 获得图片路径 * - * @param fileUrl * @return */ - public String getImgUrl(String fileUrl) { - if (!StringUtils.isEmpty(fileUrl)) { - String[] split = fileUrl.split("/"); - return url + this.imageDir + split[split.length - 1]; + public String getImgUrl(String filePath,String filename) { + if (!StringUtils.isEmpty(filename)) { + String[] split = filename.split("/"); + return url + filePath + split[split.length - 1]; } return null; }