github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

🎨 修改附件存储目录为用户目录下的halo/upload

pull/33/merge
ruibaby 2018-09-05 19:02:51 +08:00
parent 321709400e
commit d2bac3226f
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cc/ryanc/halo/config/MvcConfig.java
View File

@ -69,7 +69,7 @@ public class MvcConfig implements WebMvcConfigurer {
.addResourceLocations("classpath:/templates/themes/") .addResourceLocations("classpath:/templates/themes/")
.addResourceLocations("classpath:/robots.txt"); .addResourceLocations("classpath:/robots.txt");
registry.addResourceHandler("/upload/**") registry.addResourceHandler("/upload/**")
.addResourceLocations("classpath:/upload/"); .addResourceLocations("file:///" + System.getProperties().getProperty("user.home") + "/halo/upload/");
registry.addResourceHandler("/favicon.ico") registry.addResourceHandler("/favicon.ico")
.addResourceLocations("classpath:/static/images/favicon.ico"); .addResourceLocations("classpath:/static/images/favicon.ico");
registry.addResourceHandler("/backup/**") registry.addResourceHandler("/backup/**")

13
src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
View File

@ -21,7 +21,6 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.util.ResourceUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -133,13 +132,13 @@ public class AttachmentController {
Map<String, Object> result = new HashMap<>(3); Map<String, Object> result = new HashMap<>(3);
if (!file.isEmpty()) { if (!file.isEmpty()) {
try { try {
//程序根路径，也就是/resources //用户目录
File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); String userPath = System.getProperties().getProperty("user.home") + "/halo";
//upload的路径 //upload的路径
StringBuffer sbMedia = new StringBuffer("upload/"); StringBuffer sbMedia = new StringBuffer("upload/");
//获取当前年月以创建目录，如果没有该目录则创建 //获取当前年月以创建目录，如果没有该目录则创建
sbMedia.append(DateUtil.thisYear()).append("/").append(DateUtil.thisMonth()).append("/"); sbMedia.append(DateUtil.thisYear()).append("/").append(DateUtil.thisMonth()).append("/");
File mediaPath = new File(basePath.getAbsolutePath(), sbMedia.toString()); File mediaPath = new File(userPath, sbMedia.toString());
if (!mediaPath.exists()) { if (!mediaPath.exists()) {
mediaPath.mkdirs(); mediaPath.mkdirs();
} }
@ -200,7 +199,7 @@ public class AttachmentController {
* 移除附件的请求 * 移除附件的请求
* *
* @param attachId 附件编号 * @param attachId 附件编号
* @param request request * @param request request
* @return JsonResult * @return JsonResult
*/ */
@GetMapping(value = "/remove") @GetMapping(value = "/remove")
@ -214,8 +213,8 @@ public class AttachmentController {
//删除数据库中的内容 //删除数据库中的内容
attachmentService.removeByAttachId(attachId); attachmentService.removeByAttachId(attachId);
//删除文件 //删除文件
File basePath = new File(ResourceUtils.getURL("classpath:").getPath()); String userPath = System.getProperties().getProperty("user.home") + "/halo";
File mediaPath = new File(basePath.getAbsolutePath(), attachment.get().getAttachPath().substring(0, attachment.get().getAttachPath().lastIndexOf('/'))); File mediaPath = new File(userPath, attachment.get().getAttachPath().substring(0, attachment.get().getAttachPath().lastIndexOf('/')));
File delFile = new File(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(delFileName).toString()); File delFile = new File(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(delFileName).toString());
File delSmallFile = new File(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(delSmallFileName).toString()); File delSmallFile = new File(new StringBuffer(mediaPath.getAbsolutePath()).append("/").append(delSmallFileName).toString());
if (delFile.exists() && delFile.isFile()) { if (delFile.exists() && delFile.isFile()) {