20220606

xiaoyong931011

2022-07-07 472f283b4da53a68dddb2ade8a32f646cc475f9f

20220606

 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 {

 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);
    }

}