|
@@ -91,7 +91,7 @@ public class FreemarkerUtil {
|
|
|
Template template = configuration.getTemplate(ftlName + SystemConstant.FTL_PREFIX);
|
|
|
// step2 生成数据
|
|
|
StringJoiner localStringJoiner = new StringJoiner("");
|
|
|
- localStringJoiner.add(SystemConstant.TEMP_FILES_DIR + File.separator + ftlPath.replaceAll(UploadFileEnum.FILE.getTitle(), UploadFileEnum.HTML.getTitle()))
|
|
|
+ localStringJoiner.add(SystemConstant.TEMP_FILES_DIR + File.separator + ftlPath.replaceAll(UploadFileEnum.FILE.getTitle(), UploadFileEnum.HTML.getTitle()).replaceAll(UploadFileEnum.UPLOAD.getTitle(), UploadFileEnum.HTML.getTitle()))
|
|
|
.add(File.separator)
|
|
|
.add(ftlName)
|
|
|
.add(SystemConstant.HTML_PREFIX);
|
|
@@ -107,7 +107,7 @@ public class FreemarkerUtil {
|
|
|
boolean oss = dictionaryConfig.sysDomain().isOss();
|
|
|
if (oss) {
|
|
|
StringJoiner stringJoiner = new StringJoiner("");
|
|
|
- stringJoiner.add(ftlPath.replaceAll(UploadFileEnum.FILE.getTitle(), UploadFileEnum.HTML.getTitle()))
|
|
|
+ stringJoiner.add(ftlPath.replaceAll(UploadFileEnum.FILE.getTitle(), UploadFileEnum.HTML.getTitle()).replaceAll(UploadFileEnum.UPLOAD.getTitle(), UploadFileEnum.HTML.getTitle()))
|
|
|
.add(File.separator).add(ftlName).add(SystemConstant.HTML_PREFIX);
|
|
|
ossUtil.ossUpload(stringJoiner.toString(), htmlFile, DigestUtils.md5Hex(new FileInputStream(htmlFile)));
|
|
|
jsonObject.put(SystemConstant.HTML_PATH, stringJoiner.toString());
|