添加多运行环境支持 #14

Open
xiaohai2271 wants to merge 36 commits from feat-multlyEnv#13 into master-old
6 changed files with 34 additions and 4 deletions
Showing only changes of commit 0283bd11dc - Show all commits

View File

@@ -2,6 +2,7 @@ package cn.celess.blog.service.interfaces;
import cn.celess.blog.entity.model.QiniuResponse; import cn.celess.blog.entity.model.QiniuResponse;
import com.qiniu.storage.model.FileInfo; import com.qiniu.storage.model.FileInfo;
import org.springframework.stereotype.Service;
import java.io.InputStream; import java.io.InputStream;
@@ -10,6 +11,7 @@ import java.io.InputStream;
* @date : 2020/10/15 18:19 * @date : 2020/10/15 18:19
* @desc : 文件管理器 定义操作文件的方法 * @desc : 文件管理器 定义操作文件的方法
*/ */
@Service
public interface FileManager { public interface FileManager {
/** /**

View File

@@ -2,6 +2,7 @@ package cn.celess.blog.service.interfaces;
import cn.celess.blog.entity.model.QiniuResponse; import cn.celess.blog.entity.model.QiniuResponse;
import com.qiniu.storage.model.FileInfo; import com.qiniu.storage.model.FileInfo;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.InputStream; import java.io.InputStream;
@@ -10,7 +11,8 @@ import java.io.InputStream;
* @author : xiaohai * @author : xiaohai
* @date : 2019/04/25 18:15 * @date : 2019/04/25 18:15
*/ */
@Service @Service("fileService")
@FunctionalInterface
public interface FileService { public interface FileService {
/** /**
* 获取文件管理器 * 获取文件管理器

View File

@@ -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;
}
}

View File

@@ -20,7 +20,7 @@ import java.io.InputStream;
* @author : xiaohai * @author : xiaohai
* @date : 2019/04/25 18:15 * @date : 2019/04/25 18:15
*/ */
@Service @Service("qiniuFileServiceImpl")
public class QiniuFileServiceImpl implements FileManager { public class QiniuFileServiceImpl implements FileManager {
private static final Configuration cfg = new Configuration(Zone.zone2()); private static final Configuration cfg = new Configuration(Zone.zone2());
private static UploadManager uploadManager; private static UploadManager uploadManager;

View File

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.SimpleMailMessage;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.beans.Transient; import java.beans.Transient;
import java.io.InputStream; import java.io.InputStream;
@@ -45,7 +46,7 @@ public class UserServiceImpl implements UserService {
HttpServletRequest request; HttpServletRequest request;
@Autowired @Autowired
MailService mailService; MailService mailService;
@Autowired @Resource(name = "fileServiceImpl")
FileService fileService; FileService fileService;
@Autowired @Autowired
RedisUtil redisUtil; RedisUtil redisUtil;

View File

@@ -9,6 +9,8 @@ import cn.celess.blog.entity.request.LoginReq;
import cn.celess.blog.entity.request.UserReq; import cn.celess.blog.entity.request.UserReq;
import cn.celess.blog.mapper.UserMapper; import cn.celess.blog.mapper.UserMapper;
import cn.celess.blog.service.UserService; 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.MD5Util;
import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.RedisUtil;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
@@ -116,7 +118,7 @@ public class UserControllerTest extends BaseTest {
// mock 实现类 // mock 实现类
// FIXME mock 时不应该为 qiniuService // 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); MockMultipartFile file = new MockMultipartFile("file", "logo.png", MediaType.IMAGE_PNG_VALUE, inputStream);
getMockData(multipart("/user/imgUpload").file(file), userLogin()).andDo(result -> { getMockData(multipart("/user/imgUpload").file(file), userLogin()).andDo(result -> {