From 5f72ec020fc003d4b3d681e52c1f977ff1f3b95c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 04 Jul 2022 17:11:47 +0800
Subject: [PATCH] fix upload template
---
src/main/java/com/xcong/farmer/cms/common/utils/FileUtils.java | 48 +++++++++++++++++++++--
src/main/java/com/xcong/farmer/cms/common/exception/GlobalException.java | 2
src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java | 3 +
src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java | 2
src/main/java/com/xcong/farmer/cms/configurations/GlobalExceptionHandler.java | 6 +++
5 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/common/exception/GlobalException.java b/src/main/java/com/xcong/farmer/cms/common/exception/GlobalException.java
index 938cd36..8780f85 100644
--- a/src/main/java/com/xcong/farmer/cms/common/exception/GlobalException.java
+++ b/src/main/java/com/xcong/farmer/cms/common/exception/GlobalException.java
@@ -1,4 +1,4 @@
-package com.xcong.excoin.common.exception;
+package com.xcong.farmer.cms.common.exception;
import lombok.Getter;
diff --git a/src/main/java/com/xcong/farmer/cms/common/utils/FileUtils.java b/src/main/java/com/xcong/farmer/cms/common/utils/FileUtils.java
index 005a65c..a6d4283 100644
--- a/src/main/java/com/xcong/farmer/cms/common/utils/FileUtils.java
+++ b/src/main/java/com/xcong/farmer/cms/common/utils/FileUtils.java
@@ -1,7 +1,45 @@
-package com.xcong.farmer.cms.common.utils;/**
-*
-* @author wzy
-* @date 2022-07-04
-**/
+package com.xcong.farmer.cms.common.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+/**
+ * @author wzy
+ * @date 2022-07-04
+ **/
public class FileUtils {
+
+ public static String path(String path) {
+ if (!path.endsWith("/")) {
+ return path + "/";
+ }
+
+ return path;
+ }
+
+ public static String path(String path, String fileName) {
+ File file = new File(path);
+ if (!file.isDirectory()){
+ return "";
+ }
+
+ String dir = path(path);
+ return dir + fileName;
+ }
+
+ public static void zipUpload(File file, String templateDir, String staticDir) throws IOException {
+ ZipFile zipFile = new ZipFile(file);
+
+ Enumeration<? extends ZipEntry> entries = zipFile.entries();
+ if (entries.hasMoreElements()) {
+ ZipEntry zipEntry = entries.nextElement();
+ if (zipEntry.isDirectory()) {
+// zipEntry.
+ }
+ System.out.println(zipEntry.getName());
+ }
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java b/src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java
index cfbfc5b..10f3e34 100644
--- a/src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java
+++ b/src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java
@@ -17,7 +17,7 @@
@Bean
public TemplateConfiguration templateConfiguration() {
log.info("CMS管理系统");
- TemplateConfiguration cfg = new TemplateConfiguration("/Users/helius/Desktop/court-web", "", "/Users/helius/Desktop/web/output");
+ TemplateConfiguration cfg = new TemplateConfiguration("/Users/helius/Desktop/template", "", "/Users/helius/Desktop/web/output");
TemplateLoader loader = new TemplateLoader(cfg);
cfg.templateLoader(loader);
return cfg;
diff --git a/src/main/java/com/xcong/farmer/cms/configurations/GlobalExceptionHandler.java b/src/main/java/com/xcong/farmer/cms/configurations/GlobalExceptionHandler.java
index 970906e..8fc9cc1 100644
--- a/src/main/java/com/xcong/farmer/cms/configurations/GlobalExceptionHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/configurations/GlobalExceptionHandler.java
@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.configurations;
+import com.xcong.farmer.cms.common.exception.GlobalException;
import com.xcong.farmer.cms.common.response.Result;
import lombok.extern.slf4j.Slf4j;
import org.springframework.dao.DuplicateKeyException;
@@ -55,6 +56,11 @@
return Result.fail("系统异常");
}
+ @ExceptionHandler(value = {GlobalException.class})
+ public Result handleException(GlobalException e) {
+ return Result.fail(e.getMessage());
+ }
+
/**
* spring security 账户密码验证异常
*
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 35e5f18..74ff8d3 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,8 @@
package com.xcong.farmer.cms.core.handler;
import com.xcong.farmer.cms.core.node.AttrNode;
+import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
+import com.xcong.farmer.cms.utils.SpringContextHolder;
import java.util.ArrayList;
import java.util.HashMap;
@@ -13,6 +15,7 @@
**/
public class NavDataParserHandler implements DataParserHandler {
+ private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
@Override
public void dataParser(AttrNode node) {
--
Gitblit v1.9.1