From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/file/NewNovaFileController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/file/NewNovaFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/file/NewNovaFileController.java
index 1464ad2..1cb7eb3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/file/NewNovaFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/file/NewNovaFileController.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.file.FileToThumbnail;
+import com.sandu.common.file.config.NovaFileConfig;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.newnova.param.NewNovaFileParam;
@@ -28,7 +28,7 @@
@RequestMapping("/v1/nova/file")
public class NewNovaFileController {
- private FileToThumbnail fileToThumbnail;
+ private NovaFileConfig fileConfig;
private PermissionConfig permissionConfig;
private final NewNovaFileService newNovaFileService;
@@ -59,7 +59,14 @@
wrapper.like(NewNovaFile::getName, keyword);
}
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return ResponseUtil.successPage(newNovaFileService.list(wrapper));
+ List<NewNovaFile> list = newNovaFileService.list(wrapper);
+ list.forEach(file -> {
+ file.setFileUrl(fileConfig.getRealUrl() + file.getFileUrl());
+ if (file.getScreenShot() != null) {
+ file.setScreenShot(fileConfig.getRealUrl() + file.getScreenShot());
+ }
+ });
+ return ResponseUtil.success(list);
}
@PostMapping("/uploading")
--
Gitblit v1.9.3