feat(image): 优化图片上传和预览功能
- 修改图片上传接口,支持用户 ID 和 Markdown ID 参数 - 实现在线预览功能,支持多种文件类型 - 优化图片插入到 Markdown 编辑器的逻辑 - 更新数据库配置和连接字符串
This commit is contained in:
@@ -8,10 +8,15 @@ import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Parameters;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.util.StreamUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
@@ -20,19 +25,21 @@ import java.util.List;
|
||||
@RequestMapping("/api/images")
|
||||
public class ImageController {
|
||||
|
||||
@Value("${file.upload-dir}")
|
||||
private String rootPath;
|
||||
|
||||
@Autowired
|
||||
private ImageService imageService;
|
||||
|
||||
@Operation(summary = "上传图片")
|
||||
@Parameters({
|
||||
@Parameter(name = "file", description = "图片文件", required = true)
|
||||
})
|
||||
@PostMapping
|
||||
public R<Image> uploadImage(
|
||||
@RequestParam("file") MultipartFile file) {
|
||||
@RequestParam("file") MultipartFile file,
|
||||
@RequestParam(value = "userId", required = false) Long userId,
|
||||
@RequestParam(value = "markdownId", required = false) Long markdownId) {
|
||||
|
||||
try {
|
||||
Image image = imageService.uploadImage(file);
|
||||
Image image = imageService.uploadImage(file, userId, markdownId);
|
||||
return R.success(image);
|
||||
} catch (IOException e) {
|
||||
return R.fail();
|
||||
@@ -50,6 +57,33 @@ public class ImageController {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 在线预览(图片、视频、音频、pdf 等浏览器可直接识别的类型)
|
||||
*/
|
||||
@GetMapping("/preview/{url}")
|
||||
@Operation(summary = "在线预览", description = "浏览器直接打开文件流")
|
||||
public void preview(@PathVariable String url, HttpServletResponse resp) throws IOException {
|
||||
if (url == null) {
|
||||
resp.setStatus(404);
|
||||
R.fail("文件不存在");
|
||||
}
|
||||
File file = new File(rootPath + File.separator + url);
|
||||
if (!file.exists()) {
|
||||
resp.setStatus(404);
|
||||
R.fail("文件不存在");
|
||||
}
|
||||
String contentTypeFromFileExtension = getContentTypeFromFileExtension(url);
|
||||
// 设置正确的 MIME
|
||||
resp.setContentType(contentTypeFromFileExtension);
|
||||
// 设置文件长度,支持断点续传
|
||||
resp.setContentLengthLong(file.length());
|
||||
// 写出文件流
|
||||
try (FileInputStream in = new FileInputStream(file)) {
|
||||
StreamUtils.copy(in, resp.getOutputStream());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Operation(summary = "根据url删除图片")
|
||||
@PostMapping("/deleteByUrl")
|
||||
public R<Void> deleteImageByUrl(@RequestParam String url) {
|
||||
@@ -73,4 +107,34 @@ public class ImageController {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据文件扩展名获取内容类型
|
||||
* @param fileName 文件名
|
||||
* @return 对应的MIME类型
|
||||
*/
|
||||
private String getContentTypeFromFileExtension(String fileName) {
|
||||
if (fileName == null || fileName.lastIndexOf('.') == -1) {
|
||||
return "application/octet-stream";
|
||||
}
|
||||
|
||||
String extension = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
|
||||
switch (extension) {
|
||||
case "jpg":
|
||||
case "jpeg":
|
||||
return "image/jpeg";
|
||||
case "png":
|
||||
return "image/png";
|
||||
case "gif":
|
||||
return "image/gif";
|
||||
case "bmp":
|
||||
return "image/bmp";
|
||||
case "webp":
|
||||
return "image/webp";
|
||||
case "svg":
|
||||
return "image/svg+xml";
|
||||
default:
|
||||
return "application/octet-stream";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ public interface ImageService extends IService<Image> {
|
||||
* @return 上传的图片对象
|
||||
* @throws IOException 文件操作异常
|
||||
*/
|
||||
Image uploadImage(MultipartFile file) throws IOException;
|
||||
Image uploadImage(MultipartFile file, Long userId, Long markdownId) throws IOException;
|
||||
|
||||
/**
|
||||
* 删除图片
|
||||
|
||||
@@ -33,7 +33,7 @@ public class ImageServiceImpl
|
||||
private ImageMapper imageMapper;
|
||||
|
||||
@Override
|
||||
public Image uploadImage( MultipartFile file) throws IOException {
|
||||
public Image uploadImage( MultipartFile file, Long userId, Long markdownId) throws IOException {
|
||||
// 创建上传目录
|
||||
Path uploadPath = Paths.get(uploadDir);
|
||||
if (!Files.exists(uploadPath)) {
|
||||
@@ -53,10 +53,11 @@ public class ImageServiceImpl
|
||||
Image image = new Image();
|
||||
image.setOriginalName(originalFilename);
|
||||
image.setStoredName(storedName);
|
||||
image.setUrl("/uploads/" + storedName);
|
||||
image.setUrl("/api/images/preview/" + storedName);
|
||||
image.setSize(file.getSize());
|
||||
image.setContentType(file.getContentType());
|
||||
image.setCreatedAt(new Date());
|
||||
image.setMarkdownId(markdownId);
|
||||
|
||||
this.save(image);
|
||||
return image;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
spring:
|
||||
datasource:
|
||||
driver-class-name: org.sqlite.JDBC
|
||||
url: jdbc:sqlite:C:\it\houtaigunli\biji\mydatabase.db
|
||||
# url: jdbc:sqlite:C:\KAIFA\2\mydatabase.db
|
||||
# url: jdbc:sqlite:C:\it\houtaigunli\biji\mydatabase.db
|
||||
url: jdbc:sqlite:C:\KAIFA\2\mydatabase.db
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: none
|
||||
|
||||
@@ -29,10 +29,12 @@ export const deleteImages = (list) => {
|
||||
})
|
||||
}
|
||||
// 上传图片
|
||||
export const uploadImage = (file) => {
|
||||
export const uploadImage = (file, userId, markdownId) => {
|
||||
const formData = new FormData()
|
||||
if (file) formData.append('file', file)
|
||||
return axiosApi.post('/api/images?markdownId', formData, {
|
||||
if (userId) formData.append('userId', userId)
|
||||
if (markdownId) formData.append('markdownId', markdownId)
|
||||
return axiosApi.post('/api/images', formData, {
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data'
|
||||
}
|
||||
|
||||
@@ -527,14 +527,16 @@ const editNote = async (file) => {
|
||||
|
||||
// 图片上传
|
||||
const handleImageUpload=async (files) => {
|
||||
const promise = await uploadImage(files);
|
||||
const promise = await uploadImage(files[0]);
|
||||
if (promise.code !== 200) {
|
||||
ElMessage.error(promise.msg);
|
||||
return;
|
||||
}
|
||||
const url = promise.data;
|
||||
imageUrls.value.push(url);
|
||||
vditor.value.insertValue(`![${files[0].name}](${url})`);
|
||||
const url = promise.data.url;
|
||||
// 修正IP地址并正确拼接
|
||||
const baseUrl = "http://127.0.0.1:8084";
|
||||
imageUrls.value.push(baseUrl + url);
|
||||
vditor.value.insertValue(`![${files[0].name}](${baseUrl + url})`);
|
||||
}
|
||||
|
||||
const debouncedSave = (value) => {
|
||||
|
||||
@@ -21,10 +21,10 @@
|
||||
|
||||
<script>
|
||||
import MarkdownEditor from '@/components/MarkdownEditor.vue';
|
||||
import VMdPreview from '@kangc/v-md-editor/lib/preview';
|
||||
import { ref } from 'vue';
|
||||
import { ElMessage } from 'element-plus';
|
||||
import axios from 'axios';
|
||||
import {uploadImage} from "@/api/CommonApi.js";
|
||||
|
||||
export default {
|
||||
name: 'MarkdownEditor',
|
||||
@@ -85,19 +85,8 @@ export default {
|
||||
|
||||
const handleImageUpload = async (event, insertImage, files) => {
|
||||
const file = files[0];
|
||||
const formData = new FormData();
|
||||
formData.append('file', file);
|
||||
formData.append('userId', userId.value);
|
||||
formData.append('markdownId', currentFileId.value);
|
||||
|
||||
try {
|
||||
const API_BASE_URL = 'http://localhost:8083';
|
||||
const response = await axios.post(`${API_BASE_URL}/api/images`, formData, {
|
||||
withCredentials: true,
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data'
|
||||
}
|
||||
});
|
||||
const response = await uploadImage(file, userId.value, currentFileId.value);
|
||||
|
||||
// 插入图片到编辑器
|
||||
insertImage({
|
||||
|
||||
@@ -11,3 +11,6 @@ vite+vue3.js怎么支持markdown文件的上传,预览、编辑、创建呢?
|
||||
|
||||
|
||||
MarkdownFile(id=325279554144964608, userId=1, title=测试, fileName=测试, content=userId=1&title=%E6%B5%8B%E8%AF%95&fileName=%E6%B5%8B%E8%AF%95&content=%E6%B5%8B%E8%AF%95, createdAt=2025-06-16T22:24:49.110387, updatedAt=2025-06-16T22:24:49.110387)
|
||||
|
||||
|
||||
https://segmentfault.com/blog/chengxy-nds
|
||||
BIN
mydatabase.db
BIN
mydatabase.db
Binary file not shown.
BIN
uploads/1e316444-2396-4f90-835b-e3a0ffe12086.png
Normal file
BIN
uploads/1e316444-2396-4f90-835b-e3a0ffe12086.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
uploads/61af81aa-944f-4b17-9695-70482a6a5f16.png
Normal file
BIN
uploads/61af81aa-944f-4b17-9695-70482a6a5f16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
BIN
uploads/724d6aa4-16cf-48b6-88ba-22b33ba88b63.png
Normal file
BIN
uploads/724d6aa4-16cf-48b6-88ba-22b33ba88b63.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
BIN
uploads/fcd6213d-d969-4b8f-bf39-19e823857083.png
Normal file
BIN
uploads/fcd6213d-d969-4b8f-bf39-19e823857083.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
Reference in New Issue
Block a user