From 472f283b4da53a68dddb2ade8a32f646cc475f9f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 15:55:40 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 6 +-----
src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
index dc2c206..85c2902 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
@@ -155,7 +155,6 @@
Long companyId = LoginUserUtil.getCompanyId();
QueryWrapper<CmsTemplateEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("company_id",companyId);
- objectQueryWrapper.eq("company_id",companyId);
List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
return Result.ok(cmsTemplateEntities);
}
@@ -165,12 +164,9 @@
@Override
public Result viewTemplateInfo(Long id) {
- Long companyId = LoginUserUtil.getCompanyId();
CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
- String baseUrl = cmsProperties.getBaseUrl();
String templatePath = cmsProperties.getTemplatePath();
- String htmlUrl = baseUrl + templatePath;
- String pathName = htmlUrl + "/" + cmsTemplateEntity.getPath();
+ String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());
byte[] bytes = new byte[0];
try {
diff --git a/src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java b/src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java
index 87f25ee..542c24e 100644
--- a/src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java
+++ b/src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java
@@ -2,9 +2,11 @@
import cn.hutool.core.util.ObjectUtil;
import com.xcong.farmer.cms.common.response.Result;
+import com.xcong.farmer.cms.common.utils.FileUtils;
import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
import com.xcong.farmer.cms.modules.system.mapper.CmsTemplateMapper;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.test.dao.TestUserDao;
import com.xcong.farmer.cms.modules.test.entity.TestUserEntity;
import org.jsoup.Jsoup;
@@ -80,4 +82,14 @@
System.out.println(content);
}
+ @Test
+ public void path(){
+ Long id = 6L;
+ CmsTemplateEntity cmsTemplateEntity = cmsTemplateMapper.selectById(id);
+ String templatePath = cmsProperties.getTemplatePath();
+ String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());
+ System.out.println(templatePath);
+ System.out.println(pathName);
+ }
+
}
--
Gitblit v1.9.1