From 7e700b649931d95a7e55df5251f8b970ef6cbc3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Fri, 1 Oct 2021 01:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8C=96=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/celess/article/ArticleApplication.java | 13 ++++ .../serviceimpl/ArticleServiceImpl.java | 15 ++-- .../cn/celess/article/ArticleBaseTest.java | 11 +++ .../controller/ArticleControllerTest.java | 22 +++--- .../serviceimpl}/ArticleServiceTest.java | 10 +-- blog-categorytag/pom.xml | 6 ++ .../categorytag/CategoryTagApplication.java | 14 ++++ .../categorytag/CategoryTagBaseTest.java | 11 +++ .../controller/CategoryControllerTest.java | 6 +- .../controller/TagControllerTest.java | 6 +- .../cn/celess/comment/CommentApplication.java | 13 ++++ .../cn/celess/comment/CommentBaseTest.java | 11 +++ .../controller/CommentControllerTest.java | 6 +- blog-common/pom.xml | 38 +++++----- .../cn/celess/common/CommonApplication.java | 11 +++ .../celess/common/config/MybatisConfig.java | 13 ++++ .../common/exception/ExceptionHandle.java | 5 +- .../java/cn/celess/common/test}/BaseTest.java | 38 ++++------ .../celess/common/test/RedisServerMock.java | 32 +++++++++ .../java/cn/celess/common/util/HttpUtil.java | 7 +- .../java/cn/celess/common/CommonBaseTest.java | 11 +++ .../enmu/UserAccountStatusEnumTest.java | 7 +- .../common}/mapper/ArticleMapperTest.java | 9 +-- .../common}/mapper/ArticleTagMapperTest.java | 9 +-- .../common}/mapper/CategoryMapperTest.java | 7 +- .../common}/mapper/CommentMapperTest.java | 8 +-- .../common}/mapper/PartnerMapperTest.java | 7 +- .../celess/common}/mapper/TagMapperTest.java | 7 +- .../celess/common}/mapper/UserMapperTest.java | 7 +- .../common}/mapper/VisitorMapperTest.java | 7 +- .../mapper/WebUpdateInfoMapperTest.java | 7 +- .../common}/util/DateFormatUtilTest.java | 7 +- .../cn/celess/common}/util/HttpUtilTest.java | 9 +-- .../cn/celess/common}/util/MD5UtilTest.java | 7 +- blog-deploy/pom.xml | 23 ------ ...nfig.java => DeployInterceptorConfig.java} | 10 +-- .../resources/application-prod.properties | 68 ------------------ .../test/java/cn/celess/DeployBaseTest.java | 11 +++ .../test/java/cn/celess/RedisServerMock.java | 37 ---------- .../celess/filter/MultipleSubmitFilter.java | 4 +- .../extension/ExtensionApplication.java | 11 +++ .../partnersite/PartnerSiteApplication.java | 11 +++ .../controller/PartnerSiteControllerTest.java | 6 +- .../serviceimpl}/PartnerSiteServiceTest.java | 4 +- blog-resource/pom.xml | 19 +++++ blog-resource/src/main/java/.gitkeep | 0 .../application-openSource.properties | 14 ---- .../resources/application-test.properties | 13 ---- .../src/main/resources/application.properties | 7 +- .../src/main/resources/ip2region/ip2region.db | Bin .../src/main/resources/sql/data.sql | 0 .../src/main/resources/sql/schema.sql | 0 .../src/main/resources/sql/schema_h2.sql | 0 .../celess/siteinfo/SiteInfoApplication.java | 11 +++ .../WebUpdateInfoControllerTest.java | 7 +- blog-user/pom.xml | 21 ++++++ .../java/cn/celess/user/UserApplication.java | 12 ++++ .../AuthorizationInterceptorConfig.java | 25 +++++++ .../user}/filter/AuthenticationFilter.java | 2 +- .../java/cn/celess/user/UserBaseTest.java | 11 +++ .../user}/controller/UserControllerTest.java | 6 +- .../user}/filter/AuthorizationFilter.java | 6 +- .../user/serviceimpl}/UserServiceTest.java | 6 +- .../cn/celess/user}/util/JwtUtilTest.java | 11 ++- .../cn/celess/visitor/VisitorApplication.java | 11 +++ .../controller/VisitorControllerTest.java | 4 +- .../serviceimpl}/VisitorServiceTest.java | 4 +- .../celess/visitor}/util/AddressUtilTest.java | 5 +- pom.xml | 25 +++++++ 69 files changed, 471 insertions(+), 331 deletions(-) create mode 100644 blog-article/src/main/java/cn/celess/article/ArticleApplication.java create mode 100644 blog-article/src/test/java/cn/celess/article/ArticleBaseTest.java rename {blog-deploy/src/test/java/cn/celess => blog-article/src/test/java/cn/celess/article}/controller/ArticleControllerTest.java (95%) rename {blog-deploy/src/test/java/cn/celess/service => blog-article/src/test/java/cn/celess/article/serviceimpl}/ArticleServiceTest.java (91%) create mode 100644 blog-categorytag/src/main/java/cn/celess/categorytag/CategoryTagApplication.java create mode 100644 blog-categorytag/src/test/java/cn/celess/categorytag/CategoryTagBaseTest.java rename {blog-deploy/src/test/java/cn/celess => blog-categorytag/src/test/java/cn/celess/categorytag}/controller/CategoryControllerTest.java (95%) rename {blog-deploy/src/test/java/cn/celess => blog-categorytag/src/test/java/cn/celess/categorytag}/controller/TagControllerTest.java (96%) create mode 100644 blog-comment/src/main/java/cn/celess/comment/CommentApplication.java create mode 100644 blog-comment/src/test/java/cn/celess/comment/CommentBaseTest.java rename {blog-deploy/src/test/java/cn/celess => blog-comment/src/test/java/cn/celess/comment}/controller/CommentControllerTest.java (97%) create mode 100644 blog-common/src/main/java/cn/celess/common/CommonApplication.java rename {blog-deploy/src/test/java/cn/celess => blog-common/src/main/java/cn/celess/common/test}/BaseTest.java (90%) create mode 100644 blog-common/src/main/java/cn/celess/common/test/RedisServerMock.java create mode 100644 blog-common/src/test/java/cn/celess/common/CommonBaseTest.java rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/enmu/UserAccountStatusEnumTest.java (88%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/ArticleMapperTest.java (96%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/ArticleTagMapperTest.java (95%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/CategoryMapperTest.java (95%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/CommentMapperTest.java (95%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/PartnerMapperTest.java (95%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/TagMapperTest.java (94%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/UserMapperTest.java (97%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/VisitorMapperTest.java (86%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/mapper/WebUpdateInfoMapperTest.java (93%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/util/DateFormatUtilTest.java (73%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/util/HttpUtilTest.java (73%) rename {blog-deploy/src/test/java/cn/celess => blog-common/src/test/java/cn/celess/common}/util/MD5UtilTest.java (60%) rename blog-deploy/src/main/java/cn/celess/configuration/{InterceptorConfig.java => DeployInterceptorConfig.java} (79%) delete mode 100644 blog-deploy/src/main/resources/application-prod.properties create mode 100644 blog-deploy/src/test/java/cn/celess/DeployBaseTest.java delete mode 100644 blog-deploy/src/test/java/cn/celess/RedisServerMock.java create mode 100644 blog-extension/src/main/java/cn/celess/extension/ExtensionApplication.java create mode 100644 blog-partnersite/src/main/java/cn/celess/partnersite/PartnerSiteApplication.java rename blog-deploy/src/test/java/cn/celess/controller/LinksControllerTest.java => blog-partnersite/src/test/java/cn/celess/partnersite/controller/PartnerSiteControllerTest.java (98%) rename {blog-deploy/src/test/java/cn/celess/service => blog-partnersite/src/test/java/cn/celess/partnersite/serviceimpl}/PartnerSiteServiceTest.java (93%) create mode 100644 blog-resource/pom.xml create mode 100644 blog-resource/src/main/java/.gitkeep rename {blog-deploy => blog-resource}/src/main/resources/application-openSource.properties (89%) rename {blog-deploy => blog-resource}/src/main/resources/application-test.properties (89%) rename {blog-deploy => blog-resource}/src/main/resources/application.properties (54%) rename {blog-deploy => blog-resource}/src/main/resources/ip2region/ip2region.db (100%) rename {blog-deploy => blog-resource}/src/main/resources/sql/data.sql (100%) rename {blog-deploy => blog-resource}/src/main/resources/sql/schema.sql (100%) rename {blog-deploy => blog-resource}/src/main/resources/sql/schema_h2.sql (100%) create mode 100644 blog-siteinfo/src/main/java/cn/celess/siteinfo/SiteInfoApplication.java rename {blog-deploy/src/test/java/cn/celess => blog-siteinfo/src/test/java/cn/celess/siteinfo}/controller/WebUpdateInfoControllerTest.java (97%) create mode 100644 blog-user/src/main/java/cn/celess/user/UserApplication.java create mode 100644 blog-user/src/main/java/cn/celess/user/config/AuthorizationInterceptorConfig.java rename {blog-deploy/src/main/java/cn/celess/configuration => blog-user/src/main/java/cn/celess/user}/filter/AuthenticationFilter.java (98%) create mode 100644 blog-user/src/test/java/cn/celess/user/UserBaseTest.java rename {blog-deploy/src/test/java/cn/celess => blog-user/src/test/java/cn/celess/user}/controller/UserControllerTest.java (98%) rename {blog-deploy/src/test/java/cn/celess => blog-user/src/test/java/cn/celess/user}/filter/AuthorizationFilter.java (94%) rename {blog-deploy/src/test/java/cn/celess/service => blog-user/src/test/java/cn/celess/user/serviceimpl}/UserServiceTest.java (96%) rename {blog-deploy/src/test/java/cn/celess => blog-user/src/test/java/cn/celess/user}/util/JwtUtilTest.java (91%) create mode 100644 blog-visitor/src/main/java/cn/celess/visitor/VisitorApplication.java rename {blog-deploy/src/test/java/cn/celess => blog-visitor/src/test/java/cn/celess/visitor}/controller/VisitorControllerTest.java (97%) rename {blog-deploy/src/test/java/cn/celess/service => blog-visitor/src/test/java/cn/celess/visitor/serviceimpl}/VisitorServiceTest.java (92%) rename {blog-deploy/src/test/java/cn/celess => blog-visitor/src/test/java/cn/celess/visitor}/util/AddressUtilTest.java (79%) diff --git a/blog-article/src/main/java/cn/celess/article/ArticleApplication.java b/blog-article/src/main/java/cn/celess/article/ArticleApplication.java new file mode 100644 index 0000000..d872841 --- /dev/null +++ b/blog-article/src/main/java/cn/celess/article/ArticleApplication.java @@ -0,0 +1,13 @@ +package cn.celess.article; + +import cn.celess.common.CommonApplication; +import cn.celess.user.UserApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication(scanBasePackageClasses = {ArticleApplication.class, CommonApplication.class, UserApplication.class}) +public class ArticleApplication { + public static void main(String[] args) { + SpringApplication.run(ArticleApplication.class, args); + } +} diff --git a/blog-article/src/main/java/cn/celess/article/serviceimpl/ArticleServiceImpl.java b/blog-article/src/main/java/cn/celess/article/serviceimpl/ArticleServiceImpl.java index db3923b..bbc87cd 100644 --- a/blog-article/src/main/java/cn/celess/article/serviceimpl/ArticleServiceImpl.java +++ b/blog-article/src/main/java/cn/celess/article/serviceimpl/ArticleServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; @@ -38,22 +39,22 @@ import java.util.stream.Collectors; @Slf4j public class ArticleServiceImpl implements ArticleService { - @Autowired + @Resource ArticleMapper articleMapper; - @Autowired + @Resource TagMapper tagMapper; - @Autowired + @Resource CategoryMapper categoryMapper; - @Autowired + @Resource CommentMapper commentMapper; - @Autowired + @Resource ArticleTagMapper articleTagMapper; - @Autowired + @Resource UserService userService; @Autowired HttpServletRequest request; - @Autowired + @Resource RedisUserUtil redisUserUtil; @Override diff --git a/blog-article/src/test/java/cn/celess/article/ArticleBaseTest.java b/blog-article/src/test/java/cn/celess/article/ArticleBaseTest.java new file mode 100644 index 0000000..68b6e73 --- /dev/null +++ b/blog-article/src/test/java/cn/celess/article/ArticleBaseTest.java @@ -0,0 +1,11 @@ +package cn.celess.article; + +import cn.celess.common.test.RedisServerMock; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest(classes = {ArticleApplication.class}) +@RunWith(SpringRunner.class) +public abstract class ArticleBaseTest extends RedisServerMock { +} diff --git a/blog-deploy/src/test/java/cn/celess/controller/ArticleControllerTest.java b/blog-article/src/test/java/cn/celess/article/controller/ArticleControllerTest.java similarity index 95% rename from blog-deploy/src/test/java/cn/celess/controller/ArticleControllerTest.java rename to blog-article/src/test/java/cn/celess/article/controller/ArticleControllerTest.java index b3ebc09..fa952e3 100644 --- a/blog-deploy/src/test/java/cn/celess/controller/ArticleControllerTest.java +++ b/blog-article/src/test/java/cn/celess/article/controller/ArticleControllerTest.java @@ -1,7 +1,7 @@ -package cn.celess.controller; +package cn.celess.article.controller; -import cn.celess.BaseTest; +import cn.celess.article.ArticleBaseTest; import cn.celess.common.entity.Article; import cn.celess.common.entity.Response; import cn.celess.common.entity.Tag; @@ -11,18 +11,18 @@ import cn.celess.common.entity.vo.PageData; import cn.celess.common.mapper.ArticleMapper; import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import javax.annotation.Resource; import java.util.List; import static cn.celess.common.enmu.ResponseEnum.*; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -public class ArticleControllerTest extends BaseTest { - @Autowired +public class ArticleControllerTest extends ArticleBaseTest { + @Resource ArticleMapper articleMapper; private static final TypeReference ARTICLE_MODEL_TYPE = new TypeReference>() { }; @@ -204,18 +204,18 @@ public class ArticleControllerTest extends BaseTest { @Test public void adminArticles() { try { - getMockData(get("/admin/articles?page=1&count=10")).andExpect(result -> - assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result, STRING_TYPE).getCode()) + getMockData(get("/admin/articles?page=1&count=5")).andExpect(result -> + assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result, ARTICLE_MODEL_PAGE_TYPE).getCode()) ); // User权限登陆 - getMockData(get("/admin/articles?page=1&count=10"), userLogin()).andDo(result -> - assertEquals(PERMISSION_ERROR.getCode(), getResponse(result, STRING_TYPE).getCode()) + getMockData(get("/admin/articles?page=1&count=5"), userLogin()).andDo(result -> + assertEquals(PERMISSION_ERROR.getCode(), getResponse(result, ARTICLE_MODEL_PAGE_TYPE).getCode()) ); for (int i = 0; i < 2; i++) { // admin权限登陆 int finalI = i; - getMockData(get("/admin/articles?page=1&count=10&deleted=" + (i == 1)), adminLogin()).andDo(result -> { + getMockData(get("/admin/articles?page=1&count=5&deleted=" + (i == 1)), adminLogin()).andDo(result -> { Response> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE); assertEquals(SUCCESS.getCode(), response.getCode()); assertNotNull(response.getResult()); @@ -223,7 +223,7 @@ public class ArticleControllerTest extends BaseTest { PageData pageData = response.getResult(); assertNotEquals(0, pageData.getTotal()); assertEquals(1, pageData.getPageNum()); - assertEquals(10, pageData.getPageSize()); + assertEquals(5, pageData.getPageSize()); // 内容完整 for (ArticleModel a : pageData.getList()) { assertNotNull(a.getTitle()); diff --git a/blog-deploy/src/test/java/cn/celess/service/ArticleServiceTest.java b/blog-article/src/test/java/cn/celess/article/serviceimpl/ArticleServiceTest.java similarity index 91% rename from blog-deploy/src/test/java/cn/celess/service/ArticleServiceTest.java rename to blog-article/src/test/java/cn/celess/article/serviceimpl/ArticleServiceTest.java index 5433ced..fd1c94b 100644 --- a/blog-deploy/src/test/java/cn/celess/service/ArticleServiceTest.java +++ b/blog-article/src/test/java/cn/celess/article/serviceimpl/ArticleServiceTest.java @@ -1,6 +1,6 @@ -package cn.celess.service; +package cn.celess.article.serviceimpl; -import cn.celess.BaseTest; +import cn.celess.article.ArticleBaseTest; import cn.celess.common.entity.vo.ArticleModel; import cn.celess.common.entity.vo.PageData; import cn.celess.common.mapper.ArticleMapper; @@ -9,13 +9,15 @@ import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; + import static org.junit.Assert.*; -public class ArticleServiceTest extends BaseTest { +public class ArticleServiceTest extends ArticleBaseTest { @Autowired ArticleService articleService; - @Autowired + @Resource ArticleMapper articleMapper; @Test diff --git a/blog-categorytag/pom.xml b/blog-categorytag/pom.xml index bab46dc..d8db7cf 100644 --- a/blog-categorytag/pom.xml +++ b/blog-categorytag/pom.xml @@ -18,6 +18,12 @@ ${blog-common.version} + + cn.celess + blog-user + ${blog-user.version} + + org.springframework.boot spring-boot-starter-web diff --git a/blog-categorytag/src/main/java/cn/celess/categorytag/CategoryTagApplication.java b/blog-categorytag/src/main/java/cn/celess/categorytag/CategoryTagApplication.java new file mode 100644 index 0000000..65e8e15 --- /dev/null +++ b/blog-categorytag/src/main/java/cn/celess/categorytag/CategoryTagApplication.java @@ -0,0 +1,14 @@ +package cn.celess.categorytag; + + +import cn.celess.common.CommonApplication; +import cn.celess.user.UserApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication(scanBasePackageClasses = {CategoryTagApplication.class, CommonApplication.class, UserApplication.class}) +public class CategoryTagApplication { + public static void main(String[] args) { + SpringApplication.run(CategoryTagApplication.class, args); + } +} diff --git a/blog-categorytag/src/test/java/cn/celess/categorytag/CategoryTagBaseTest.java b/blog-categorytag/src/test/java/cn/celess/categorytag/CategoryTagBaseTest.java new file mode 100644 index 0000000..419f217 --- /dev/null +++ b/blog-categorytag/src/test/java/cn/celess/categorytag/CategoryTagBaseTest.java @@ -0,0 +1,11 @@ +package cn.celess.categorytag; + +import cn.celess.common.test.BaseTest; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest(classes = {CategoryTagApplication.class}) +@RunWith(SpringRunner.class) +public abstract class CategoryTagBaseTest extends BaseTest { +} diff --git a/blog-deploy/src/test/java/cn/celess/controller/CategoryControllerTest.java b/blog-categorytag/src/test/java/cn/celess/categorytag/controller/CategoryControllerTest.java similarity index 95% rename from blog-deploy/src/test/java/cn/celess/controller/CategoryControllerTest.java rename to blog-categorytag/src/test/java/cn/celess/categorytag/controller/CategoryControllerTest.java index 391009c..e559b79 100644 --- a/blog-deploy/src/test/java/cn/celess/controller/CategoryControllerTest.java +++ b/blog-categorytag/src/test/java/cn/celess/categorytag/controller/CategoryControllerTest.java @@ -1,6 +1,6 @@ -package cn.celess.controller; +package cn.celess.categorytag.controller; -import cn.celess.BaseTest; +import cn.celess.categorytag.CategoryTagBaseTest; import cn.celess.common.entity.Category; import cn.celess.common.entity.Response; import cn.celess.common.entity.vo.CategoryModel; @@ -14,7 +14,7 @@ import static cn.celess.common.enmu.ResponseEnum.SUCCESS; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -public class CategoryControllerTest extends BaseTest { +public class CategoryControllerTest extends CategoryTagBaseTest { @Autowired CategoryMapper categoryMapper; diff --git a/blog-deploy/src/test/java/cn/celess/controller/TagControllerTest.java b/blog-categorytag/src/test/java/cn/celess/categorytag/controller/TagControllerTest.java similarity index 96% rename from blog-deploy/src/test/java/cn/celess/controller/TagControllerTest.java rename to blog-categorytag/src/test/java/cn/celess/categorytag/controller/TagControllerTest.java index 0e4b2ed..6d06da0 100644 --- a/blog-deploy/src/test/java/cn/celess/controller/TagControllerTest.java +++ b/blog-categorytag/src/test/java/cn/celess/categorytag/controller/TagControllerTest.java @@ -1,7 +1,7 @@ -package cn.celess.controller; +package cn.celess.categorytag.controller; -import cn.celess.BaseTest; +import cn.celess.categorytag.CategoryTagBaseTest; import cn.celess.common.entity.Response; import cn.celess.common.entity.Tag; import cn.celess.common.entity.vo.PageData; @@ -18,7 +18,7 @@ import static cn.celess.common.enmu.ResponseEnum.*; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -public class TagControllerTest extends BaseTest { +public class TagControllerTest extends CategoryTagBaseTest { @Autowired TagMapper tagMapper; private static final TypeReference TAG_MODEL_TYPE = new TypeReference>() { diff --git a/blog-comment/src/main/java/cn/celess/comment/CommentApplication.java b/blog-comment/src/main/java/cn/celess/comment/CommentApplication.java new file mode 100644 index 0000000..7f0e4df --- /dev/null +++ b/blog-comment/src/main/java/cn/celess/comment/CommentApplication.java @@ -0,0 +1,13 @@ +package cn.celess.comment; + +import cn.celess.common.CommonApplication; +import cn.celess.user.UserApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication(scanBasePackageClasses = {CommentApplication.class, CommonApplication.class, UserApplication.class}) +public class CommentApplication { + public static void main(String[] args) { + SpringApplication.run(CommentApplication.class, args); + } +} diff --git a/blog-comment/src/test/java/cn/celess/comment/CommentBaseTest.java b/blog-comment/src/test/java/cn/celess/comment/CommentBaseTest.java new file mode 100644 index 0000000..150d1d7 --- /dev/null +++ b/blog-comment/src/test/java/cn/celess/comment/CommentBaseTest.java @@ -0,0 +1,11 @@ +package cn.celess.comment; + +import cn.celess.common.test.BaseTest; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest(classes = {CommentApplication.class}) +@RunWith(SpringRunner.class) +public abstract class CommentBaseTest extends BaseTest { +} diff --git a/blog-deploy/src/test/java/cn/celess/controller/CommentControllerTest.java b/blog-comment/src/test/java/cn/celess/comment/controller/CommentControllerTest.java similarity index 97% rename from blog-deploy/src/test/java/cn/celess/controller/CommentControllerTest.java rename to blog-comment/src/test/java/cn/celess/comment/controller/CommentControllerTest.java index 8591f69..18d1fac 100644 --- a/blog-deploy/src/test/java/cn/celess/controller/CommentControllerTest.java +++ b/blog-comment/src/test/java/cn/celess/comment/controller/CommentControllerTest.java @@ -1,6 +1,6 @@ -package cn.celess.controller; +package cn.celess.comment.controller; -import cn.celess.BaseTest; +import cn.celess.comment.CommentBaseTest; import cn.celess.common.entity.Article; import cn.celess.common.entity.Comment; import cn.celess.common.entity.Response; @@ -21,7 +21,7 @@ import static cn.celess.common.enmu.ResponseEnum.SUCCESS; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -public class CommentControllerTest extends BaseTest { +public class CommentControllerTest extends CommentBaseTest { @Autowired ArticleMapper articleMapper; @Autowired diff --git a/blog-common/pom.xml b/blog-common/pom.xml index e38a487..3af4cad 100644 --- a/blog-common/pom.xml +++ b/blog-common/pom.xml @@ -12,6 +12,12 @@ blog-common + + cn.celess + blog-resource + ${blog-resource.version} + + org.springframework.boot spring-boot-starter-test @@ -28,22 +34,22 @@ runtime - - com.sun - tools - 1.8 - system - ${project.basedir}/src/main/resources/lib/tools.jar - true - - - com.sun - jconsole - 1.8 - system - ${project.basedir}/src/main/resources/lib/jconsole.jar - true - + + + + + + + + + + + + + + + + com.alibaba diff --git a/blog-common/src/main/java/cn/celess/common/CommonApplication.java b/blog-common/src/main/java/cn/celess/common/CommonApplication.java new file mode 100644 index 0000000..8bd4b22 --- /dev/null +++ b/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); + } +} diff --git a/blog-common/src/main/java/cn/celess/common/config/MybatisConfig.java b/blog-common/src/main/java/cn/celess/common/config/MybatisConfig.java index af2ddf1..f707b7a 100644 --- a/blog-common/src/main/java/cn/celess/common/config/MybatisConfig.java +++ b/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(); +// } } diff --git a/blog-common/src/main/java/cn/celess/common/exception/ExceptionHandle.java b/blog-common/src/main/java/cn/celess/common/exception/ExceptionHandle.java index 23961ea..119914f 100644 --- a/blog-common/src/main/java/cn/celess/common/exception/ExceptionHandle.java +++ b/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) diff --git a/blog-deploy/src/test/java/cn/celess/BaseTest.java b/blog-common/src/main/java/cn/celess/common/test/BaseTest.java similarity index 90% rename from blog-deploy/src/test/java/cn/celess/BaseTest.java rename to blog-common/src/main/java/cn/celess/common/test/BaseTest.java index 901b73c..9736546 100644 --- a/blog-deploy/src/test/java/cn/celess/BaseTest.java +++ b/blog-common/src/main/java/cn/celess/common/test/BaseTest.java @@ -1,4 +1,4 @@ -package cn.celess; +package cn.celess.common.test; import cn.celess.common.entity.Response; import cn.celess.common.entity.dto.LoginReq; @@ -6,6 +6,7 @@ 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; @@ -13,17 +14,14 @@ import com.qiniu.storage.model.FileInfo; import lombok.extern.slf4j.Slf4j; import org.junit.After; import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; 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.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; @@ -42,19 +40,17 @@ import java.util.Map; import java.util.UUID; import static cn.celess.common.enmu.ResponseEnum.SUCCESS; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @Author: 小海 * @Date: 2019/08/22 12:46 * @Description: 测试基类 */ -@SpringBootTest -@RunWith(SpringRunner.class) @WebAppConfiguration @ActiveProfiles("test") -public class BaseTest { - +public abstract class BaseTest { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -67,7 +63,6 @@ public class BaseTest { /** * jackson 序列化/反序列化Json */ - protected final ObjectMapper mapper = new ObjectMapper(); protected static final TypeReference BOOLEAN_TYPE = new TypeReference>() { }; protected static final TypeReference STRING_TYPE = new TypeReference>() { @@ -134,7 +129,7 @@ public class BaseTest { try { str = getMockData(MockMvcRequestBuilders.post("/login"), null, req) .andReturn().getResponse().getContentAsString(); - Response response = mapper.readValue(str, new TypeReference>() { + Response response = new ObjectMapper().readValue(str, new TypeReference>() { }); assertEquals(SUCCESS.getCode(), response.getCode()); String token = response.getResult().getToken(); @@ -148,20 +143,6 @@ public class BaseTest { return null; } - @Test - public void test() { - // 测试登录 - assertNotNull(userLogin()); - assertNotNull(adminLogin()); - assertNotEquals(userLogin(), adminLogin()); - try { - // 测试getMockData方法 - assertNotNull(getMockData(MockMvcRequestBuilders.get("/headerInfo"))); - getMockData((MockMvcRequestBuilders.get("/headerInfo"))).andDo(result -> assertNotNull(getResponse(result, OBJECT_TYPE))); - } catch (Exception e) { - e.printStackTrace(); - } - } /** * 产生指定长度的随机字符 @@ -220,6 +201,7 @@ public class BaseTest { 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)); } @@ -245,6 +227,8 @@ public class BaseTest { protected Response getResponse(String json, TypeReference responseType) { Response 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); @@ -292,6 +276,7 @@ public class BaseTest { @Slf4j + @Service("mailService") public static class TestMailServiceImpl implements MailService { @Override @@ -323,6 +308,7 @@ public class BaseTest { } @Slf4j + @Service("qiniuService") public static class TestQiNiuServiceImpl implements QiniuService { @Override public QiniuResponse uploadFile(InputStream is, String fileName) { diff --git a/blog-common/src/main/java/cn/celess/common/test/RedisServerMock.java b/blog-common/src/main/java/cn/celess/common/test/RedisServerMock.java new file mode 100644 index 0000000..b7e63ec --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/blog-common/src/main/java/cn/celess/common/util/HttpUtil.java b/blog-common/src/main/java/cn/celess/common/util/HttpUtil.java index 08ca2e5..6d31ea1 100644 --- a/blog-common/src/main/java/cn/celess/common/util/HttpUtil.java +++ b/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); diff --git a/blog-common/src/test/java/cn/celess/common/CommonBaseTest.java b/blog-common/src/test/java/cn/celess/common/CommonBaseTest.java new file mode 100644 index 0000000..8e1ca09 --- /dev/null +++ b/blog-common/src/test/java/cn/celess/common/CommonBaseTest.java @@ -0,0 +1,11 @@ +package cn.celess.common; + +import cn.celess.common.test.BaseTest; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest(classes = CommonApplication.class) +@RunWith(SpringRunner.class) +public abstract class CommonBaseTest extends BaseTest { +} diff --git a/blog-deploy/src/test/java/cn/celess/enmu/UserAccountStatusEnumTest.java b/blog-common/src/test/java/cn/celess/common/enmu/UserAccountStatusEnumTest.java similarity index 88% rename from blog-deploy/src/test/java/cn/celess/enmu/UserAccountStatusEnumTest.java rename to blog-common/src/test/java/cn/celess/common/enmu/UserAccountStatusEnumTest.java index 8486bc9..cb223b5 100644 --- a/blog-deploy/src/test/java/cn/celess/enmu/UserAccountStatusEnumTest.java +++ b/blog-common/src/test/java/cn/celess/common/enmu/UserAccountStatusEnumTest.java @@ -1,7 +1,6 @@ -package cn.celess.enmu; +package cn.celess.common.enmu; -import cn.celess.BaseTest; -import cn.celess.common.enmu.UserAccountStatusEnum; +import cn.celess.common.CommonBaseTest; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; @@ -10,7 +9,7 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; -public class UserAccountStatusEnumTest extends BaseTest { +public class UserAccountStatusEnumTest extends CommonBaseTest { @Test public void get() { diff --git a/blog-deploy/src/test/java/cn/celess/mapper/ArticleMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/ArticleMapperTest.java similarity index 96% rename from blog-deploy/src/test/java/cn/celess/mapper/ArticleMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/ArticleMapperTest.java index 50e5c5e..7f84264 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/ArticleMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/ArticleMapperTest.java @@ -1,10 +1,7 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.entity.*; -import cn.celess.common.mapper.ArticleMapper; -import cn.celess.common.mapper.ArticleTagMapper; -import cn.celess.common.mapper.TagMapper; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +9,7 @@ import java.util.List; import static org.junit.Assert.*; -public class ArticleMapperTest extends BaseTest { +public class ArticleMapperTest extends CommonBaseTest { @Autowired ArticleMapper articleMapper; @Autowired diff --git a/blog-deploy/src/test/java/cn/celess/mapper/ArticleTagMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/ArticleTagMapperTest.java similarity index 95% rename from blog-deploy/src/test/java/cn/celess/mapper/ArticleTagMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/ArticleTagMapperTest.java index 200487b..4506970 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/ArticleTagMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/ArticleTagMapperTest.java @@ -1,10 +1,7 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.entity.*; -import cn.celess.common.mapper.ArticleMapper; -import cn.celess.common.mapper.ArticleTagMapper; -import cn.celess.common.mapper.TagMapper; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +9,7 @@ import java.util.List; import static org.junit.Assert.*; -public class ArticleTagMapperTest extends BaseTest { +public class ArticleTagMapperTest extends CommonBaseTest { @Autowired ArticleMapper articleMapper; diff --git a/blog-deploy/src/test/java/cn/celess/mapper/CategoryMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/CategoryMapperTest.java similarity index 95% rename from blog-deploy/src/test/java/cn/celess/mapper/CategoryMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/CategoryMapperTest.java index 6f09fbb..6c523b7 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/CategoryMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/CategoryMapperTest.java @@ -1,8 +1,7 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.entity.Category; -import cn.celess.common.mapper.CategoryMapper; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +10,7 @@ import java.util.stream.Collectors; import static org.junit.Assert.*; -public class CategoryMapperTest extends BaseTest { +public class CategoryMapperTest extends CommonBaseTest { @Autowired CategoryMapper categoryMapper; diff --git a/blog-deploy/src/test/java/cn/celess/mapper/CommentMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/CommentMapperTest.java similarity index 95% rename from blog-deploy/src/test/java/cn/celess/mapper/CommentMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/CommentMapperTest.java index d1e024d..2a24955 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/CommentMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/CommentMapperTest.java @@ -1,11 +1,9 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.enmu.CommentStatusEnum; import cn.celess.common.entity.Comment; import cn.celess.common.entity.User; -import cn.celess.common.mapper.CommentMapper; -import cn.celess.common.mapper.UserMapper; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +11,7 @@ import java.util.List; import static org.junit.Assert.*; -public class CommentMapperTest extends BaseTest { +public class CommentMapperTest extends CommonBaseTest { @Autowired UserMapper userMapper; diff --git a/blog-deploy/src/test/java/cn/celess/mapper/PartnerMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/PartnerMapperTest.java similarity index 95% rename from blog-deploy/src/test/java/cn/celess/mapper/PartnerMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/PartnerMapperTest.java index 17d8946..cc416f3 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/PartnerMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/PartnerMapperTest.java @@ -1,8 +1,7 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.entity.PartnerSite; -import cn.celess.common.mapper.PartnerMapper; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,7 @@ import java.util.List; import static org.junit.Assert.*; -public class PartnerMapperTest extends BaseTest { +public class PartnerMapperTest extends CommonBaseTest { @Autowired PartnerMapper partnerMapper; diff --git a/blog-deploy/src/test/java/cn/celess/mapper/TagMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/TagMapperTest.java similarity index 94% rename from blog-deploy/src/test/java/cn/celess/mapper/TagMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/TagMapperTest.java index b024229..3a92d4c 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/TagMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/TagMapperTest.java @@ -1,8 +1,7 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.entity.Tag; -import cn.celess.common.mapper.TagMapper; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +10,7 @@ import java.util.stream.Collectors; import static org.junit.Assert.*; -public class TagMapperTest extends BaseTest { +public class TagMapperTest extends CommonBaseTest { @Autowired TagMapper tagMapper; diff --git a/blog-deploy/src/test/java/cn/celess/mapper/UserMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/UserMapperTest.java similarity index 97% rename from blog-deploy/src/test/java/cn/celess/mapper/UserMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/UserMapperTest.java index 09eef63..a839684 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/UserMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/UserMapperTest.java @@ -1,10 +1,9 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.enmu.RoleEnum; import cn.celess.common.enmu.UserAccountStatusEnum; import cn.celess.common.entity.User; -import cn.celess.common.mapper.UserMapper; import cn.celess.common.util.MD5Util; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +12,7 @@ import java.util.List; import static org.junit.Assert.*; -public class UserMapperTest extends BaseTest { +public class UserMapperTest extends CommonBaseTest { @Autowired UserMapper userMapper; diff --git a/blog-deploy/src/test/java/cn/celess/mapper/VisitorMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/VisitorMapperTest.java similarity index 86% rename from blog-deploy/src/test/java/cn/celess/mapper/VisitorMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/VisitorMapperTest.java index 1caee91..7f8ddad 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/VisitorMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/VisitorMapperTest.java @@ -1,8 +1,7 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.entity.Visitor; -import cn.celess.common.mapper.VisitorMapper; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +10,7 @@ import java.util.Date; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -public class VisitorMapperTest extends BaseTest { +public class VisitorMapperTest extends CommonBaseTest { @Autowired VisitorMapper visitorMapper; diff --git a/blog-deploy/src/test/java/cn/celess/mapper/WebUpdateInfoMapperTest.java b/blog-common/src/test/java/cn/celess/common/mapper/WebUpdateInfoMapperTest.java similarity index 93% rename from blog-deploy/src/test/java/cn/celess/mapper/WebUpdateInfoMapperTest.java rename to blog-common/src/test/java/cn/celess/common/mapper/WebUpdateInfoMapperTest.java index fee61fc..7b6cf0a 100644 --- a/blog-deploy/src/test/java/cn/celess/mapper/WebUpdateInfoMapperTest.java +++ b/blog-common/src/test/java/cn/celess/common/mapper/WebUpdateInfoMapperTest.java @@ -1,8 +1,7 @@ -package cn.celess.mapper; +package cn.celess.common.mapper; -import cn.celess.BaseTest; +import cn.celess.common.CommonBaseTest; import cn.celess.common.entity.WebUpdate; -import cn.celess.common.mapper.WebUpdateInfoMapper; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,7 @@ import java.util.List; import static org.junit.Assert.*; -public class WebUpdateInfoMapperTest extends BaseTest { +public class WebUpdateInfoMapperTest extends CommonBaseTest { @Autowired WebUpdateInfoMapper webUpdateInfoMapper; diff --git a/blog-deploy/src/test/java/cn/celess/util/DateFormatUtilTest.java b/blog-common/src/test/java/cn/celess/common/util/DateFormatUtilTest.java similarity index 73% rename from blog-deploy/src/test/java/cn/celess/util/DateFormatUtilTest.java rename to blog-common/src/test/java/cn/celess/common/util/DateFormatUtilTest.java index 8b30f75..09c9d2b 100644 --- a/blog-deploy/src/test/java/cn/celess/util/DateFormatUtilTest.java +++ b/blog-common/src/test/java/cn/celess/common/util/DateFormatUtilTest.java @@ -1,14 +1,13 @@ -package cn.celess.util; +package cn.celess.common.util; -import cn.celess.BaseTest; -import cn.celess.common.util.DateFormatUtil; +import cn.celess.common.CommonBaseTest; import org.junit.Test; import java.util.Date; import static org.junit.Assert.assertNotNull; -public class DateFormatUtilTest extends BaseTest { +public class DateFormatUtilTest extends CommonBaseTest { @Test public void get() { diff --git a/blog-deploy/src/test/java/cn/celess/util/HttpUtilTest.java b/blog-common/src/test/java/cn/celess/common/util/HttpUtilTest.java similarity index 73% rename from blog-deploy/src/test/java/cn/celess/util/HttpUtilTest.java rename to blog-common/src/test/java/cn/celess/common/util/HttpUtilTest.java index 6cec6e4..0902ab7 100644 --- a/blog-deploy/src/test/java/cn/celess/util/HttpUtilTest.java +++ b/blog-common/src/test/java/cn/celess/common/util/HttpUtilTest.java @@ -1,14 +1,15 @@ -package cn.celess.util; +package cn.celess.common.util; -import cn.celess.BaseTest; -import cn.celess.common.util.HttpUtil; +import cn.celess.common.CommonBaseTest; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.assertNotNull; -public class HttpUtilTest extends BaseTest { +public class HttpUtilTest extends CommonBaseTest { @Test + @Ignore public void get() { String s = HttpUtil.get("https://api.celess.cn/headerInfo"); assertNotNull(s); diff --git a/blog-deploy/src/test/java/cn/celess/util/MD5UtilTest.java b/blog-common/src/test/java/cn/celess/common/util/MD5UtilTest.java similarity index 60% rename from blog-deploy/src/test/java/cn/celess/util/MD5UtilTest.java rename to blog-common/src/test/java/cn/celess/common/util/MD5UtilTest.java index 602762b..229d219 100644 --- a/blog-deploy/src/test/java/cn/celess/util/MD5UtilTest.java +++ b/blog-common/src/test/java/cn/celess/common/util/MD5UtilTest.java @@ -1,12 +1,11 @@ -package cn.celess.util; +package cn.celess.common.util; -import cn.celess.BaseTest; -import cn.celess.common.util.MD5Util; +import cn.celess.common.CommonBaseTest; import org.junit.Test; import static org.junit.Assert.assertEquals; -public class MD5UtilTest extends BaseTest { +public class MD5UtilTest extends CommonBaseTest { @Test public void getMD5() { diff --git a/blog-deploy/pom.xml b/blog-deploy/pom.xml index 7d4f2c1..1593f2c 100644 --- a/blog-deploy/pom.xml +++ b/blog-deploy/pom.xml @@ -15,29 +15,6 @@ - - junit - junit - 4.13.1 - - - com.h2database - h2 - 1.4.200 - - - com.github.kstyrc - embedded-redis - 0.6 - - - com.google.guava - guava - - - test - - io.springfox diff --git a/blog-deploy/src/main/java/cn/celess/configuration/InterceptorConfig.java b/blog-deploy/src/main/java/cn/celess/configuration/DeployInterceptorConfig.java similarity index 79% rename from blog-deploy/src/main/java/cn/celess/configuration/InterceptorConfig.java rename to blog-deploy/src/main/java/cn/celess/configuration/DeployInterceptorConfig.java index 41dc3ce..7b2a609 100644 --- a/blog-deploy/src/main/java/cn/celess/configuration/InterceptorConfig.java +++ b/blog-deploy/src/main/java/cn/celess/configuration/DeployInterceptorConfig.java @@ -1,6 +1,5 @@ package cn.celess.configuration; -import cn.celess.configuration.filter.AuthenticationFilter; import cn.celess.configuration.filter.MultipleSubmitFilter; import cn.celess.configuration.filter.VisitorRecord; import cn.celess.configuration.listener.SessionListener; @@ -16,17 +15,12 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @Description: */ @Configuration -public class InterceptorConfig implements WebMvcConfigurer { +public class DeployInterceptorConfig implements WebMvcConfigurer { + @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(new MultipleSubmitFilter()).addPathPatterns("/**"); registry.addInterceptor(new VisitorRecord()).addPathPatterns("/**"); - registry.addInterceptor(authenticationFilter()).addPathPatterns("/**"); - } - - @Bean - public AuthenticationFilter authenticationFilter() { - return new AuthenticationFilter(); } @Bean diff --git a/blog-deploy/src/main/resources/application-prod.properties b/blog-deploy/src/main/resources/application-prod.properties deleted file mode 100644 index d2b7e5d..0000000 --- a/blog-deploy/src/main/resources/application-prod.properties +++ /dev/null @@ -1,68 +0,0 @@ -server.port=8081 -# 七牛的密钥配置 -qiniu.accessKey=si3O2_Q7edFtjzmyyzXkoE9G1toxcjDfULhX5zdh -qiniu.secretKey=Pnq8q2Iy1Ez8RQXQR33XmgAYlit7M8C197BZ4lCj -qiniu.bucket=xiaohai -# sitemap 存放地址 -sitemap.path= -# 生成JWT时候的密钥 -jwt.secret=sdjfi77;47h7uuo4l;4lgiu4;dl5684aasdasdpsidf;sdf -#mybatis.type-handlers-package=cn.celess.common.mapper.typehandler -spring.jpa.show-sql=false -spring.jpa.hibernate.ddl-auto=update -# 上传单个文件的大小 -spring.servlet.multipart.max-file-size=10MB -# 上传文件的总大小 -spring.servlet.multipart.max-request-size=10MB -spring.jackson.default-property-inclusion=non_null -################# 数据库 ################## -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -# spring.datasource.url=jdbc:mysql://localhost:3306/blog?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true -spring.datasource.url=jdbc:mysql://localhost:3306/blog?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=zhenghai -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.initialization-mode=never -################## mybatis ################## -mybatis.mapper-locations=classpath:mapper/*.xml -mybatis.type-aliases-package=cn.celess.common.entity -pagehelper.helper-dialect=mysql -pagehelper.reasonable=true -pagehelper.support-methods-arguments=true -pagehelper.params=count=countSql -#### 用于nginx的代理 获取真实ip -server.use-forward-headers=true -server.tomcat.remote-ip-header=X-Real-IP -server.tomcat.protocol-header=X-Forwarded-Proto -############### email ############## -spring.mail.host=smtp.163.com -spring.mail.username=xiaohai2271@163.com -spring.mail.password=56462271Zh -spring.mail.properties.mail.smtp.auth=true -spring.mail.properties.mail.smtp.starttls.enable=true -spring.mail.properties.mail.smtp.starttls.required=true -spring.mail.default-encoding=UTF-8 -spring.mail.port=465 -spring.mail.properties.mail.smtp.socketFactory.port=465 -spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory -spring.mail.properties.mail.smtp.socketFactory.fallback=false -############### redis ############## -# REDIS (RedisProperties) -# Redis数据库索引（默认为0） -spring.redis.database=0 -# Redis服务器地址 -spring.redis.host=127.0.0.1 -# Redis服务器连接端口 -spring.redis.port=6379 -# Redis服务器连接密码（默认为空） -spring.redis.password=zhenghai -# 连接池最大连接数（使用负值表示没有限制） -spring.redis.jedis.pool.max-active=-1 -# 连接池最大阻塞等待时间（使用负值表示没有限制） -spring.redis.jedis.pool.max-wait=-1 -# 连接池中的最大空闲连接 -spring.redis.jedis.pool.max-idle=8 -# 连接池中的最小空闲连接 -spring.redis.jedis.pool.min-idle=0 -# 连接超时时间（毫秒） -spring.redis.timeout=5000 \ No newline at end of file diff --git a/blog-deploy/src/test/java/cn/celess/DeployBaseTest.java b/blog-deploy/src/test/java/cn/celess/DeployBaseTest.java new file mode 100644 index 0000000..fb564c5 --- /dev/null +++ b/blog-deploy/src/test/java/cn/celess/DeployBaseTest.java @@ -0,0 +1,11 @@ +package cn.celess; + +import cn.celess.common.test.BaseTest; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest(classes = {BlogApplication.class}) +@RunWith(SpringRunner.class) +public abstract class DeployBaseTest extends BaseTest { +} diff --git a/blog-deploy/src/test/java/cn/celess/RedisServerMock.java b/blog-deploy/src/test/java/cn/celess/RedisServerMock.java deleted file mode 100644 index 75dea4e..0000000 --- a/blog-deploy/src/test/java/cn/celess/RedisServerMock.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.celess; - -import org.springframework.stereotype.Component; -import redis.embedded.RedisServer; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import java.io.IOException; - -/** - * @author : xiaohai - * @date : 2020/08/14 16:20 - */ -@Component -public class RedisServerMock { - - private RedisServer redisServer; - - /** - * 构造方法之后执行. - * - * @throws IOException e - */ - @PostConstruct - public void startRedis() throws IOException { - redisServer = new RedisServer(6380); - redisServer.start(); - } - - /** - * 析构方法之后执行. - */ - @PreDestroy - public void stopRedis() { - redisServer.stop(); - } -} diff --git a/blog-deploy/src/test/java/cn/celess/filter/MultipleSubmitFilter.java b/blog-deploy/src/test/java/cn/celess/filter/MultipleSubmitFilter.java index df5dacd..cd278c8 100644 --- a/blog-deploy/src/test/java/cn/celess/filter/MultipleSubmitFilter.java +++ b/blog-deploy/src/test/java/cn/celess/filter/MultipleSubmitFilter.java @@ -1,6 +1,6 @@ package cn.celess.filter; -import cn.celess.BaseTest; +import cn.celess.DeployBaseTest; import cn.celess.common.enmu.ResponseEnum; import cn.celess.common.entity.Response; import org.junit.Assert; @@ -13,7 +13,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; * @Date: 2019/11/28 16:17 * @Description: 测试重复请求 */ -public class MultipleSubmitFilter extends BaseTest { +public class MultipleSubmitFilter extends DeployBaseTest { private MockHttpSession session = null; diff --git a/blog-extension/src/main/java/cn/celess/extension/ExtensionApplication.java b/blog-extension/src/main/java/cn/celess/extension/ExtensionApplication.java new file mode 100644 index 0000000..fb25f32 --- /dev/null +++ b/blog-extension/src/main/java/cn/celess/extension/ExtensionApplication.java @@ -0,0 +1,11 @@ +package cn.celess.extension; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ExtensionApplication { + public static void main(String[] args) { + SpringApplication.run(ExtensionApplication.class, args); + } +} diff --git a/blog-partnersite/src/main/java/cn/celess/partnersite/PartnerSiteApplication.java b/blog-partnersite/src/main/java/cn/celess/partnersite/PartnerSiteApplication.java new file mode 100644 index 0000000..1989ead --- /dev/null +++ b/blog-partnersite/src/main/java/cn/celess/partnersite/PartnerSiteApplication.java @@ -0,0 +1,11 @@ +package cn.celess.partnersite; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PartnerSiteApplication { + public static void main(String[] args) { + SpringApplication.run(PartnerSiteApplication.class, args); + } +} diff --git a/blog-deploy/src/test/java/cn/celess/controller/LinksControllerTest.java b/blog-partnersite/src/test/java/cn/celess/partnersite/controller/PartnerSiteControllerTest.java similarity index 98% rename from blog-deploy/src/test/java/cn/celess/controller/LinksControllerTest.java rename to blog-partnersite/src/test/java/cn/celess/partnersite/controller/PartnerSiteControllerTest.java index c37304e..5ad3c68 100644 --- a/blog-deploy/src/test/java/cn/celess/controller/LinksControllerTest.java +++ b/blog-partnersite/src/test/java/cn/celess/partnersite/controller/PartnerSiteControllerTest.java @@ -1,7 +1,6 @@ -package cn.celess.controller; +package cn.celess.partnersite.controller; -import cn.celess.BaseTest; import cn.celess.common.entity.PartnerSite; import cn.celess.common.entity.Response; import cn.celess.common.entity.dto.LinkApplyReq; @@ -10,6 +9,7 @@ import cn.celess.common.entity.vo.PageData; import cn.celess.common.exception.MyException; import cn.celess.common.mapper.PartnerMapper; import cn.celess.common.service.PartnerSiteService; +import cn.celess.common.test.BaseTest; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; import org.junit.Test; @@ -22,7 +22,7 @@ import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; @Slf4j -public class LinksControllerTest extends BaseTest { +public class PartnerSiteControllerTest extends BaseTest { @Autowired PartnerMapper mapper; diff --git a/blog-deploy/src/test/java/cn/celess/service/PartnerSiteServiceTest.java b/blog-partnersite/src/test/java/cn/celess/partnersite/serviceimpl/PartnerSiteServiceTest.java similarity index 93% rename from blog-deploy/src/test/java/cn/celess/service/PartnerSiteServiceTest.java rename to blog-partnersite/src/test/java/cn/celess/partnersite/serviceimpl/PartnerSiteServiceTest.java index 1ad3bf9..524aa34 100644 --- a/blog-deploy/src/test/java/cn/celess/service/PartnerSiteServiceTest.java +++ b/blog-partnersite/src/test/java/cn/celess/partnersite/serviceimpl/PartnerSiteServiceTest.java @@ -1,9 +1,9 @@ -package cn.celess.service; +package cn.celess.partnersite.serviceimpl; -import cn.celess.BaseTest; import cn.celess.common.entity.PartnerSite; import cn.celess.common.entity.vo.PageData; import cn.celess.common.service.PartnerSiteService; +import cn.celess.common.test.BaseTest; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/blog-resource/pom.xml b/blog-resource/pom.xml new file mode 100644 index 0000000..13b3a2f --- /dev/null +++ b/blog-resource/pom.xml @@ -0,0 +1,19 @@ + + + + blog + cn.celess + 0.0.1-SNAPSHOT + + 4.0.0 + + blog-resource + + + 13 + 13 + + + \ No newline at end of file diff --git a/blog-resource/src/main/java/.gitkeep b/blog-resource/src/main/java/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/blog-deploy/src/main/resources/application-openSource.properties b/blog-resource/src/main/resources/application-openSource.properties similarity index 89% rename from blog-deploy/src/main/resources/application-openSource.properties rename to blog-resource/src/main/resources/application-openSource.properties index ea38559..d60bca6 100644 --- a/blog-deploy/src/main/resources/application-openSource.properties +++ b/blog-resource/src/main/resources/application-openSource.properties @@ -33,20 +33,6 @@ spring.datasource.sql-script-encoding=utf-8 spring.datasource.schema=classpath:sql/schema.sql spring.datasource.data=classpath:sql/data.sql - -################## mybatis ################## -mybatis.mapper-locations=classpath:mapper/*.xml -mybatis.type-aliases-package=cn.celess.common.entity - - -pagehelper.helper-dialect=mysql -pagehelper.reasonable=true -pagehelper.support-methods-arguments=true -pagehelper.params=count=countSql - - - - ################ email ############## #请先填写下面的配置，不然可能运行不起来 spring.mail.host= diff --git a/blog-deploy/src/main/resources/application-test.properties b/blog-resource/src/main/resources/application-test.properties similarity index 89% rename from blog-deploy/src/main/resources/application-test.properties rename to blog-resource/src/main/resources/application-test.properties index 9800929..ca9d0a4 100644 --- a/blog-deploy/src/main/resources/application-test.properties +++ b/blog-resource/src/main/resources/application-test.properties @@ -32,19 +32,6 @@ spring.datasource.initialization-mode=ALWAYS spring.datasource.schema=classpath:sql/schema_h2.sql spring.datasource.data=classpath:sql/data.sql - -################## mybatis ################## -mybatis.mapper-locations=classpath:mapper/*.xml -mybatis.type-aliases-package=cn.celess.common.entity - - -pagehelper.helper-dialect=mysql -pagehelper.reasonable=true -pagehelper.support-methods-arguments=true -pagehelper.params=count=countSql - - - #### 用于nginx的代理 获取真实ip server.use-forward-headers = true server.tomcat.remote-ip-header = X-Real-IP diff --git a/blog-deploy/src/main/resources/application.properties b/blog-resource/src/main/resources/application.properties similarity index 54% rename from blog-deploy/src/main/resources/application.properties rename to blog-resource/src/main/resources/application.properties index 18dc243..227b958 100644 --- a/blog-deploy/src/main/resources/application.properties +++ b/blog-resource/src/main/resources/application.properties @@ -4,5 +4,10 @@ spring.profiles.active=prod logging.level.cn.celess.blog=debug logging.level.cn.celess.common.mapper=info spring.cache.type=redis - +mybatis.mapper-locations=classpath*:mapper/*.xml +mybatis.type-aliases-package=cn.celess.common.entity +pagehelper.helper-dialect=mysql +pagehelper.reasonable=true +pagehelper.support-methods-arguments=true +pagehelper.params=count=countSql ## 修改openSource 添加-test 文件用于测试 -prod文件用于线上发布 \ No newline at end of file diff --git a/blog-deploy/src/main/resources/ip2region/ip2region.db b/blog-resource/src/main/resources/ip2region/ip2region.db similarity index 100% rename from blog-deploy/src/main/resources/ip2region/ip2region.db rename to blog-resource/src/main/resources/ip2region/ip2region.db diff --git a/blog-deploy/src/main/resources/sql/data.sql b/blog-resource/src/main/resources/sql/data.sql similarity index 100% rename from blog-deploy/src/main/resources/sql/data.sql rename to blog-resource/src/main/resources/sql/data.sql diff --git a/blog-deploy/src/main/resources/sql/schema.sql b/blog-resource/src/main/resources/sql/schema.sql similarity index 100% rename from blog-deploy/src/main/resources/sql/schema.sql rename to blog-resource/src/main/resources/sql/schema.sql diff --git a/blog-deploy/src/main/resources/sql/schema_h2.sql b/blog-resource/src/main/resources/sql/schema_h2.sql similarity index 100% rename from blog-deploy/src/main/resources/sql/schema_h2.sql rename to blog-resource/src/main/resources/sql/schema_h2.sql diff --git a/blog-siteinfo/src/main/java/cn/celess/siteinfo/SiteInfoApplication.java b/blog-siteinfo/src/main/java/cn/celess/siteinfo/SiteInfoApplication.java new file mode 100644 index 0000000..705732c --- /dev/null +++ b/blog-siteinfo/src/main/java/cn/celess/siteinfo/SiteInfoApplication.java @@ -0,0 +1,11 @@ +package cn.celess.siteinfo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SiteInfoApplication { + public static void main(String[] args) { + SpringApplication.run(SiteInfoApplication.class, args); + } +} diff --git a/blog-deploy/src/test/java/cn/celess/controller/WebUpdateInfoControllerTest.java b/blog-siteinfo/src/test/java/cn/celess/siteinfo/controller/WebUpdateInfoControllerTest.java similarity index 97% rename from blog-deploy/src/test/java/cn/celess/controller/WebUpdateInfoControllerTest.java rename to blog-siteinfo/src/test/java/cn/celess/siteinfo/controller/WebUpdateInfoControllerTest.java index ca5d99d..08846c8 100644 --- a/blog-deploy/src/test/java/cn/celess/controller/WebUpdateInfoControllerTest.java +++ b/blog-siteinfo/src/test/java/cn/celess/siteinfo/controller/WebUpdateInfoControllerTest.java @@ -1,13 +1,14 @@ -package cn.celess.controller; +package cn.celess.siteinfo.controller; -import cn.celess.BaseTest; import cn.celess.common.entity.Response; import cn.celess.common.entity.WebUpdate; import cn.celess.common.entity.vo.PageData; import cn.celess.common.entity.vo.WebUpdateModel; import cn.celess.common.mapper.WebUpdateInfoMapper; +import cn.celess.common.test.BaseTest; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; +import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +22,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder @Slf4j public class WebUpdateInfoControllerTest extends BaseTest { - private final TypeReference MODAL_TYPE = new TypeReference>() { }; private final TypeReference MODAL_LIST_TYPE = new TypeReference>>() { @@ -126,6 +126,7 @@ public class WebUpdateInfoControllerTest extends BaseTest { } @Test + @Ignore public void lastestUpdateTime() throws Exception { getMockData(get("/lastestUpdate")).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode())); } diff --git a/blog-user/pom.xml b/blog-user/pom.xml index 30e2e52..8ed8414 100644 --- a/blog-user/pom.xml +++ b/blog-user/pom.xml @@ -29,5 +29,26 @@ jjwt 0.9.1 + + + javax.xml.bind + jaxb-api + 2.3.1 + + + com.sun.xml.bind + jaxb-impl + 3.0.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0.1 + + + javax.activation + activation + 1.1.1 + \ No newline at end of file diff --git a/blog-user/src/main/java/cn/celess/user/UserApplication.java b/blog-user/src/main/java/cn/celess/user/UserApplication.java new file mode 100644 index 0000000..7196452 --- /dev/null +++ b/blog-user/src/main/java/cn/celess/user/UserApplication.java @@ -0,0 +1,12 @@ +package cn.celess.user; + +import cn.celess.common.CommonApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication(scanBasePackageClasses = {UserApplication.class, CommonApplication.class}) +public class UserApplication { + public static void main(String[] args) { + SpringApplication.run(UserApplication.class, args); + } +} diff --git a/blog-user/src/main/java/cn/celess/user/config/AuthorizationInterceptorConfig.java b/blog-user/src/main/java/cn/celess/user/config/AuthorizationInterceptorConfig.java new file mode 100644 index 0000000..5d815ec --- /dev/null +++ b/blog-user/src/main/java/cn/celess/user/config/AuthorizationInterceptorConfig.java @@ -0,0 +1,25 @@ +package cn.celess.user.config; + +import cn.celess.user.filter.AuthenticationFilter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * @Author: 小海 + * @Date: 2019/10/18 14:19 + * @Description: + */ +@Configuration +public class AuthorizationInterceptorConfig implements WebMvcConfigurer { + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(authenticationFilter()).addPathPatterns("/**"); + } + + @Bean + public AuthenticationFilter authenticationFilter() { + return new AuthenticationFilter(); + } +} diff --git a/blog-deploy/src/main/java/cn/celess/configuration/filter/AuthenticationFilter.java b/blog-user/src/main/java/cn/celess/user/filter/AuthenticationFilter.java similarity index 98% rename from blog-deploy/src/main/java/cn/celess/configuration/filter/AuthenticationFilter.java rename to blog-user/src/main/java/cn/celess/user/filter/AuthenticationFilter.java index eab8c0e..a5a3877 100644 --- a/blog-deploy/src/main/java/cn/celess/configuration/filter/AuthenticationFilter.java +++ b/blog-user/src/main/java/cn/celess/user/filter/AuthenticationFilter.java @@ -1,4 +1,4 @@ -package cn.celess.configuration.filter; +package cn.celess.user.filter; import cn.celess.common.enmu.ResponseEnum; diff --git a/blog-user/src/test/java/cn/celess/user/UserBaseTest.java b/blog-user/src/test/java/cn/celess/user/UserBaseTest.java new file mode 100644 index 0000000..30243f1 --- /dev/null +++ b/blog-user/src/test/java/cn/celess/user/UserBaseTest.java @@ -0,0 +1,11 @@ +package cn.celess.user; + +import cn.celess.common.test.BaseTest; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public abstract class UserBaseTest extends BaseTest { +} diff --git a/blog-deploy/src/test/java/cn/celess/controller/UserControllerTest.java b/blog-user/src/test/java/cn/celess/user/controller/UserControllerTest.java similarity index 98% rename from blog-deploy/src/test/java/cn/celess/controller/UserControllerTest.java rename to blog-user/src/test/java/cn/celess/user/controller/UserControllerTest.java index 0abaf16..aa9028a 100644 --- a/blog-deploy/src/test/java/cn/celess/controller/UserControllerTest.java +++ b/blog-user/src/test/java/cn/celess/user/controller/UserControllerTest.java @@ -1,6 +1,5 @@ -package cn.celess.controller; +package cn.celess.user.controller; -import cn.celess.BaseTest; import cn.celess.common.entity.Response; import cn.celess.common.entity.User; import cn.celess.common.entity.dto.LoginReq; @@ -11,6 +10,7 @@ import cn.celess.common.mapper.UserMapper; import cn.celess.common.service.UserService; import cn.celess.common.util.MD5Util; import cn.celess.common.util.RedisUtil; +import cn.celess.user.UserBaseTest; import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +35,7 @@ import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -public class UserControllerTest extends BaseTest { +public class UserControllerTest extends UserBaseTest { @Autowired UserMapper userMapper; diff --git a/blog-deploy/src/test/java/cn/celess/filter/AuthorizationFilter.java b/blog-user/src/test/java/cn/celess/user/filter/AuthorizationFilter.java similarity index 94% rename from blog-deploy/src/test/java/cn/celess/filter/AuthorizationFilter.java rename to blog-user/src/test/java/cn/celess/user/filter/AuthorizationFilter.java index b2a0c74..91e923a 100644 --- a/blog-deploy/src/test/java/cn/celess/filter/AuthorizationFilter.java +++ b/blog-user/src/test/java/cn/celess/user/filter/AuthorizationFilter.java @@ -1,7 +1,7 @@ -package cn.celess.filter; +package cn.celess.user.filter; -import cn.celess.BaseTest; import cn.celess.common.entity.Response; +import cn.celess.user.UserBaseTest; import org.junit.Test; import static cn.celess.common.enmu.ResponseEnum.*; @@ -13,7 +13,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder * @Date: 2019/11/28 16:05 * @Description: 授权拦截器的测试类 */ -public class AuthorizationFilter extends BaseTest { +public class AuthorizationFilter extends UserBaseTest { @Test public void UserAccess() throws Exception { diff --git a/blog-deploy/src/test/java/cn/celess/service/UserServiceTest.java b/blog-user/src/test/java/cn/celess/user/serviceimpl/UserServiceTest.java similarity index 96% rename from blog-deploy/src/test/java/cn/celess/service/UserServiceTest.java rename to blog-user/src/test/java/cn/celess/user/serviceimpl/UserServiceTest.java index 87f0d7c..203f9e1 100644 --- a/blog-deploy/src/test/java/cn/celess/service/UserServiceTest.java +++ b/blog-user/src/test/java/cn/celess/user/serviceimpl/UserServiceTest.java @@ -1,6 +1,5 @@ -package cn.celess.service; +package cn.celess.user.serviceimpl; -import cn.celess.BaseTest; import cn.celess.common.enmu.ResponseEnum; import cn.celess.common.enmu.UserAccountStatusEnum; import cn.celess.common.entity.User; @@ -11,12 +10,13 @@ import cn.celess.common.exception.MyException; import cn.celess.common.mapper.UserMapper; import cn.celess.common.service.UserService; import cn.celess.common.util.MD5Util; +import cn.celess.user.UserBaseTest; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import static org.junit.Assert.*; -public class UserServiceTest extends BaseTest { +public class UserServiceTest extends UserBaseTest { @Autowired UserService userService; @Autowired diff --git a/blog-deploy/src/test/java/cn/celess/util/JwtUtilTest.java b/blog-user/src/test/java/cn/celess/user/util/JwtUtilTest.java similarity index 91% rename from blog-deploy/src/test/java/cn/celess/util/JwtUtilTest.java rename to blog-user/src/test/java/cn/celess/user/util/JwtUtilTest.java index 83d7714..826740f 100644 --- a/blog-deploy/src/test/java/cn/celess/util/JwtUtilTest.java +++ b/blog-user/src/test/java/cn/celess/user/util/JwtUtilTest.java @@ -1,25 +1,24 @@ -package cn.celess.util; +package cn.celess.user.util; -import cn.celess.BaseTest; import cn.celess.common.entity.User; -import cn.celess.user.util.JwtUtil; +import cn.celess.user.UserBaseTest; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import javax.annotation.Resource; import java.time.Instant; import java.util.Date; import static org.junit.Assert.*; @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class JwtUtilTest extends BaseTest { +public class JwtUtilTest extends UserBaseTest { - @Autowired + @Resource JwtUtil jwtUtil; @Value("${jwt.secret}") private String secret; diff --git a/blog-visitor/src/main/java/cn/celess/visitor/VisitorApplication.java b/blog-visitor/src/main/java/cn/celess/visitor/VisitorApplication.java new file mode 100644 index 0000000..a53f196 --- /dev/null +++ b/blog-visitor/src/main/java/cn/celess/visitor/VisitorApplication.java @@ -0,0 +1,11 @@ +package cn.celess.visitor; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class VisitorApplication { + public static void main(String[] args) { + SpringApplication.run(VisitorApplication.class, args); + } +} diff --git a/blog-deploy/src/test/java/cn/celess/controller/VisitorControllerTest.java b/blog-visitor/src/test/java/cn/celess/visitor/controller/VisitorControllerTest.java similarity index 97% rename from blog-deploy/src/test/java/cn/celess/controller/VisitorControllerTest.java rename to blog-visitor/src/test/java/cn/celess/visitor/controller/VisitorControllerTest.java index 0994739..ec94ed6 100644 --- a/blog-deploy/src/test/java/cn/celess/controller/VisitorControllerTest.java +++ b/blog-visitor/src/test/java/cn/celess/visitor/controller/VisitorControllerTest.java @@ -1,9 +1,9 @@ -package cn.celess.controller; +package cn.celess.visitor.controller; -import cn.celess.BaseTest; import cn.celess.common.entity.Response; import cn.celess.common.entity.vo.PageData; import cn.celess.common.entity.vo.VisitorModel; +import cn.celess.common.test.BaseTest; import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; diff --git a/blog-deploy/src/test/java/cn/celess/service/VisitorServiceTest.java b/blog-visitor/src/test/java/cn/celess/visitor/serviceimpl/VisitorServiceTest.java similarity index 92% rename from blog-deploy/src/test/java/cn/celess/service/VisitorServiceTest.java rename to blog-visitor/src/test/java/cn/celess/visitor/serviceimpl/VisitorServiceTest.java index fd4171b..6517b3b 100644 --- a/blog-deploy/src/test/java/cn/celess/service/VisitorServiceTest.java +++ b/blog-visitor/src/test/java/cn/celess/visitor/serviceimpl/VisitorServiceTest.java @@ -1,9 +1,9 @@ -package cn.celess.service; +package cn.celess.visitor.serviceimpl; -import cn.celess.BaseTest; import cn.celess.common.entity.vo.PageData; import cn.celess.common.entity.vo.VisitorModel; import cn.celess.common.service.VisitorService; +import cn.celess.common.test.BaseTest; import com.alibaba.druid.util.StringUtils; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/blog-deploy/src/test/java/cn/celess/util/AddressUtilTest.java b/blog-visitor/src/test/java/cn/celess/visitor/util/AddressUtilTest.java similarity index 79% rename from blog-deploy/src/test/java/cn/celess/util/AddressUtilTest.java rename to blog-visitor/src/test/java/cn/celess/visitor/util/AddressUtilTest.java index d38bdad..a4a22c8 100644 --- a/blog-deploy/src/test/java/cn/celess/util/AddressUtilTest.java +++ b/blog-visitor/src/test/java/cn/celess/visitor/util/AddressUtilTest.java @@ -1,7 +1,6 @@ -package cn.celess.util; +package cn.celess.visitor.util; -import cn.celess.BaseTest; -import cn.celess.visitor.util.AddressUtil; +import cn.celess.common.test.BaseTest; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/pom.xml b/pom.xml index 13d9e47..b9aa2e7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ blog-siteinfo blog-extension blog-deploy + blog-resource org.springframework.boot @@ -40,6 +41,7 @@ 0.0.1-SNAPSHOT 0.0.1-SNAPSHOT 0.0.1-SNAPSHOT + 0.0.1-SNAPSHOT @@ -49,7 +51,30 @@ lombok 1.18.20 + + + junit + junit + 4.13.1 + + + com.h2database + h2 + 1.4.200 + + + com.github.kstyrc + embedded-redis + 0.6 + + + + + + + +