From 810ac4caa87d4e2aa0253ec383d45ab4709ce2a9 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 8 Sep 2022 14:59:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A2=9E=E5=8A=A0=E7=B4=A0?= =?UTF-8?q?=E6=9D=90=E7=9B=B8=E5=AF=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/admin/service/common/impl/AlbumServiceImpl.java | 9 +++++++++ .../src/main/java/com/mdd/admin/vo/album/AlbumVo.java | 1 + 2 files changed, 10 insertions(+) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/common/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/common/impl/AlbumServiceImpl.java index 6fbafd11..e15e1d68 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/common/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/common/impl/AlbumServiceImpl.java @@ -10,6 +10,7 @@ import com.mdd.admin.validate.common.AlbumParam; import com.mdd.admin.validate.common.PageParam; import com.mdd.admin.vo.album.AlbumCateVo; import com.mdd.admin.vo.album.AlbumVo; +import com.mdd.common.config.GlobalConfig; import com.mdd.common.core.PageResult; import com.mdd.common.entity.album.Album; import com.mdd.common.entity.album.AlbumCate; @@ -70,11 +71,19 @@ public class AlbumServiceImpl implements IAlbumService { IPage iPage = albumMapper.selectPage(new Page<>(page, limit), queryWrapper); + String engine = ConfigUtil.get("storage", "default", "local"); + engine = engine.equals("") ? "local" : engine; + List list = new ArrayList<>(); for (Album album : iPage.getRecords()) { AlbumVo vo = new AlbumVo(); BeanUtils.copyProperties(album, vo); + if (engine.equals("local")) { + vo.setPath(GlobalConfig.publicPrefix + "/" + album.getUri()); + } else { + vo.setPath(album.getUri()); + } vo.setUri(UrlUtil.toAbsoluteUrl(album.getUri())); vo.setSize(ToolsUtil.storageUnit(album.getSize())); vo.setCreateTime(TimeUtil.timestampToDate(album.getCreateTime())); diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/album/AlbumVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/album/AlbumVo.java index db09fcef..9f7ae0ad 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/album/AlbumVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/album/AlbumVo.java @@ -15,6 +15,7 @@ public class AlbumVo implements Serializable { private Integer id; // 主键 private Integer cid; // 所属类目 private String name; // 文件名称 + private String path; // 相对路径 private String uri; // 文件路径 private String ext; // 文件扩展 private String size; // 文件大小