From f17a3980d0dfec11c1db69503e930fa20b6684f8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 11:17:39 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
index db0ebb5..0ec80b8 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
@@ -1,6 +1,7 @@
package com.xcong.farmer.cms.core.handler;
import cn.hutool.core.collection.CollUtil;
+import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.conversion.ColumnConversion;
import com.xcong.farmer.cms.core.node.AttrNode;
import com.xcong.farmer.cms.core.tag.data.ColumnData;
@@ -25,7 +26,7 @@
private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
- private String BASE_URL = "http://192.168.0.1/";
+ private CmsProperties cmsProperties = SpringContextHolder.getBean(CmsProperties.class);
@Override
public void dataParser(AttrNode attrNode) {
@@ -55,13 +56,14 @@
public ColumnData columnToData(ColumnEntity column) {
ColumnData columnData = ColumnConversion.INSTANCE.entityToData(column);
- columnData.setUrl(BASE_URL + columnData.getCode());
+ columnData.setUrl(cmsProperties.getBaseUrl() + column.getPath());
if (column.getType() == 2) {
if (column.getTargetType() == 1) {
ArticleEntity article = this.articleMapper.selectArticleById(Long.parseLong(column.getTargetUrl()));
- columnData.setUrl(BASE_URL + article.getColumnCode() + "/" + article.getId() + ".html");
+ columnData.setUrl(cmsProperties.getBaseUrl() + article.getPath() + "/" + article.getId() + ".html");
} else if (column.getTargetType() == 2) {
- columnData.setUrl(BASE_URL + column.getTargetUrl());
+ ColumnEntity columnEntity = this.columnMapper.selectByCodeAndCompanyId(column.getTargetUrl(), column.getCompanyId());
+ columnData.setUrl(cmsProperties.getBaseUrl() + columnEntity.getPath());
} else {
columnData.setUrl(column.getTargetUrl());
}
--
Gitblit v1.9.1