diff --git a/README.md b/README.md index 715f014402ca66ee11f3be66df2ec7188abfd74f..f72a1b6994d7266514348d4d71bf26d79a676edb 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ Jeecg-Boot快速开发平台,可以应用在任何J2EE项目的开发中,尤 - 依赖管理:Maven -- 数据库:MySQL5.0+ & Oracle 11g & Sqlserver2008 +- 数据库:MySQL5.0 & Oracle 11g & Sqlserver2005 - 缓存:Redis diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java index 02bda26156d68279a2f19e11fa31928d0104d4ad..3bd464795fb43101ef836c6099b102323d032602 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java @@ -68,6 +68,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/actuator/metrics/**", "anon"); filterChainDefinitionMap.put("/actuator/httptrace/**", "anon"); filterChainDefinitionMap.put("/actuator/redis/**", "anon"); + filterChainDefinitionMap.put("/test/jeecgDemo/demo3", "anon"); //模板测试 + filterChainDefinitionMap.put("/test/jeecgDemo/redisDemo/**", "anon"); //redis测试 // 添加自己的过滤器并且取名为jwt diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java index 0dde6d04dbfbe08c33469f2efb08df9a4bd6ebb8..35cb6b975307950ffe299fc3a7bb26a76376427b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java @@ -1,5 +1,7 @@ package org.jeecg.modules.demo.test.entity; +import java.io.Serializable; + import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -24,8 +26,8 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @ApiModel(value="测试DEMO对象", description="测试DEMO") @TableName("demo") -public class JeecgDemo extends JeecgEntity { - +public class JeecgDemo extends JeecgEntity implements Serializable { + private static final long serialVersionUID = 1L; /** 部门编码 */ @Excel(name="部门编码",width=25) @ApiModelProperty(value = "部门编码") diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java index 6dcd11c048be3cb62b5ce73363eefde1047f6b88..dde898043b2cba2e87a17eaa23ba11c33f1eb39b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java @@ -166,7 +166,9 @@ public class SysPermissionServiceImpl extends ServiceImpl().lambda().eq(SysPermission::getParentId, p.getParentId())); if(cc==0) { - this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1); + if(oConvertUtils.isNotEmpty(p.getParentId())) { + this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1); + } } }