From 8fc04d4af4b80d9b1ed13141f8600234ba37f38b Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 27 Aug 2019 14:16:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=8A=A0=E5=BC=BA=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E9=A1=B9=EF=BC=9A=E6=98=AF=E5=90=A6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=EF=BC=88=E6=9F=90=E4=BA=9B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=A0=8F=E4=B8=AD=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BC=93=E5=AD=98=E8=8F=9C=E5=8D=95=EF=BC=88?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=A3=E5=86=B3=E5=88=87=E6=8D=A2Tab=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/zhengjie/modules/system/domain/Menu.java  | 7 +++++++
 .../me/zhengjie/modules/system/domain/vo/MenuMetaVo.java   | 2 ++
 .../java/me/zhengjie/modules/system/domain/vo/MenuVo.java  | 2 ++
 .../me/zhengjie/modules/system/service/dto/MenuDTO.java    | 4 ++++
 .../modules/system/service/impl/MenuServiceImpl.java       | 5 ++++-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java
index b9f684f0..bd47c433 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java
@@ -34,6 +34,7 @@ public class Menu implements Serializable {
     @NotNull
     private Long sort;
 
+    @NotBlank
     @Column(name = "path")
     private String path;
 
@@ -41,6 +42,12 @@ public class Menu implements Serializable {
 
     private String icon;
 
+    @Column(columnDefinition = "bit(1) default 0")
+    private Boolean cache;
+
+    @Column(columnDefinition = "bit(1) default 0")
+    private Boolean hidden;
+
     /**
      * 上级菜单ID
      */
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java
index d6fc9ddd..00856fb1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java
@@ -15,4 +15,6 @@ public class MenuMetaVo implements Serializable {
     private String title;
 
     private String icon;
+
+    private Boolean noCache;
 }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java
index ea0610ba..c511c3db 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java
@@ -19,6 +19,8 @@ public class MenuVo implements Serializable {
 
     private String path;
 
+    private Boolean hidden;
+
     private String redirect;
 
     private String component;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java
index 9dd8bd61..d5f1d014 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java
@@ -27,6 +27,10 @@ public class MenuDTO {
 
     private Boolean iFrame;
 
+    private Boolean cache;
+
+    private Boolean hidden;
+
     private String icon;
 
     private List<MenuDTO> children;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
index 7d081559..f8ac5026 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java
@@ -92,6 +92,8 @@ public class MenuServiceImpl implements MenuService {
         menu.setIFrame(resources.getIFrame());
         menu.setPid(resources.getPid());
         menu.setSort(resources.getSort());
+        menu.setCache(resources.getCache());
+        menu.setHidden(resources.getHidden());
         menuRepository.save(menu);
     }
 
@@ -158,6 +160,7 @@ public class MenuServiceImpl implements MenuService {
                 MenuVo menuVo = new MenuVo();
                 menuVo.setName(menuDTO.getName());
                 menuVo.setPath(menuDTO.getPath());
+                menuVo.setHidden(menuDTO.getHidden());
 
                 // 如果不是外链
                 if(!menuDTO.getIFrame()){
@@ -169,7 +172,7 @@ public class MenuServiceImpl implements MenuService {
                         menuVo.setComponent(menuDTO.getComponent());
                     }
                 }
-                menuVo.setMeta(new MenuMetaVo(menuDTO.getName(),menuDTO.getIcon()));
+                menuVo.setMeta(new MenuMetaVo(menuDTO.getName(),menuDTO.getIcon(),!menuDTO.getCache()));
                 if(menuDTOList!=null && menuDTOList.size()!=0){
                     menuVo.setAlwaysShow(true);
                     menuVo.setRedirect("noredirect");