From f5a13f79a9cae5af79e25535256cd11e13aa424b Mon Sep 17 00:00:00 2001
From: wangbing <1919101440@qq.com>
Date: Sun, 7 Jul 2019 23:32:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/SpringBoot/java/action/GlobalController.ftl     | 5 ++---
 .../modules/SpringBoot/java/frame/base/BaseEntity.java      | 3 ++-
 src/main/resources/modules/SpringBoot/pom.ftl               | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl b/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl
index 5fac6b05..5c73a2ab 100644
--- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl
+++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl
@@ -164,16 +164,15 @@ public class GlobalController implements ErrorController {
 
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-        headers.setContentDispositionFormData("attachment", new String(downFile.getName().getBytes("UTF-8"), "iso-8859-1"));
 
         //========
         //下载DEMO
         //========
         if (file == null) {
             file = "test.txt";
-            headers.setContentDispositionFormData("attachment", file);
+            headers.setContentDispositionFormData("attachment", new String(file.getBytes("UTF-8"), "iso-8859-1"));
             return new ResponseEntity<byte[]>("test".getBytes(),
-                    headers, HttpStatus.CREATED);
+                headers, HttpStatus.CREATED);
         }
 
         return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(new File(file)),
diff --git a/src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java b/src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java
index 71de623e..c1e1d823 100644
--- a/src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java
+++ b/src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java
@@ -1,6 +1,7 @@
 package ${basePackage}.frame.base;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -11,7 +12,7 @@ import java.util.Date;
  * @since 2017-01-01
  */
 
-public class BaseEntity {
+public class BaseEntity implements Serializable {
 
     /**
      * 行版本
diff --git a/src/main/resources/modules/SpringBoot/pom.ftl b/src/main/resources/modules/SpringBoot/pom.ftl
index 17c6a9db..b39d92e6 100644
--- a/src/main/resources/modules/SpringBoot/pom.ftl
+++ b/src/main/resources/modules/SpringBoot/pom.ftl
@@ -24,6 +24,7 @@
         <commons-io-version>2.6</commons-io-version>
         <pagehelper-version>1.2.5</pagehelper-version>
         <mybatis-version>1.3.2</mybatis-version>
+        <ehcache-version>1.1.0</ehcache-version>
         <dozer-version>5.5.1</dozer-version>
         <spring-cloud.version>Greenwich.RC2</spring-cloud.version>
     </properties>
@@ -143,6 +144,11 @@
                 <artifactId>mybatis-spring-boot-starter</artifactId>
                 <version>${r'${mybatis-version}'}</version>
             </dependency>
+            <dependency>
+                <groupId>org.mybatis.caches</groupId>
+                <artifactId>mybatis-ehcache</artifactId>
+                <version>${r'${ehcache-version}'}</version>
+            </dependency>
             <dependency>
                 <groupId>net.sf.dozer</groupId>
                 <artifactId>dozer</artifactId>