From 1facfdc9361d888d72c959bac4d8fb05dcad02d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 18:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java
index ab64db2..b50a231 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.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.NavData;
@@ -27,7 +28,8 @@
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 node) {
log.info("导航栏解析");
@@ -43,7 +45,7 @@
NavData index = new NavData();
index.setTitle("首页");
- index.setUrl(BASE_URL);
+ index.setUrl(cmsProperties.getBaseUrl());
index.setCode("index");
list.add(index);
@@ -73,14 +75,14 @@
public NavData columnToNav(ColumnEntity column) {
NavData navData = ColumnConversion.INSTANCE.columnToNav(column);
- navData.setUrl(BASE_URL + column.getPath());
+ navData.setUrl(cmsProperties.getBaseUrl() + column.getPath());
if (column.getType() == 2) {
if (column.getTargetType() == 1) {
ArticleEntity article = this.articleMapper.selectArticleById(Long.parseLong(column.getTargetUrl()));
- navData.setUrl(BASE_URL + article.getPath() + "/" + article.getId() + ".html");
+ navData.setUrl(cmsProperties.getBaseUrl() + article.getPath() + "/" + article.getId() + ".html");
} else if (column.getTargetType() == 2) {
ColumnEntity columnEntity = this.columnMapper.selectByCodeAndCompanyId(column.getTargetUrl(), column.getCompanyId());
- navData.setUrl(BASE_URL + columnEntity.getPath());
+ navData.setUrl(cmsProperties.getBaseUrl() + columnEntity.getPath());
} else {
navData.setUrl(column.getTargetUrl());
}
--
Gitblit v1.9.1