diff --git a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java index b6c9960..ea82204 100644 --- a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java +++ b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java @@ -183,29 +183,4 @@ public class CaseCategoryController { return ajaxResult; } - /** - * @CK - * files就是文件流,filedir是oss路径 - * @return - */ - @RequestMapping(value = "/upload-category-url", produces = "text/html;charset=UTF-8") - public String uploadCategoryUrl(MultipartFile file) { - Map value = new HashMap<>(); - try { - if(file!=null){ - //保存文件 - String url = ossService.uploadCategoryUrl(file,filedir); - logger.debug("图片路径{}",url); - value.put("code", 2000); - value.put("msg", "图片上传成功"); - value.put("url",url); - } - } catch (Exception e) { - e.printStackTrace(); - value.put("code", 2001); - value.put("msg", "图片上传失败"); - } - return JSONObject.toJSONString(value); - } - } diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index f5a47f0..f35283c 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -213,13 +213,13 @@ public class CaseContentController { * files就是文件流,filedir是oss路径 * @return */ - @RequestMapping(value = "/upload-content-url", produces = "text/html;charset=UTF-8") - public String uploadContentUrl(MultipartFile file) { + @RequestMapping(value = "/upload-file", produces = "text/html;charset=UTF-8") + public String uploadFile(MultipartFile file) { Map value = new HashMap<>(); try { if(file!=null){ //保存文件 - String url = ossService.uploadCategoryUrl(file,filedir); + String url = ossService.uploadFile(file,filedir); logger.debug("图片路径{}",url); value.put("code", 2000); value.put("msg", "图片上传成功"); diff --git a/src/main/java/com/bsd/cases/service/OssService.java b/src/main/java/com/bsd/cases/service/OssService.java index ad8fc02..84c1e14 100644 --- a/src/main/java/com/bsd/cases/service/OssService.java +++ b/src/main/java/com/bsd/cases/service/OssService.java @@ -51,7 +51,7 @@ public class OssService { return jsonObject; } - public String uploadCategoryUrl(MultipartFile file, String filedir) throws Exception { + public String uploadFile(MultipartFile file, String filedir) throws Exception { if (file == null || file.getSize() <= 0) { throw new Exception("file不能为空"); }