diff --git a/.gitignore b/.gitignore
index e0d65e1..21fcf12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@
target/
# 本地项目的私有文件
-src/main/resources/application-dev.properties
+blog-deploy/src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
diff --git a/blog-article/pom.xml b/blog-article/pom.xml
new file mode 100644
index 0000000..9efdded
--- /dev/null
+++ b/blog-article/pom.xml
@@ -0,0 +1,50 @@
+
+
+
+ blog
+ cn.celess
+ 0.0.1-SNAPSHOT
+
+ 4.0.0
+
+ blog-article
+
+
+ 13
+ 13
+
+
+
+
+ cn.celess
+ blog-common
+ ${blog-common.version}
+
+
+
+ cn.celess
+ blog-user
+ ${blog-user.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+
+ com.youbenzi
+ MDTool
+ 1.2.4
+
+
+ net.minidev
+ json-smart
+ 2.4.7
+ compile
+
+
+
\ No newline at end of file
diff --git a/src/main/java/cn/celess/blog/controller/ArticleController.java b/blog-article/src/main/java/cn/celess/article/controller/ArticleController.java
similarity index 90%
rename from src/main/java/cn/celess/blog/controller/ArticleController.java
rename to blog-article/src/main/java/cn/celess/article/controller/ArticleController.java
index 80fd4cc..f02d51a 100644
--- a/src/main/java/cn/celess/blog/controller/ArticleController.java
+++ b/blog-article/src/main/java/cn/celess/article/controller/ArticleController.java
@@ -1,163 +1,163 @@
-package cn.celess.blog.controller;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.entity.Response;
-import cn.celess.blog.entity.model.ArticleModel;
-import cn.celess.blog.entity.request.ArticleReq;
-import cn.celess.blog.service.ArticleService;
-import cn.celess.blog.util.RedisUserUtil;
-import cn.celess.blog.util.SitemapGenerateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 15:18
- */
-@RestController
-public class ArticleController {
- @Autowired
- ArticleService articleService;
- @Autowired
- SitemapGenerateUtil sitemapGenerateUtil;
- @Autowired
- RedisUserUtil redisUserUtil;
- @Value("${spring.profiles.active}")
- private String activeModel;
-
- /**
- * 新建一篇文章
- *
- * @param body 请求数据
- * @return Response
- */
- @PostMapping("/admin/article/create")
- public Response create(@RequestBody ArticleReq body) {
- ArticleModel articleModel = articleService.create(body);
- if ("prod".equals(activeModel)) {
- sitemapGenerateUtil.createSitemap();
- }
- return Response.success(articleModel);
- }
-
- /**
- * 通过文章id 删除一篇文章
- *
- * @param articleId 文章id
- * @return Response
- */
- @DeleteMapping("/admin/article/del")
- public Response delete(@RequestParam("articleID") long articleId) {
- boolean delete = articleService.delete(articleId);
- if ("prod".equals(activeModel)) {
- sitemapGenerateUtil.createSitemap();
- }
- return Response.success(delete);
- }
-
- /**
- * 更新文章
- *
- * @param body 请求数据
- * @return Response
- */
- @PutMapping("/admin/article/update")
- public Response update(@RequestBody ArticleReq body) {
- ArticleModel update = articleService.update(body);
- if ("prod".equals(activeModel)) {
- sitemapGenerateUtil.createSitemap();
- }
- return Response.success(update);
- }
-
- /**
- * 通过id查找一篇文章
- * 公开 =>返回数据
- * 不公开
- * *** =>作者 返回数据
- * *** =>其他 抛出错误
- *
- * @param articleId 文章id
- * @param is4update 是否是更新
- * @return Response
- */
- @GetMapping("/article/articleID/{articleID}")
- public Response retrieveOneById(@PathVariable("articleID") long articleId,
- @RequestParam(value = "update", defaultValue = "false") boolean is4update,
- HttpServletRequest request) {
- ArticleModel article = articleService.retrieveOneById(articleId, is4update);
- if (article.getOpen()) {
- return Response.success(article);
- } else if (article.getAuthor().getId().equals(redisUserUtil.get().getId())) {
- return Response.success(article);
- }
- return Response.response(ResponseEnum.PERMISSION_ERROR, null);
- }
-
- /**
- * 分页获取所有文章状态为开放的的文章
- *
- * @param page 页码
- * @param count 单页数据量
- * @return Response
- */
- @GetMapping("/articles")
- public Response articles(@RequestParam(name = "page", defaultValue = "1") int page,
- @RequestParam(name = "count", defaultValue = "5") int count) {
- return Response.success(articleService.retrievePageForOpen(count, page));
- }
-
- /**
- * 分页获取所有文章
- *
- * @param page 页码
- * @param count 单页数据量
- * @return Response
- */
- @GetMapping("/admin/articles")
- public Response adminArticles(@RequestParam(name = "page", defaultValue = "1") int page,
- @RequestParam(name = "count", defaultValue = "10") int count,
- @RequestParam(name = "deleted", required = false) Boolean deleted) {
- return Response.success(articleService.adminArticles(count, page, deleted));
- }
-
- /**
- * 通过分类获取文章（文章摘要）
- *
- * @param name 分类名
- * @param page 页码
- * @param count 单页数据量
- * @return Response
- */
- @GetMapping("/articles/category/{name}")
- public Response findByCategory(@PathVariable("name") String name,
- @RequestParam(name = "page", defaultValue = "1") int page,
- @RequestParam(name = "count", defaultValue = "10") int count) {
- return Response.success(articleService.findByCategory(name, page, count));
- }
-
- /**
- * 通过标签名获取文章（文章摘要）
- *
- * @param name 标签名
- * @param page 页码
- * @param count 单页数据量
- * @return Response
- */
- @GetMapping("/articles/tag/{name}")
- public Response findByTag(@PathVariable("name") String name,
- @RequestParam(name = "page", defaultValue = "1") int page,
- @RequestParam(name = "count", defaultValue = "10") int count) {
- return Response.success(articleService.findByTag(name, page, count));
- }
-
-
- @GetMapping("/createSitemap")
- public Response createSitemap() {
- sitemapGenerateUtil.createSitemap();
- return Response.success(null);
- }
-}
+package cn.celess.article.controller;
+
+import cn.celess.article.util.SitemapGenerateUtil;
+import cn.celess.common.enmu.ResponseEnum;
+import cn.celess.common.entity.Response;
+import cn.celess.common.entity.dto.ArticleReq;
+import cn.celess.common.entity.vo.ArticleModel;
+import cn.celess.common.service.ArticleService;
+import cn.celess.user.util.RedisUserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 15:18
+ */
+@RestController
+public class ArticleController {
+ @Autowired
+ ArticleService articleService;
+ @Autowired
+ SitemapGenerateUtil sitemapGenerateUtil;
+ @Autowired
+ RedisUserUtil redisUserUtil;
+ @Value("${spring.profiles.active}")
+ private String activeModel;
+
+ /**
+ * 新建一篇文章
+ *
+ * @param body 请求数据
+ * @return Response
+ */
+ @PostMapping("/admin/article/create")
+ public Response create(@RequestBody ArticleReq body) {
+ ArticleModel articleModel = articleService.create(body);
+ if ("prod".equals(activeModel)) {
+ sitemapGenerateUtil.createSitemap();
+ }
+ return Response.success(articleModel);
+ }
+
+ /**
+ * 通过文章id 删除一篇文章
+ *
+ * @param articleId 文章id
+ * @return Response
+ */
+ @DeleteMapping("/admin/article/del")
+ public Response delete(@RequestParam("articleID") long articleId) {
+ boolean delete = articleService.delete(articleId);
+ if ("prod".equals(activeModel)) {
+ sitemapGenerateUtil.createSitemap();
+ }
+ return Response.success(delete);
+ }
+
+ /**
+ * 更新文章
+ *
+ * @param body 请求数据
+ * @return Response
+ */
+ @PutMapping("/admin/article/update")
+ public Response update(@RequestBody ArticleReq body) {
+ ArticleModel update = articleService.update(body);
+ if ("prod".equals(activeModel)) {
+ sitemapGenerateUtil.createSitemap();
+ }
+ return Response.success(update);
+ }
+
+ /**
+ * 通过id查找一篇文章
+ * 公开 =>返回数据
+ * 不公开
+ * *** =>作者 返回数据
+ * *** =>其他 抛出错误
+ *
+ * @param articleId 文章id
+ * @param is4update 是否是更新
+ * @return Response
+ */
+ @GetMapping("/article/articleID/{articleID}")
+ public Response retrieveOneById(@PathVariable("articleID") long articleId,
+ @RequestParam(value = "update", defaultValue = "false") boolean is4update,
+ HttpServletRequest request) {
+ ArticleModel article = articleService.retrieveOneById(articleId, is4update);
+ if (article.getOpen()) {
+ return Response.success(article);
+ } else if (article.getAuthor().getId().equals(redisUserUtil.get().getId())) {
+ return Response.success(article);
+ }
+ return Response.response(ResponseEnum.PERMISSION_ERROR, null);
+ }
+
+ /**
+ * 分页获取所有文章状态为开放的的文章
+ *
+ * @param page 页码
+ * @param count 单页数据量
+ * @return Response
+ */
+ @GetMapping("/articles")
+ public Response articles(@RequestParam(name = "page", defaultValue = "1") int page,
+ @RequestParam(name = "count", defaultValue = "5") int count) {
+ return Response.success(articleService.retrievePageForOpen(count, page));
+ }
+
+ /**
+ * 分页获取所有文章
+ *
+ * @param page 页码
+ * @param count 单页数据量
+ * @return Response
+ */
+ @GetMapping("/admin/articles")
+ public Response adminArticles(@RequestParam(name = "page", defaultValue = "1") int page,
+ @RequestParam(name = "count", defaultValue = "10") int count,
+ @RequestParam(name = "deleted", required = false) Boolean deleted) {
+ return Response.success(articleService.adminArticles(count, page, deleted));
+ }
+
+ /**
+ * 通过分类获取文章（文章摘要）
+ *
+ * @param name 分类名
+ * @param page 页码
+ * @param count 单页数据量
+ * @return Response
+ */
+ @GetMapping("/articles/category/{name}")
+ public Response findByCategory(@PathVariable("name") String name,
+ @RequestParam(name = "page", defaultValue = "1") int page,
+ @RequestParam(name = "count", defaultValue = "10") int count) {
+ return Response.success(articleService.findByCategory(name, page, count));
+ }
+
+ /**
+ * 通过标签名获取文章（文章摘要）
+ *
+ * @param name 标签名
+ * @param page 页码
+ * @param count 单页数据量
+ * @return Response
+ */
+ @GetMapping("/articles/tag/{name}")
+ public Response findByTag(@PathVariable("name") String name,
+ @RequestParam(name = "page", defaultValue = "1") int page,
+ @RequestParam(name = "count", defaultValue = "10") int count) {
+ return Response.success(articleService.findByTag(name, page, count));
+ }
+
+
+ @GetMapping("/createSitemap")
+ public Response createSitemap() {
+ sitemapGenerateUtil.createSitemap();
+ return Response.success(null);
+ }
+}
diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java b/blog-article/src/main/java/cn/celess/article/serviceimpl/ArticleServiceImpl.java
similarity index 93%
rename from src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
rename to blog-article/src/main/java/cn/celess/article/serviceimpl/ArticleServiceImpl.java
index 247c971..db3923b 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
+++ b/blog-article/src/main/java/cn/celess/article/serviceimpl/ArticleServiceImpl.java
@@ -1,361 +1,367 @@
-package cn.celess.blog.service.serviceimpl;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.enmu.RoleEnum;
-import cn.celess.blog.entity.*;
-import cn.celess.blog.entity.model.ArticleModel;
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.request.ArticleReq;
-import cn.celess.blog.exception.MyException;
-import cn.celess.blog.mapper.*;
-import cn.celess.blog.service.ArticleService;
-import cn.celess.blog.service.UserService;
-import cn.celess.blog.util.ModalTrans;
-import cn.celess.blog.util.RedisUserUtil;
-import cn.celess.blog.util.RegexUtil;
-import cn.celess.blog.util.StringFromHtmlUtil;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.youbenzi.mdtool.tool.MDTool;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 15:21
- */
-@Service
-@Slf4j
-public class ArticleServiceImpl implements ArticleService {
-
- @Autowired
- ArticleMapper articleMapper;
-
- @Autowired
- TagMapper tagMapper;
- @Autowired
- CategoryMapper categoryMapper;
- @Autowired
- CommentMapper commentMapper;
- @Autowired
- ArticleTagMapper articleTagMapper;
- @Autowired
- UserService userService;
- @Autowired
- HttpServletRequest request;
- @Autowired
- RedisUserUtil redisUserUtil;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public ArticleModel create(ArticleReq reqBody) {
- if (reqBody == null) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- }
- //数据判断
- if (reqBody.getTitle() == null || reqBody.getTitle().replaceAll(" ", "").isEmpty()) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- } else if (reqBody.getMdContent() == null || reqBody.getMdContent().replaceAll(" ", "").isEmpty()) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- }
- //转载 判断链接
- if (!reqBody.getType()) {
- if (reqBody.getUrl() == null || reqBody.getUrl().replaceAll(" ", "").isEmpty()) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- } else if (!RegexUtil.urlMatch(reqBody.getUrl())) {
- throw new MyException(ResponseEnum.PARAMETERS_URL_ERROR);
- }
- }
- if (reqBody.getCategory() == null || reqBody.getCategory().replaceAll(" ", "").isEmpty()) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- }
- if (reqBody.getTags() == null || reqBody.getTags().length == 0) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- }
- if (articleMapper.existsByTitle(reqBody.getTitle())) {
- throw new MyException(ResponseEnum.ARTICLE_HAS_EXIST);
- }
- // 查看是否存在已有的分类
- Category category = categoryMapper.findCategoryByName(reqBody.getCategory());
- if (category == null) {
- throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
- }
-
- // 构建 需要写入数据库的对象数据
- Article article = new Article();
- BeanUtils.copyProperties(reqBody, article);
-
- article.setUser(redisUserUtil.get());
-
- //markdown->html->summary
- String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent()));
- //获取摘要 摘要长度为255个字符
- String summary = str.length() > 240 ? str.substring(0, 240) + "......" : str;
- article.setSummary(summary);
-
- article.setCategory(category);
-
- //文章存数据库
- articleMapper.insert(article);
- //将标签写入数据库
- for (String tagName : reqBody.getTags()) {
- if (tagName.replaceAll(" ", "").length() == 0) {
- //单个标签只含空格
- continue;
- }
- Tag tag = tagMapper.findTagByName(tagName);
- if (tag == null) {
- tag = new Tag();
- tag.setName(tagName);
- tagMapper.insert(tag);
- }
- ArticleTag articleTag = new ArticleTag(article, tag);
- articleTagMapper.insert(articleTag);
- }
- Article articleFromDb = articleMapper.findArticleById(article.getId());
-
- ArticleModel articleModel = ModalTrans.article(articleFromDb);
- articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(article.getId()), true));
- return articleModel;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public boolean delete(long articleId) {
- Article articleForDel = articleMapper.findArticleById(articleId);
-
- if (articleForDel == null) {
- //文章不存在
- throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);
- }
-
- //对访问情况进行判断 非admin 权限不可删除文章
- User user = redisUserUtil.get();
- if (!RoleEnum.ADMIN_ROLE.getRoleName().equals(user.getRole())) {
- throw new MyException(ResponseEnum.PERMISSION_ERROR);
- }
- //删除指定文章
- articleMapper.delete(articleId);
-
- //articleTagMapper.deleteByArticleId(articleId);
-
- return true;
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public ArticleModel update(ArticleReq reqBody) {
- if (reqBody == null || reqBody.getId() == null) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- }
- // 查找数据
- Article article = articleMapper.findArticleById(reqBody.getId());
-
- //数据判断
- if (reqBody.getTitle() != null && !reqBody.getTitle().replaceAll(" ", "").isEmpty()) {
- if (!article.getTitle().equals(reqBody.getTitle()) && articleMapper.existsByTitle(reqBody.getTitle())) {
- throw new MyException(ResponseEnum.ARTICLE_HAS_EXIST);
- }
- article.setTitle(reqBody.getTitle());
- }
- if (reqBody.getMdContent() != null && !reqBody.getMdContent().replaceAll(" ", "").isEmpty()) {
- article.setMdContent(reqBody.getMdContent());
- }
-
- //转载 判断链接
- if (reqBody.getType() != null) {
- if (!reqBody.getType() && reqBody.getUrl() == null) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- }
-
- if (!reqBody.getType() && !RegexUtil.urlMatch(reqBody.getUrl())) {
- throw new MyException(ResponseEnum.PARAMETERS_URL_ERROR);
- }
- article.setType(reqBody.getType());
- article.setUrl(reqBody.getUrl());
- }
- if (reqBody.getCategory() != null && !reqBody.getCategory().replaceAll(" ", "").isEmpty()) {
- Category category = categoryMapper.findCategoryByName(reqBody.getCategory());
- if (category == null) {
- category = new Category();
- category.setName(reqBody.getCategory());
- categoryMapper.insert(category);
- }
- article.setCategory(category);
- }
-
- //写入数据库的数据
- article.setOpen(reqBody.getOpen() == null ? article.getOpen() : reqBody.getOpen());
- String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent()));
- article.setSummary(str.length() > 240 ? str.substring(0, 240) + "......" : str);
- articleMapper.update(article);
-
-
- List allByArticleId = articleTagMapper.findAllByArticleId(article.getId());
- List updateList = new ArrayList<>();
- List deleteList = new ArrayList<>();
-
- // 获取要更新 的标签
- for (String tag : reqBody.getTags()) {
- boolean contain = allByArticleId.stream().anyMatch(articleTag -> articleTag.getTag().getName().equals(tag));
- if (!contain) {
- ArticleTag articleTag = new ArticleTag();
- articleTag.setArticle(article);
- Tag tagByName = tagMapper.findTagByName(tag);
- if (tagByName == null) {
- tagByName = new Tag(tag);
- tagMapper.insert(tagByName);
- }
- articleTag.setTag(tagByName);
- updateList.add(articleTag);
- }
- }
- // 获取要删除的标签
- allByArticleId.forEach(articleTag -> {
- boolean contain = false;
- for (String tag : reqBody.getTags()) {
- if (articleTag.getTag().getName().equals(tag)) {
- contain = true;
- break;
- }
- }
- if (!contain) {
- deleteList.add(articleTag);
- }
- });
-
- if (updateList.size() != 0) {
- updateList.forEach(articleTag -> articleTagMapper.insert(articleTag));
- }
-
- if (deleteList.size() != 0) {
- articleTagMapper.deleteMultiById(deleteList);
- }
-
- //更新完成移除
- request.getSession().removeAttribute("article4update");
- ArticleModel articleModel = ModalTrans.article(articleMapper.findArticleById(article.getId()));
- setPreAndNextArticle(articleModel);
- return articleModel;
- }
-
- @Override
- public ArticleModel retrieveOneById(long articleId, boolean is4update) {
- Article article = articleMapper.findArticleById(articleId);
- if (article == null) {
- throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);
- }
- if (!article.getOpen()) {
- User user = redisUserUtil.getWithOutExc();
- if (user == null || "user".equals(user.getRole())) {
- throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC);
- }
- }
- ArticleModel articleModel = ModalTrans.article(article);
-
- if (is4update) {
- //因更新而获取文章 不需要增加阅读量
- request.getSession().setAttribute("article4update", article);
- return articleModel;
- }
- setPreAndNextArticle(articleModel);
- articleMapper.updateReadingNumber(articleId);
- return articleModel;
- }
-
- /**
- * @param count 数目
- * @param page 页面
- * @return PageInfo
- */
- @Override
- public PageData adminArticles(int count, int page, Boolean deleted) {
- PageHelper.startPage(page, count);
- List articleList = articleMapper.findAll();
-
- PageData pageData = new PageData<>(new PageInfo<>(articleList));
-
- List collect;
- if (deleted != null) {
- collect = articleList.stream().filter(article -> article.isDeleted() == deleted).collect(Collectors.toList());
- } else {
- collect = articleList;
- }
- List articleModels = collect.stream()
- .peek(article -> article.setMdContent(null))
- .map(ModalTrans::article)
- .collect(Collectors.toList());
- pageData.setList(articleModels);
-
- return pageData;
- }
-
- @Override
- public PageData retrievePageForOpen(int count, int page) {
- PageHelper.startPage(page, count);
- List articleList = articleMapper.findAllByOpen(true);
- PageData pageData = new PageData<>(new PageInfo<>(articleList));
-
- List articleModelList = articleList
- .stream()
- .map(article -> setPreAndNextArticle(ModalTrans.article(article, true)))
- .collect(Collectors.toList());
- pageData.setList(articleModelList);
- return pageData;
- }
-
- @Override
- public PageData findByCategory(String name, int page, int count) {
- Category category = categoryMapper.findCategoryByName(name);
- if (category == null) {
- throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
- }
- PageHelper.startPage(page, count);
- List open = articleMapper.findAllByCategoryIdAndOpen(category.getId());
-
- List modelList = open.stream()
- .map(article -> ModalTrans.article(article, true))
- .peek(articleModel -> {
- articleModel.setNextArticle(null);
- articleModel.setPreArticle(null);
- })
- .collect(Collectors.toList());
- return new PageData<>(new PageInfo<>(open), modelList);
- }
-
- @Override
- public PageData findByTag(String name, int page, int count) {
- Tag tag = tagMapper.findTagByName(name);
- if (tag == null) {
- throw new MyException(ResponseEnum.TAG_NOT_EXIST);
- }
- PageHelper.startPage(page, count);
- List articleByTag = articleTagMapper.findArticleByTagAndOpen(tag.getId());
- List modelList = articleByTag
- .stream()
- .map(articleTag -> ModalTrans.article(articleTag.getArticle(), true))
- .peek(articleModel -> {
- articleModel.setNextArticle(null);
- articleModel.setPreArticle(null);
- }).collect(Collectors.toList());
- return new PageData<>(new PageInfo<>(articleByTag), modelList);
- }
-
- private ArticleModel setPreAndNextArticle(ArticleModel articleModel) {
- if (articleModel == null) {
- return null;
- }
- articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(articleModel.getId()), true));
- articleModel.setNextArticle(ModalTrans.article(articleMapper.getNextArticle(articleModel.getId()), true));
- return articleModel;
- }
-}
+package cn.celess.article.serviceimpl;
+
+import cn.celess.common.enmu.ResponseEnum;
+import cn.celess.common.enmu.RoleEnum;
+import cn.celess.common.entity.*;
+import cn.celess.common.entity.dto.ArticleReq;
+import cn.celess.common.entity.vo.ArticleModel;
+import cn.celess.common.entity.vo.PageData;
+import cn.celess.common.exception.MyException;
+import cn.celess.common.mapper.*;
+import cn.celess.common.service.ArticleService;
+import cn.celess.common.service.UserService;
+import cn.celess.common.util.ModalTrans;
+import cn.celess.common.util.RegexUtil;
+import cn.celess.common.util.StringFromHtmlUtil;
+import cn.celess.user.util.RedisUserUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.youbenzi.mdtool.tool.MDTool;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 15:21
+ */
+@Service
+@Slf4j
+public class ArticleServiceImpl implements ArticleService {
+
+ @Autowired
+ ArticleMapper articleMapper;
+
+ @Autowired
+ TagMapper tagMapper;
+ @Autowired
+ CategoryMapper categoryMapper;
+ @Autowired
+ CommentMapper commentMapper;
+ @Autowired
+ ArticleTagMapper articleTagMapper;
+ @Autowired
+ UserService userService;
+ @Autowired
+ HttpServletRequest request;
+ @Autowired
+ RedisUserUtil redisUserUtil;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public ArticleModel create(ArticleReq reqBody) {
+ if (reqBody == null) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ }
+ //数据判断
+ if (reqBody.getTitle() == null || reqBody.getTitle().replaceAll(" ", "").isEmpty()) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ } else if (reqBody.getMdContent() == null || reqBody.getMdContent().replaceAll(" ", "").isEmpty()) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ }
+ //转载 判断链接
+ if (!reqBody.getType()) {
+ if (reqBody.getUrl() == null || reqBody.getUrl().replaceAll(" ", "").isEmpty()) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ } else if (!RegexUtil.urlMatch(reqBody.getUrl())) {
+ throw new MyException(ResponseEnum.PARAMETERS_URL_ERROR);
+ }
+ }
+ if (reqBody.getCategory() == null || reqBody.getCategory().replaceAll(" ", "").isEmpty()) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ }
+ if (reqBody.getTags() == null || reqBody.getTags().length == 0) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ }
+ if (articleMapper.existsByTitle(reqBody.getTitle())) {
+ throw new MyException(ResponseEnum.ARTICLE_HAS_EXIST);
+ }
+ // 查看是否存在已有的分类
+ Category category = categoryMapper.findCategoryByName(reqBody.getCategory());
+ if (category == null) {
+ throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
+ }
+
+ // 构建 需要写入数据库的对象数据
+ Article article = new Article();
+ BeanUtils.copyProperties(reqBody, article);
+
+ article.setUser(redisUserUtil.get());
+
+ //markdown->html->summary
+ String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent()));
+ //获取摘要 摘要长度为255个字符
+ String summary = str.length() > 240 ? str.substring(0, 240) + "......" : str;
+ article.setSummary(summary);
+
+ article.setCategory(category);
+
+ //文章存数据库
+ articleMapper.insert(article);
+ //将标签写入数据库
+ for (String tagName : reqBody.getTags()) {
+ if (tagName.replaceAll(" ", "").length() == 0) {
+ //单个标签只含空格
+ continue;
+ }
+ Tag tag = tagMapper.findTagByName(tagName);
+ if (tag == null) {
+ tag = new Tag();
+ tag.setName(tagName);
+ tagMapper.insert(tag);
+ }
+ ArticleTag articleTag = new ArticleTag(article, tag);
+ articleTagMapper.insert(articleTag);
+ }
+ Article articleFromDb = articleMapper.findArticleById(article.getId());
+
+ ArticleModel articleModel = ModalTrans.article(articleFromDb);
+ articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(article.getId()), true));
+ return articleModel;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean delete(long articleId) {
+ Article articleForDel = articleMapper.findArticleById(articleId);
+
+ if (articleForDel == null) {
+ //文章不存在
+ throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);
+ }
+
+ //对访问情况进行判断 非admin 权限不可删除文章
+ User user = redisUserUtil.get();
+ if (!RoleEnum.ADMIN_ROLE.getRoleName().equals(user.getRole())) {
+ throw new MyException(ResponseEnum.PERMISSION_ERROR);
+ }
+ //删除指定文章
+ articleMapper.delete(articleId);
+
+ //articleTagMapper.deleteByArticleId(articleId);
+
+ return true;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public ArticleModel update(ArticleReq reqBody) {
+ if (reqBody == null || reqBody.getId() == null) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ }
+ // 查找数据
+ Article article = articleMapper.findArticleById(reqBody.getId());
+
+ //数据判断
+ if (reqBody.getTitle() != null && !reqBody.getTitle().replaceAll(" ", "").isEmpty()) {
+ if (!article.getTitle().equals(reqBody.getTitle()) && articleMapper.existsByTitle(reqBody.getTitle())) {
+ throw new MyException(ResponseEnum.ARTICLE_HAS_EXIST);
+ }
+ article.setTitle(reqBody.getTitle());
+ }
+ if (reqBody.getMdContent() != null && !reqBody.getMdContent().replaceAll(" ", "").isEmpty()) {
+ article.setMdContent(reqBody.getMdContent());
+ }
+
+ //转载 判断链接
+ if (reqBody.getType() != null) {
+ if (!reqBody.getType() && reqBody.getUrl() == null) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ }
+
+ if (!reqBody.getType() && !RegexUtil.urlMatch(reqBody.getUrl())) {
+ throw new MyException(ResponseEnum.PARAMETERS_URL_ERROR);
+ }
+ article.setType(reqBody.getType());
+ article.setUrl(reqBody.getUrl());
+ }
+ if (reqBody.getCategory() != null && !reqBody.getCategory().replaceAll(" ", "").isEmpty()) {
+ Category category = categoryMapper.findCategoryByName(reqBody.getCategory());
+ if (category == null) {
+ category = new Category();
+ category.setName(reqBody.getCategory());
+ categoryMapper.insert(category);
+ }
+ article.setCategory(category);
+ }
+
+ //写入数据库的数据
+ article.setOpen(reqBody.getOpen() == null ? article.getOpen() : reqBody.getOpen());
+ String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent()));
+ article.setSummary(str.length() > 240 ? str.substring(0, 240) + "......" : str);
+ articleMapper.update(article);
+
+
+ List allByArticleId = articleTagMapper.findAllByArticleId(article.getId());
+ List updateList = new ArrayList<>();
+ List deleteList = new ArrayList<>();
+
+ // 获取要更新 的标签
+ for (String tag : reqBody.getTags()) {
+ boolean contain = allByArticleId.stream().anyMatch(articleTag -> articleTag.getTag().getName().equals(tag));
+ if (!contain) {
+ ArticleTag articleTag = new ArticleTag();
+ articleTag.setArticle(article);
+ Tag tagByName = tagMapper.findTagByName(tag);
+ if (tagByName == null) {
+ tagByName = new Tag(tag);
+ tagMapper.insert(tagByName);
+ }
+ articleTag.setTag(tagByName);
+ updateList.add(articleTag);
+ }
+ }
+ // 获取要删除的标签
+ allByArticleId.forEach(articleTag -> {
+ boolean contain = false;
+ for (String tag : reqBody.getTags()) {
+ if (articleTag.getTag().getName().equals(tag)) {
+ contain = true;
+ break;
+ }
+ }
+ if (!contain) {
+ deleteList.add(articleTag);
+ }
+ });
+
+ if (updateList.size() != 0) {
+ updateList.forEach(articleTag -> articleTagMapper.insert(articleTag));
+ }
+
+ if (deleteList.size() != 0) {
+ articleTagMapper.deleteMultiById(deleteList);
+ }
+
+ //更新完成移除
+ request.getSession().removeAttribute("article4update");
+ ArticleModel articleModel = ModalTrans.article(articleMapper.findArticleById(article.getId()));
+ setPreAndNextArticle(articleModel);
+ return articleModel;
+ }
+
+ @Override
+ @Cacheable(value = {"article"}, key = "'retrieveOneById'+#articleId")
+ public ArticleModel retrieveOneById(long articleId, boolean is4update) {
+ Article article = articleMapper.findArticleById(articleId);
+ if (article == null) {
+ throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);
+ }
+ if (!article.getOpen()) {
+ User user = redisUserUtil.getWithOutExc();
+ if (user == null || "user".equals(user.getRole())) {
+ throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC);
+ }
+ }
+ ArticleModel articleModel = ModalTrans.article(article);
+
+ if (is4update) {
+ //因更新而获取文章 不需要增加阅读量
+ request.getSession().setAttribute("article4update", article);
+ return articleModel;
+ }
+ setPreAndNextArticle(articleModel);
+ articleMapper.updateReadingNumber(articleId);
+ return articleModel;
+ }
+
+ /**
+ * @param count 数目
+ * @param page 页面
+ * @return PageInfo
+ */
+ @Override
+ public PageData adminArticles(int count, int page, Boolean deleted) {
+ PageHelper.startPage(page, count);
+ List articleList = articleMapper.findAll();
+
+ PageData pageData = new PageData<>(new PageInfo<>(articleList));
+
+ List collect;
+ if (deleted != null) {
+ collect = articleList.stream().filter(article -> article.isDeleted() == deleted).collect(Collectors.toList());
+ } else {
+ collect = articleList;
+ }
+ List articleModels = collect.stream()
+ .peek(article -> article.setMdContent(null))
+ .map(ModalTrans::article)
+ .collect(Collectors.toList());
+ pageData.setList(articleModels);
+
+ return pageData;
+ }
+
+ @Override
+ @Cacheable(value = {"article"}, key = "'retrievePageForOpen:'+#page+':'+#count")
+ public PageData retrievePageForOpen(int count, int page) {
+ PageHelper.startPage(page, count);
+ List articleList = articleMapper.findAllByOpen(true);
+ PageData pageData = new PageData<>(new PageInfo<>(articleList));
+
+ List articleModelList = articleList
+ .stream()
+ .map(article -> setPreAndNextArticle(ModalTrans.article(article, true)))
+ .collect(Collectors.toList());
+ pageData.setList(articleModelList);
+ return pageData;
+ }
+
+ @Override
+ @Cacheable(value = {"article"}, key = "'findByCategory:'+#name")
+ public PageData findByCategory(String name, int page, int count) {
+ Category category = categoryMapper.findCategoryByName(name);
+ if (category == null) {
+ throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
+ }
+ PageHelper.startPage(page, count);
+ List open = articleMapper.findAllByCategoryIdAndOpen(category.getId());
+
+ List modelList = open.stream()
+ .map(article -> ModalTrans.article(article, true))
+ .peek(articleModel -> {
+ articleModel.setNextArticle(null);
+ articleModel.setPreArticle(null);
+ })
+ .collect(Collectors.toList());
+ return new PageData<>(new PageInfo<>(open), modelList);
+ }
+
+ @Override
+ @Cacheable(value = {"article"}, key = "'findByTag:'+#name")
+ public PageData findByTag(String name, int page, int count) {
+ Tag tag = tagMapper.findTagByName(name);
+ if (tag == null) {
+ throw new MyException(ResponseEnum.TAG_NOT_EXIST);
+ }
+ PageHelper.startPage(page, count);
+ List articleByTag = articleTagMapper.findArticleByTagAndOpen(tag.getId());
+ List modelList = articleByTag
+ .stream()
+ .map(articleTag -> ModalTrans.article(articleTag.getArticle(), true))
+ .peek(articleModel -> {
+ articleModel.setNextArticle(null);
+ articleModel.setPreArticle(null);
+ }).collect(Collectors.toList());
+ return new PageData<>(new PageInfo<>(articleByTag), modelList);
+ }
+
+
+ private ArticleModel setPreAndNextArticle(ArticleModel articleModel) {
+ if (articleModel == null) {
+ return null;
+ }
+ articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(articleModel.getId()), true));
+ articleModel.setNextArticle(ModalTrans.article(articleMapper.getNextArticle(articleModel.getId()), true));
+ return articleModel;
+ }
+}
diff --git a/src/main/java/cn/celess/blog/util/SitemapGenerateUtil.java b/blog-article/src/main/java/cn/celess/article/util/SitemapGenerateUtil.java
similarity index 92%
rename from src/main/java/cn/celess/blog/util/SitemapGenerateUtil.java
rename to blog-article/src/main/java/cn/celess/article/util/SitemapGenerateUtil.java
index 27cedaa..7cb826d 100644
--- a/src/main/java/cn/celess/blog/util/SitemapGenerateUtil.java
+++ b/blog-article/src/main/java/cn/celess/article/util/SitemapGenerateUtil.java
@@ -1,111 +1,113 @@
-package cn.celess.blog.util;
-
-import cn.celess.blog.entity.Article;
-import cn.celess.blog.mapper.ArticleMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Author: 小海
- * @Date： 2019/07/30 17:29
- * @Description：
- */
-@Component
-public class SitemapGenerateUtil {
-
- @Autowired
- ArticleMapper articleMapper;
- @Value("${sitemap.path}")
- private String path;
- private Map urlList;
-
- private static DocumentBuilder getDocumentBuilder() {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- DocumentBuilder db = null;
- try {
- db = dbf.newDocumentBuilder();
- } catch (ParserConfigurationException e) {
- e.printStackTrace();
- }
- return db;
- }
-
- @Async
- public void createSitemap() {
- initList();
- if ("".equals(path) || "classpath".equals(path)) {
- path = System.getProperty("user.dir") + "/sitemap.xml";
- }
- File file = new File(path);
- try {
- if (file.exists()) {
- file.delete();
- } else {
- file.createNewFile();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- DocumentBuilder db = getDocumentBuilder();
- Document document = db.newDocument();
- document.setXmlVersion("1.0");
- document.setXmlStandalone(true);
- Element urlset = document.createElement("urlset");
- urlset.setAttribute("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9");
- // 创建url 结点
- urlList.forEach((s, s2) -> {
- Element url = document.createElement("url");
- Element loc = document.createElement("loc");
- Element lastmod = document.createElement("lastmod");
- loc.setTextContent(s);
- lastmod.setTextContent(s2);
- url.appendChild(loc);
- url.appendChild(lastmod);
- urlset.appendChild(url);
- });
- document.appendChild(urlset);
- try {
- TransformerFactory tff = TransformerFactory.newInstance();
- Transformer tf = tff.newTransformer();
- tf.setOutputProperty(OutputKeys.INDENT, "yes");
- tf.transform(new DOMSource(document), new StreamResult(file));
- } catch (TransformerException e) {
- e.printStackTrace();
- }
- }
-
- private void initList() {
- urlList = new HashMap<>();
- urlList.put("https://www.celess.cn", DateFormatUtil.getForXmlDate(new Date()));
- urlList.put("https://www.celess.cn/links", DateFormatUtil.getForXmlDate(new Date()));
- urlList.put("https://www.celess.cn/leaveMsg", DateFormatUtil.getForXmlDate(new Date()));
- List articles = articleMapper.findAll().stream().filter(article -> article.getOpen()&&!article.isDeleted()).collect(Collectors.toList());
- articles.forEach(article -> {
- urlList.put("https://www.celess.cn/article/" + article.getId(), DateFormatUtil.getForXmlDate(
- article.getUpdateDate() == null ? article.getPublishDate() : article.getUpdateDate()));
- });
- }
-
-}
-
+package cn.celess.article.util;
+
+
+import cn.celess.common.entity.Article;
+import cn.celess.common.mapper.ArticleMapper;
+import cn.celess.common.util.DateFormatUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/07/30 17:29
+ * @Description：
+ */
+@Component
+public class SitemapGenerateUtil {
+
+ @Autowired
+ ArticleMapper articleMapper;
+
+ @Value("${sitemap.path}")
+ private String path;
+ private Map urlList;
+
+ private static DocumentBuilder getDocumentBuilder() {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder db = null;
+ try {
+ db = dbf.newDocumentBuilder();
+ } catch (ParserConfigurationException e) {
+ e.printStackTrace();
+ }
+ return db;
+ }
+
+ @Async
+ public void createSitemap() {
+ initList();
+ if ("".equals(path) || "classpath".equals(path)) {
+ path = System.getProperty("user.dir") + "/sitemap.xml";
+ }
+ File file = new File(path);
+ try {
+ if (file.exists()) {
+ file.delete();
+ } else {
+ file.createNewFile();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ DocumentBuilder db = getDocumentBuilder();
+ Document document = db.newDocument();
+ document.setXmlVersion("1.0");
+ document.setXmlStandalone(true);
+ Element urlset = document.createElement("urlset");
+ urlset.setAttribute("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9");
+ // 创建url 结点
+ urlList.forEach((s, s2) -> {
+ Element url = document.createElement("url");
+ Element loc = document.createElement("loc");
+ Element lastmod = document.createElement("lastmod");
+ loc.setTextContent(s);
+ lastmod.setTextContent(s2);
+ url.appendChild(loc);
+ url.appendChild(lastmod);
+ urlset.appendChild(url);
+ });
+ document.appendChild(urlset);
+ try {
+ TransformerFactory tff = TransformerFactory.newInstance();
+ Transformer tf = tff.newTransformer();
+ tf.setOutputProperty(OutputKeys.INDENT, "yes");
+ tf.transform(new DOMSource(document), new StreamResult(file));
+ } catch (TransformerException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void initList() {
+ urlList = new HashMap<>();
+ urlList.put("https://www.celess.cn", DateFormatUtil.getForXmlDate(new Date()));
+ urlList.put("https://www.celess.cn/links", DateFormatUtil.getForXmlDate(new Date()));
+ urlList.put("https://www.celess.cn/leaveMsg", DateFormatUtil.getForXmlDate(new Date()));
+ List articles = articleMapper.findAll().stream().filter(article -> article.getOpen() && !article.isDeleted()).collect(Collectors.toList());
+ articles.forEach(article -> {
+ urlList.put("https://www.celess.cn/article/" + article.getId(), DateFormatUtil.getForXmlDate(
+ article.getUpdateDate() == null ? article.getPublishDate() : article.getUpdateDate()));
+ });
+ }
+
+}
diff --git a/blog-categorytag/pom.xml b/blog-categorytag/pom.xml
new file mode 100644
index 0000000..0cea345
--- /dev/null
+++ b/blog-categorytag/pom.xml
@@ -0,0 +1,31 @@
+
+
+
+ blog
+ cn.celess
+ 0.0.1-SNAPSHOT
+
+ 4.0.0
+
+ blog-categorytag
+
+
+ 13
+ 13
+
+
+
+ cn.celess
+ blog-common
+ ${blog-common.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/cn/celess/blog/controller/CategoryController.java b/blog-categorytag/src/main/java/cn/celess/categorytag/controller/CategoryController.java
similarity index 89%
rename from src/main/java/cn/celess/blog/controller/CategoryController.java
rename to blog-categorytag/src/main/java/cn/celess/categorytag/controller/CategoryController.java
index 08f2791..6456e10 100644
--- a/src/main/java/cn/celess/blog/controller/CategoryController.java
+++ b/blog-categorytag/src/main/java/cn/celess/categorytag/controller/CategoryController.java
@@ -1,63 +1,63 @@
-package cn.celess.blog.controller;
-
-import cn.celess.blog.entity.Response;
-import cn.celess.blog.service.CategoryService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/30 20:36
- */
-@RestController
-public class CategoryController {
-
- @Autowired
- CategoryService categoryService;
-
- /**
- * 新增一个分类
- *
- * @param name 分类名
- * @return Response
- */
- @PostMapping("/admin/category/create")
- public Response addOne(@RequestParam("name") String name) {
- return Response.success(categoryService.create(name));
- }
-
- /**
- * 删除一个分类
- *
- * @param id 分类id
- * @return Response
- */
- @DeleteMapping("/admin/category/del")
- public Response deleteOne(@RequestParam("id") long id) {
- return Response.success(categoryService.delete(id));
- }
-
- /**
- * 更新一个分类
- *
- * @param id 分类id
- * @param name 更新后的名字
- * @return Response
- */
- @PutMapping("/admin/category/update")
- public Response updateOne(@RequestParam("id") Long id,
- @RequestParam("name") String name) {
- return Response.success(categoryService.update(id, name));
- }
-
- /**
- * 获取所有的分类
- *
- * @return Response
- */
- @GetMapping("/categories")
- public Response getPage(@RequestParam(name = "page", defaultValue = "1") int page,
- @RequestParam(name = "count", defaultValue = "1000") int count) {
- return Response.success(categoryService.retrievePage(page, count));
- }
-}
+package cn.celess.categorytag.controller;
+
+import cn.celess.common.entity.Response;
+import cn.celess.common.service.CategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/30 20:36
+ */
+@RestController
+public class CategoryController {
+
+ @Autowired
+ CategoryService categoryService;
+
+ /**
+ * 新增一个分类
+ *
+ * @param name 分类名
+ * @return Response
+ */
+ @PostMapping("/admin/category/create")
+ public Response addOne(@RequestParam("name") String name) {
+ return Response.success(categoryService.create(name));
+ }
+
+ /**
+ * 删除一个分类
+ *
+ * @param id 分类id
+ * @return Response
+ */
+ @DeleteMapping("/admin/category/del")
+ public Response deleteOne(@RequestParam("id") long id) {
+ return Response.success(categoryService.delete(id));
+ }
+
+ /**
+ * 更新一个分类
+ *
+ * @param id 分类id
+ * @param name 更新后的名字
+ * @return Response
+ */
+ @PutMapping("/admin/category/update")
+ public Response updateOne(@RequestParam("id") Long id,
+ @RequestParam("name") String name) {
+ return Response.success(categoryService.update(id, name));
+ }
+
+ /**
+ * 获取所有的分类
+ *
+ * @return Response
+ */
+ @GetMapping("/categories")
+ public Response getPage(@RequestParam(name = "page", defaultValue = "1") int page,
+ @RequestParam(name = "count", defaultValue = "1000") int count) {
+ return Response.success(categoryService.retrievePage(page, count));
+ }
+}
diff --git a/src/main/java/cn/celess/blog/controller/TagController.java b/blog-categorytag/src/main/java/cn/celess/categorytag/controller/TagController.java
similarity index 88%
rename from src/main/java/cn/celess/blog/controller/TagController.java
rename to blog-categorytag/src/main/java/cn/celess/categorytag/controller/TagController.java
index b09e0c8..1bef3c6 100644
--- a/src/main/java/cn/celess/blog/controller/TagController.java
+++ b/blog-categorytag/src/main/java/cn/celess/categorytag/controller/TagController.java
@@ -1,59 +1,59 @@
-package cn.celess.blog.controller;
-
-import cn.celess.blog.entity.Response;
-import cn.celess.blog.entity.model.TagModel;
-import cn.celess.blog.service.TagService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/30 20:36
- */
-@RestController
-public class TagController {
- @Autowired
- TagService tagService;
-
-
- @PostMapping("/admin/tag/create")
- public Response addOne(@RequestParam("name") String name) {
- return Response.success(tagService.create(name));
- }
-
- @DeleteMapping("/admin/tag/del")
- public Response delOne(@RequestParam("id") long id) {
- return Response.success(tagService.delete(id));
- }
-
-
- @PutMapping("/admin/tag/update")
- public Response updateOne(@RequestParam("id") Long id, @RequestParam("name") String name) {
- return Response.success(tagService.update(id, name));
- }
-
- @GetMapping("/tags")
- public Response getPage(@RequestParam(required = false, defaultValue = "10", value = "count") int count,
- @RequestParam(required = false, defaultValue = "1", value = "page") int page) {
- return Response.success(tagService.retrievePage(page, count));
- }
-
- @GetMapping("/tags/nac")
- public Response getTagNameAndCount() {
- List> nameAndCount = new ArrayList<>();
- List all = tagService.findAll();
- for (TagModel t : all) {
- Map map = new HashMap<>(2);
- map.put("name", t.getName());
- map.put("size", t.getArticles().size());
- nameAndCount.add(map);
- }
- return Response.success(nameAndCount);
- }
-
-}
+package cn.celess.categorytag.controller;
+
+import cn.celess.common.entity.Response;
+import cn.celess.common.entity.vo.TagModel;
+import cn.celess.common.service.TagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/30 20:36
+ */
+@RestController
+public class TagController {
+ @Autowired
+ TagService tagService;
+
+
+ @PostMapping("/admin/tag/create")
+ public Response addOne(@RequestParam("name") String name) {
+ return Response.success(tagService.create(name));
+ }
+
+ @DeleteMapping("/admin/tag/del")
+ public Response delOne(@RequestParam("id") long id) {
+ return Response.success(tagService.delete(id));
+ }
+
+
+ @PutMapping("/admin/tag/update")
+ public Response updateOne(@RequestParam("id") Long id, @RequestParam("name") String name) {
+ return Response.success(tagService.update(id, name));
+ }
+
+ @GetMapping("/tags")
+ public Response getPage(@RequestParam(required = false, defaultValue = "10", value = "count") int count,
+ @RequestParam(required = false, defaultValue = "1", value = "page") int page) {
+ return Response.success(tagService.retrievePage(page, count));
+ }
+
+ @GetMapping("/tags/nac")
+ public Response getTagNameAndCount() {
+ List> nameAndCount = new ArrayList<>();
+ List all = tagService.findAll();
+ for (TagModel t : all) {
+ Map map = new HashMap<>(2);
+ map.put("name", t.getName());
+ map.put("size", t.getArticles().size());
+ nameAndCount.add(map);
+ }
+ return Response.success(nameAndCount);
+ }
+
+}
diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/CategoryServiceImpl.java b/blog-categorytag/src/main/java/cn/celess/categorytag/serviceimpl/CategoryServiceImpl.java
similarity index 82%
rename from src/main/java/cn/celess/blog/service/serviceimpl/CategoryServiceImpl.java
rename to blog-categorytag/src/main/java/cn/celess/categorytag/serviceimpl/CategoryServiceImpl.java
index 61849a4..d1d02aa 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/CategoryServiceImpl.java
+++ b/blog-categorytag/src/main/java/cn/celess/categorytag/serviceimpl/CategoryServiceImpl.java
@@ -1,92 +1,92 @@
-package cn.celess.blog.service.serviceimpl;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.entity.Article;
-import cn.celess.blog.entity.Category;
-import cn.celess.blog.entity.model.ArticleModel;
-import cn.celess.blog.entity.model.CategoryModel;
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.exception.MyException;
-import cn.celess.blog.mapper.ArticleMapper;
-import cn.celess.blog.mapper.CategoryMapper;
-import cn.celess.blog.service.CategoryService;
-import cn.celess.blog.util.ModalTrans;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 22:43
- */
-@Service
-public class CategoryServiceImpl implements CategoryService {
- @Autowired
- CategoryMapper categoryMapper;
- @Autowired
- HttpServletRequest request;
- @Autowired
- ArticleMapper articleMapper;
-
- @Override
- public CategoryModel create(String name) {
- if (categoryMapper.existsByName(name)) {
- throw new MyException(ResponseEnum.CATEGORY_HAS_EXIST);
- }
- Category category = new Category();
- category.setName(name);
- categoryMapper.insert(category);
- return ModalTrans.category(category);
- }
-
- @Override
- public boolean delete(long id) {
- Category category = categoryMapper.findCategoryById(id);
- if (category == null) {
- throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
- }
- return categoryMapper.delete(id) == 1;
- }
-
- @Override
- public CategoryModel update(Long id, String name) {
- if (id == null) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR.getCode(), "id不可为空");
- }
- Category category = categoryMapper.findCategoryById(id);
- category.setName(name);
- categoryMapper.update(category);
- return ModalTrans.category(category);
- }
-
- @Override
- public PageData retrievePage(int page, int count) {
- PageHelper.startPage(page, count);
- List all = categoryMapper.findAll();
- // 遍历没一个category
- List modelList = all
- .stream()
- .map(ModalTrans::category)
- .peek(categoryModel -> {
- // 根据category去查article，并赋值给categoryModel
- List allByCategoryId = articleMapper.findAllByCategoryId(categoryModel.getId());
- List articleModelList = allByCategoryId
- .stream()
- .map(article -> ModalTrans.article(article, true))
- .peek(articleModel -> {
- // 去除不必要的字段
- articleModel.setPreArticle(null);
- articleModel.setNextArticle(null);
- articleModel.setTags(null);
- })
- .collect(Collectors.toList());
- categoryModel.setArticles(articleModelList);
- }).collect(Collectors.toList());
- return new PageData<>(new PageInfo<>(all), modelList);
- }
-}
+package cn.celess.categorytag.serviceimpl;
+
+import cn.celess.common.enmu.ResponseEnum;
+import cn.celess.common.entity.Article;
+import cn.celess.common.entity.Category;
+import cn.celess.common.entity.vo.ArticleModel;
+import cn.celess.common.entity.vo.CategoryModel;
+import cn.celess.common.entity.vo.PageData;
+import cn.celess.common.exception.MyException;
+import cn.celess.common.mapper.ArticleMapper;
+import cn.celess.common.mapper.CategoryMapper;
+import cn.celess.common.service.CategoryService;
+import cn.celess.common.util.ModalTrans;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 22:43
+ */
+@Service
+public class CategoryServiceImpl implements CategoryService {
+ @Autowired
+ CategoryMapper categoryMapper;
+ @Autowired
+ HttpServletRequest request;
+ @Autowired
+ ArticleMapper articleMapper;
+
+ @Override
+ public CategoryModel create(String name) {
+ if (categoryMapper.existsByName(name)) {
+ throw new MyException(ResponseEnum.CATEGORY_HAS_EXIST);
+ }
+ Category category = new Category();
+ category.setName(name);
+ categoryMapper.insert(category);
+ return ModalTrans.category(category);
+ }
+
+ @Override
+ public boolean delete(long id) {
+ Category category = categoryMapper.findCategoryById(id);
+ if (category == null) {
+ throw new MyException(ResponseEnum.CATEGORY_NOT_EXIST);
+ }
+ return categoryMapper.delete(id) == 1;
+ }
+
+ @Override
+ public CategoryModel update(Long id, String name) {
+ if (id == null) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR.getCode(), "id不可为空");
+ }
+ Category category = categoryMapper.findCategoryById(id);
+ category.setName(name);
+ categoryMapper.update(category);
+ return ModalTrans.category(category);
+ }
+
+ @Override
+ public PageData retrievePage(int page, int count) {
+ PageHelper.startPage(page, count);
+ List all = categoryMapper.findAll();
+ // 遍历没一个category
+ List modelList = all
+ .stream()
+ .map(ModalTrans::category)
+ .peek(categoryModel -> {
+ // 根据category去查article，并赋值给categoryModel
+ List allByCategoryId = articleMapper.findAllByCategoryId(categoryModel.getId());
+ List articleModelList = allByCategoryId
+ .stream()
+ .map(article -> ModalTrans.article(article, true))
+ .peek(articleModel -> {
+ // 去除不必要的字段
+ articleModel.setPreArticle(null);
+ articleModel.setNextArticle(null);
+ articleModel.setTags(null);
+ })
+ .collect(Collectors.toList());
+ categoryModel.setArticles(articleModelList);
+ }).collect(Collectors.toList());
+ return new PageData<>(new PageInfo<>(all), modelList);
+ }
+}
diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/TagServiceImpl.java b/blog-categorytag/src/main/java/cn/celess/categorytag/serviceimpl/TagServiceImpl.java
similarity index 81%
rename from src/main/java/cn/celess/blog/service/serviceimpl/TagServiceImpl.java
rename to blog-categorytag/src/main/java/cn/celess/categorytag/serviceimpl/TagServiceImpl.java
index 8b0d5d0..d699d56 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/TagServiceImpl.java
+++ b/blog-categorytag/src/main/java/cn/celess/categorytag/serviceimpl/TagServiceImpl.java
@@ -1,103 +1,103 @@
-package cn.celess.blog.service.serviceimpl;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.entity.ArticleTag;
-import cn.celess.blog.entity.Tag;
-import cn.celess.blog.entity.model.ArticleModel;
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.model.TagModel;
-import cn.celess.blog.exception.MyException;
-import cn.celess.blog.mapper.ArticleMapper;
-import cn.celess.blog.mapper.ArticleTagMapper;
-import cn.celess.blog.mapper.TagMapper;
-import cn.celess.blog.service.TagService;
-import cn.celess.blog.util.ModalTrans;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 22:29
- */
-@Service
-public class TagServiceImpl implements TagService {
- @Autowired
- TagMapper tagMapper;
- @Autowired
- HttpServletRequest request;
- @Autowired
- ArticleMapper articleMapper;
- @Autowired
- ArticleTagMapper articleTagMapper;
-
- @Override
- public TagModel create(String name) {
- boolean b = tagMapper.existsByName(name);
- if (b) {
- throw new MyException(ResponseEnum.TAG_HAS_EXIST);
- }
- Tag tag = new Tag();
- tag.setName(name);
- tagMapper.insert(tag);
- return ModalTrans.tag(tag);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public boolean delete(long tagId) {
- Tag tag = tagMapper.findTagById(tagId);
- if (tag == null) {
- throw new MyException(ResponseEnum.TAG_NOT_EXIST);
- }
- List articleByTag = articleTagMapper.findArticleByTag(tagId);
- // 删除文章
- articleByTag.forEach(articleTag -> articleMapper.delete(articleTag.getArticle().getId()));
- return tagMapper.delete(tagId) == 1;
- }
-
-
- @Override
- public TagModel update(Long id, String name) {
- if (id == null) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR.getCode(), "缺少ID");
- }
- Tag tag = tagMapper.findTagById(id);
- tag.setName(name);
- tagMapper.update(tag);
- return ModalTrans.tag(tag);
-
- }
-
- @Override
- public PageData retrievePage(int page, int count) {
- PageHelper.startPage(page, count);
- List tagList = tagMapper.findAll();
- List modelList = new ArrayList<>();
- tagList.forEach(tag -> modelList.add(ModalTrans.tag(tag)));
- return new PageData<>(new PageInfo<>(tagList), modelList);
- }
-
- @Override
- public List findAll() {
- return tagMapper.findAll().stream()
- .map(ModalTrans::tag)
- .peek(tagModel -> {
- List articleByTagAndOpen = articleTagMapper.findArticleByTagAndOpen(tagModel.getId());
- tagModel.setArticles(
- articleByTagAndOpen
- .stream()
- .map(articleTag -> ModalTrans.article(articleTag.getArticle(), true))
- .collect(Collectors.toList())
- );
- })
- .collect(Collectors.toList());
- }
-}
+package cn.celess.categorytag.serviceimpl;
+
+
+import cn.celess.common.enmu.ResponseEnum;
+import cn.celess.common.entity.ArticleTag;
+import cn.celess.common.entity.Tag;
+import cn.celess.common.entity.vo.PageData;
+import cn.celess.common.entity.vo.TagModel;
+import cn.celess.common.exception.MyException;
+import cn.celess.common.mapper.ArticleMapper;
+import cn.celess.common.mapper.ArticleTagMapper;
+import cn.celess.common.mapper.TagMapper;
+import cn.celess.common.service.TagService;
+import cn.celess.common.util.ModalTrans;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 22:29
+ */
+@Service
+public class TagServiceImpl implements TagService {
+ @Autowired
+ TagMapper tagMapper;
+ @Autowired
+ HttpServletRequest request;
+ @Autowired
+ ArticleMapper articleMapper;
+ @Autowired
+ ArticleTagMapper articleTagMapper;
+
+ @Override
+ public TagModel create(String name) {
+ boolean b = tagMapper.existsByName(name);
+ if (b) {
+ throw new MyException(ResponseEnum.TAG_HAS_EXIST);
+ }
+ Tag tag = new Tag();
+ tag.setName(name);
+ tagMapper.insert(tag);
+ return ModalTrans.tag(tag);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean delete(long tagId) {
+ Tag tag = tagMapper.findTagById(tagId);
+ if (tag == null) {
+ throw new MyException(ResponseEnum.TAG_NOT_EXIST);
+ }
+ List articleByTag = articleTagMapper.findArticleByTag(tagId);
+ // 删除文章
+ articleByTag.forEach(articleTag -> articleMapper.delete(articleTag.getArticle().getId()));
+ return tagMapper.delete(tagId) == 1;
+ }
+
+
+ @Override
+ public TagModel update(Long id, String name) {
+ if (id == null) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR.getCode(), "缺少ID");
+ }
+ Tag tag = tagMapper.findTagById(id);
+ tag.setName(name);
+ tagMapper.update(tag);
+ return ModalTrans.tag(tag);
+
+ }
+
+ @Override
+ public PageData retrievePage(int page, int count) {
+ PageHelper.startPage(page, count);
+ List tagList = tagMapper.findAll();
+ List modelList = new ArrayList<>();
+ tagList.forEach(tag -> modelList.add(ModalTrans.tag(tag)));
+ return new PageData<>(new PageInfo<>(tagList), modelList);
+ }
+
+ @Override
+ public List findAll() {
+ return tagMapper.findAll().stream()
+ .map(ModalTrans::tag)
+ .peek(tagModel -> {
+ List articleByTagAndOpen = articleTagMapper.findArticleByTagAndOpen(tagModel.getId());
+ tagModel.setArticles(
+ articleByTagAndOpen
+ .stream()
+ .map(articleTag -> ModalTrans.article(articleTag.getArticle(), true))
+ .collect(Collectors.toList())
+ );
+ })
+ .collect(Collectors.toList());
+ }
+}
diff --git a/blog-comment/pom.xml b/blog-comment/pom.xml
new file mode 100644
index 0000000..3c54d57
--- /dev/null
+++ b/blog-comment/pom.xml
@@ -0,0 +1,38 @@
+
+
+
+ blog
+ cn.celess
+ 0.0.1-SNAPSHOT
+
+ 4.0.0
+
+ blog-comment
+
+
+ 13
+ 13
+
+
+
+ cn.celess
+ blog-common
+ ${blog-common.version}
+
+
+
+ cn.celess
+ blog-user
+ ${blog-user.version}
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/cn/celess/blog/controller/CommentController.java b/blog-comment/src/main/java/cn/celess/comment/controller/CommentController.java
similarity index 93%
rename from src/main/java/cn/celess/blog/controller/CommentController.java
rename to blog-comment/src/main/java/cn/celess/comment/controller/CommentController.java
index 8841ef3..80103f8 100644
--- a/src/main/java/cn/celess/blog/controller/CommentController.java
+++ b/blog-comment/src/main/java/cn/celess/comment/controller/CommentController.java
@@ -1,119 +1,119 @@
-package cn.celess.blog.controller;
-
-import cn.celess.blog.entity.Response;
-import cn.celess.blog.entity.request.CommentReq;
-import cn.celess.blog.service.CommentService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-
-/**
- * @author : xiaohai
- * @date : 2019/03/30 20:37
- */
-@RestController
-public class CommentController {
- @Autowired
- CommentService commentService;
-
- /**
- * 新增一条评论数据
- *
- * @param reqBody 请求数据
- * @return Response
- */
- @PostMapping("/user/comment/create")
- public Response addOne(@RequestBody CommentReq reqBody) {
- return Response.success(commentService.create(reqBody));
- }
-
- @DeleteMapping("/user/comment/del")
- public Response delete(@RequestParam("id") long id) {
- return Response.success(commentService.delete(id));
- }
-
- @PutMapping("/user/comment/update")
- public Response update(@RequestBody CommentReq reqBody) {
- return Response.success(commentService.update(reqBody));
- }
-
- /**
- * 获取所有的评论
- *
- * @param pagePath pagePath
- * @param count 单页数据量
- * @param page 页码
- * @return Response
- */
- @GetMapping("/comments/{pagePath}/{pid}")
- public Response commentsOfArticle(@PathVariable("pagePath") String pagePath, @PathVariable(value = "pid") long pid,
- @RequestParam(value = "count", required = false, defaultValue = "10") int count,
- @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
- String path = "";
- if (pagePath.contains("article+")) {
- path = "article/" + pagePath.split("\\+", 2)[1];
- } else {
- path = pagePath;
- }
- if ("*".equals(pagePath)) {
- path = null;
- }
- return Response.success(commentService.retrievePageByPageAndPid(path, pid, page, count));
- }
-
- /**
- * 通过pid获取数据
- *
- * @param pagePath pagePath
- * @param count count
- * @param page page
- * @return Response
- */
- @GetMapping("/comment/pagePath/{pagePath}")
- public Response retrievePage(@PathVariable("pagePath") String pagePath,
- @RequestParam(value = "count", required = false, defaultValue = "10") int count,
- @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
- String path = "";
- if (pagePath.contains("article+")) {
- path = "article/" + pagePath.split("\\+", 2)[1];
- } else {
- path = pagePath;
- }
- if ("*".equals(pagePath)) {
- path = null;
- }
- return Response.success(commentService.retrievePage(path, page, count));
- }
-
- @GetMapping("/user/comment/pagePath/{pagePath}")
- public Response userComment(@PathVariable("pagePath") String pagePath,
- @RequestParam(value = "count", required = false, defaultValue = "10") int count,
- @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
- String path = "";
- if (pagePath.contains("article+")) {
- path = "article/" + pagePath.split("\\+", 2)[1];
- } else {
- path = pagePath;
- }
- if ("*".equals(pagePath)) {
- path = null;
- }
- return Response.success(commentService.retrievePageByAuthor(path, page, count));
- }
-
- @GetMapping("/admin/comment/pagePath/{pagePath}")
- public Response adminComment(@PathVariable("pagePath") String pagePath,
- @RequestParam(value = "count", required = false, defaultValue = "10") int count,
- @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
- String path = "";
- if (pagePath.contains("article+")) {
- path = "article/" + pagePath.split("\\+", 2)[1];
- } else {
- path = pagePath;
- }
- if ("*".equals(pagePath)) {
- path = null;
- }
- return Response.success(commentService.retrievePageByPage(path, page, count));
- }
-}
+package cn.celess.comment.controller;
+
+import cn.celess.common.entity.Response;
+import cn.celess.common.entity.dto.CommentReq;
+import cn.celess.common.service.CommentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/30 20:37
+ */
+@RestController
+public class CommentController {
+ @Autowired
+ CommentService commentService;
+
+ /**
+ * 新增一条评论数据
+ *
+ * @param reqBody 请求数据
+ * @return Response
+ */
+ @PostMapping("/user/comment/create")
+ public Response addOne(@RequestBody CommentReq reqBody) {
+ return Response.success(commentService.create(reqBody));
+ }
+
+ @DeleteMapping("/user/comment/del")
+ public Response delete(@RequestParam("id") long id) {
+ return Response.success(commentService.delete(id));
+ }
+
+ @PutMapping("/user/comment/update")
+ public Response update(@RequestBody CommentReq reqBody) {
+ return Response.success(commentService.update(reqBody));
+ }
+
+ /**
+ * 获取所有的评论
+ *
+ * @param pagePath pagePath
+ * @param count 单页数据量
+ * @param page 页码
+ * @return Response
+ */
+ @GetMapping("/comments/{pagePath}/{pid}")
+ public Response commentsOfArticle(@PathVariable("pagePath") String pagePath, @PathVariable(value = "pid") long pid,
+ @RequestParam(value = "count", required = false, defaultValue = "10") int count,
+ @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
+ String path = "";
+ if (pagePath.contains("article+")) {
+ path = "article/" + pagePath.split("\\+", 2)[1];
+ } else {
+ path = pagePath;
+ }
+ if ("*".equals(pagePath)) {
+ path = null;
+ }
+ return Response.success(commentService.retrievePageByPageAndPid(path, pid, page, count));
+ }
+
+ /**
+ * 通过pid获取数据
+ *
+ * @param pagePath pagePath
+ * @param count count
+ * @param page page
+ * @return Response
+ */
+ @GetMapping("/comment/pagePath/{pagePath}")
+ public Response retrievePage(@PathVariable("pagePath") String pagePath,
+ @RequestParam(value = "count", required = false, defaultValue = "10") int count,
+ @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
+ String path = "";
+ if (pagePath.contains("article+")) {
+ path = "article/" + pagePath.split("\\+", 2)[1];
+ } else {
+ path = pagePath;
+ }
+ if ("*".equals(pagePath)) {
+ path = null;
+ }
+ return Response.success(commentService.retrievePage(path, page, count));
+ }
+
+ @GetMapping("/user/comment/pagePath/{pagePath}")
+ public Response userComment(@PathVariable("pagePath") String pagePath,
+ @RequestParam(value = "count", required = false, defaultValue = "10") int count,
+ @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
+ String path = "";
+ if (pagePath.contains("article+")) {
+ path = "article/" + pagePath.split("\\+", 2)[1];
+ } else {
+ path = pagePath;
+ }
+ if ("*".equals(pagePath)) {
+ path = null;
+ }
+ return Response.success(commentService.retrievePageByAuthor(path, page, count));
+ }
+
+ @GetMapping("/admin/comment/pagePath/{pagePath}")
+ public Response adminComment(@PathVariable("pagePath") String pagePath,
+ @RequestParam(value = "count", required = false, defaultValue = "10") int count,
+ @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
+ String path = "";
+ if (pagePath.contains("article+")) {
+ path = "article/" + pagePath.split("\\+", 2)[1];
+ } else {
+ path = pagePath;
+ }
+ if ("*".equals(pagePath)) {
+ path = null;
+ }
+ return Response.success(commentService.retrievePageByPage(path, page, count));
+ }
+}
diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java b/blog-comment/src/main/java/cn/celess/comment/serviceimpl/CommentServiceImpl.java
similarity index 85%
rename from src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java
rename to blog-comment/src/main/java/cn/celess/comment/serviceimpl/CommentServiceImpl.java
index b58e706..1ac23d4 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java
+++ b/blog-comment/src/main/java/cn/celess/comment/serviceimpl/CommentServiceImpl.java
@@ -1,153 +1,152 @@
-package cn.celess.blog.service.serviceimpl;
-
-import cn.celess.blog.enmu.CommentStatusEnum;
-import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.entity.Comment;
-import cn.celess.blog.entity.User;
-import cn.celess.blog.entity.model.CommentModel;
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.request.CommentReq;
-import cn.celess.blog.exception.MyException;
-import cn.celess.blog.mapper.ArticleMapper;
-import cn.celess.blog.mapper.CommentMapper;
-import cn.celess.blog.mapper.UserMapper;
-import cn.celess.blog.service.CommentService;
-import cn.celess.blog.util.ModalTrans;
-import cn.celess.blog.util.RedisUserUtil;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/29 17:05
- */
-@Service
-public class CommentServiceImpl implements CommentService {
- @Autowired
- CommentMapper commentMapper;
- @Autowired
- UserMapper userMapper;
- @Autowired
- ArticleMapper articleMapper;
- @Autowired
- HttpServletRequest request;
- @Autowired
- RedisUserUtil redisUserUtil;
-
- @Override
- public CommentModel create(CommentReq reqBody) {
- if (reqBody == null) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- }
- User user = redisUserUtil.get();
- Comment pComment = null;
- if (reqBody.getPid() != -1) {
- pComment = commentMapper.findCommentById(reqBody.getPid());
- }
- //不是一级评论
- if (reqBody.getPid() != -1 && pComment == null) {
- //父评论不存在
- throw new MyException(ResponseEnum.PARAMETERS_ERROR);
- }
- Comment comment = new Comment();
- comment.setFromUser(user);
- User userTo = new User();
- userTo.setId(null);
- if (reqBody.getToUserId() != -1) {
- userTo = userMapper.findById(reqBody.getToUserId());
- comment.setToUser(userTo);
- }
- comment.setToUser(userTo);
- userMapper.findById(reqBody.getToUserId());
- BeanUtils.copyProperties(reqBody, comment);
- commentMapper.insert(comment);
- return ModalTrans.comment(commentMapper.findCommentById(comment.getId()));
- }
-
- @Override
- public boolean delete(long id) {
- Comment b = commentMapper.findCommentById(id);
- if (b == null) {
- throw new MyException(ResponseEnum.COMMENT_NOT_EXIST);
- }
- if (b.getStatus() == CommentStatusEnum.DELETED.getCode()) {
- throw new MyException(ResponseEnum.DATA_IS_DELETED);
- }
- commentMapper.delete(id);
- return true;
- }
-
- @Override
- public CommentModel update(CommentReq reqBody) {
- if (reqBody.getId() == null) {
- throw new MyException(ResponseEnum.PARAMETERS_ERROR.getCode(), "id不可为空");
- }
- Comment comment = commentMapper.findCommentById(reqBody.getId());
- if (!comment.getContent().equals(reqBody.getContent())) {
- commentMapper.updateContent(reqBody.getContent(), reqBody.getId());
- comment.setContent(reqBody.getContent());
- }
- return ModalTrans.comment(comment);
- }
-
- @Override
- public PageData retrievePage(String pagePath, int page, int count) {
- PageHelper.startPage(page, count);
- List list = commentMapper.findAllByPagePathAndPidAndNormal(pagePath, -1);
- return pageTrans(list);
- }
-
- @Override
- public List retrievePageByPid(long pid) {
- List allByPagePath = commentMapper.findAllByPid(pid);
- return allByPagePath
- .stream()
- .filter(comment -> comment.getStatus() != CommentStatusEnum.DELETED.getCode())
- .map(ModalTrans::comment)
- .collect(Collectors.toList());
- }
-
- @Override
- public PageData retrievePageByAuthor(String pagePath, int page, int count) {
- User user = redisUserUtil.get();
- PageHelper.startPage(page, count);
- List list = commentMapper.findAllByPagePathAndFromUser(pagePath, user.getId());
- return pageTrans(list);
- }
-
- @Override
- public PageData retrievePageByPageAndPid(String pagePath, long pid, int page, int count) {
- PageHelper.startPage(page, count);
- List list = commentMapper.findAllByPagePath(pagePath);
- return pageTrans(list, true);
- }
-
- @Override
- public PageData retrievePageByPage(String pagePath, int page, int count) {
- PageHelper.startPage(page, count);
- List list = commentMapper.findAllByPagePath(pagePath);
- return pageTrans(list, true);
- }
-
- private PageData pageTrans(List commentList) {
- return pageTrans(commentList, false);
- }
-
- private PageData pageTrans(List commentList, boolean noResponseList) {
- PageInfo p = PageInfo.of(commentList);
- List modelList = commentList
- .stream()
- .map(ModalTrans::comment)
- .peek(commentModel -> commentModel.setRespComment(this.retrievePageByPid(commentModel.getId())))
- .collect(Collectors.toList());
- return new PageData<>(p, modelList);
- }
-}
+package cn.celess.comment.serviceimpl;
+
+import cn.celess.common.enmu.CommentStatusEnum;
+import cn.celess.common.enmu.ResponseEnum;
+import cn.celess.common.entity.Comment;
+import cn.celess.common.entity.User;
+import cn.celess.common.entity.dto.CommentReq;
+import cn.celess.common.entity.vo.CommentModel;
+import cn.celess.common.entity.vo.PageData;
+import cn.celess.common.exception.MyException;
+import cn.celess.common.mapper.ArticleMapper;
+import cn.celess.common.mapper.CommentMapper;
+import cn.celess.common.mapper.UserMapper;
+import cn.celess.common.service.CommentService;
+import cn.celess.common.util.ModalTrans;
+import cn.celess.user.util.RedisUserUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/29 17:05
+ */
+@Service
+public class CommentServiceImpl implements CommentService {
+ @Autowired
+ CommentMapper commentMapper;
+ @Autowired
+ UserMapper userMapper;
+ @Autowired
+ ArticleMapper articleMapper;
+ @Autowired
+ HttpServletRequest request;
+ @Autowired
+ RedisUserUtil redisUserUtil;
+
+ @Override
+ public CommentModel create(CommentReq reqBody) {
+ if (reqBody == null) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ }
+ User user = redisUserUtil.get();
+ Comment pComment = null;
+ if (reqBody.getPid() != -1) {
+ pComment = commentMapper.findCommentById(reqBody.getPid());
+ }
+ //不是一级评论
+ if (reqBody.getPid() != -1 && pComment == null) {
+ //父评论不存在
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR);
+ }
+ Comment comment = new Comment();
+ comment.setFromUser(user);
+ User userTo = new User();
+ userTo.setId(null);
+ if (reqBody.getToUserId() != -1) {
+ userTo = userMapper.findById(reqBody.getToUserId());
+ comment.setToUser(userTo);
+ }
+ comment.setToUser(userTo);
+ userMapper.findById(reqBody.getToUserId());
+ BeanUtils.copyProperties(reqBody, comment);
+ commentMapper.insert(comment);
+ return ModalTrans.comment(commentMapper.findCommentById(comment.getId()));
+ }
+
+ @Override
+ public boolean delete(long id) {
+ Comment b = commentMapper.findCommentById(id);
+ if (b == null) {
+ throw new MyException(ResponseEnum.COMMENT_NOT_EXIST);
+ }
+ if (b.getStatus() == CommentStatusEnum.DELETED.getCode()) {
+ throw new MyException(ResponseEnum.DATA_IS_DELETED);
+ }
+ commentMapper.delete(id);
+ return true;
+ }
+
+ @Override
+ public CommentModel update(CommentReq reqBody) {
+ if (reqBody.getId() == null) {
+ throw new MyException(ResponseEnum.PARAMETERS_ERROR.getCode(), "id不可为空");
+ }
+ Comment comment = commentMapper.findCommentById(reqBody.getId());
+ if (!comment.getContent().equals(reqBody.getContent())) {
+ commentMapper.updateContent(reqBody.getContent(), reqBody.getId());
+ comment.setContent(reqBody.getContent());
+ }
+ return ModalTrans.comment(comment);
+ }
+
+ @Override
+ public PageData retrievePage(String pagePath, int page, int count) {
+ PageHelper.startPage(page, count);
+ List list = commentMapper.findAllByPagePathAndPidAndNormal(pagePath, -1);
+ return pageTrans(list);
+ }
+
+ @Override
+ public List retrievePageByPid(long pid) {
+ List allByPagePath = commentMapper.findAllByPid(pid);
+ return allByPagePath
+ .stream()
+ .filter(comment -> comment.getStatus() != CommentStatusEnum.DELETED.getCode())
+ .map(ModalTrans::comment)
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public PageData retrievePageByAuthor(String pagePath, int page, int count) {
+ User user = redisUserUtil.get();
+ PageHelper.startPage(page, count);
+ List list = commentMapper.findAllByPagePathAndFromUser(pagePath, user.getId());
+ return pageTrans(list);
+ }
+
+ @Override
+ public PageData retrievePageByPageAndPid(String pagePath, long pid, int page, int count) {
+ PageHelper.startPage(page, count);
+ List list = commentMapper.findAllByPagePath(pagePath);
+ return pageTrans(list, true);
+ }
+
+ @Override
+ public PageData retrievePageByPage(String pagePath, int page, int count) {
+ PageHelper.startPage(page, count);
+ List list = commentMapper.findAllByPagePath(pagePath);
+ return pageTrans(list, true);
+ }
+
+ private PageData pageTrans(List commentList) {
+ return pageTrans(commentList, false);
+ }
+
+ private PageData pageTrans(List commentList, boolean noResponseList) {
+ PageInfo p = PageInfo.of(commentList);
+ List modelList = commentList
+ .stream()
+ .map(ModalTrans::comment)
+ .peek(commentModel -> commentModel.setRespComment(this.retrievePageByPid(commentModel.getId())))
+ .collect(Collectors.toList());
+ return new PageData<>(p, modelList);
+ }
+}
diff --git a/blog-common/pom.xml b/blog-common/pom.xml
new file mode 100644
index 0000000..a39ee18
--- /dev/null
+++ b/blog-common/pom.xml
@@ -0,0 +1,91 @@
+
+
+
+ blog
+ cn.celess
+ 0.0.1-SNAPSHOT
+
+ 4.0.0
+
+ blog-common
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ mysql
+ mysql-connector-java
+ runtime
+
+
+
+
+ com.alibaba
+ druid
+ 1.2.6
+
+
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ 2.2.0
+
+
+
+
+ com.github.pagehelper
+ pagehelper-spring-boot-starter
+ 1.3.0
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-mail
+
+
+
+ com.qiniu
+ qiniu-java-sdk
+ [7.2.0, 7.2.99]
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+
+ net.sourceforge.htmlunit
+ htmlunit
+ 2.45.0
+
+
+
+
+
+ com.dyuproject.protostuff
+ protostuff-core
+ 1.1.6
+
+
+ com.dyuproject.protostuff
+ protostuff-runtime
+ 1.1.6
+
+
+
+
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
new file mode 100644
index 0000000..af2ddf1
--- /dev/null
+++ b/blog-common/src/main/java/cn/celess/common/config/MybatisConfig.java
@@ -0,0 +1,9 @@
+package cn.celess.common.config;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("cn.celess.common.mapper")
+public class MybatisConfig {
+}
diff --git a/src/main/java/cn/celess/blog/enmu/CommentStatusEnum.java b/blog-common/src/main/java/cn/celess/common/enmu/CommentStatusEnum.java
similarity index 92%
rename from src/main/java/cn/celess/blog/enmu/CommentStatusEnum.java
rename to blog-common/src/main/java/cn/celess/common/enmu/CommentStatusEnum.java
index 01ccbac..4bea80c 100644
--- a/src/main/java/cn/celess/blog/enmu/CommentStatusEnum.java
+++ b/blog-common/src/main/java/cn/celess/common/enmu/CommentStatusEnum.java
@@ -1,4 +1,4 @@
-package cn.celess.blog.enmu;
+package cn.celess.common.enmu;
import lombok.Getter;
diff --git a/src/main/java/cn/celess/blog/enmu/ResponseEnum.java b/blog-common/src/main/java/cn/celess/common/enmu/ResponseEnum.java
similarity index 96%
rename from src/main/java/cn/celess/blog/enmu/ResponseEnum.java
rename to blog-common/src/main/java/cn/celess/common/enmu/ResponseEnum.java
index 54bea45..728068e 100644
--- a/src/main/java/cn/celess/blog/enmu/ResponseEnum.java
+++ b/blog-common/src/main/java/cn/celess/common/enmu/ResponseEnum.java
@@ -1,96 +1,96 @@
-package cn.celess.blog.enmu;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 15:37
- */
-public enum ResponseEnum {
- // Response enum
-
- SUCCESS(0, "成功"),
- FAILURE(-1, "失败"),
- ERROR(-2, "错误"),
-
- DATA_IS_DELETED(1000, "数据已被删除"),
-
- //文章类
- ARTICLE_NOT_EXIST(2010, "文章不存在"),
- ARTICLE_HAS_EXIST(2020, "文章已存在"),
- ARTICLE_NOT_PUBLIC(2030, "文章暂未公开"),
- ARTICLE_NOT_BELONG_YOU(2040, "无权限操作别人的文章"),
-
- //用户类
- HAVE_NOT_LOG_IN(3010, "还未登录"),
- PERMISSION_ERROR(3020, "没有此权限"),
- USER_NOT_EXIST(3030, "用户不存在"),
- USERNAME_HAS_EXIST(3040, "用户名已存在"),
- USERNAME_TOO_SHORT(3050, "用户名太短"),
- PASSWORD_TOO_SHORT_OR_LONG(3060, "密码长度过长或者过短"),
- LOGIN_FAILURE(3100, "登录失败,用户名/密码不正确"),
- USEREMAIL_NULL(3310, "未设置邮箱"),
- USEREMAIL_NOT_VERIFY(3320, "邮箱未验证"),
- LOGIN_LATER(3500, "错误次数已达5次，请稍后再试"),
- PWD_SAME(3601, "新密码与原密码相同"),
- PWD_NOT_SAME(3602, "新密码与原密码不相同"),
- LOGIN_EXPIRED(3700, "登陆过期"),
- LOGOUT(3710, "账户已注销"),
- CAN_NOT_USE(3711, "账户不可用"),
- PWD_WRONG(3800, "密码不正确"),
-
- JWT_EXPIRED(3810, "Token过期"),
- JWT_MALFORMED(3820, "Token格式不对"),
- JWT_SIGNATURE(3830, "Token签名错误"),
- JWT_NOT_SUPPORT(3840, "不支持的Token"),
-
- //标签
- TAG_NOT_EXIST(4010, "标签不存在"),
- TAG_HAS_EXIST(4020, "标签已存在"),
-
- //分类
- CATEGORY_NOT_EXIST(5010, "分类不存在"),
- CATEGORY_HAS_EXIST(5020, "分类已存在"),
-
- //评论/留言
- COMMENT_NOT_EXIST(6010, "评论/留言不存在"),
- COMMENT_HAS_EXIST(6020, "评论/留言已存在,请不要重复提交"),
-
- //webUdpateInfo amd PartnerSite
- DATA_NOT_EXIST(7010, "数据不存在"),
- DATA_HAS_EXIST(7020, "数据已存在"),
-
- //其他
- APPLY_LINK_NO_ADD_THIS_SITE(7200, "暂未在您的网站中抓取到本站链接"),
- DATA_EXPIRED(7300, "数据过期"),
- CANNOT_GET_DATA(7400, "暂无法获取到数据"),
- NO_FILE(7500, "未选择文件，请重新选择"),
-
-
- //提交更新之前，没有获取数据/,
- DID_NOT_GET_THE_DATA(8020, "非法访问"),
- IMG_CODE_TIMEOUT(8100, "验证码已失效"),
- IMG_CODE_DIDNOTVERIFY(8200, "请先验证验证码"),
- VERIFY_ERROR(8300, "验证失败"),
- PARAMETERS_ERROR(8500, "参数错误"),
- PARAMETERS_URL_ERROR(8510, "链接格式错误"),
- PARAMETERS_EMAIL_ERROR(8520, "邮箱格式错误"),
- PARAMETERS_PHONE_ERROR(8530, "手机格式错误"),
- PARAMETERS_QQ_ERROR(8540, "QQ格式错误"),
- PARAMETERS_PWD_ERROR(8550, "密码格式错误"),
- VERIFY_OUT(8400, "已经验证过了");
- private final int code;
- private final String msg;
-
-
- ResponseEnum(int code, String msg) {
- this.code = code;
- this.msg = msg;
- }
-
- public int getCode() {
- return code;
- }
-
- public String getMsg() {
- return msg;
- }
-}
+package cn.celess.common.enmu;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 15:37
+ */
+public enum ResponseEnum {
+ // Response enum
+
+ SUCCESS(0, "成功"),
+ FAILURE(-1, "失败"),
+ ERROR(-2, "错误"),
+
+ DATA_IS_DELETED(1000, "数据已被删除"),
+
+ //文章类
+ ARTICLE_NOT_EXIST(2010, "文章不存在"),
+ ARTICLE_HAS_EXIST(2020, "文章已存在"),
+ ARTICLE_NOT_PUBLIC(2030, "文章暂未公开"),
+ ARTICLE_NOT_BELONG_YOU(2040, "无权限操作别人的文章"),
+
+ //用户类
+ HAVE_NOT_LOG_IN(3010, "还未登录"),
+ PERMISSION_ERROR(3020, "没有此权限"),
+ USER_NOT_EXIST(3030, "用户不存在"),
+ USERNAME_HAS_EXIST(3040, "用户名已存在"),
+ USERNAME_TOO_SHORT(3050, "用户名太短"),
+ PASSWORD_TOO_SHORT_OR_LONG(3060, "密码长度过长或者过短"),
+ LOGIN_FAILURE(3100, "登录失败,用户名/密码不正确"),
+ USEREMAIL_NULL(3310, "未设置邮箱"),
+ USEREMAIL_NOT_VERIFY(3320, "邮箱未验证"),
+ LOGIN_LATER(3500, "错误次数已达5次，请稍后再试"),
+ PWD_SAME(3601, "新密码与原密码相同"),
+ PWD_NOT_SAME(3602, "新密码与原密码不相同"),
+ LOGIN_EXPIRED(3700, "登陆过期"),
+ LOGOUT(3710, "账户已注销"),
+ CAN_NOT_USE(3711, "账户不可用"),
+ PWD_WRONG(3800, "密码不正确"),
+
+ JWT_EXPIRED(3810, "Token过期"),
+ JWT_MALFORMED(3820, "Token格式不对"),
+ JWT_SIGNATURE(3830, "Token签名错误"),
+ JWT_NOT_SUPPORT(3840, "不支持的Token"),
+
+ //标签
+ TAG_NOT_EXIST(4010, "标签不存在"),
+ TAG_HAS_EXIST(4020, "标签已存在"),
+
+ //分类
+ CATEGORY_NOT_EXIST(5010, "分类不存在"),
+ CATEGORY_HAS_EXIST(5020, "分类已存在"),
+
+ //评论/留言
+ COMMENT_NOT_EXIST(6010, "评论/留言不存在"),
+ COMMENT_HAS_EXIST(6020, "评论/留言已存在,请不要重复提交"),
+
+ //webUdpateInfo amd PartnerSite
+ DATA_NOT_EXIST(7010, "数据不存在"),
+ DATA_HAS_EXIST(7020, "数据已存在"),
+
+ //其他
+ APPLY_LINK_NO_ADD_THIS_SITE(7200, "暂未在您的网站中抓取到本站链接"),
+ DATA_EXPIRED(7300, "数据过期"),
+ CANNOT_GET_DATA(7400, "暂无法获取到数据"),
+ NO_FILE(7500, "未选择文件，请重新选择"),
+
+
+ //提交更新之前，没有获取数据/,
+ DID_NOT_GET_THE_DATA(8020, "非法访问"),
+ IMG_CODE_TIMEOUT(8100, "验证码已失效"),
+ IMG_CODE_DIDNOTVERIFY(8200, "请先验证验证码"),
+ VERIFY_ERROR(8300, "验证失败"),
+ PARAMETERS_ERROR(8500, "参数错误"),
+ PARAMETERS_URL_ERROR(8510, "链接格式错误"),
+ PARAMETERS_EMAIL_ERROR(8520, "邮箱格式错误"),
+ PARAMETERS_PHONE_ERROR(8530, "手机格式错误"),
+ PARAMETERS_QQ_ERROR(8540, "QQ格式错误"),
+ PARAMETERS_PWD_ERROR(8550, "密码格式错误"),
+ VERIFY_OUT(8400, "已经验证过了");
+ private final int code;
+ private final String msg;
+
+
+ ResponseEnum(int code, String msg) {
+ this.code = code;
+ this.msg = msg;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+}
diff --git a/src/main/java/cn/celess/blog/enmu/RoleEnum.java b/blog-common/src/main/java/cn/celess/common/enmu/RoleEnum.java
similarity index 91%
rename from src/main/java/cn/celess/blog/enmu/RoleEnum.java
rename to blog-common/src/main/java/cn/celess/common/enmu/RoleEnum.java
index 8f399f2..d64d7c0 100644
--- a/src/main/java/cn/celess/blog/enmu/RoleEnum.java
+++ b/blog-common/src/main/java/cn/celess/common/enmu/RoleEnum.java
@@ -1,4 +1,4 @@
-package cn.celess.blog.enmu;
+package cn.celess.common.enmu;
import lombok.Getter;
diff --git a/src/main/java/cn/celess/blog/enmu/UserAccountStatusEnum.java b/blog-common/src/main/java/cn/celess/common/enmu/UserAccountStatusEnum.java
similarity index 98%
rename from src/main/java/cn/celess/blog/enmu/UserAccountStatusEnum.java
rename to blog-common/src/main/java/cn/celess/common/enmu/UserAccountStatusEnum.java
index 31973e9..95250d3 100644
--- a/src/main/java/cn/celess/blog/enmu/UserAccountStatusEnum.java
+++ b/blog-common/src/main/java/cn/celess/common/enmu/UserAccountStatusEnum.java
@@ -1,4 +1,4 @@
-package cn.celess.blog.enmu;
+package cn.celess.common.enmu;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/src/main/java/cn/celess/blog/entity/Article.java b/blog-common/src/main/java/cn/celess/common/entity/Article.java
similarity index 88%
rename from src/main/java/cn/celess/blog/entity/Article.java
rename to blog-common/src/main/java/cn/celess/common/entity/Article.java
index e3f3e47..6b04551 100644
--- a/src/main/java/cn/celess/blog/entity/Article.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/Article.java
@@ -1,63 +1,64 @@
-package cn.celess.blog.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 14:51
- */
-@Data
-public class Article {
- private Long id;
-
- /**
- * 标题
- */
- private String title;
-
- /**
- * 摘要
- */
- private String summary;
-
- /**
- * Markdown正文
- */
- private String mdContent;
-
- /**
- * 文章类型 true(1)为原创 false(0)为转载
- */
- private Boolean type;
-
- /**
- * 若为转载 则为转载文章的url
- */
- private String url = null;
-
- private Date publishDate;
-
- private Date updateDate = null;
-
- private Long readingNumber;
-
- /**
- * 文章的状态 true：公开 false:不公开
- */
- private Boolean open;
-
- private Category category;
-
- private List tags;
-
- private Integer likeCount;
-
- private Integer dislikeCount;
-
- private User user;
-
- private boolean deleted = false;
-}
+package cn.celess.common.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 14:51
+ */
+@Data
+public class Article implements Serializable {
+ private Long id;
+
+ /**
+ * 标题
+ */
+ private String title;
+
+ /**
+ * 摘要
+ */
+ private String summary;
+
+ /**
+ * Markdown正文
+ */
+ private String mdContent;
+
+ /**
+ * 文章类型 true(1)为原创 false(0)为转载
+ */
+ private Boolean type;
+
+ /**
+ * 若为转载 则为转载文章的url
+ */
+ private String url = null;
+
+ private Date publishDate;
+
+ private Date updateDate = null;
+
+ private Long readingNumber;
+
+ /**
+ * 文章的状态 true：公开 false:不公开
+ */
+ private Boolean open;
+
+ private Category category;
+
+ private List tags;
+
+ private Integer likeCount;
+
+ private Integer dislikeCount;
+
+ private User user;
+
+ private boolean deleted = false;
+}
diff --git a/src/main/java/cn/celess/blog/entity/ArticleTag.java b/blog-common/src/main/java/cn/celess/common/entity/ArticleTag.java
similarity index 78%
rename from src/main/java/cn/celess/blog/entity/ArticleTag.java
rename to blog-common/src/main/java/cn/celess/common/entity/ArticleTag.java
index 6ba2184..d16da59 100644
--- a/src/main/java/cn/celess/blog/entity/ArticleTag.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/ArticleTag.java
@@ -1,9 +1,11 @@
-package cn.celess.blog.entity;
+package cn.celess.common.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
+
/**
* @Author: 小海
* @Date: 2020-05-24 14:52
@@ -12,7 +14,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class ArticleTag {
+public class ArticleTag implements Serializable {
private Long id;
private Article article;
diff --git a/src/main/java/cn/celess/blog/entity/Category.java b/blog-common/src/main/java/cn/celess/common/entity/Category.java
similarity index 58%
rename from src/main/java/cn/celess/blog/entity/Category.java
rename to blog-common/src/main/java/cn/celess/common/entity/Category.java
index 815f7aa..bb3405a 100644
--- a/src/main/java/cn/celess/blog/entity/Category.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/Category.java
@@ -1,13 +1,15 @@
-package cn.celess.blog.entity;
+package cn.celess.common.entity;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
+
/**
* @author : xiaohai
* @date : 2019/03/28 22:18
*/
@NoArgsConstructor
-public class Category extends TagCategory {
+public class Category extends TagCategory implements Serializable {
public Category(String name) {
super.setName(name);
}
diff --git a/src/main/java/cn/celess/blog/entity/Comment.java b/blog-common/src/main/java/cn/celess/common/entity/Comment.java
similarity index 78%
rename from src/main/java/cn/celess/blog/entity/Comment.java
rename to blog-common/src/main/java/cn/celess/common/entity/Comment.java
index 0651111..8cd059a 100644
--- a/src/main/java/cn/celess/blog/entity/Comment.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/Comment.java
@@ -1,34 +1,35 @@
-package cn.celess.blog.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/29 16:47
- */
-
-@Data
-public class Comment {
-
- private Long id;
-
- private int status;
-
- private String pagePath;
-
- private String content;
-
- private Date date;
-
- private User fromUser;
-
- private User toUser;
- /**
- * 评论的父ID
- */
- private Long pid;
-
- // private boolean delete;
-}
+package cn.celess.common.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/29 16:47
+ */
+
+@Data
+public class Comment implements Serializable {
+
+ private Long id;
+
+ private int status;
+
+ private String pagePath;
+
+ private String content;
+
+ private Date date;
+
+ private User fromUser;
+
+ private User toUser;
+ /**
+ * 评论的父ID
+ */
+ private Long pid;
+
+ // private boolean delete;
+}
diff --git a/src/main/java/cn/celess/blog/entity/PartnerSite.java b/blog-common/src/main/java/cn/celess/common/entity/PartnerSite.java
similarity index 82%
rename from src/main/java/cn/celess/blog/entity/PartnerSite.java
rename to blog-common/src/main/java/cn/celess/common/entity/PartnerSite.java
index 87a26e2..48ad50f 100644
--- a/src/main/java/cn/celess/blog/entity/PartnerSite.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/PartnerSite.java
@@ -1,40 +1,42 @@
-package cn.celess.blog.entity;
-
-import lombok.Data;
-
-/**
- * 友链
- *
- * @author : xiaohai
- * @date : 2019/05/12 11:33
- */
-@Data
-public class PartnerSite {
-
- private Long id;
-
- private String name;
-
- private String url;
-
- private Boolean open;
-
- private String iconPath;
-
- private String desc;
-
- private Boolean delete = false;
-
- private String email;
-
- private Boolean notification = true;
-
- public PartnerSite() {
- }
-
- public PartnerSite(String name, String url, Boolean open) {
- this.name = name;
- this.url = url;
- this.open = open;
- }
-}
+package cn.celess.common.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 友链
+ *
+ * @author : xiaohai
+ * @date : 2019/05/12 11:33
+ */
+@Data
+public class PartnerSite implements Serializable {
+
+ private Long id;
+
+ private String name;
+
+ private String url;
+
+ private Boolean open;
+
+ private String iconPath;
+
+ private String desc;
+
+ private Boolean delete = false;
+
+ private String email;
+
+ private Boolean notification = true;
+
+ public PartnerSite() {
+ }
+
+ public PartnerSite(String name, String url, Boolean open) {
+ this.name = name;
+ this.url = url;
+ this.open = open;
+ }
+}
diff --git a/src/main/java/cn/celess/blog/entity/Response.java b/blog-common/src/main/java/cn/celess/common/entity/Response.java
similarity index 91%
rename from src/main/java/cn/celess/blog/entity/Response.java
rename to blog-common/src/main/java/cn/celess/common/entity/Response.java
index eec624c..3cad8ea 100644
--- a/src/main/java/cn/celess/blog/entity/Response.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/Response.java
@@ -1,65 +1,65 @@
-package cn.celess.blog.entity;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Data;
-import lombok.SneakyThrows;
-
-import java.io.Serializable;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 15:24
- */
-@Data
-public class Response implements Serializable {
- private int code;
- private String msg;
- private T result;
-
- public Response() {
- }
-
- public Response(int code, String msg, T result) {
- this.code = code;
- this.msg = msg;
- this.result = result;
- }
-
- /**
- * 成功相应
- *
- * @param result 结果
- * @return Response
- */
- public static Response success(T result) {
- return new Response(ResponseEnum.SUCCESS.getCode(), ResponseEnum.SUCCESS.getMsg(), result);
- }
-
- /**
- * 失败的响应
- *
- * @param result 结果
- * @return Response
- */
- public static Response failure(String result) {
- return new Response(ResponseEnum.FAILURE.getCode(), ResponseEnum.FAILURE.getMsg(), result);
- }
-
- /**
- * 其他的响应
- *
- * @param r 枚举常量
- * @param result 结果
- * @return Response
- */
- public static Response response(ResponseEnum r, T result) {
- return new Response(r.getCode(), r.getMsg(), result);
- }
-
- @SneakyThrows
- @Override
- public String toString() {
- return new ObjectMapper().writeValueAsString(this);
- }
-}
+package cn.celess.common.entity;
+
+import cn.celess.common.enmu.ResponseEnum;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Data;
+import lombok.SneakyThrows;
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 15:24
+ */
+@Data
+public class Response implements Serializable {
+ private int code;
+ private String msg;
+ private T result;
+
+ public Response() {
+ }
+
+ public Response(int code, String msg, T result) {
+ this.code = code;
+ this.msg = msg;
+ this.result = result;
+ }
+
+ /**
+ * 成功相应
+ *
+ * @param result 结果
+ * @return Response
+ */
+ public static Response success(T result) {
+ return new Response(ResponseEnum.SUCCESS.getCode(), ResponseEnum.SUCCESS.getMsg(), result);
+ }
+
+ /**
+ * 失败的响应
+ *
+ * @param result 结果
+ * @return Response
+ */
+ public static Response failure(String result) {
+ return new Response(ResponseEnum.FAILURE.getCode(), ResponseEnum.FAILURE.getMsg(), result);
+ }
+
+ /**
+ * 其他的响应
+ *
+ * @param r 枚举常量
+ * @param result 结果
+ * @return Response
+ */
+ public static Response response(ResponseEnum r, T result) {
+ return new Response(r.getCode(), r.getMsg(), result);
+ }
+
+ @SneakyThrows
+ @Override
+ public String toString() {
+ return new ObjectMapper().writeValueAsString(this);
+ }
+}
diff --git a/src/main/java/cn/celess/blog/entity/Tag.java b/blog-common/src/main/java/cn/celess/common/entity/Tag.java
similarity index 58%
rename from src/main/java/cn/celess/blog/entity/Tag.java
rename to blog-common/src/main/java/cn/celess/common/entity/Tag.java
index e120cd0..1875d4e 100644
--- a/src/main/java/cn/celess/blog/entity/Tag.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/Tag.java
@@ -1,13 +1,15 @@
-package cn.celess.blog.entity;
+package cn.celess.common.entity;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
+
/**
* @author : xiaohai
* @date : 2019/03/28 22:19
*/
@NoArgsConstructor
-public class Tag extends TagCategory {
+public class Tag extends TagCategory implements Serializable {
public Tag(String name) {
super.setName(name);
diff --git a/src/main/java/cn/celess/blog/entity/TagCategory.java b/blog-common/src/main/java/cn/celess/common/entity/TagCategory.java
similarity index 65%
rename from src/main/java/cn/celess/blog/entity/TagCategory.java
rename to blog-common/src/main/java/cn/celess/common/entity/TagCategory.java
index 78ec3ed..2222f87 100644
--- a/src/main/java/cn/celess/blog/entity/TagCategory.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/TagCategory.java
@@ -1,14 +1,16 @@
-package cn.celess.blog.entity;
+package cn.celess.common.entity;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Author: 小海
* @Date: 2020-05-24 14:03
* @Desc:
*/
@Data
-public class TagCategory {
+public class TagCategory implements Serializable {
private Long id;
private String name;
diff --git a/src/main/java/cn/celess/blog/entity/User.java b/blog-common/src/main/java/cn/celess/common/entity/User.java
similarity index 87%
rename from src/main/java/cn/celess/blog/entity/User.java
rename to blog-common/src/main/java/cn/celess/common/entity/User.java
index f912025..741564e 100644
--- a/src/main/java/cn/celess/blog/entity/User.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/User.java
@@ -1,53 +1,54 @@
-package cn.celess.blog.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 14:52
- */
-@Data
-@NoArgsConstructor
-public class User {
- private Long id;
-
- /**
- * 邮箱
- */
- private String email;
-
- /**
- * 密码
- */
- @JsonIgnore
- private String pwd;
-
- /**
- * 昵称
- */
- private String displayName;
-
- private Boolean emailStatus = false;
-
- /**
- * 头像地址
- */
- private String avatarImgUrl;
-
- private String desc;
-
- private Date recentlyLandedDate;
-
- private String role = "user";
-
- private int status;
-
- public User(String email, String pwd) {
- this.email = email;
- this.pwd = pwd;
- }
-}
+package cn.celess.common.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 14:52
+ */
+@Data
+@NoArgsConstructor
+public class User implements Serializable {
+ private Long id;
+
+ /**
+ * 邮箱
+ */
+ private String email;
+
+ /**
+ * 密码
+ */
+ @JsonIgnore
+ private String pwd;
+
+ /**
+ * 昵称
+ */
+ private String displayName;
+
+ private Boolean emailStatus = false;
+
+ /**
+ * 头像地址
+ */
+ private String avatarImgUrl;
+
+ private String desc;
+
+ private Date recentlyLandedDate;
+
+ private String role = "user";
+
+ private int status;
+
+ public User(String email, String pwd) {
+ this.email = email;
+ this.pwd = pwd;
+ }
+}
diff --git a/src/main/java/cn/celess/blog/entity/Visitor.java b/blog-common/src/main/java/cn/celess/common/entity/Visitor.java
similarity index 78%
rename from src/main/java/cn/celess/blog/entity/Visitor.java
rename to blog-common/src/main/java/cn/celess/common/entity/Visitor.java
index 5767cf1..01eb14d 100644
--- a/src/main/java/cn/celess/blog/entity/Visitor.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/Visitor.java
@@ -1,28 +1,29 @@
-package cn.celess.blog.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author : xiaohai
- * @date : 2019/04/02 22:14
- */
-@Data
-public class Visitor {
-
- private long id;
- private String ip;
- private Date date;
- private String ua;
- private boolean delete;
-
- public Visitor(String ip, Date date, String ua) {
- this.ip = ip;
- this.date = date;
- this.ua = ua;
- }
-
- public Visitor() {
- }
-}
+package cn.celess.common.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/02 22:14
+ */
+@Data
+public class Visitor implements Serializable {
+
+ private long id;
+ private String ip;
+ private Date date;
+ private String ua;
+ private boolean delete;
+
+ public Visitor(String ip, Date date, String ua) {
+ this.ip = ip;
+ this.date = date;
+ this.ua = ua;
+ }
+
+ public Visitor() {
+ }
+}
diff --git a/src/main/java/cn/celess/blog/entity/WebUpdate.java b/blog-common/src/main/java/cn/celess/common/entity/WebUpdate.java
similarity index 75%
rename from src/main/java/cn/celess/blog/entity/WebUpdate.java
rename to blog-common/src/main/java/cn/celess/common/entity/WebUpdate.java
index 4e2a99e..54814ad 100644
--- a/src/main/java/cn/celess/blog/entity/WebUpdate.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/WebUpdate.java
@@ -1,28 +1,29 @@
-package cn.celess.blog.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author : xiaohai
- * @date : 2019/05/12 11:29
- */
-@Data
-public class WebUpdate {
-
- private long id;
-
- private String updateInfo;
-
- private Date updateTime;
-
- private boolean delete;
-
- public WebUpdate() {
- }
-
- public WebUpdate(String updateInfo) {
- this.updateInfo = updateInfo;
- }
-}
+package cn.celess.common.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/05/12 11:29
+ */
+@Data
+public class WebUpdate implements Serializable {
+
+ private long id;
+
+ private String updateInfo;
+
+ private Date updateTime;
+
+ private boolean delete;
+
+ public WebUpdate() {
+ }
+
+ public WebUpdate(String updateInfo) {
+ this.updateInfo = updateInfo;
+ }
+}
diff --git a/src/main/java/cn/celess/blog/entity/request/ArticleReq.java b/blog-common/src/main/java/cn/celess/common/entity/dto/ArticleReq.java
similarity index 72%
rename from src/main/java/cn/celess/blog/entity/request/ArticleReq.java
rename to blog-common/src/main/java/cn/celess/common/entity/dto/ArticleReq.java
index e1312b4..d4c9ee7 100644
--- a/src/main/java/cn/celess/blog/entity/request/ArticleReq.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/dto/ArticleReq.java
@@ -1,19 +1,21 @@
-package cn.celess.blog.entity.request;
-
-import lombok.Data;
-
-/**
- * @author : xiaohai
- * @date : 2019/06/01 22:46
- */
-@Data
-public class ArticleReq {
- private Long id;
- private String title;
- private String mdContent;
- private String[] tags;
- private Boolean type;
- private String url;
- private String category;
- private Boolean open = true;
-}
+package cn.celess.common.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/06/01 22:46
+ */
+@Data
+public class ArticleReq implements Serializable {
+ private Long id;
+ private String title;
+ private String mdContent;
+ private String[] tags;
+ private Boolean type;
+ private String url;
+ private String category;
+ private Boolean open = true;
+}
diff --git a/src/main/java/cn/celess/blog/entity/request/CommentReq.java b/blog-common/src/main/java/cn/celess/common/entity/dto/CommentReq.java
similarity index 65%
rename from src/main/java/cn/celess/blog/entity/request/CommentReq.java
rename to blog-common/src/main/java/cn/celess/common/entity/dto/CommentReq.java
index c322326..e730acc 100644
--- a/src/main/java/cn/celess/blog/entity/request/CommentReq.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/dto/CommentReq.java
@@ -1,16 +1,18 @@
-package cn.celess.blog.entity.request;
-
-import lombok.Data;
-
-/**
- * @author : xiaohai
- * @date : 2019/06/02 10:35
- */
-@Data
-public class CommentReq {
- private Long id;
- private String content;
- private long pid = -1;
- private String pagePath;
- private long toUserId = -1;
-}
+package cn.celess.common.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/06/02 10:35
+ */
+@Data
+public class CommentReq implements Serializable {
+ private Long id;
+ private String content;
+ private long pid = -1;
+ private String pagePath;
+ private long toUserId = -1;
+}
diff --git a/src/main/java/cn/celess/blog/entity/request/LinkApplyReq.java b/blog-common/src/main/java/cn/celess/common/entity/dto/LinkApplyReq.java
similarity index 67%
rename from src/main/java/cn/celess/blog/entity/request/LinkApplyReq.java
rename to blog-common/src/main/java/cn/celess/common/entity/dto/LinkApplyReq.java
index 910332b..cfca015 100644
--- a/src/main/java/cn/celess/blog/entity/request/LinkApplyReq.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/dto/LinkApplyReq.java
@@ -1,13 +1,15 @@
-package cn.celess.blog.entity.request;
+package cn.celess.common.entity.dto;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @author : xiaohai
* @date : 2020/07/31 20:50
*/
@Data
-public class LinkApplyReq {
+public class LinkApplyReq implements Serializable {
private String name;
private String email;
private String url;
diff --git a/src/main/java/cn/celess/blog/entity/request/LinkReq.java b/blog-common/src/main/java/cn/celess/common/entity/dto/LinkReq.java
similarity index 67%
rename from src/main/java/cn/celess/blog/entity/request/LinkReq.java
rename to blog-common/src/main/java/cn/celess/common/entity/dto/LinkReq.java
index e7ed027..aa2b05b 100644
--- a/src/main/java/cn/celess/blog/entity/request/LinkReq.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/dto/LinkReq.java
@@ -1,17 +1,19 @@
-package cn.celess.blog.entity.request;
-
-import lombok.Data;
-
-/**
- * @author : xiaohai
- * @date : 2019/06/02 11:40
- */
-@Data
-public class LinkReq {
- private long id;
- private String name;
- private String url;
- private String iconPath;
- private String desc;
- private boolean open;
-}
+package cn.celess.common.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/06/02 11:40
+ */
+@Data
+public class LinkReq implements Serializable {
+ private long id;
+ private String name;
+ private String url;
+ private String iconPath;
+ private String desc;
+ private boolean open;
+}
diff --git a/src/main/java/cn/celess/blog/entity/request/LoginReq.java b/blog-common/src/main/java/cn/celess/common/entity/dto/LoginReq.java
similarity index 74%
rename from src/main/java/cn/celess/blog/entity/request/LoginReq.java
rename to blog-common/src/main/java/cn/celess/common/entity/dto/LoginReq.java
index 0ea98c1..efef7ea 100644
--- a/src/main/java/cn/celess/blog/entity/request/LoginReq.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/dto/LoginReq.java
@@ -1,23 +1,25 @@
-package cn.celess.blog.entity.request;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author : xiaohai
- * @date : 2019/06/01 22:47
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class LoginReq {
- private String email;
- private String password;
- /**
- * isRememberMe默认为false
- */
- private Boolean isRememberMe = false;
-
-}
-
+package cn.celess.common.entity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/06/01 22:47
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoginReq implements Serializable {
+ private String email;
+ private String password;
+ /**
+ * isRememberMe默认为false
+ */
+ private Boolean isRememberMe = false;
+
+}
+
diff --git a/src/main/java/cn/celess/blog/entity/request/UserReq.java b/blog-common/src/main/java/cn/celess/common/entity/dto/UserReq.java
similarity index 72%
rename from src/main/java/cn/celess/blog/entity/request/UserReq.java
rename to blog-common/src/main/java/cn/celess/common/entity/dto/UserReq.java
index 5bbad0b..5eae376 100644
--- a/src/main/java/cn/celess/blog/entity/request/UserReq.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/dto/UserReq.java
@@ -1,26 +1,28 @@
-package cn.celess.blog.entity.request;
-
-import lombok.Data;
-
-/**
- * @Author: 小海
- * @Date： 2019/09/06 13:33
- * @Description：
- */
-@Data
-public class UserReq {
- private Long id;
-
- private String email;
-
- private String pwd;
-
- private String displayName;
-
- private Boolean emailStatus;
-
- private String desc;
-
- private String role;
-
-}
+package cn.celess.common.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/09/06 13:33
+ * @Description：
+ */
+@Data
+public class UserReq implements Serializable {
+ private Long id;
+
+ private String email;
+
+ private String pwd;
+
+ private String displayName;
+
+ private Boolean emailStatus;
+
+ private String desc;
+
+ private String role;
+
+}
diff --git a/src/main/java/cn/celess/blog/entity/model/ArticleModel.java b/blog-common/src/main/java/cn/celess/common/entity/vo/ArticleModel.java
similarity index 86%
rename from src/main/java/cn/celess/blog/entity/model/ArticleModel.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/ArticleModel.java
index ef74da9..2f54c60 100644
--- a/src/main/java/cn/celess/blog/entity/model/ArticleModel.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/ArticleModel.java
@@ -1,87 +1,88 @@
-package cn.celess.blog.entity.model;
-
-import cn.celess.blog.entity.Tag;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @author : xiaohai
- * @date : 2019/04/23 12:02
- */
-@Getter
-@Setter
-public class ArticleModel {
- private Long id;
-
- /**
- * 标题
- */
- private String title;
-
- /**
- * 摘要
- */
- private String summary;
-
- /**
- * Markdown正文
- */
- private String mdContent;
-
- /**
- * 文章类型 true(1)为原创 false(0)为转载
- */
- private Boolean original;
-
- /**
- * 若为转载 则为转载文章的url
- */
- private String url;
-
- /**
- * 发布时间
- */
- private String publishDateFormat;
-
- /**
- * 更新时间
- */
- private String updateDateFormat;
-
- /**
- * 分类
- */
- private String category;
-
- /**
- * 标签
- */
- private List tags;
-
- /**
- * 作者
- */
- private UserModel author;
-
- private ArticleModel preArticle;
-
- private ArticleModel nextArticle;
-
- /**
- * 阅读数
- */
- private Long readingNumber;
-
- private Integer likeCount;
-
- private Integer dislikeCount;
-
- /**
- * 文章的状态 true：公开 false:不公开
- */
- private Boolean open;
-
- private boolean deleted;
-}
+package cn.celess.common.entity.vo;
+
+import cn.celess.common.entity.Tag;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/23 12:02
+ */
+@Getter
+@Setter
+public class ArticleModel implements Serializable {
+ private Long id;
+
+ /**
+ * 标题
+ */
+ private String title;
+
+ /**
+ * 摘要
+ */
+ private String summary;
+
+ /**
+ * Markdown正文
+ */
+ private String mdContent;
+
+ /**
+ * 文章类型 true(1)为原创 false(0)为转载
+ */
+ private Boolean original;
+
+ /**
+ * 若为转载 则为转载文章的url
+ */
+ private String url;
+
+ /**
+ * 发布时间
+ */
+ private String publishDateFormat;
+
+ /**
+ * 更新时间
+ */
+ private String updateDateFormat;
+
+ /**
+ * 分类
+ */
+ private String category;
+
+ /**
+ * 标签
+ */
+ private List tags;
+
+ /**
+ * 作者
+ */
+ private UserModel author;
+
+ private ArticleModel preArticle;
+
+ private ArticleModel nextArticle;
+
+ /**
+ * 阅读数
+ */
+ private Long readingNumber;
+
+ private Integer likeCount;
+
+ private Integer dislikeCount;
+
+ /**
+ * 文章的状态 true：公开 false:不公开
+ */
+ private Boolean open;
+
+ private boolean deleted;
+}
diff --git a/src/main/java/cn/celess/blog/entity/model/CategoryModel.java b/blog-common/src/main/java/cn/celess/common/entity/vo/CategoryModel.java
similarity index 74%
rename from src/main/java/cn/celess/blog/entity/model/CategoryModel.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/CategoryModel.java
index 1af5bd4..21ae276 100644
--- a/src/main/java/cn/celess/blog/entity/model/CategoryModel.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/CategoryModel.java
@@ -1,9 +1,10 @@
-package cn.celess.blog.entity.model;
+package cn.celess.common.entity.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.List;
/**
@@ -14,7 +15,7 @@ import java.util.List;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class CategoryModel {
+public class CategoryModel implements Serializable {
private Long id;
private String name;
diff --git a/src/main/java/cn/celess/blog/entity/model/CommentModel.java b/blog-common/src/main/java/cn/celess/common/entity/vo/CommentModel.java
similarity index 82%
rename from src/main/java/cn/celess/blog/entity/model/CommentModel.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/CommentModel.java
index ad9de7b..03bc402 100644
--- a/src/main/java/cn/celess/blog/entity/model/CommentModel.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/CommentModel.java
@@ -1,44 +1,45 @@
-package cn.celess.blog.entity.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @author : xiaohai
- * @date : 2019/04/22 21:50
- */
-@Setter
-@Getter
-public class CommentModel {
- private long id;
-
- private UserModel fromUser;
-
- private UserModel toUser;
-
- /**
- * 内容
- */
- private String content;
-
- /**
- * 文章标题
- */
- private String pagePath;
-
- /**
- * 发布日期
- */
- private String date;
-
- /**
- * 评论的父ID
- */
- private Long pid;
-
- private List respComment;
-
- private int status;
-}
+package cn.celess.common.entity.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/22 21:50
+ */
+@Setter
+@Getter
+public class CommentModel implements Serializable {
+ private long id;
+
+ private UserModel fromUser;
+
+ private UserModel toUser;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 文章标题
+ */
+ private String pagePath;
+
+ /**
+ * 发布日期
+ */
+ private String date;
+
+ /**
+ * 评论的父ID
+ */
+ private Long pid;
+
+ private List respComment;
+
+ private int status;
+}
diff --git a/src/main/java/cn/celess/blog/entity/model/PageData.java b/blog-common/src/main/java/cn/celess/common/entity/vo/PageData.java
similarity index 85%
rename from src/main/java/cn/celess/blog/entity/model/PageData.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/PageData.java
index 5e75273..f3a08f3 100644
--- a/src/main/java/cn/celess/blog/entity/model/PageData.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/PageData.java
@@ -1,10 +1,11 @@
-package cn.celess.blog.entity.model;
+package cn.celess.common.entity.vo;
import com.github.pagehelper.PageInfo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.List;
/**
@@ -15,7 +16,7 @@ import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class PageData {
+public class PageData implements Serializable {
private List list;
diff --git a/src/main/java/cn/celess/blog/entity/model/QiniuResponse.java b/blog-common/src/main/java/cn/celess/common/entity/vo/QiniuResponse.java
similarity index 56%
rename from src/main/java/cn/celess/blog/entity/model/QiniuResponse.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/QiniuResponse.java
index 2048f14..1a7a696 100644
--- a/src/main/java/cn/celess/blog/entity/model/QiniuResponse.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/QiniuResponse.java
@@ -1,13 +1,15 @@
-package cn.celess.blog.entity.model;
-
-
-/**
- * @author : xiaohai
- * @date : 2019/04/21 22:43
- */
-public class QiniuResponse {
- public String key;
- public String hash;
- public String bucket;
- public long fsize;
-}
+package cn.celess.common.entity.vo;
+
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/21 22:43
+ */
+public class QiniuResponse implements Serializable {
+ public String key;
+ public String hash;
+ public String bucket;
+ public long fsize;
+}
diff --git a/src/main/java/cn/celess/blog/entity/model/TagModel.java b/blog-common/src/main/java/cn/celess/common/entity/vo/TagModel.java
similarity index 75%
rename from src/main/java/cn/celess/blog/entity/model/TagModel.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/TagModel.java
index c3d7265..8f556fe 100644
--- a/src/main/java/cn/celess/blog/entity/model/TagModel.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/TagModel.java
@@ -1,9 +1,10 @@
-package cn.celess.blog.entity.model;
+package cn.celess.common.entity.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.List;
/**
@@ -14,7 +15,7 @@ import java.util.List;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TagModel {
+public class TagModel implements Serializable {
private Long id;
private String name;
diff --git a/src/main/java/cn/celess/blog/entity/model/UserModel.java b/blog-common/src/main/java/cn/celess/common/entity/vo/UserModel.java
similarity index 76%
rename from src/main/java/cn/celess/blog/entity/model/UserModel.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/UserModel.java
index cc925fd..52cb692 100644
--- a/src/main/java/cn/celess/blog/entity/model/UserModel.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/UserModel.java
@@ -1,43 +1,45 @@
-package cn.celess.blog.entity.model;
-
-import cn.celess.blog.enmu.UserAccountStatusEnum;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author : xiaohai
- * @date : 2019/04/22 23:13
- */
-@Getter
-@Setter
-public class UserModel {
-
- private Long id;
-
- /**
- * 邮箱
- */
- private String email;
-
- /**
- * 昵称
- */
- private String displayName;
-
- private Boolean emailStatus = false;
-
- /**
- * 头像地址
- */
- private String avatarImgUrl;
-
- private String desc;
-
- private String recentlyLandedDate;
-
- private String role = "user";
-
- private String token;
-
- private UserAccountStatusEnum status;
-}
+package cn.celess.common.entity.vo;
+
+import cn.celess.common.enmu.UserAccountStatusEnum;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/22 23:13
+ */
+@Getter
+@Setter
+public class UserModel implements Serializable {
+
+ private Long id;
+
+ /**
+ * 邮箱
+ */
+ private String email;
+
+ /**
+ * 昵称
+ */
+ private String displayName;
+
+ private Boolean emailStatus = false;
+
+ /**
+ * 头像地址
+ */
+ private String avatarImgUrl;
+
+ private String desc;
+
+ private String recentlyLandedDate;
+
+ private String role = "user";
+
+ private String token;
+
+ private UserAccountStatusEnum status;
+}
diff --git a/src/main/java/cn/celess/blog/entity/model/VisitorModel.java b/blog-common/src/main/java/cn/celess/common/entity/vo/VisitorModel.java
similarity index 70%
rename from src/main/java/cn/celess/blog/entity/model/VisitorModel.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/VisitorModel.java
index 6afd55c..578ae02 100644
--- a/src/main/java/cn/celess/blog/entity/model/VisitorModel.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/VisitorModel.java
@@ -1,24 +1,26 @@
-package cn.celess.blog.entity.model;
-
-import lombok.Data;
-
-/**
- * @author : xiaohai
- * @date : 2019/05/05 16:05
- */
-@Data
-public class VisitorModel {
- private long id;
-
- private String ip;
-
- private String date;
-
- private String browserName;
-
- private String browserVersion;
-
- private String OSName;
-
- private String location;
-}
+package cn.celess.common.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/05/05 16:05
+ */
+@Data
+public class VisitorModel implements Serializable {
+ private long id;
+
+ private String ip;
+
+ private String date;
+
+ private String browserName;
+
+ private String browserVersion;
+
+ private String OSName;
+
+ private String location;
+}
diff --git a/src/main/java/cn/celess/blog/entity/model/WebUpdateModel.java b/blog-common/src/main/java/cn/celess/common/entity/vo/WebUpdateModel.java
similarity index 76%
rename from src/main/java/cn/celess/blog/entity/model/WebUpdateModel.java
rename to blog-common/src/main/java/cn/celess/common/entity/vo/WebUpdateModel.java
index 15aacb8..0f05b15 100644
--- a/src/main/java/cn/celess/blog/entity/model/WebUpdateModel.java
+++ b/blog-common/src/main/java/cn/celess/common/entity/vo/WebUpdateModel.java
@@ -1,26 +1,28 @@
-package cn.celess.blog.entity.model;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author : xiaohai
- * @date : 2019/05/12 11:32
- */
-@Data
-@NoArgsConstructor
-public class WebUpdateModel {
- private long id;
-
- private String info;
-
- private String time;
-
- public WebUpdateModel(long id, String info, String time) {
- this.id = id;
- this.info = info;
- this.time = time;
- }
-
- private boolean deleted;
-}
+package cn.celess.common.entity.vo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/05/12 11:32
+ */
+@Data
+@NoArgsConstructor
+public class WebUpdateModel implements Serializable {
+ private long id;
+
+ private String info;
+
+ private String time;
+
+ public WebUpdateModel(long id, String info, String time) {
+ this.id = id;
+ this.info = info;
+ this.time = time;
+ }
+
+ private boolean deleted;
+}
diff --git a/src/main/java/cn/celess/blog/exception/ExceptionHandle.java b/blog-common/src/main/java/cn/celess/common/exception/ExceptionHandle.java
similarity index 93%
rename from src/main/java/cn/celess/blog/exception/ExceptionHandle.java
rename to blog-common/src/main/java/cn/celess/common/exception/ExceptionHandle.java
index 0b85dd8..23961ea 100644
--- a/src/main/java/cn/celess/blog/exception/ExceptionHandle.java
+++ b/blog-common/src/main/java/cn/celess/common/exception/ExceptionHandle.java
@@ -1,100 +1,101 @@
-package cn.celess.blog.exception;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.entity.Response;
-import cn.celess.blog.service.MailService;
-import cn.celess.blog.util.DateFormatUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.validation.BindException;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 17:02
- */
-
-@ControllerAdvice
-public class ExceptionHandle {
- public static final Logger logger = LoggerFactory.getLogger(ExceptionHandle.class);
- @Autowired
- MailService mailService;
- @Autowired
- HttpServletRequest request;
- @Value("${spring.profiles.active}")
- private String activeModel;
-
- @ExceptionHandler(value = Exception.class)
- @ResponseBody
- public Response handle(Exception e) {
- //自定义错误
- if (e instanceof MyException) {
- MyException exception = (MyException) e;
- logger.debug("返回了自定义的exception,[code={},msg={},result={}]", exception.getCode(), e.getMessage(), exception.getResult());
- return new Response(exception.getCode(), e.getMessage(), exception.getResult());
- }
- //请求路径不支持该方法
- if (e instanceof HttpRequestMethodNotSupportedException) {
- logger.debug("遇到请求路径与请求方法不匹配的请求，[msg={}，path:{},method:{}]", e.getMessage(), request.getRequestURL(), request.getMethod());
- return new Response(ResponseEnum.ERROR.getCode(), e.getMessage(), null);
- }
- //数据输入类型不匹配
- if (e instanceof MethodArgumentTypeMismatchException) {
- logger.debug("输入类型不匹配,[msg={}]", e.getMessage());
- return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改后再访问", null);
- }
- //数据验证失败
- if (e instanceof BindException) {
- logger.debug("数据验证失败,[msg={}]", e.getMessage());
- return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改", null);
- }
- //数据输入不完整
- if (e instanceof MissingServletRequestParameterException) {
- logger.debug("数据输入不完整,[msg={}]", e.getMessage());
- return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入不完整,请检查", null);
- }
-
- // 发送错误信息到邮箱
- if ("prod".equals(activeModel)) {
- logger.debug("有一个未捕获的bug，已发送到邮箱");
- sendMessage(e);
- }
- e.printStackTrace();
- return new Response(ResponseEnum.ERROR.getCode(), "服务器出现错误，已记录", null);
- }
-
- /**
- * 发送错误信息
- *
- * @param e 错误
- */
- private void sendMessage(Exception e) {
- SimpleMailMessage simpleMailMessage = new SimpleMailMessage();
- simpleMailMessage.setTo("a@celess.cn");
- simpleMailMessage.setSubject("服务器出现了错误");
- StringBuilder msg = new StringBuilder();
- String queryString = request.getQueryString();
- msg.append("requirePath:\n").append(request.getRequestURL().toString());
- if (queryString != null) {
- msg.append("?").append(queryString);
- }
- msg.append("\n\n\n");
- msg.append("msg:\n").append(e.getMessage()).append("\n\n\n");
- msg.append("date:\n").append(DateFormatUtil.getNow()).append("\n\n\n");
- msg.append("from:\n").append(request.getHeader("User-Agent")).append("\n\n\n");
- msg.append("ip:\n").append(request.getRemoteAddr()).append("\n\n\n");
- simpleMailMessage.setText(msg.toString());
- mailService.AsyncSend(simpleMailMessage);
- }
-
-}
+package cn.celess.common.exception;
+
+import cn.celess.common.enmu.ResponseEnum;
+import cn.celess.common.entity.Response;
+import cn.celess.common.service.MailService;
+import cn.celess.common.util.DateFormatUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.validation.BindException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+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;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 17:02
+ */
+
+@ControllerAdvice
+public class ExceptionHandle {
+ public static final Logger logger = LoggerFactory.getLogger(ExceptionHandle.class);
+ @Resource
+ MailService mailService;
+ @Autowired
+ HttpServletRequest request;
+ @Value("${spring.profiles.active}")
+ private String activeModel;
+
+ @ExceptionHandler(value = Exception.class)
+ @ResponseBody
+ public Response handle(Exception e) {
+ //自定义错误
+ if (e instanceof MyException) {
+ MyException exception = (MyException) e;
+ logger.debug("返回了自定义的exception,[code={},msg={},result={}]", exception.getCode(), e.getMessage(), exception.getResult());
+ return new Response(exception.getCode(), e.getMessage(), exception.getResult());
+ }
+ //请求路径不支持该方法
+ if (e instanceof HttpRequestMethodNotSupportedException) {
+ logger.debug("遇到请求路径与请求方法不匹配的请求，[msg={}，path:{},method:{}]", e.getMessage(), request.getRequestURL(), request.getMethod());
+ return new Response(ResponseEnum.ERROR.getCode(), e.getMessage(), null);
+ }
+ //数据输入类型不匹配
+ if (e instanceof MethodArgumentTypeMismatchException) {
+ logger.debug("输入类型不匹配,[msg={}]", e.getMessage());
+ return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改后再访问", null);
+ }
+ //数据验证失败
+ if (e instanceof BindException) {
+ logger.debug("数据验证失败,[msg={}]", e.getMessage());
+ return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改", null);
+ }
+ //数据输入不完整
+ if (e instanceof MissingServletRequestParameterException) {
+ logger.debug("数据输入不完整,[msg={}]", e.getMessage());
+ return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入不完整,请检查", null);
+ }
+
+ // 发送错误信息到邮箱
+ if ("prod".equals(activeModel)) {
+ logger.debug("有一个未捕获的bug，已发送到邮箱");
+ sendMessage(e);
+ }
+ e.printStackTrace();
+ return new Response(ResponseEnum.ERROR.getCode(), "服务器出现错误，已记录", null);
+ }
+
+ /**
+ * 发送错误信息
+ *
+ * @param e 错误
+ */
+ private void sendMessage(Exception e) {
+ SimpleMailMessage simpleMailMessage = new SimpleMailMessage();
+ simpleMailMessage.setTo("a@celess.cn");
+ simpleMailMessage.setSubject("服务器出现了错误");
+ StringBuilder msg = new StringBuilder();
+ String queryString = request.getQueryString();
+ msg.append("requirePath:\n").append(request.getRequestURL().toString());
+ if (queryString != null) {
+ msg.append("?").append(queryString);
+ }
+ msg.append("\n\n\n");
+ msg.append("msg:\n").append(e.getMessage()).append("\n\n\n");
+ msg.append("date:\n").append(DateFormatUtil.getNow()).append("\n\n\n");
+ msg.append("from:\n").append(request.getHeader("User-Agent")).append("\n\n\n");
+ msg.append("ip:\n").append(request.getRemoteAddr()).append("\n\n\n");
+ simpleMailMessage.setText(msg.toString());
+ mailService.AsyncSend(simpleMailMessage);
+ }
+
+}
diff --git a/src/main/java/cn/celess/blog/exception/MyException.java b/blog-common/src/main/java/cn/celess/common/exception/MyException.java
similarity index 87%
rename from src/main/java/cn/celess/blog/exception/MyException.java
rename to blog-common/src/main/java/cn/celess/common/exception/MyException.java
index a681356..2df7428 100644
--- a/src/main/java/cn/celess/blog/exception/MyException.java
+++ b/blog-common/src/main/java/cn/celess/common/exception/MyException.java
@@ -1,41 +1,41 @@
-package cn.celess.blog.exception;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import lombok.Data;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 16:56
- */
-@Data
-public class MyException extends RuntimeException {
- private int code;
- private Object result;
-
- public MyException(int code, String msg) {
- super(msg);
- this.code = code;
- }
-
- public MyException(ResponseEnum e) {
- super(e.getMsg());
- this.code = e.getCode();
- }
-
- public MyException(ResponseEnum e, Object result) {
- super(e.getMsg());
- this.code = e.getCode();
- this.result = result;
- }
-
- public MyException(ResponseEnum e, String msg) {
- super(msg + e.getMsg());
- this.code = e.getCode();
- }
-
- public MyException(ResponseEnum e, String msg, Object result) {
- super(e.getMsg());
- this.code = e.getCode();
- this.result = result;
- }
-}
+package cn.celess.common.exception;
+
+import cn.celess.common.enmu.ResponseEnum;
+import lombok.Data;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 16:56
+ */
+@Data
+public class MyException extends RuntimeException {
+ private int code;
+ private Object result;
+
+ public MyException(int code, String msg) {
+ super(msg);
+ this.code = code;
+ }
+
+ public MyException(ResponseEnum e) {
+ super(e.getMsg());
+ this.code = e.getCode();
+ }
+
+ public MyException(ResponseEnum e, Object result) {
+ super(e.getMsg());
+ this.code = e.getCode();
+ this.result = result;
+ }
+
+ public MyException(ResponseEnum e, String msg) {
+ super(msg + e.getMsg());
+ this.code = e.getCode();
+ }
+
+ public MyException(ResponseEnum e, String msg, Object result) {
+ super(e.getMsg());
+ this.code = e.getCode();
+ this.result = result;
+ }
+}
diff --git a/src/main/java/cn/celess/blog/mapper/ArticleMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/ArticleMapper.java
similarity index 76%
rename from src/main/java/cn/celess/blog/mapper/ArticleMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/ArticleMapper.java
index 26e0881..10926ce 100644
--- a/src/main/java/cn/celess/blog/mapper/ArticleMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/ArticleMapper.java
@@ -1,52 +1,55 @@
-package cn.celess.blog.mapper;
-
-import cn.celess.blog.entity.Article;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: 小海
- * @Date： 2019/06/27 20:43
- * @Description：
- */
-@Mapper
-@Repository
-public interface ArticleMapper {
-
- int insert(Article a);
-
- int delete(long id);
-
- int update(Article a);
-
- Article getLastestArticle();
-
- Article findArticleById(long id);
-
- boolean existsByTitle(String title);
-
- boolean isDeletedById(long id);
-
- List findAllByAuthorId(long authorId);
-
- List findAllByOpen(boolean isOpen);
-
- String getTitleById(long id);
-
- List findAllByCategoryId(long id);
-
- List findAllByCategoryIdAndOpen(long id);
-
- List findAll();
-
- Article getPreArticle(Long id);
-
- Article getNextArticle(Long id);
-
- int updateReadingNumber(long id);
-
- long count();
-
-}
+package cn.celess.common.mapper;
+
+import cn.celess.common.entity.Article;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/06/27 20:43
+ * @Description：
+ */
+@Mapper
+@Repository
+public interface ArticleMapper {
+
+ int insert(Article a);
+
+ int delete(long id);
+
+ int update(Article a);
+
+ Article getLastestArticle();
+
+ Article findArticleById(long id);
+
+ boolean existsByTitle(String title);
+
+ boolean isDeletedById(long id);
+
+ List findAllByAuthorId(long authorId);
+
+ List findAllByOpen(boolean isOpen);
+
+ String getTitleById(long id);
+
+ List findAllByCategoryId(long id);
+
+ List findAllByCategoryIdAndOpen(long id);
+
+ List findAll();
+
+ @Cacheable(value = {"articleDao"}, key = "'getPreArticle:'+#id")
+ Article getPreArticle(Long id);
+
+ @Cacheable(value = {"articleDao"}, key = "'getNextArticle:'+#id")
+ Article getNextArticle(Long id);
+
+ int updateReadingNumber(long id);
+
+ long count();
+
+}
diff --git a/src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/ArticleTagMapper.java
similarity index 86%
rename from src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/ArticleTagMapper.java
index 5620e8f..a794ea9 100644
--- a/src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/ArticleTagMapper.java
@@ -1,7 +1,7 @@
-package cn.celess.blog.mapper;
+package cn.celess.common.mapper;
-import cn.celess.blog.entity.ArticleTag;
-import cn.celess.blog.entity.Tag;
+import cn.celess.common.entity.ArticleTag;
+import cn.celess.common.entity.Tag;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/cn/celess/blog/mapper/CategoryMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/CategoryMapper.java
similarity index 85%
rename from src/main/java/cn/celess/blog/mapper/CategoryMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/CategoryMapper.java
index 2fc9017..09999e0 100644
--- a/src/main/java/cn/celess/blog/mapper/CategoryMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/CategoryMapper.java
@@ -1,42 +1,42 @@
-package cn.celess.blog.mapper;
-
-import cn.celess.blog.entity.Category;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: 小海
- * @Date： 2019/06/30 12:56
- * @Description：
- */
-@Mapper
-@Repository
-public interface CategoryMapper {
- int insert(Category c);
-
- int delete(long id);
-
- int update(Category c);
-
- boolean existsByName(String name);
-
- boolean existsById(long id);
-
- Category findCategoryByName(String name);
-
- Category findCategoryById(long id);
-
- List findAll();
-
- List getAllName();
-
- String getNameById(long id);
-
- Long getIdByName(String name);
-
- Category getLastestCategory();
-
- long count();
-}
+package cn.celess.common.mapper;
+
+import cn.celess.common.entity.Category;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/06/30 12:56
+ * @Description：
+ */
+@Mapper
+@Repository
+public interface CategoryMapper {
+ int insert(Category c);
+
+ int delete(long id);
+
+ int update(Category c);
+
+ boolean existsByName(String name);
+
+ boolean existsById(long id);
+
+ Category findCategoryByName(String name);
+
+ Category findCategoryById(long id);
+
+ List findAll();
+
+ List getAllName();
+
+ String getNameById(long id);
+
+ Long getIdByName(String name);
+
+ Category getLastestCategory();
+
+ long count();
+}
diff --git a/src/main/java/cn/celess/blog/mapper/CommentMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/CommentMapper.java
similarity index 88%
rename from src/main/java/cn/celess/blog/mapper/CommentMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/CommentMapper.java
index 84af53a..0efa7b8 100644
--- a/src/main/java/cn/celess/blog/mapper/CommentMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/CommentMapper.java
@@ -1,44 +1,44 @@
-package cn.celess.blog.mapper;
-
-import cn.celess.blog.entity.Comment;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: 小海
- * @Date: 2019/06/30 16:19
- * @Description:
- */
-@Mapper
-@Repository
-public interface CommentMapper {
- int insert(Comment c);
-
- int updateContent(String content, long id);
-
- int delete(long id);
-
- int deleteByPagePath(String pagePath);
-
- boolean existsById(long id);
-
- Comment findCommentById(long id);
-
- Comment getLastestComment();
-
- List findAllByFromUser(long id);
-
- List findAllByPid(long pid);
-
- List findAllByPagePath(String pagePath);
-
- List findAllByPagePathAndFromUser(String pagePath, long userId);
-
- List findAllByPagePathAndPidAndNormal(String pagePath, long pid);
-
- long countByPagePath(String pagePath);
-
- long count();
-}
+package cn.celess.common.mapper;
+
+import cn.celess.common.entity.Comment;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date: 2019/06/30 16:19
+ * @Description:
+ */
+@Mapper
+@Repository
+public interface CommentMapper {
+ int insert(Comment c);
+
+ int updateContent(String content, long id);
+
+ int delete(long id);
+
+ int deleteByPagePath(String pagePath);
+
+ boolean existsById(long id);
+
+ Comment findCommentById(long id);
+
+ Comment getLastestComment();
+
+ List findAllByFromUser(long id);
+
+ List findAllByPid(long pid);
+
+ List findAllByPagePath(String pagePath);
+
+ List findAllByPagePathAndFromUser(String pagePath, long userId);
+
+ List findAllByPagePathAndPidAndNormal(String pagePath, long pid);
+
+ long countByPagePath(String pagePath);
+
+ long count();
+}
diff --git a/src/main/java/cn/celess/blog/mapper/PartnerMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/PartnerMapper.java
similarity index 85%
rename from src/main/java/cn/celess/blog/mapper/PartnerMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/PartnerMapper.java
index c1c2de6..cbde173 100644
--- a/src/main/java/cn/celess/blog/mapper/PartnerMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/PartnerMapper.java
@@ -1,41 +1,41 @@
-package cn.celess.blog.mapper;
-
-import cn.celess.blog.entity.PartnerSite;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: 小海
- * @Date： 2019/07/03 00:22
- * @Description：
- */
-@Mapper
-@Repository
-public interface PartnerMapper {
- int insert(PartnerSite site);
-
- int delete(long id);
-
- int update(PartnerSite site);
-
- boolean existsById(long id);
-
- boolean existsByName(String name);
-
- boolean existsByUrl(String url);
-
- PartnerSite findById(long id);
-
- PartnerSite findByName(String name);
-
- PartnerSite findByUrl(String url);
-
- PartnerSite getLastest();
-
- List findAll();
-
- List findAll(Boolean deleted);
-
-}
+package cn.celess.common.mapper;
+
+import cn.celess.common.entity.PartnerSite;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/07/03 00:22
+ * @Description：
+ */
+@Mapper
+@Repository
+public interface PartnerMapper {
+ int insert(PartnerSite site);
+
+ int delete(long id);
+
+ int update(PartnerSite site);
+
+ boolean existsById(long id);
+
+ boolean existsByName(String name);
+
+ boolean existsByUrl(String url);
+
+ PartnerSite findById(long id);
+
+ PartnerSite findByName(String name);
+
+ PartnerSite findByUrl(String url);
+
+ PartnerSite getLastest();
+
+ List findAll();
+
+ List findAll(Boolean deleted);
+
+}
diff --git a/src/main/java/cn/celess/blog/mapper/TagMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/TagMapper.java
similarity index 83%
rename from src/main/java/cn/celess/blog/mapper/TagMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/TagMapper.java
index ed479c9..61766ca 100644
--- a/src/main/java/cn/celess/blog/mapper/TagMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/TagMapper.java
@@ -1,34 +1,34 @@
-package cn.celess.blog.mapper;
-
-import cn.celess.blog.entity.Tag;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: 小海
- * @Date： 2019/06/29 22:00
- * @Description：
- */
-@Mapper
-@Repository
-public interface TagMapper {
- int insert(Tag tag);
-
- int update(Tag tag);
-
- int delete(long id);
-
- Tag findTagById(long id);
-
- Tag findTagByName(String name);
-
- Boolean existsByName(String name);
-
- Tag getLastestTag();
-
- List findAll();
-
- long count();
-}
+package cn.celess.common.mapper;
+
+import cn.celess.common.entity.Tag;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/06/29 22:00
+ * @Description：
+ */
+@Mapper
+@Repository
+public interface TagMapper {
+ int insert(Tag tag);
+
+ int update(Tag tag);
+
+ int delete(long id);
+
+ Tag findTagById(long id);
+
+ Tag findTagByName(String name);
+
+ Boolean existsByName(String name);
+
+ Tag getLastestTag();
+
+ List findAll();
+
+ long count();
+}
diff --git a/src/main/java/cn/celess/blog/mapper/UserMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/UserMapper.java
similarity index 89%
rename from src/main/java/cn/celess/blog/mapper/UserMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/UserMapper.java
index 8f80077..9c9c3be 100644
--- a/src/main/java/cn/celess/blog/mapper/UserMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/UserMapper.java
@@ -1,61 +1,61 @@
-package cn.celess.blog.mapper;
-
-import cn.celess.blog.entity.User;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: 小海
- * @Date： 2019/07/03 00:23
- * @Description：
- */
-@Mapper
-@Repository
-public interface UserMapper {
-
- int addUser(User user);
-
- int updateInfo(String desc, String displayName, long id);
-
- int updateAvatarImgUrl(String avatarImgUrl, long id);
-
- int updateLoginTime(String email);
-
- int updateEmailStatus(String email, boolean status);
-
- int updatePwd(String email, String pwd);
-
- String getPwd(String email);
-
- boolean existsByEmail(String email);
-
- User findByEmail(String email);
-
- User findById(long id);
-
- String getAvatarImgUrlById(long id);
-
- String getEmail(long id);
-
- String getDisPlayName(long id);
-
- String getRoleByEmail(String email);
-
- String getRoleById(long id);
-
- long count();
-
- int delete(long id);
-
- int lock(long id);
-
- int setUserRole(Long id, String role);
-
- List findAll(Integer status);
-
- List findAll();
-
- int update(User user);
-}
+package cn.celess.common.mapper;
+
+import cn.celess.common.entity.User;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/07/03 00:23
+ * @Description：
+ */
+@Mapper
+@Repository
+public interface UserMapper {
+
+ int addUser(User user);
+
+ int updateInfo(String desc, String displayName, long id);
+
+ int updateAvatarImgUrl(String avatarImgUrl, long id);
+
+ int updateLoginTime(String email);
+
+ int updateEmailStatus(String email, boolean status);
+
+ int updatePwd(String email, String pwd);
+
+ String getPwd(String email);
+
+ boolean existsByEmail(String email);
+
+ User findByEmail(String email);
+
+ User findById(long id);
+
+ String getAvatarImgUrlById(long id);
+
+ String getEmail(long id);
+
+ String getDisPlayName(long id);
+
+ String getRoleByEmail(String email);
+
+ String getRoleById(long id);
+
+ long count();
+
+ int delete(long id);
+
+ int lock(long id);
+
+ int setUserRole(Long id, String role);
+
+ List findAll(Integer status);
+
+ List findAll();
+
+ int update(User user);
+}
diff --git a/src/main/java/cn/celess/blog/mapper/VisitorMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/VisitorMapper.java
similarity index 80%
rename from src/main/java/cn/celess/blog/mapper/VisitorMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/VisitorMapper.java
index e47a661..1b60360 100644
--- a/src/main/java/cn/celess/blog/mapper/VisitorMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/VisitorMapper.java
@@ -1,26 +1,26 @@
-package cn.celess.blog.mapper;
-
-import cn.celess.blog.entity.Visitor;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: 小海
- * @Date： 2019/07/03 00:23
- * @Description：
- */
-@Repository
-@Mapper
-public interface VisitorMapper {
- int insert(Visitor visitor);
-
- int delete(long id);
-
- List findAll();
-
- List findAllNotDeleted();
-
- long count();
-}
+package cn.celess.common.mapper;
+
+import cn.celess.common.entity.Visitor;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/07/03 00:23
+ * @Description：
+ */
+@Repository
+@Mapper
+public interface VisitorMapper {
+ int insert(Visitor visitor);
+
+ int delete(long id);
+
+ List findAll();
+
+ List findAllNotDeleted();
+
+ long count();
+}
diff --git a/src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java b/blog-common/src/main/java/cn/celess/common/mapper/WebUpdateInfoMapper.java
similarity index 83%
rename from src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java
rename to blog-common/src/main/java/cn/celess/common/mapper/WebUpdateInfoMapper.java
index 9d57283..49cf306 100644
--- a/src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java
+++ b/blog-common/src/main/java/cn/celess/common/mapper/WebUpdateInfoMapper.java
@@ -1,32 +1,32 @@
-package cn.celess.blog.mapper;
-
-import cn.celess.blog.entity.WebUpdate;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @Author: 小海
- * @Date： 2019/07/03 00:24
- * @Description：
- */
-@Mapper
-@Repository
-public interface WebUpdateInfoMapper {
- int insert(WebUpdate webUpdate);
-
- int delete(long id);
-
- int update(long id, String info);
-
- boolean existsById(long id);
-
- WebUpdate findById(long id);
-
- List findAll();
-
- List findAllNotDeleted();
-
- WebUpdate getLastestOne();
-}
+package cn.celess.common.mapper;
+
+import cn.celess.common.entity.WebUpdate;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date： 2019/07/03 00:24
+ * @Description：
+ */
+@Mapper
+@Repository
+public interface WebUpdateInfoMapper {
+ int insert(WebUpdate webUpdate);
+
+ int delete(long id);
+
+ int update(long id, String info);
+
+ boolean existsById(long id);
+
+ WebUpdate findById(long id);
+
+ List findAll();
+
+ List findAllNotDeleted();
+
+ WebUpdate getLastestOne();
+}
diff --git a/src/main/java/cn/celess/blog/service/ArticleService.java b/blog-common/src/main/java/cn/celess/common/service/ArticleService.java
similarity index 87%
rename from src/main/java/cn/celess/blog/service/ArticleService.java
rename to blog-common/src/main/java/cn/celess/common/service/ArticleService.java
index f74b875..64ff920 100644
--- a/src/main/java/cn/celess/blog/service/ArticleService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/ArticleService.java
@@ -1,85 +1,85 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.model.ArticleModel;
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.request.ArticleReq;
-import org.springframework.stereotype.Service;
-
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 15:20
- */
-@Service
-public interface ArticleService {
- /**
- * 新增一篇文章
- *
- * @param reqBody 请求文章的数据
- * @return 文章数据
- */
- ArticleModel create(ArticleReq reqBody);
-
- /**
- * 删除一篇文章
- *
- * @param articleID 文章id
- * @return 删除状态 true：删除成功 false：失败
- */
- boolean delete(long articleID);
-
- /**
- * 更新一篇文章
- *
- * @param reqBody 请求数据
- * @return 文章数据
- */
- ArticleModel update(ArticleReq reqBody);
-
- /**
- * 获取一篇文章的数据
- *
- * @param articleId 文章id
- * @param is4update 是否是因文章更新而请求数据
- * @return 文章数据
- */
- ArticleModel retrieveOneById(long articleId, boolean is4update);
-
- /**
- * 管理员 获取分页数据
- *
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData adminArticles(int count, int page, Boolean deleted);
-
- /**
- * 获取文章状态为开放的文章
- *
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData retrievePageForOpen(int count, int page);
-
- /**
- * 根据分类名获取文章数据
- *
- * @param name 分类名
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData findByCategory(String name, int page, int count);
-
- /**
- * 根据标签名获取文章数据
- *
- * @param name 标签名
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData findByTag(String name, int page, int count);
-}
+package cn.celess.common.service;
+
+import cn.celess.common.entity.dto.ArticleReq;
+import cn.celess.common.entity.vo.ArticleModel;
+import cn.celess.common.entity.vo.PageData;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 15:20
+ */
+@Service
+public interface ArticleService {
+ /**
+ * 新增一篇文章
+ *
+ * @param reqBody 请求文章的数据
+ * @return 文章数据
+ */
+ ArticleModel create(ArticleReq reqBody);
+
+ /**
+ * 删除一篇文章
+ *
+ * @param articleID 文章id
+ * @return 删除状态 true：删除成功 false：失败
+ */
+ boolean delete(long articleID);
+
+ /**
+ * 更新一篇文章
+ *
+ * @param reqBody 请求数据
+ * @return 文章数据
+ */
+ ArticleModel update(ArticleReq reqBody);
+
+ /**
+ * 获取一篇文章的数据
+ *
+ * @param articleId 文章id
+ * @param is4update 是否是因文章更新而请求数据
+ * @return 文章数据
+ */
+ ArticleModel retrieveOneById(long articleId, boolean is4update);
+
+ /**
+ * 管理员 获取分页数据
+ *
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData adminArticles(int count, int page, Boolean deleted);
+
+ /**
+ * 获取文章状态为开放的文章
+ *
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData retrievePageForOpen(int count, int page);
+
+ /**
+ * 根据分类名获取文章数据
+ *
+ * @param name 分类名
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData findByCategory(String name, int page, int count);
+
+ /**
+ * 根据标签名获取文章数据
+ *
+ * @param name 标签名
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData findByTag(String name, int page, int count);
+}
diff --git a/src/main/java/cn/celess/blog/service/CategoryService.java b/blog-common/src/main/java/cn/celess/common/service/CategoryService.java
similarity index 82%
rename from src/main/java/cn/celess/blog/service/CategoryService.java
rename to blog-common/src/main/java/cn/celess/common/service/CategoryService.java
index 6f29cbb..4e4c687 100644
--- a/src/main/java/cn/celess/blog/service/CategoryService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/CategoryService.java
@@ -1,45 +1,45 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.model.CategoryModel;
-import cn.celess.blog.entity.model.PageData;
-import org.springframework.stereotype.Service;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 22:42
- */
-@Service
-public interface CategoryService {
- /**
- * 增加一个分类
- *
- * @param name 分类名
- * @return 所增加的分类数据
- */
- CategoryModel create(String name);
-
- /**
- * 通过id删除分类
- *
- * @param id 分类id
- * @return 删除状态
- */
- boolean delete(long id);
-
- /**
- * 编辑分类的名字
- *
- * @param id 分类id
- * @param name 分类名字
- * @return 更新后的分类的数据
- */
- CategoryModel update(Long id, String name);
-
- /**
- * 获取全部的分类数据
- *
- * @return 全部的分类数据
- */
- PageData retrievePage(int page, int count);
-
-}
+package cn.celess.common.service;
+
+import cn.celess.common.entity.vo.CategoryModel;
+import cn.celess.common.entity.vo.PageData;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 22:42
+ */
+@Service
+public interface CategoryService {
+ /**
+ * 增加一个分类
+ *
+ * @param name 分类名
+ * @return 所增加的分类数据
+ */
+ CategoryModel create(String name);
+
+ /**
+ * 通过id删除分类
+ *
+ * @param id 分类id
+ * @return 删除状态
+ */
+ boolean delete(long id);
+
+ /**
+ * 编辑分类的名字
+ *
+ * @param id 分类id
+ * @param name 分类名字
+ * @return 更新后的分类的数据
+ */
+ CategoryModel update(Long id, String name);
+
+ /**
+ * 获取全部的分类数据
+ *
+ * @return 全部的分类数据
+ */
+ PageData retrievePage(int page, int count);
+
+}
diff --git a/src/main/java/cn/celess/blog/service/CommentService.java b/blog-common/src/main/java/cn/celess/common/service/CommentService.java
similarity index 87%
rename from src/main/java/cn/celess/blog/service/CommentService.java
rename to blog-common/src/main/java/cn/celess/common/service/CommentService.java
index 71879f6..43331b8 100644
--- a/src/main/java/cn/celess/blog/service/CommentService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/CommentService.java
@@ -1,91 +1,92 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.model.CommentModel;
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.request.CommentReq;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/29 16:58
- */
-@Service
-public interface CommentService {
- /**
- * 新增数据
- *
- * @param reqBody 请求数据体
- * @return 增加的comment数据
- */
- CommentModel create(CommentReq reqBody);
-
- /**
- * 删除数据
- *
- * @param id comment的id
- * @return 删除状态
- */
- boolean delete(long id);
-
- /**
- * 更新数据
- *
- * @param reqBody comment请求体
- * @return 更新后的数据
- */
- CommentModel update(CommentReq reqBody);
-
- /**
- * 分页获取数据
- *
- * @param pagePath pagePath
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData retrievePage(String pagePath, int page, int count);
-
- /**
- * 通过pid获取数据
- *
- * @param pid 父id
- * @return 分页数据
- */
- List retrievePageByPid(long pid);
-
-
- /**
- * 根据评论者获取数据
- *
- * @param pagePath pagePath
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData retrievePageByAuthor(String pagePath, int page, int count);
-
-
- /**
- * 根据数据的type和pid获取数据
- *
- * @param pagePath pagePath
- * @param pid 父id
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData retrievePageByPageAndPid(String pagePath, long pid, int page, int count);
-
- /**
- * 根据type获取数据
- *
- * @param pagePath pagePath
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData retrievePageByPage(String pagePath, int page, int count);
-
-}
+package cn.celess.common.service;
+
+
+import cn.celess.common.entity.dto.CommentReq;
+import cn.celess.common.entity.vo.CommentModel;
+import cn.celess.common.entity.vo.PageData;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/29 16:58
+ */
+@Service
+public interface CommentService {
+ /**
+ * 新增数据
+ *
+ * @param reqBody 请求数据体
+ * @return 增加的comment数据
+ */
+ CommentModel create(CommentReq reqBody);
+
+ /**
+ * 删除数据
+ *
+ * @param id comment的id
+ * @return 删除状态
+ */
+ boolean delete(long id);
+
+ /**
+ * 更新数据
+ *
+ * @param reqBody comment请求体
+ * @return 更新后的数据
+ */
+ CommentModel update(CommentReq reqBody);
+
+ /**
+ * 分页获取数据
+ *
+ * @param pagePath pagePath
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData retrievePage(String pagePath, int page, int count);
+
+ /**
+ * 通过pid获取数据
+ *
+ * @param pid 父id
+ * @return 分页数据
+ */
+ List retrievePageByPid(long pid);
+
+
+ /**
+ * 根据评论者获取数据
+ *
+ * @param pagePath pagePath
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData retrievePageByAuthor(String pagePath, int page, int count);
+
+
+ /**
+ * 根据数据的type和pid获取数据
+ *
+ * @param pagePath pagePath
+ * @param pid 父id
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData retrievePageByPageAndPid(String pagePath, long pid, int page, int count);
+
+ /**
+ * 根据type获取数据
+ *
+ * @param pagePath pagePath
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData retrievePageByPage(String pagePath, int page, int count);
+
+}
diff --git a/src/main/java/cn/celess/blog/service/CountService.java b/blog-common/src/main/java/cn/celess/common/service/CountService.java
similarity index 90%
rename from src/main/java/cn/celess/blog/service/CountService.java
rename to blog-common/src/main/java/cn/celess/common/service/CountService.java
index 7267ece..e010e6c 100644
--- a/src/main/java/cn/celess/blog/service/CountService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/CountService.java
@@ -1,59 +1,59 @@
-package cn.celess.blog.service;
-
-import org.springframework.stereotype.Service;
-
-/**
- * @author : xiaohai
- * @date : 2019/04/02 22:04
- */
-@Service
-public interface CountService {
- /**
- * 获取评论的数据量
- *
- * @return 评论的数据量
- */
- long getCommentCount();
-
- /**
- * 获取文章的篇数
- *
- * @return 文章的篇数
- */
- long getArticleCount();
-
- /**
- * 获取分类数量
- *
- * @return 分类数量
- */
- long getCategoriesCount();
-
- /**
- * 获取标签数量
- *
- * @return 标签数量
- */
- long getTagsCount();
-
- /**
- * 获取用户量
- *
- * @return 用户量
- */
- long getUserCount();
-
- /**
- * 获取总访问量
- *
- * @return 总访问量
- */
- long getVisitorCount();
-
- /**
- * 获取日访问量
- *
- * @return 日访问量
- */
- long getDayVisitCount();
-}
+package cn.celess.common.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/02 22:04
+ */
+@Service
+public interface CountService {
+ /**
+ * 获取评论的数据量
+ *
+ * @return 评论的数据量
+ */
+ long getCommentCount();
+
+ /**
+ * 获取文章的篇数
+ *
+ * @return 文章的篇数
+ */
+ long getArticleCount();
+
+ /**
+ * 获取分类数量
+ *
+ * @return 分类数量
+ */
+ long getCategoriesCount();
+
+ /**
+ * 获取标签数量
+ *
+ * @return 标签数量
+ */
+ long getTagsCount();
+
+ /**
+ * 获取用户量
+ *
+ * @return 用户量
+ */
+ long getUserCount();
+
+ /**
+ * 获取总访问量
+ *
+ * @return 总访问量
+ */
+ long getVisitorCount();
+
+ /**
+ * 获取日访问量
+ *
+ * @return 日访问量
+ */
+ long getDayVisitCount();
+}
diff --git a/src/main/java/cn/celess/blog/service/MailService.java b/blog-common/src/main/java/cn/celess/common/service/MailService.java
similarity index 90%
rename from src/main/java/cn/celess/blog/service/MailService.java
rename to blog-common/src/main/java/cn/celess/common/service/MailService.java
index 61d8e35..2bb70bb 100644
--- a/src/main/java/cn/celess/blog/service/MailService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/MailService.java
@@ -1,27 +1,27 @@
-package cn.celess.blog.service;
-
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.stereotype.Service;
-
-/**
- * @author : xiaohai
- * @date : 2019/04/22 14:25
- */
-@Service
-public interface MailService {
- /**
- * 异步发生邮件
- *
- * @param message SimpleMailMessage对象
- * @return //
- */
- Boolean AsyncSend(SimpleMailMessage message);
-
- /**
- * 同步发送邮件
- *
- * @param message SimpleMailMessage对象
- * @return 发送状态
- */
- Boolean send(SimpleMailMessage message);
-}
+package cn.celess.common.service;
+
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/22 14:25
+ */
+@Service
+public interface MailService {
+ /**
+ * 异步发生邮件
+ *
+ * @param message SimpleMailMessage对象
+ * @return //
+ */
+ Boolean AsyncSend(SimpleMailMessage message);
+
+ /**
+ * 同步发送邮件
+ *
+ * @param message SimpleMailMessage对象
+ * @return 发送状态
+ */
+ Boolean send(SimpleMailMessage message);
+}
diff --git a/src/main/java/cn/celess/blog/service/PartnerSiteService.java b/blog-common/src/main/java/cn/celess/common/service/PartnerSiteService.java
similarity index 81%
rename from src/main/java/cn/celess/blog/service/PartnerSiteService.java
rename to blog-common/src/main/java/cn/celess/common/service/PartnerSiteService.java
index a0b4f69..6557b59 100644
--- a/src/main/java/cn/celess/blog/service/PartnerSiteService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/PartnerSiteService.java
@@ -1,72 +1,72 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.PartnerSite;
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.request.LinkApplyReq;
-import cn.celess.blog.entity.request.LinkReq;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author : xiaohai
- * @date : 2019/05/12 11:42
- */
-@Service
-public interface PartnerSiteService {
- /**
- * 新增数据
- *
- * @param reqBody 数据请求体
- * @return 新增数据
- */
- PartnerSite create(LinkReq reqBody);
-
- /**
- * 删除数据
- *
- * @param id 数据id
- * @return 删除状态
- */
- Boolean del(long id);
-
- /**
- * 更新数据
- *
- * @param reqBody 数据请求体
- * @return 更新后的数据
- */
- PartnerSite update(LinkReq reqBody);
-
- /**
- * 分页获取数据
- *
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData partnerSitePages(int page, int count, Boolean deleted);
-
- /**
- * 获取全部数据
- *
- * @return 全部友链数据
- */
- List findAll();
-
- /**
- * 申请友链
- *
- * @param linkApplyReq linkApplyReq
- * @return linkApplyReq
- */
- PartnerSite apply(LinkApplyReq linkApplyReq);
-
- /**
- * 重写申请友链
- *
- * @param key key
- * @return msg
- */
- String reapply(String key);
-}
+package cn.celess.common.service;
+
+import cn.celess.common.entity.PartnerSite;
+import cn.celess.common.entity.dto.LinkApplyReq;
+import cn.celess.common.entity.dto.LinkReq;
+import cn.celess.common.entity.vo.PageData;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/05/12 11:42
+ */
+@Service
+public interface PartnerSiteService {
+ /**
+ * 新增数据
+ *
+ * @param reqBody 数据请求体
+ * @return 新增数据
+ */
+ PartnerSite create(LinkReq reqBody);
+
+ /**
+ * 删除数据
+ *
+ * @param id 数据id
+ * @return 删除状态
+ */
+ Boolean del(long id);
+
+ /**
+ * 更新数据
+ *
+ * @param reqBody 数据请求体
+ * @return 更新后的数据
+ */
+ PartnerSite update(LinkReq reqBody);
+
+ /**
+ * 分页获取数据
+ *
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData partnerSitePages(int page, int count, Boolean deleted);
+
+ /**
+ * 获取全部数据
+ *
+ * @return 全部友链数据
+ */
+ List findAll();
+
+ /**
+ * 申请友链
+ *
+ * @param linkApplyReq linkApplyReq
+ * @return linkApplyReq
+ */
+ PartnerSite apply(LinkApplyReq linkApplyReq);
+
+ /**
+ * 重写申请友链
+ *
+ * @param key key
+ * @return msg
+ */
+ String reapply(String key);
+}
diff --git a/src/main/java/cn/celess/blog/service/QiniuService.java b/blog-common/src/main/java/cn/celess/common/service/QiniuService.java
similarity index 82%
rename from src/main/java/cn/celess/blog/service/QiniuService.java
rename to blog-common/src/main/java/cn/celess/common/service/QiniuService.java
index 32bdc2a..827ff01 100644
--- a/src/main/java/cn/celess/blog/service/QiniuService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/QiniuService.java
@@ -1,31 +1,31 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.model.QiniuResponse;
-import com.qiniu.storage.model.FileInfo;
-import org.springframework.stereotype.Service;
-
-import java.io.InputStream;
-
-/**
- * @author : xiaohai
- * @date : 2019/04/25 18:15
- */
-@Service
-public interface QiniuService {
- /**
- * 上传文件
- *
- * @param is InputStream流
- * @param fileName 文件名
- * @return 响应数据
- */
- QiniuResponse uploadFile(InputStream is, String fileName);
-
- /**
- * 获取文件列表
- *
- * @return 文件列表
- */
- FileInfo[] getFileList();
-
-}
+package cn.celess.common.service;
+
+import cn.celess.common.entity.vo.QiniuResponse;
+import com.qiniu.storage.model.FileInfo;
+import org.springframework.stereotype.Service;
+
+import java.io.InputStream;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/25 18:15
+ */
+@Service
+public interface QiniuService {
+ /**
+ * 上传文件
+ *
+ * @param is InputStream流
+ * @param fileName 文件名
+ * @return 响应数据
+ */
+ QiniuResponse uploadFile(InputStream is, String fileName);
+
+ /**
+ * 获取文件列表
+ *
+ * @return 文件列表
+ */
+ FileInfo[] getFileList();
+
+}
diff --git a/src/main/java/cn/celess/blog/service/TagService.java b/blog-common/src/main/java/cn/celess/common/service/TagService.java
similarity index 84%
rename from src/main/java/cn/celess/blog/service/TagService.java
rename to blog-common/src/main/java/cn/celess/common/service/TagService.java
index 69090bb..c63c84e 100644
--- a/src/main/java/cn/celess/blog/service/TagService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/TagService.java
@@ -1,56 +1,56 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.model.TagModel;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 22:23
- */
-@Service
-public interface TagService {
- /**
- * 新增数据
- *
- * @param name 标签名
- * @return 新增后的数据
- */
- TagModel create(String name);
-
- /**
- * 删除数据
- *
- * @param tagId 标签id
- * @return 删除状态
- */
- boolean delete(long tagId);
-
- /**
- * 更新数据
- *
- * @param id 标签id
- * @param name 改名的name值
- * @return 更新后的数据
- */
- TagModel update(Long id, String name);
-
- /**
- * 分页获取标签数据
- *
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData retrievePage(int page, int count);
-
- /**
- * 获取全部标签数据
- *
- * @return 标签数据列表
- */
- List findAll();
-
-}
+package cn.celess.common.service;
+
+import cn.celess.common.entity.vo.PageData;
+import cn.celess.common.entity.vo.TagModel;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 22:23
+ */
+@Service
+public interface TagService {
+ /**
+ * 新增数据
+ *
+ * @param name 标签名
+ * @return 新增后的数据
+ */
+ TagModel create(String name);
+
+ /**
+ * 删除数据
+ *
+ * @param tagId 标签id
+ * @return 删除状态
+ */
+ boolean delete(long tagId);
+
+ /**
+ * 更新数据
+ *
+ * @param id 标签id
+ * @param name 改名的name值
+ * @return 更新后的数据
+ */
+ TagModel update(Long id, String name);
+
+ /**
+ * 分页获取标签数据
+ *
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData retrievePage(int page, int count);
+
+ /**
+ * 获取全部标签数据
+ *
+ * @return 标签数据列表
+ */
+ List findAll();
+
+}
diff --git a/src/main/java/cn/celess/blog/service/UserService.java b/blog-common/src/main/java/cn/celess/common/service/UserService.java
similarity index 89%
rename from src/main/java/cn/celess/blog/service/UserService.java
rename to blog-common/src/main/java/cn/celess/common/service/UserService.java
index e34d231..e18d929 100644
--- a/src/main/java/cn/celess/blog/service/UserService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/UserService.java
@@ -1,159 +1,159 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.model.UserModel;
-import cn.celess.blog.entity.request.LoginReq;
-import cn.celess.blog.entity.request.UserReq;
-import org.springframework.stereotype.Service;
-
-import java.io.InputStream;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/30 18:40
- */
-@Service
-public interface UserService {
- /**
- * 注册
- *
- * @param email 邮箱
- * @param password 密码
- * @return 注册状态
- */
- Boolean registration(String email, String password);
-
- /**
- * 登录
- *
- * @param loginReq 请求数据
- * @return 用户数据
- */
- UserModel login(LoginReq loginReq);
-
- /**
- * 注销登录
- *
- * @return **
- */
- Object logout();
-
- /**
- * 更新用户数据
- *
- * @param desc 用户描述
- * @param displayName 显示昵称
- * @return 用户数据
- */
- UserModel update(String desc, String displayName);
-
- /**
- * 更新头像
- *
- * @param is 头像文件的输入流
- * @param mime 文件的mime
- * @return 响应数据
- */
- Object updateUserAavatarImg(InputStream is, String mime);
-
- /**
- * 获取session中存储的用户资料
- *
- * @return 用户资料
- */
- UserModel getUserInfoBySession();
-
- /**
- * 获取用户的角色
- *
- * @param email 用户的邮箱
- * @return role
- */
- String getUserRoleByEmail(String email);
-
- /**
- * 获取邮箱是否注册过
- *
- * @param email 用户邮箱
- * @return 注册状态
- */
- boolean isExistOfEmail(String email);
-
- /**
- * 发送重置密码邮件
- *
- * @param email 用户邮箱
- * @return 发送状态
- */
- Object sendResetPwdEmail(String email);
-
- /**
- * 发送验证邮箱邮件
- *
- * @param email 用户邮箱
- * @return 发送状态
- */
- Object sendVerifyEmail(String email);
-
- /**
- * 验证邮箱
- *
- * @param verifyId 验证码
- * @param email 邮箱
- * @return 验证状态
- */
- Object verifyEmail(String verifyId, String email);
-
- /**
- * 重置密码
- *
- * @param verifyId 验证码
- * @param email 邮箱
- * @param pwd 新密码
- * @return 修改状态
- */
- Object reSetPwd(String verifyId, String email, String pwd);
-
- /**
- * 删除用户
- *
- * @param id 用户id的数组
- * @return 对应id 的删除状态
- */
- Object deleteUser(Integer[] id);
-
- /**
- * 获取用户列表
- *
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData getUserList(Integer page, Integer count, Integer status);
-
- /**
- * 更改用户信息
- *
- * @param user 用户数据
- * @return 用户信息
- */
- UserModel adminUpdate(UserReq user);
-
- /**
- * 获取电子邮件的存在状态
- *
- * @param email email
- * @return true:存在 false：不存在
- */
- boolean getStatusOfEmail(String email);
-
- /**
- * 设置密码
- *
- * @param pwd pwd
- * @param newPwd newPwd
- * @param confirmPwd confirmPwd
- * @return UserModel
- */
- UserModel setPwd(String pwd, String newPwd, String confirmPwd);
-}
+package cn.celess.common.service;
+
+import cn.celess.common.entity.dto.LoginReq;
+import cn.celess.common.entity.dto.UserReq;
+import cn.celess.common.entity.vo.PageData;
+import cn.celess.common.entity.vo.UserModel;
+import org.springframework.stereotype.Service;
+
+import java.io.InputStream;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/30 18:40
+ */
+@Service
+public interface UserService {
+ /**
+ * 注册
+ *
+ * @param email 邮箱
+ * @param password 密码
+ * @return 注册状态
+ */
+ Boolean registration(String email, String password);
+
+ /**
+ * 登录
+ *
+ * @param loginReq 请求数据
+ * @return 用户数据
+ */
+ UserModel login(LoginReq loginReq);
+
+ /**
+ * 注销登录
+ *
+ * @return **
+ */
+ Object logout();
+
+ /**
+ * 更新用户数据
+ *
+ * @param desc 用户描述
+ * @param displayName 显示昵称
+ * @return 用户数据
+ */
+ UserModel update(String desc, String displayName);
+
+ /**
+ * 更新头像
+ *
+ * @param is 头像文件的输入流
+ * @param mime 文件的mime
+ * @return 响应数据
+ */
+ Object updateUserAavatarImg(InputStream is, String mime);
+
+ /**
+ * 获取session中存储的用户资料
+ *
+ * @return 用户资料
+ */
+ UserModel getUserInfoBySession();
+
+ /**
+ * 获取用户的角色
+ *
+ * @param email 用户的邮箱
+ * @return role
+ */
+ String getUserRoleByEmail(String email);
+
+ /**
+ * 获取邮箱是否注册过
+ *
+ * @param email 用户邮箱
+ * @return 注册状态
+ */
+ boolean isExistOfEmail(String email);
+
+ /**
+ * 发送重置密码邮件
+ *
+ * @param email 用户邮箱
+ * @return 发送状态
+ */
+ Object sendResetPwdEmail(String email);
+
+ /**
+ * 发送验证邮箱邮件
+ *
+ * @param email 用户邮箱
+ * @return 发送状态
+ */
+ Object sendVerifyEmail(String email);
+
+ /**
+ * 验证邮箱
+ *
+ * @param verifyId 验证码
+ * @param email 邮箱
+ * @return 验证状态
+ */
+ Object verifyEmail(String verifyId, String email);
+
+ /**
+ * 重置密码
+ *
+ * @param verifyId 验证码
+ * @param email 邮箱
+ * @param pwd 新密码
+ * @return 修改状态
+ */
+ Object reSetPwd(String verifyId, String email, String pwd);
+
+ /**
+ * 删除用户
+ *
+ * @param id 用户id的数组
+ * @return 对应id 的删除状态
+ */
+ Object deleteUser(Integer[] id);
+
+ /**
+ * 获取用户列表
+ *
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData getUserList(Integer page, Integer count, Integer status);
+
+ /**
+ * 更改用户信息
+ *
+ * @param user 用户数据
+ * @return 用户信息
+ */
+ UserModel adminUpdate(UserReq user);
+
+ /**
+ * 获取电子邮件的存在状态
+ *
+ * @param email email
+ * @return true:存在 false：不存在
+ */
+ boolean getStatusOfEmail(String email);
+
+ /**
+ * 设置密码
+ *
+ * @param pwd pwd
+ * @param newPwd newPwd
+ * @param confirmPwd confirmPwd
+ * @return UserModel
+ */
+ UserModel setPwd(String pwd, String newPwd, String confirmPwd);
+}
diff --git a/src/main/java/cn/celess/blog/service/VisitorService.java b/blog-common/src/main/java/cn/celess/common/service/VisitorService.java
similarity index 84%
rename from src/main/java/cn/celess/blog/service/VisitorService.java
rename to blog-common/src/main/java/cn/celess/common/service/VisitorService.java
index 1da235d..395d212 100644
--- a/src/main/java/cn/celess/blog/service/VisitorService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/VisitorService.java
@@ -1,40 +1,40 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.model.VisitorModel;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @author : xiaohai
- * @date : 2019/04/02 23:03
- */
-@Service
-public interface VisitorService {
- /**
- * 分页获取访客数据
- *
- * @param count 单页数据量
- * @param page 数据页
- * @param showLocation 是否显示位置信息 开启改选项数据响应超慢
- * @return 分页数据
- */
- PageData visitorPage(int page, int count, boolean showLocation);
-
- /**
- * 新增访客
- *
- * @param request HttpServletRequest
- * @return 返回状态 null: 访客信息已记录、爬虫
- */
- VisitorModel addVisitor(HttpServletRequest request);
-
- /**
- * 获取位置信息
- *
- * @param ip ip地址
- * @return 位置信息
- */
- String location(String ip);
-}
+package cn.celess.common.service;
+
+import cn.celess.common.entity.vo.PageData;
+import cn.celess.common.entity.vo.VisitorModel;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/04/02 23:03
+ */
+@Service
+public interface VisitorService {
+ /**
+ * 分页获取访客数据
+ *
+ * @param count 单页数据量
+ * @param page 数据页
+ * @param showLocation 是否显示位置信息 开启改选项数据响应超慢
+ * @return 分页数据
+ */
+ PageData visitorPage(int page, int count, boolean showLocation);
+
+ /**
+ * 新增访客
+ *
+ * @param request HttpServletRequest
+ * @return 返回状态 null: 访客信息已记录、爬虫
+ */
+ VisitorModel addVisitor(HttpServletRequest request);
+
+ /**
+ * 获取位置信息
+ *
+ * @param ip ip地址
+ * @return 位置信息
+ */
+ String location(String ip);
+}
diff --git a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java b/blog-common/src/main/java/cn/celess/common/service/WebUpdateInfoService.java
similarity index 85%
rename from src/main/java/cn/celess/blog/service/WebUpdateInfoService.java
rename to blog-common/src/main/java/cn/celess/common/service/WebUpdateInfoService.java
index 3973598..c684232 100644
--- a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java
+++ b/blog-common/src/main/java/cn/celess/common/service/WebUpdateInfoService.java
@@ -1,63 +1,64 @@
-package cn.celess.blog.service;
-
-import cn.celess.blog.entity.model.PageData;
-import cn.celess.blog.entity.model.WebUpdateModel;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author : xiaohai
- * @date : 2019/05/12 11:42
- */
-@Service
-public interface WebUpdateInfoService {
- /**
- * 新增记录
- *
- * @param info 更新内容
- * @return 创建状态
- */
- WebUpdateModel create(String info);
-
- /**
- * 删除数据
- *
- * @param id 数据id
- * @return 删除状态
- */
- Boolean del(long id);
-
- /**
- * 更新数据
- *
- * @param id 数据id
- * @param info 新内容
- * @return 数据
- */
- WebUpdateModel update(long id, String info);
-
- /**
- * 分页获取更新记录
- *
- * @param count 单页数据量
- * @param page 数据页
- * @return 分页数据
- */
- PageData pages(int count, int page);
-
- /**
- * 获取全部的更新记录
- *
- * @return 更新记录
- */
- List findAll();
-
- /**
- * 获取最后更新时间
- *
- * @return
- */
- Map getLastestUpdateTime();
-}
+package cn.celess.common.service;
+
+
+import cn.celess.common.entity.vo.PageData;
+import cn.celess.common.entity.vo.WebUpdateModel;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/05/12 11:42
+ */
+@Service
+public interface WebUpdateInfoService {
+ /**
+ * 新增记录
+ *
+ * @param info 更新内容
+ * @return 创建状态
+ */
+ WebUpdateModel create(String info);
+
+ /**
+ * 删除数据
+ *
+ * @param id 数据id
+ * @return 删除状态
+ */
+ Boolean del(long id);
+
+ /**
+ * 更新数据
+ *
+ * @param id 数据id
+ * @param info 新内容
+ * @return 数据
+ */
+ WebUpdateModel update(long id, String info);
+
+ /**
+ * 分页获取更新记录
+ *
+ * @param count 单页数据量
+ * @param page 数据页
+ * @return 分页数据
+ */
+ PageData pages(int count, int page);
+
+ /**
+ * 获取全部的更新记录
+ *
+ * @return 更新记录
+ */
+ List findAll();
+
+ /**
+ * 获取最后更新时间
+ *
+ * @return
+ */
+ Map getLastestUpdateTime();
+}
diff --git a/src/main/java/cn/celess/blog/util/DateFormatUtil.java b/blog-common/src/main/java/cn/celess/common/util/DateFormatUtil.java
similarity index 94%
rename from src/main/java/cn/celess/blog/util/DateFormatUtil.java
rename to blog-common/src/main/java/cn/celess/common/util/DateFormatUtil.java
index 9ca8279..0027e57 100644
--- a/src/main/java/cn/celess/blog/util/DateFormatUtil.java
+++ b/blog-common/src/main/java/cn/celess/common/util/DateFormatUtil.java
@@ -1,42 +1,42 @@
-package cn.celess.blog.util;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 17:22
- */
-public class DateFormatUtil {
- public static String get(Date date) {
- if (date == null) {
- return null;
- }
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- return sdf.format(date);
- }
-
- public static String getForXmlDate(Date date) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZ");
- GregorianCalendar gc = new GregorianCalendar();
- String dateString = sdf.format(date);
- try {
- gc.setTime(sdf.parse(dateString));
- XMLGregorianCalendar date2 = DatatypeFactory.newInstance().newXMLGregorianCalendar(gc);
- return date2.toString();
- } catch (DatatypeConfigurationException | ParseException e) {
- e.printStackTrace();
- return null;
- }
- }
-
-
- public static String getNow() {
- return get(new Date());
- }
-}
+package cn.celess.common.util;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/28 17:22
+ */
+public class DateFormatUtil {
+ public static String get(Date date) {
+ if (date == null) {
+ return null;
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return sdf.format(date);
+ }
+
+ public static String getForXmlDate(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZ");
+ GregorianCalendar gc = new GregorianCalendar();
+ String dateString = sdf.format(date);
+ try {
+ gc.setTime(sdf.parse(dateString));
+ XMLGregorianCalendar date2 = DatatypeFactory.newInstance().newXMLGregorianCalendar(gc);
+ return date2.toString();
+ } catch (DatatypeConfigurationException | ParseException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
+ public static String getNow() {
+ return get(new Date());
+ }
+}
diff --git a/src/main/java/cn/celess/blog/util/HttpUtil.java b/blog-common/src/main/java/cn/celess/common/util/HttpUtil.java
similarity index 60%
rename from src/main/java/cn/celess/blog/util/HttpUtil.java
rename to blog-common/src/main/java/cn/celess/common/util/HttpUtil.java
index a720f38..08ca2e5 100644
--- a/src/main/java/cn/celess/blog/util/HttpUtil.java
+++ b/blog-common/src/main/java/cn/celess/common/util/HttpUtil.java
@@ -1,15 +1,13 @@
-package cn.celess.blog.util;
+package cn.celess.common.util;
+
import com.gargoylesoftware.htmlunit.BrowserVersion;
import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
+import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
import java.io.IOException;
-import java.util.Objects;
/**
* @Author: 小海
@@ -17,15 +15,20 @@ import java.util.Objects;
* @Desc:
*/
public class HttpUtil {
- private static final OkHttpClient CLIENT = new OkHttpClient();
-
public static String get(String urlStr) {
- Request request = new Request.Builder()
- .url(urlStr)
- .get()
- .build();
- try (Response response = CLIENT.newCall(request).execute()) {
- return Objects.requireNonNull(response.body()).string();
+ try (final WebClient webClient = new WebClient(BrowserVersion.CHROME)) {
+ webClient.getOptions().setCssEnabled(false);
+ webClient.getOptions().setJavaScriptEnabled(false);
+ webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
+ webClient.getOptions().setThrowExceptionOnScriptError(false);
+ webClient.getOptions().setDownloadImages(false);
+ webClient.getOptions().setActiveXNative(false);
+ webClient.setAjaxController(new NicelyResynchronizingAjaxController());
+ Page clientPage = webClient.getPage(urlStr);
+ if (clientPage.isHtmlPage()) {
+ return clientPage.toString();
+ }
+ return null;
} catch (IOException e) {
return null;
}
@@ -33,7 +36,7 @@ public class HttpUtil {
public static String getAfterRendering(String url) {
- try (final WebClient webClient = new WebClient(BrowserVersion.CHROME)) {
+ try (final WebClient webClient = new WebClient(BrowserVersion.BEST_SUPPORTED)) {
webClient.getOptions().setCssEnabled(false);
webClient.getOptions().setJavaScriptEnabled(true);
webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
diff --git a/src/main/java/cn/celess/blog/util/MD5Util.java b/blog-common/src/main/java/cn/celess/common/util/MD5Util.java
similarity index 86%
rename from src/main/java/cn/celess/blog/util/MD5Util.java
rename to blog-common/src/main/java/cn/celess/common/util/MD5Util.java
index 2d7f82a..a712883 100644
--- a/src/main/java/cn/celess/blog/util/MD5Util.java
+++ b/blog-common/src/main/java/cn/celess/common/util/MD5Util.java
@@ -1,14 +1,14 @@
-package cn.celess.blog.util;
-
-import org.springframework.util.DigestUtils;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/30 18:56
- */
-public class MD5Util {
- public static String getMD5(String str) {
- String md5 = DigestUtils.md5DigestAsHex(str.getBytes());
- return md5;
- }
-}
+package cn.celess.common.util;
+
+import org.springframework.util.DigestUtils;
+
+/**
+ * @author : xiaohai
+ * @date : 2019/03/30 18:56
+ */
+public class MD5Util {
+ public static String getMD5(String str) {
+ String md5 = DigestUtils.md5DigestAsHex(str.getBytes());
+ return md5;
+ }
+}
diff --git a/src/main/java/cn/celess/blog/util/ModalTrans.java b/blog-common/src/main/java/cn/celess/common/util/ModalTrans.java
similarity index 95%
rename from src/main/java/cn/celess/blog/util/ModalTrans.java
rename to blog-common/src/main/java/cn/celess/common/util/ModalTrans.java
index 348b8f7..339f671 100644
--- a/src/main/java/cn/celess/blog/util/ModalTrans.java
+++ b/blog-common/src/main/java/cn/celess/common/util/ModalTrans.java
@@ -1,8 +1,9 @@
-package cn.celess.blog.util;
+package cn.celess.common.util;
-import cn.celess.blog.enmu.UserAccountStatusEnum;
-import cn.celess.blog.entity.*;
-import cn.celess.blog.entity.model.*;
+
+import cn.celess.common.enmu.UserAccountStatusEnum;
+import cn.celess.common.entity.*;
+import cn.celess.common.entity.vo.*;
import org.springframework.beans.BeanUtils;
/**
diff --git a/src/main/java/cn/celess/blog/util/ProtoStuffSerializerUtil.java b/blog-common/src/main/java/cn/celess/common/util/ProtoStuffSerializerUtil.java
similarity index 96%
rename from src/main/java/cn/celess/blog/util/ProtoStuffSerializerUtil.java
rename to blog-common/src/main/java/cn/celess/common/util/ProtoStuffSerializerUtil.java
index ec3d805..93291cd 100644
--- a/src/main/java/cn/celess/blog/util/ProtoStuffSerializerUtil.java
+++ b/blog-common/src/main/java/cn/celess/common/util/ProtoStuffSerializerUtil.java
@@ -1,126 +1,126 @@
-package cn.celess.blog.util;
-
-
-import com.dyuproject.protostuff.LinkedBuffer;
-import com.dyuproject.protostuff.ProtostuffIOUtil;
-import com.dyuproject.protostuff.Schema;
-import com.dyuproject.protostuff.runtime.RuntimeSchema;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * ProtoStuffSerializerUtil
- *
- * @author Sirius
- * @date 2019-1-8
- */
-public class ProtoStuffSerializerUtil {
- /**
- * 序列化对象
- *
- * @param obj
- * @return
- */
- public static byte[] serialize(T obj) {
- if (obj == null) {
- throw new RuntimeException("序列化对象(" + obj + ")!");
- }
- @SuppressWarnings("unchecked")
- Schema schema = (Schema) RuntimeSchema.getSchema(obj.getClass());
- LinkedBuffer buffer = LinkedBuffer.allocate(1024 * 1024);
- byte[] protostuff = null;
- try {
- protostuff = ProtostuffIOUtil.toByteArray(obj, schema, buffer);
- } catch (Exception e) {
- throw new RuntimeException("序列化(" + obj.getClass() + ")对象(" + obj + ")发生异常!", e);
- } finally {
- buffer.clear();
- }
- return protostuff;
- }
-
- /**
- * 反序列化对象
- *
- * @param paramArrayOfByte
- * @param targetClass
- * @return
- */
- public static T deserialize(byte[] paramArrayOfByte, Class targetClass) {
- if (paramArrayOfByte == null || paramArrayOfByte.length == 0) {
- throw new RuntimeException("反序列化对象发生异常,byte序列为空!");
- }
- T instance = null;
- try {
- instance = targetClass.newInstance();
- } catch (InstantiationException e1) {
- throw new RuntimeException("反序列化过程中依据类型创建对象失败!", e1);
- } catch (IllegalAccessException e2) {
- throw new RuntimeException("反序列化过程中依据类型创建对象失败!", e2);
- }
- Schema schema = RuntimeSchema.getSchema(targetClass);
- ProtostuffIOUtil.mergeFrom(paramArrayOfByte, instance, schema);
- return instance;
- }
-
- /**
- * 序列化列表
- *
- * @param objList
- * @return
- */
- public static byte[] serializeList(List objList) {
- if (objList == null || objList.isEmpty()) {
- throw new RuntimeException("序列化对象列表(" + objList + ")参数异常!");
- }
- @SuppressWarnings("unchecked")
- Schema schema = (Schema) RuntimeSchema.getSchema(objList.get(0).getClass());
- LinkedBuffer buffer = LinkedBuffer.allocate(1024 * 1024);
- byte[] protostuff = null;
- ByteArrayOutputStream bos = null;
- try {
- bos = new ByteArrayOutputStream();
- ProtostuffIOUtil.writeListTo(bos, objList, schema, buffer);
- protostuff = bos.toByteArray();
- } catch (Exception e) {
- throw new RuntimeException("序列化对象列表(" + objList + ")发生异常!", e);
- } finally {
- buffer.clear();
- try {
- if (bos != null) {
- bos.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- return protostuff;
- }
-
- /**
- * 反序列化列表
- *
- * @param paramArrayOfByte
- * @param targetClass
- * @return
- */
- public static List deserializeList(byte[] paramArrayOfByte, Class targetClass) {
- if (paramArrayOfByte == null || paramArrayOfByte.length == 0) {
- throw new RuntimeException("反序列化对象发生异常,byte序列为空!");
- }
-
- Schema schema = RuntimeSchema.getSchema(targetClass);
- List result = null;
- try {
- result = ProtostuffIOUtil.parseListFrom(new ByteArrayInputStream(paramArrayOfByte), schema);
- } catch (IOException e) {
- throw new RuntimeException("反序列化对象列表发生异常!", e);
- }
- return result;
- }
-
-}
+package cn.celess.common.util;
+
+
+import com.dyuproject.protostuff.LinkedBuffer;
+import com.dyuproject.protostuff.ProtostuffIOUtil;
+import com.dyuproject.protostuff.Schema;
+import com.dyuproject.protostuff.runtime.RuntimeSchema;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * ProtoStuffSerializerUtil
+ *
+ * @author Sirius
+ * @date 2019-1-8
+ */
+public class ProtoStuffSerializerUtil {
+ /**
+ * 序列化对象
+ *
+ * @param obj
+ * @return
+ */
+ public static byte[] serialize(T obj) {
+ if (obj == null) {
+ throw new RuntimeException("序列化对象(" + obj + ")!");
+ }
+ @SuppressWarnings("unchecked")
+ Schema schema = (Schema) RuntimeSchema.getSchema(obj.getClass());
+ LinkedBuffer buffer = LinkedBuffer.allocate(1024 * 1024);
+ byte[] protostuff = null;
+ try {
+ protostuff = ProtostuffIOUtil.toByteArray(obj, schema, buffer);
+ } catch (Exception e) {
+ throw new RuntimeException("序列化(" + obj.getClass() + ")对象(" + obj + ")发生异常!", e);
+ } finally {
+ buffer.clear();
+ }
+ return protostuff;
+ }
+
+ /**
+ * 反序列化对象
+ *
+ * @param paramArrayOfByte
+ * @param targetClass
+ * @return
+ */
+ public static T deserialize(byte[] paramArrayOfByte, Class targetClass) {
+ if (paramArrayOfByte == null || paramArrayOfByte.length == 0) {
+ throw new RuntimeException("反序列化对象发生异常,byte序列为空!");
+ }
+ T instance = null;
+ try {
+ instance = targetClass.newInstance();
+ } catch (InstantiationException e1) {
+ throw new RuntimeException("反序列化过程中依据类型创建对象失败!", e1);
+ } catch (IllegalAccessException e2) {
+ throw new RuntimeException("反序列化过程中依据类型创建对象失败!", e2);
+ }
+ Schema schema = RuntimeSchema.getSchema(targetClass);
+ ProtostuffIOUtil.mergeFrom(paramArrayOfByte, instance, schema);
+ return instance;
+ }
+
+ /**
+ * 序列化列表
+ *
+ * @param objList
+ * @return
+ */
+ public static byte[] serializeList(List objList) {
+ if (objList == null || objList.isEmpty()) {
+ throw new RuntimeException("序列化对象列表(" + objList + ")参数异常!");
+ }
+ @SuppressWarnings("unchecked")
+ Schema schema = (Schema) RuntimeSchema.getSchema(objList.get(0).getClass());
+ LinkedBuffer buffer = LinkedBuffer.allocate(1024 * 1024);
+ byte[] protostuff = null;
+ ByteArrayOutputStream bos = null;
+ try {
+ bos = new ByteArrayOutputStream();
+ ProtostuffIOUtil.writeListTo(bos, objList, schema, buffer);
+ protostuff = bos.toByteArray();
+ } catch (Exception e) {
+ throw new RuntimeException("序列化对象列表(" + objList + ")发生异常!", e);
+ } finally {
+ buffer.clear();
+ try {
+ if (bos != null) {
+ bos.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ return protostuff;
+ }
+
+ /**
+ * 反序列化列表
+ *
+ * @param paramArrayOfByte
+ * @param targetClass
+ * @return
+ */
+ public static List deserializeList(byte[] paramArrayOfByte, Class targetClass) {
+ if (paramArrayOfByte == null || paramArrayOfByte.length == 0) {
+ throw new RuntimeException("反序列化对象发生异常,byte序列为空!");
+ }
+
+ Schema schema = RuntimeSchema.getSchema(targetClass);
+ List result = null;
+ try {
+ result = ProtostuffIOUtil.parseListFrom(new ByteArrayInputStream(paramArrayOfByte), schema);
+ } catch (IOException e) {
+ throw new RuntimeException("反序列化对象列表发生异常!", e);
+ }
+ return result;
+ }
+
+}
diff --git a/src/main/java/cn/celess/blog/util/RedisUtil.java b/blog-common/src/main/java/cn/celess/common/util/RedisUtil.java
similarity index 95%
rename from src/main/java/cn/celess/blog/util/RedisUtil.java
rename to blog-common/src/main/java/cn/celess/common/util/RedisUtil.java
index d50a55c..eeac53b 100644
--- a/src/main/java/cn/celess/blog/util/RedisUtil.java
+++ b/blog-common/src/main/java/cn/celess/common/util/RedisUtil.java
@@ -1,1381 +1,1378 @@
-package cn.celess.blog.util;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.redis.connection.DataType;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.core.Cursor;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.ScanOptions;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Redis工具类
- *
- * @author WangFan
- * @version 1.1 (GitHub文档: https://github.com/whvcse/RedisUtil )
- * @date 2018-02-24 下午03:09:50
- */
-
-@Component
-public class RedisUtil {
- @Autowired
- private StringRedisTemplate redisTemplate;
-
- public StringRedisTemplate getRedisTemplate() {
- return this.redisTemplate;
- }
-
- public void setRedisTemplate(StringRedisTemplate redisTemplate) {
- this.redisTemplate = redisTemplate;
- }
-
- /** -------------------key相关操作--------------------- */
-
- /**
- * 删除key
- *
- * @param key
- */
- public void delete(String key) {
- redisTemplate.delete(key);
- }
-
- /**
- * 批量删除key
- *
- * @param keys
- */
- public void delete(Collection keys) {
- redisTemplate.delete(keys);
- }
-
- /**
- * 序列化key
- *
- * @param key
- * @return
- */
- public byte[] dump(String key) {
- return redisTemplate.dump(key);
- }
-
- /**
- * 是否存在key
- *
- * @param key
- * @return
- */
- public Boolean hasKey(String key) {
- return redisTemplate.hasKey(key);
- }
-
- /**
- * 设置过期时间
- *
- * @param key
- * @param timeout
- * @param unit
- * @return
- */
- public Boolean expire(String key, long timeout, TimeUnit unit) {
- return redisTemplate.expire(key, timeout, unit);
- }
-
- /**
- * 设置过期时间
- *
- * @param key
- * @param date
- * @return
- */
- public Boolean expireAt(String key, Date date) {
- return redisTemplate.expireAt(key, date);
- }
-
- /**
- * 查找匹配的key
- *
- * @param pattern
- * @return
- */
- public Set keys(String pattern) {
- return redisTemplate.keys(pattern);
- }
-
- /**
- * 将当前数据库的 key 移动到给定的数据库 db 当中
- *
- * @param key
- * @param dbIndex
- * @return
- */
- public Boolean move(String key, int dbIndex) {
- return redisTemplate.move(key, dbIndex);
- }
-
- /**
- * 移除 key 的过期时间，key 将持久保持
- *
- * @param key
- * @return
- */
- public Boolean persist(String key) {
- return redisTemplate.persist(key);
- }
-
- /**
- * 返回 key 的剩余的过期时间
- *
- * @param key
- * @param unit
- * @return
- */
- public Long getExpire(String key, TimeUnit unit) {
- return redisTemplate.getExpire(key, unit);
- }
-
- /**
- * 返回 key 的剩余的过期时间
- *
- * @param key
- * @return
- */
- public Long getExpire(String key) {
- return redisTemplate.getExpire(key);
- }
-
- /**
- * 从当前数据库中随机返回一个 key
- *
- * @return
- */
- public String randomKey() {
- return redisTemplate.randomKey();
- }
-
- /**
- * 修改 key 的名称
- *
- * @param oldKey
- * @param newKey
- */
- public void rename(String oldKey, String newKey) {
- redisTemplate.rename(oldKey, newKey);
- }
-
- /**
- * 仅当 newkey 不存在时，将 oldKey 改名为 newkey
- *
- * @param oldKey
- * @param newKey
- * @return
- */
- public Boolean renameIfAbsent(String oldKey, String newKey) {
- return redisTemplate.renameIfAbsent(oldKey, newKey);
- }
-
- /**
- * 返回 key 所储存的值的类型
- *
- * @param key
- * @return
- */
- public DataType type(String key) {
- return redisTemplate.type(key);
- }
-
- /** -------------------string相关操作--------------------- */
-
- /**
- * 设置指定 key 的值
- *
- * @param key
- * @param value
- */
- public void set(String key, String value) {
- redisTemplate.opsForValue().set(key, value);
- }
-
- /**
- * 获取指定 key 的值
- *
- * @param key
- * @return
- */
- public String get(String key) {
- return redisTemplate.opsForValue().get(key);
- }
-
- /**
- * 返回 key 中字符串值的子字符
- *
- * @param key
- * @param start
- * @param end
- * @return
- */
- public String getRange(String key, long start, long end) {
- return redisTemplate.opsForValue().get(key, start, end);
- }
-
- /**
- * 将给定 key 的值设为 value ，并返回 key 的旧值(old value)
- *
- * @param key
- * @param value
- * @return
- */
- public String getAndSet(String key, String value) {
- return redisTemplate.opsForValue().getAndSet(key, value);
- }
-
- /**
- * 对 key 所储存的字符串值，获取指定偏移量上的位(bit)
- *
- * @param key
- * @param offset
- * @return
- */
- public Boolean getBit(String key, long offset) {
- return redisTemplate.opsForValue().getBit(key, offset);
- }
-
- /**
- * 批量获取
- *
- * @param keys
- * @return
- */
- public List multiGet(Collection keys) {
- return redisTemplate.opsForValue().multiGet(keys);
- }
-
- /**
- * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value
- *
- * @param key
- * @param offset 位置
- * @param value 值,true为1, false为0
- * @return
- */
- public boolean setBit(String key, long offset, boolean value) {
- return redisTemplate.opsForValue().setBit(key, offset, value);
- }
-
- /**
- * 将值 value 关联到 key ，并将 key 的过期时间设为 timeout
- *
- * @param key
- * @param value
- * @param timeout 过期时间
- * @param unit 时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES
- * 秒:TimeUnit.SECONDS 毫秒:TimeUnit.MILLISECONDS
- */
- public void setEx(String key, String value, long timeout, TimeUnit unit) {
- redisTemplate.opsForValue().set(key, value, timeout, unit);
- }
-
- /**
- * 只有在 key 不存在时设置 key 的值
- *
- * @param key
- * @param value
- * @return 之前已经存在返回false, 不存在返回true
- */
- public boolean setIfAbsent(String key, String value) {
- return redisTemplate.opsForValue().setIfAbsent(key, value);
- }
-
- /**
- * 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始
- *
- * @param key
- * @param value
- * @param offset 从指定位置开始覆写
- */
- public void setRange(String key, String value, long offset) {
- redisTemplate.opsForValue().set(key, value, offset);
- }
-
- /**
- * 获取字符串的长度
- *
- * @param key
- * @return
- */
- public Long size(String key) {
- return redisTemplate.opsForValue().size(key);
- }
-
- /**
- * 批量添加
- *
- * @param maps
- */
- public void multiSet(Map maps) {
- redisTemplate.opsForValue().multiSet(maps);
- }
-
- /**
- * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
- *
- * @param maps
- * @return 之前已经存在返回false, 不存在返回true
- */
- public boolean multiSetIfAbsent(Map maps) {
- return redisTemplate.opsForValue().multiSetIfAbsent(maps);
- }
-
- /**
- * 增加(自增长), 负数则为自减
- *
- * @param key
- * @param increment
- * @return
- */
- public Long incrBy(String key, long increment) {
- return redisTemplate.opsForValue().increment(key, increment);
- }
-
- /**
- * @param key
- * @param increment
- * @return
- */
- public Double incrByFloat(String key, double increment) {
- return redisTemplate.opsForValue().increment(key, increment);
- }
-
- /**
- * 追加到末尾
- *
- * @param key
- * @param value
- * @return
- */
- public Integer append(String key, String value) {
- return redisTemplate.opsForValue().append(key, value);
- }
-
- /** -------------------hash相关操作------------------------- */
-
- /**
- * 获取存储在哈希表中指定字段的值
- *
- * @param key
- * @param field
- * @return
- */
- public Object hGet(String key, String field) {
- return redisTemplate.opsForHash().get(key, field);
- }
-
- /**
- * 获取所有给定字段的值
- *
- * @param key
- * @return
- */
- public Map hGetAll(String key) {
- return redisTemplate.opsForHash().entries(key);
- }
-
- /**
- * 获取所有给定字段的值
- *
- * @param key
- * @param fields
- * @return
- */
- public List