farmer-cms.git - Gitblit

			@@ -79,7 +79,7 @@

			for (File templateFile : files) {
			if (!templateFile.isFile()) {
			FileUtil.move(templateFile, new File(FileUtils.path(staticPath, templateFile.getName())), true);
			FileUtil.move(templateFile, new File(staticPath), true);
			continue;
			}

			@@ -104,7 +104,7 @@
			cmsTemplate.setType(1);
			}
			cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : templateFile.getName());
			cmsTemplate.setPath(IdUtil.simpleUUID()+templateFile.getName());
			cmsTemplate.setPath(templateFile.getName());

			this.baseMapper.insert(cmsTemplate);
			}
			@@ -126,7 +126,7 @@
			cmsTemplate.setType(1);
			}
			cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : file.getName());
			cmsTemplate.setPath(IdUtil.simpleUUID()+file.getName());
			cmsTemplate.setPath(file.getName());

			this.baseMapper.insert(cmsTemplate);
			}
			@@ -156,7 +156,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);
			}
			@@ -166,12 +165,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 {