模块化拆分

blog-common/src/main/java/cn/celess/common/CommonApplication.java

@@ -0,0 +1,11 @@
+package cn.celess.common;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class CommonApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(CommonApplication.class, args);
+    }
+}

blog-common/src/main/java/cn/celess/common/config/MybatisConfig.java

@@ -1,9 +1,22 @@
 package cn.celess.common.config;
 
+import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @MapperScan("cn.celess.common.mapper")
+@Slf4j
 public class MybatisConfig {
+
+//    @Bean
+//    public SqlSessionFactory sqlSessionFactory() throws Exception {
+//        log.info("配置Mybatis的配置项");
+//        PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+//        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+//        // 此处省略部分代码
+//        bean.setMapperLocations(resolver.getResources("classpath:mapper/*.xml"));
+//        bean.setTypeAliasesPackage("cn.celess.common.entity");
+//        return bean.getObject();
+//    }
 }

blog-common/src/main/java/cn/celess/common/exception/ExceptionHandle.java

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -28,11 +27,11 @@ import javax.servlet.http.HttpServletRequest;
 @ControllerAdvice
 public class ExceptionHandle {
     public static final Logger logger = LoggerFactory.getLogger(ExceptionHandle.class);
-    @Resource
+    @Autowired
     MailService mailService;
     @Autowired
     HttpServletRequest request;
-    @Value("${spring.profiles.active}")
+    @Value("${spring.profiles.active:dev}")
     private String activeModel;
 
     @ExceptionHandler(value = Exception.class)

blog-common/src/main/java/cn/celess/common/test/BaseTest.java

@@ -0,0 +1,331 @@
+package cn.celess.common.test;
+
+import cn.celess.common.entity.Response;
+import cn.celess.common.entity.dto.LoginReq;
+import cn.celess.common.entity.vo.QiniuResponse;
+import cn.celess.common.entity.vo.UserModel;
+import cn.celess.common.service.MailService;
+import cn.celess.common.service.QiniuService;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.qiniu.storage.model.FileInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.After;
+import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.stereotype.Service;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.UUID;
+
+import static cn.celess.common.enmu.ResponseEnum.SUCCESS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @Author: 小海
+ * @Date: 2019/08/22 12:46
+ * @Description: 测试基类
+ */
+@WebAppConfiguration
+@ActiveProfiles("test")
+public abstract class BaseTest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    protected MockMvc mockMvc;
+    protected final static String Code = "code";
+    protected final static String Result = "result";
+    protected final static String USERE_MAIL = "zh56462271@qq.com";
+    protected final static String ADMIN_EMAIL = "a@celess.cn";
+
+    /**
+     * jackson 序列化/反序列化Json
+     */
+    protected static final TypeReference<?> BOOLEAN_TYPE = new TypeReference<Response<Boolean>>() {
+    };
+    protected static final TypeReference<?> STRING_TYPE = new TypeReference<Response<String>>() {
+    };
+    protected static final TypeReference<?> OBJECT_TYPE = new TypeReference<Response<Object>>() {
+    };
+    protected static final TypeReference<?> MAP_OBJECT_TYPE = new TypeReference<Response<Map<String, Object>>>() {
+    };
+
+    @Autowired
+    private WebApplicationContext wac;
+    protected MockHttpSession session;
+
+    @Before
+    public void before() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+        session = new MockHttpSession();
+        System.out.println("==========> 开始测试 <=========");
+    }
+
+    @After
+    public void after() {
+        System.out.println("==========> 测试结束 <=========");
+    }
+
+    /**
+     * 　admin 权限用户登录
+     *
+     * @return token
+     */
+    protected String adminLogin() {
+        LoginReq req = new LoginReq();
+        req.setEmail(ADMIN_EMAIL);
+        req.setPassword("123456789");
+        req.setIsRememberMe(true);
+        String token = login(req);
+        assertNotNull(token);
+        return token;
+    }
+
+    /**
+     * user 权限用户登录
+     *
+     * @return token
+     */
+    protected String userLogin() {
+        LoginReq req = new LoginReq();
+        req.setEmail(USERE_MAIL);
+        req.setPassword("123456789");
+        req.setIsRememberMe(true);
+        String token = login(req);
+        assertNotNull(token);
+        return token;
+    }
+
+    /**
+     * 登录逻辑
+     *
+     * @param req 用户信息
+     * @return token | null
+     */
+    protected String login(LoginReq req) {
+        String str = null;
+        try {
+            str = getMockData(MockMvcRequestBuilders.post("/login"), null, req)
+                    .andReturn().getResponse().getContentAsString();
+            Response<UserModel> response = new ObjectMapper().readValue(str, new TypeReference<Response<UserModel>>() {
+            });
+            assertEquals(SUCCESS.getCode(), response.getCode());
+            String token = response.getResult().getToken();
+            assertNotNull(token);
+            return token;
+        } catch (Exception e) {
+            logger.error("测试登录错误");
+            e.printStackTrace();
+        }
+        assertNotNull(str);
+        return null;
+    }
+
+
+    /**
+     * 产生指定长度的随机字符
+     *
+     * @param len len
+     * @return str
+     */
+    protected String randomStr(int len) {
+        return UUID.randomUUID().toString().replaceAll("-", "").substring(0, len);
+    }
+
+    /**
+     * 产生指定长度的随机字符
+     *
+     * @return str
+     */
+    protected String randomStr() {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     * 抽离的mock请求方法
+     *
+     * @param builder MockHttpServletRequestBuilder ：get(...)  post(...) ....
+     * @return 返回 ResultActions
+     * @throws Exception exc
+     */
+    protected ResultActions getMockData(MockHttpServletRequestBuilder builder) throws Exception {
+        return getMockData(builder, null, null);
+    }
+
+    /**
+     * 抽离的mock请求方法 重载
+     *
+     * @param builder ..
+     * @param token   用户登录的token
+     * @return ..
+     * @throws Exception ..
+     */
+    protected ResultActions getMockData(MockHttpServletRequestBuilder builder, String token) throws Exception {
+        return getMockData(builder, token, null);
+    }
+
+    /**
+     * 抽离的mock请求方法 重载
+     *
+     * @param builder ..
+     * @param token   ..
+     * @param content http中发送的APPLICATION_JSON的json数据
+     * @return ..
+     * @throws Exception ..
+     */
+    protected ResultActions getMockData(MockHttpServletRequestBuilder builder, String token, Object content) throws Exception {
+        //        MockHttpServletRequestBuilder mockHttpServletRequestBuilder = get(url);
+        if (token != null) {
+            builder.header("Authorization", "Bearer "+token);
+        }
+        if (content != null) {
+            ObjectMapper mapper = new ObjectMapper();
+            builder.content(mapper.writeValueAsString(content)).contentType(MediaType.APPLICATION_JSON);
+            logger.debug("param::json->{}", mapper.writeValueAsString(content));
+        }
+        return mockMvc.perform(builder).andExpect(MockMvcResultMatchers.status().isOk());
+    }
+
+
+    protected <T> Response<T> getResponse(String json) {
+        return getResponse(json, OBJECT_TYPE);
+    }
+
+    protected <T> Response<T> getResponse(MvcResult result) {
+        return getResponse(result, OBJECT_TYPE);
+    }
+
+    /**
+     * 根据json 信息反序列化成Response对象
+     *
+     * @param json json
+     * @param <T>  泛型
+     * @return Response对象
+     */
+    protected <T> Response<T> getResponse(String json, TypeReference<?> responseType) {
+        Response<T> response = null;
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
+            response = mapper.readValue(json, responseType);
+        } catch (IOException e) {
+            logger.error("解析json Response对象错误，json:[{}]", json);
+            e.printStackTrace();
+        }
+        assertNotNull(response);
+        return response;
+    }
+
+    /**
+     * 根据json 信息反序列化成Response对象
+     *
+     * @param result MvcResult
+     * @param <T>    泛型
+     * @return Response对象
+     */
+    protected <T> Response<T> getResponse(MvcResult result, TypeReference<?> responseType) {
+        try {
+            return getResponse(result.getResponse().getContentAsString(), responseType);
+        } catch (UnsupportedEncodingException e) {
+            logger.error("解析json Response对象错误，result:[{}]", result);
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 修改 mailService 的实现类
+     *
+     * @param service       service 类
+     * @param mailFiledName service 中自动注入的mailService字段名
+     */
+    protected void mockInjectInstance(Object service, String mailFiledName, Object impl) {
+        Field field;
+        try {
+            assertNotNull(service);
+            field = service.getClass().getDeclaredField(mailFiledName);
+            field.setAccessible(true);
+            field.set(service, impl);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Slf4j
+    @Service("mailService")
+    public static class TestMailServiceImpl implements MailService {
+
+        @Override
+        public Boolean AsyncSend(SimpleMailMessage message) {
+            log.debug("异步邮件请求,SimpleMailMessage:[{}]", getJson(message));
+            return true;
+        }
+
+        @Override
+        public Boolean send(SimpleMailMessage message) {
+            log.debug("邮件请求,SimpleMailMessage:[{}]", getJson(message));
+            return true;
+        }
+
+        /**
+         * 转json
+         *
+         * @param o
+         * @return
+         */
+        private String getJson(Object o) {
+            ObjectMapper mapper = new ObjectMapper();
+            try {
+                return mapper.writeValueAsString(o);
+            } catch (JsonProcessingException e) {
+                return null;
+            }
+        }
+    }
+
+    @Slf4j
+    @Service("qiniuService")
+    public static class TestQiNiuServiceImpl implements QiniuService {
+        @Override
+        public QiniuResponse uploadFile(InputStream is, String fileName) {
+            QiniuResponse response = new QiniuResponse();
+            log.debug("上传文件请求，[fileName:{}]", fileName);
+
+            response.key = "key";
+            response.bucket = "bucket";
+            response.hash = "hash";
+            response.fsize = 1;
+            return response;
+        }
+
+        @Override
+        public FileInfo[] getFileList() {
+            log.debug("获取文件列表请求");
+            return new FileInfo[0];
+        }
+    }
+}

blog-common/src/main/java/cn/celess/common/test/RedisServerMock.java

@@ -0,0 +1,32 @@
+package cn.celess.common.test;
+
+import redis.embedded.RedisServer;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.io.IOException;
+
+/**
+ * @author : xiaohai
+ * @date : 2020/08/14 16:20
+ */
+public class RedisServerMock extends BaseTest {
+    private static RedisServer redisServer;
+
+    @PostConstruct
+    public static void startRedis() {
+        try {
+            if (redisServer == null) {
+                redisServer = new RedisServer(6380);
+                redisServer.start();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @PreDestroy
+    public static void stopRedis() {
+        if (redisServer.isActive()) redisServer.stop();
+    }
+}

blog-common/src/main/java/cn/celess/common/util/HttpUtil.java

@@ -15,6 +15,9 @@ import java.io.IOException;
  * @Desc:
  */
 public class HttpUtil {
+    /**
+     * FIXME
+     */
     public static String get(String urlStr) {
         try (final WebClient webClient = new WebClient(BrowserVersion.CHROME)) {
             webClient.getOptions().setCssEnabled(false);
@@ -34,7 +37,9 @@ public class HttpUtil {
         }
     }
 
-
+    /**
+     * FIXME
+     */
     public static String getAfterRendering(String url) {
         try (final WebClient webClient = new WebClient(BrowserVersion.BEST_SUPPORTED)) {
             webClient.getOptions().setCssEnabled(false);