From 3284eb81a736c1cf3e78d92ecb690d47e5d7e7e6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Aug 2022 15:42:29 +0800
Subject: [PATCH] Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve
---
src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java
index c73ba7b..2c500ac 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/ArticleDataParserHandler.java
@@ -25,10 +25,11 @@
public class ArticleDataParserHandler implements DataParserHandler {
private final ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
- private final CmsProperties cmsProperties = SpringContextHolder.getBean(CmsProperties.class);
@Override
public void dataParser(AttrNode node) {
- log.info("文章解析");
+// log.info("######文章解析########");
+ String baseUrl = (String) node.getSystemDataValue("baseUrl");
+
Article tag = (Article) node.getParam();
ArticleEntity data = articleMapper.selectById(tag.getId());
@@ -40,7 +41,7 @@
if (prevEntity.getType() == 2) {
prev.setUrl(prevEntity.getArticleUrl());
} else {
- prev.setUrl(cmsProperties.getBaseUrl() + prevEntity.getPath() + "/" + prevEntity.getId() + ".html");
+ prev.setUrl(baseUrl + prevEntity.getPath() + "/" + prevEntity.getId() + ".html");
}
articleData.setPrev(prev);
@@ -54,7 +55,7 @@
if (nextEntity.getType() == 2) {
next.setUrl(nextEntity.getArticleUrl());
} else {
- next.setUrl(cmsProperties.getBaseUrl() + nextEntity.getPath() + "/" + nextEntity.getId() + ".html");
+ next.setUrl(baseUrl + nextEntity.getPath() + "/" + nextEntity.getId() + ".html");
}
articleData.setNext(next);
--
Gitblit v1.9.1