From 164e0376edd37d5b03dd375ed79cf975c2c49f1a Mon Sep 17 00:00:00 2001 From: ronger Date: Sat, 15 Feb 2020 15:07:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:mag:=201.=20=E5=AE=9A=E6=97=B6=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E4=B8=BB=E9=A1=B5=E6=9B=B4=E6=96=B0(=E7=99=BE?= =?UTF-8?q?=E5=BA=A6=E6=90=9C=E7=B4=A2)=202.=20=E4=B8=BB=E5=8A=A8=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=96=87=E7=AB=A0=E6=9B=B4=E6=96=B0(=E7=99=BE?= =?UTF-8?q?=E5=BA=A6=E6=90=9C=E7=B4=A2)=203.=20=E5=AF=B9=E8=B1=A1=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArticleServiceImpl.java | 95 +++++++++++-------- .../rymcu/vertical/task/BaiduCronTask.java | 24 +++++ .../com/rymcu/vertical/util/BaiDuUtils.java | 42 ++++++++ 3 files changed, 119 insertions(+), 42 deletions(-) create mode 100644 src/main/java/com/rymcu/vertical/task/BaiduCronTask.java diff --git a/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java b/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java index ba98412..1178ab0 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java +++ b/src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java @@ -7,6 +7,7 @@ import com.rymcu.vertical.dto.ArticleTagDTO; import com.rymcu.vertical.dto.Author; import com.rymcu.vertical.entity.Article; import com.rymcu.vertical.entity.ArticleContent; +import com.rymcu.vertical.entity.Tag; import com.rymcu.vertical.entity.User; import com.rymcu.vertical.mapper.ArticleMapper; import com.rymcu.vertical.service.ArticleService; @@ -19,6 +20,7 @@ import org.apache.commons.text.StringEscapeUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import tk.mybatis.mapper.entity.Condition; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -40,10 +42,9 @@ public class ArticleServiceImpl extends AbstractService
implements Arti private TagService tagService; @Resource private UserService userService; - @Value("${reserved-words}") - private String reservedWords; - private static final String DOMAIN = "https://rymcu.com"; + @Value("${resource.domain}") + private static String domain; private static final int MAX_PREVIEW = 200; @@ -101,82 +102,92 @@ public class ArticleServiceImpl extends AbstractService
implements Arti String articleContent = article.getArticleContent(); String articleContentHtml = article.getArticleContentHtml(); User user = UserUtils.getWxCurrentUser(); - boolean checkTags = checkTags(articleTags); + String reservedTag = checkTags(articleTags); boolean notification = false; - if (checkTags) { + if (StringUtils.isNotBlank(reservedTag)) { Integer roleWeights = userService.findRoleWeightsByUser(user.getIdUser()); if (roleWeights > 2) { - map.put("message", StringEscapeUtils.unescapeJava(reservedWords) + "标签为系统保留标签!"); + map.put("message", StringEscapeUtils.unescapeJava(reservedTag) + "标签为系统保留标签!"); return map; } else { notification = true; } } - Article article1; + Article newArticle; if(article.getIdArticle() == null || article.getIdArticle() == 0){ - article1 = new Article(); - article1.setArticleTitle(articleTitle); - article1.setArticleAuthorId(user.getIdUser()); - article1.setArticleTags(articleTags); - article1.setCreatedTime(new Date()); - article1.setUpdatedTime(article1.getCreatedTime()); - articleMapper.insertSelective(article1); - article1.setArticlePermalink(DOMAIN + "/article/"+article1.getIdArticle()); - article1.setArticleLink("/article/"+article1.getIdArticle()); - articleMapper.insertArticleContent(article1.getIdArticle(),articleContent,articleContentHtml); - BaiDuUtils.sendSEOData(article1.getArticlePermalink()); + newArticle = new Article(); + newArticle.setArticleTitle(articleTitle); + newArticle.setArticleAuthorId(user.getIdUser()); + newArticle.setArticleTags(articleTags); + newArticle.setCreatedTime(new Date()); + newArticle.setUpdatedTime(newArticle.getCreatedTime()); + articleMapper.insertSelective(newArticle); + newArticle.setArticlePermalink(domain + "/article/"+newArticle.getIdArticle()); + newArticle.setArticleLink("/article/"+newArticle.getIdArticle()); + articleMapper.insertArticleContent(newArticle.getIdArticle(),articleContent,articleContentHtml); + BaiDuUtils.sendSEOData(newArticle.getArticlePermalink()); } else { - article1 = articleMapper.selectByPrimaryKey(article.getIdArticle()); - if(!user.getIdUser().equals(article1.getArticleAuthorId())){ + newArticle = articleMapper.selectByPrimaryKey(article.getIdArticle()); + if(!user.getIdUser().equals(newArticle.getArticleAuthorId())){ map.put("message","非法访问！"); return map; } - article1.setArticleTitle(articleTitle); - article1.setArticleTags(articleTags); + newArticle.setArticleTitle(articleTitle); + newArticle.setArticleTags(articleTags); if(StringUtils.isNotBlank(articleContentHtml)){ Integer length = articleContentHtml.length(); if(length > MAX_PREVIEW){ length = 200; } String articlePreviewContent = articleContentHtml.substring(0,length); - article1.setArticlePreviewContent(Html2TextUtil.getContent(articlePreviewContent)); + newArticle.setArticlePreviewContent(Html2TextUtil.getContent(articlePreviewContent)); } - article1.setUpdatedTime(new Date()); - articleMapper.updateArticleContent(article1.getIdArticle(),articleContent,articleContentHtml); + newArticle.setUpdatedTime(new Date()); + articleMapper.updateArticleContent(newArticle.getIdArticle(),articleContent,articleContentHtml); + BaiDuUtils.updateSEOData(newArticle.getArticlePermalink()); } if (notification) { - NotificationUtils.sendAnnouncement(article1.getIdArticle(), NotificationConstant.Article, article1.getArticleTitle()); + NotificationUtils.sendAnnouncement(newArticle.getIdArticle(), NotificationConstant.Article, newArticle.getArticleTitle()); } - tagService.saveTagArticle(article1); - articleMapper.updateByPrimaryKeySelective(article1); + tagService.saveTagArticle(newArticle); + articleMapper.updateByPrimaryKeySelective(newArticle); - map.put("id", article1.getIdArticle()); + map.put("id", newArticle.getIdArticle()); return map; } - private boolean checkTags(String articleTags) { - if (StringUtils.isNotBlank(reservedWords) && StringUtils.isNotBlank(articleTags)) { - String[] words = StringEscapeUtils.unescapeJava(reservedWords).split(","); - String[] tags = articleTags.split(","); - for(String word: words) { - if (StringUtils.isBlank(word)) { + private String checkTags(String articleTags) { + // 判断文章是否有标签 + if(StringUtils.isBlank(articleTags)){ + return ""; + } + // 判断是否存在系统配置的保留标签词 + Condition condition = new Condition(Tag.class); + condition.createCriteria().andEqualTo("tagReservation", "1"); + List tags = tagService.findByCondition(condition); + if (tags.isEmpty()) { + return ""; + } else { + String[] articleTagArr = articleTags.split(","); + for (Tag tag : tags) { + if (StringUtils.isBlank(tag.getTagTitle())) { continue; } - for (String tag: tags) { - if (StringUtils.isBlank(tag)) { + + for (String articleTag: articleTagArr) { + if (StringUtils.isBlank(articleTag)) { continue; } - if (tag.equals(word)) { - return true; + if (articleTag.equals(tag.getTagTitle())) { + return tag.getTagTitle(); } } } - } else { - return false; } - return false; + + return ""; } @Override diff --git a/src/main/java/com/rymcu/vertical/task/BaiduCronTask.java b/src/main/java/com/rymcu/vertical/task/BaiduCronTask.java new file mode 100644 index 0000000..b261652 --- /dev/null +++ b/src/main/java/com/rymcu/vertical/task/BaiduCronTask.java @@ -0,0 +1,24 @@ +package com.rymcu.vertical.task; + +import com.rymcu.vertical.util.BaiDuUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class BaiduCronTask { + + @Value("${resource.domain}") + private String domain; + + /** + * 定时推送首页更新 + * */ + @Scheduled(cron = "0 0 10,14,18 * * ?") + public void pushHome() { + BaiDuUtils.updateSEOData(domain); + } + +} diff --git a/src/main/java/com/rymcu/vertical/util/BaiDuUtils.java b/src/main/java/com/rymcu/vertical/util/BaiDuUtils.java index 77ff880..5e83cd0 100644 --- a/src/main/java/com/rymcu/vertical/util/BaiDuUtils.java +++ b/src/main/java/com/rymcu/vertical/util/BaiDuUtils.java @@ -35,6 +35,48 @@ public class BaiDuUtils { },executor); } + public static void updateSEOData(String permalink) { + if (StringUtils.isBlank(permalink) || StringUtils.isBlank(token)) { + return; + } + ExecutorService executor= new ThreadPoolExecutor(1,1,0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue()); + CompletableFuture.supplyAsync(()-> { + try { + HttpResponse response = HttpRequest.post("http://data.zz.baidu.com/update?site=" + site + "&token=" + token). + header("User-Agent", "curl/7.12.1"). + header("Host", "data.zz.baidu.com"). + header("Content-Type", "text/plain"). + header("Connection", "close").body(permalink.getBytes(), "text/plain").timeout(30000).send(); + response.charset("UTF-8"); + System.out.println(response.bodyText()); + } catch (Exception e){ + e.printStackTrace(); + } + return 0; + },executor); + } + + public static void deleteSEOData(String permalink) { + if (StringUtils.isBlank(permalink) || StringUtils.isBlank(token)) { + return; + } + ExecutorService executor= new ThreadPoolExecutor(1,1,0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue()); + CompletableFuture.supplyAsync(()-> { + try { + HttpResponse response = HttpRequest.post("http://data.zz.baidu.com/del?site=" + site + "&token=" + token). + header("User-Agent", "curl/7.12.1"). + header("Host", "data.zz.baidu.com"). + header("Content-Type", "text/plain"). + header("Connection", "close").body(permalink.getBytes(), "text/plain").timeout(30000).send(); + response.charset("UTF-8"); + System.out.println(response.bodyText()); + } catch (Exception e){ + e.printStackTrace(); + } + return 0; + },executor); + } + public static void main(String agrs[]){ sendSEOData("https://rymcu.com/article/31"); } From 2d24f698ffd2f91bfa3a832507057ee51d9f2634 Mon Sep 17 00:00:00 2001 From: ronger Date: Sat, 15 Feb 2020 15:13:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=AD=A3=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rymcu/vertical/entity/Tag.java | 2 ++ .../com/rymcu/vertical/mapper/TagMapper.java | 2 +- .../vertical/service/impl/TagServiceImpl.java | 32 ++++++++++++++++--- src/main/java/mapper/TagMapper.xml | 5 +-- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/rymcu/vertical/entity/Tag.java b/src/main/java/com/rymcu/vertical/entity/Tag.java index 24dba8f..b53e68a 100644 --- a/src/main/java/com/rymcu/vertical/entity/Tag.java +++ b/src/main/java/com/rymcu/vertical/entity/Tag.java @@ -42,4 +42,6 @@ public class Tag implements Serializable,Cloneable { private Date createdTime; /** 更新时间 */ private Date updatedTime; + /** 保留标签 */ + private String tagReservation; } diff --git a/src/main/java/com/rymcu/vertical/mapper/TagMapper.java b/src/main/java/com/rymcu/vertical/mapper/TagMapper.java index 64c7b14..dcd8d30 100644 --- a/src/main/java/com/rymcu/vertical/mapper/TagMapper.java +++ b/src/main/java/com/rymcu/vertical/mapper/TagMapper.java @@ -15,5 +15,5 @@ public interface TagMapper extends Mapper { Integer deleteUnusedTag(); - Integer update(@Param("idTag") Integer idTag, @Param("tagUri") String tagUri, @Param("tagIconPath") String tagIconPath, @Param("tagStatus") String tagStatus, @Param("tagDescription") String tagDescription); + Integer update(@Param("idTag") Integer idTag, @Param("tagUri") String tagUri, @Param("tagIconPath") String tagIconPath, @Param("tagStatus") String tagStatus, @Param("tagDescription") String tagDescription, @Param("tagReservation") String tagReservation); } diff --git a/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java b/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java index d78b366..4c02be0 100644 --- a/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java +++ b/src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java @@ -11,12 +11,14 @@ import com.rymcu.vertical.web.api.exception.BaseApiException; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import tk.mybatis.mapper.entity.Condition; import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -87,15 +89,35 @@ public class TagServiceImpl extends AbstractService implements TagService { @Transactional(rollbackFor = Exception.class) public Map saveTag(Tag tag) { Integer result = 0; + + Map map = new HashMap(1); if (tag.getIdTag() == null) { - tag.setCreatedTime(new Date()); - tag.setUpdatedTime(tag.getCreatedTime()); - result = tagMapper.insertSelective(tag); + if (StringUtils.isBlank(tag.getTagTitle())) { + map.put("message","标签名不能为空!"); + return map; + } else { + Condition tagCondition = new Condition(Tag.class); + tagCondition.createCriteria().andCondition("tag_title =", tag.getTagTitle()); + List tags = tagMapper.selectByCondition(tagCondition); + if (!tags.isEmpty()) { + map.put("message","标签 '" + tag.getTagTitle() + "' 已存在!"); + return map; + } + } + Tag newTag = new Tag(); + newTag.setTagTitle(tag.getTagTitle()); + newTag.setTagUri(tag.getTagUri()); + newTag.setTagIconPath(tag.getTagIconPath()); + newTag.setTagStatus(tag.getTagStatus()); + newTag.setTagDescription(tag.getTagDescription()); + newTag.setTagReservation(tag.getTagReservation()); + newTag.setCreatedTime(new Date()); + newTag.setUpdatedTime(tag.getCreatedTime()); + result = tagMapper.insertSelective(newTag); } else { tag.setUpdatedTime(new Date()); - result = tagMapper.update(tag.getIdTag(),tag.getTagUri(),tag.getTagIconPath(),tag.getTagStatus(),tag.getTagDescription()); + result = tagMapper.update(tag.getIdTag(),tag.getTagUri(),tag.getTagIconPath(),tag.getTagStatus(),tag.getTagDescription(),tag.getTagReservation()); } - Map map = new HashMap(1); if (result == 0) { map.put("message","操作失败!"); } else { diff --git a/src/main/java/mapper/TagMapper.xml b/src/main/java/mapper/TagMapper.xml index 32baccd..4f4d437 100644 --- a/src/main/java/mapper/TagMapper.xml +++ b/src/main/java/mapper/TagMapper.xml @@ -13,6 +13,7 @@ + @@ -24,10 +25,10 @@ insert into vertical_user_tag (id_tag,id_user,type,created_time,updated_time) values (#{idTag},#{idUser},#{type},sysdate(),sysdate()) - update vertical_tag set tag_uri = #{tagUri}, tag_icon_path = #{tagIconPath}, tag_status = #{tagStatus}, tag_description = #{tagDescription} where id = #{idTag} + update vertical_tag set tag_uri = #{tagUri}, tag_icon_path = #{tagIconPath}, tag_status = #{tagStatus}, tag_description = #{tagDescription}, tag_reservation = #{tagReservation} where id = #{idTag} - delete from vertical_tag where id not in (select * from (select id_tag from vertical_tag_article vta left join vertical_article va on vta.id_article = va.id where va.id is not null) tmp); + delete from vertical_tag where tag_reservation = 0 and id not in (select * from (select id_tag from vertical_tag_article vta left join vertical_article va on vta.id_article = va.id where va.id is not null) tmp);