From 0283bd11dc0ed9a4cbd34dd6f0f42c52f28c2d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Thu, 15 Oct 2020 19:45:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=88=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blog/service/interfaces/FileManager.java | 2 ++ .../blog/service/interfaces/FileService.java | 4 +++- .../service/serviceimpl/FileServiceImpl.java | 23 +++++++++++++++++++ .../serviceimpl/QiniuFileServiceImpl.java | 2 +- .../service/serviceimpl/UserServiceImpl.java | 3 ++- .../blog/controller/UserControllerTest.java | 4 +++- 6 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 src/main/java/cn/celess/blog/service/serviceimpl/FileServiceImpl.java diff --git a/src/main/java/cn/celess/blog/service/interfaces/FileManager.java b/src/main/java/cn/celess/blog/service/interfaces/FileManager.java index 9420221..880c013 100644 --- a/src/main/java/cn/celess/blog/service/interfaces/FileManager.java +++ b/src/main/java/cn/celess/blog/service/interfaces/FileManager.java @@ -2,6 +2,7 @@ package cn.celess.blog.service.interfaces; import cn.celess.blog.entity.model.QiniuResponse; import com.qiniu.storage.model.FileInfo; +import org.springframework.stereotype.Service; import java.io.InputStream; @@ -10,6 +11,7 @@ import java.io.InputStream; * @date : 2020/10/15 18:19 * @desc : 文件管理器 定义操作文件的方法 */ +@Service public interface FileManager { /** diff --git a/src/main/java/cn/celess/blog/service/interfaces/FileService.java b/src/main/java/cn/celess/blog/service/interfaces/FileService.java index 449392d..b163a64 100644 --- a/src/main/java/cn/celess/blog/service/interfaces/FileService.java +++ b/src/main/java/cn/celess/blog/service/interfaces/FileService.java @@ -2,6 +2,7 @@ package cn.celess.blog.service.interfaces; import cn.celess.blog.entity.model.QiniuResponse; import com.qiniu.storage.model.FileInfo; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import java.io.InputStream; @@ -10,7 +11,8 @@ import java.io.InputStream; * @author : xiaohai * @date : 2019/04/25 18:15 */ -@Service +@Service("fileService") +@FunctionalInterface public interface FileService { /** * 获取文件管理器 diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/FileServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/FileServiceImpl.java new file mode 100644 index 0000000..879e829 --- /dev/null +++ b/src/main/java/cn/celess/blog/service/serviceimpl/FileServiceImpl.java @@ -0,0 +1,23 @@ +package cn.celess.blog.service.serviceimpl; + +import cn.celess.blog.service.interfaces.FileManager; +import cn.celess.blog.service.interfaces.FileService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * @author : xiaohai + * @date : 2020/10/15 18:52 + * @desc : + */ +@Service("fileServiceImpl") +public class FileServiceImpl implements FileService { + @Resource(name = "qiniuFileServiceImpl") + FileManager qiniuFileManager; + + @Override + public FileManager getFileManager() { + return qiniuFileManager; + } +} diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/QiniuFileServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/QiniuFileServiceImpl.java index 8a7e2ba..beb2633 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/QiniuFileServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/QiniuFileServiceImpl.java @@ -20,7 +20,7 @@ import java.io.InputStream; * @author : xiaohai * @date : 2019/04/25 18:15 */ -@Service +@Service("qiniuFileServiceImpl") public class QiniuFileServiceImpl implements FileManager { private static final Configuration cfg = new Configuration(Zone.zone2()); private static UploadManager uploadManager; diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java index 80666d3..80d28bd 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.SimpleMailMessage; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.beans.Transient; import java.io.InputStream; @@ -45,7 +46,7 @@ public class UserServiceImpl implements UserService { HttpServletRequest request; @Autowired MailService mailService; - @Autowired + @Resource(name = "fileServiceImpl") FileService fileService; @Autowired RedisUtil redisUtil; diff --git a/src/test/java/cn/celess/blog/controller/UserControllerTest.java b/src/test/java/cn/celess/blog/controller/UserControllerTest.java index 521009d..d33868c 100644 --- a/src/test/java/cn/celess/blog/controller/UserControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/UserControllerTest.java @@ -9,6 +9,8 @@ import cn.celess.blog.entity.request.LoginReq; import cn.celess.blog.entity.request.UserReq; import cn.celess.blog.mapper.UserMapper; import cn.celess.blog.service.UserService; +import cn.celess.blog.service.interfaces.FileManager; +import cn.celess.blog.service.interfaces.FileService; import cn.celess.blog.util.MD5Util; import cn.celess.blog.util.RedisUtil; import com.fasterxml.jackson.core.type.TypeReference; @@ -116,7 +118,7 @@ public class UserControllerTest extends BaseTest { // mock 实现类 // FIXME ：： mock 时不应该为 qiniuService - mockInjectInstance(userService, "qiniuService", new TestQiniuFileServiceImpl()); + mockInjectInstance(userService, "fileService", (FileService) TestQiniuFileServiceImpl::new); MockMultipartFile file = new MockMultipartFile("file", "logo.png", MediaType.IMAGE_PNG_VALUE, inputStream); getMockData(multipart("/user/imgUpload").file(file), userLogin()).andDo(result -> {