diff --git a/README.md b/README.md index 47675aac..dce33152 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ JeeSite 是一个低代码开发平台,具有较高的封装度、扩展性, ## 技术选型 -* 主框架:Spring Boot 2.5、Spring Framework 5.3、Apache Shiro 1.8、J2Cache +* 主框架:Spring Boot 2.5、Spring Framework 5.3、Apache Shiro 1.9、J2Cache * 持久层:Apache MyBatis 3.5、Hibernate Validator 6.2、Alibaba Druid 1.2 * 视图层:Spring MVC 5.3、Beetl 3.3(替换JSP)、Bootstrap 3.3、AdminLTE 2.4 * 前端组件:jQuery 3.5、jqGrid 4.7、layer 3.5、zTree 3.5、jQuery Validation diff --git a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java index b7868737..8f8b56a9 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java @@ -62,7 +62,7 @@ public class ShiroConfig { @ConditionalOnMissingBean(name="shiroFilterProxy") public FilterRegistrationBean shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception { FilterRegistrationBean bean = new FilterRegistrationBean<>(); - bean.setFilter((Filter) shiroFilter.getInstance()); + bean.setFilter(shiroFilter.getObject()); bean.addUrlPatterns("/*"); bean.setOrder(Ordered.HIGHEST_PRECEDENCE + 5000); return bean; diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 7c4f0825..a291e2d5 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -85,7 +85,7 @@ spring: # 缓存及会话共享(专业版) isClusterMode: false # 清理全部缓存按钮所清理的缓存列表 - clearNames: sysCache,corpCache,userCache,cmsCache,msgPcPoolCache,roleCache,fileUploadCache,bpmFormCache + clearNames: sysCache,corpCache,userCache,roleCache,fileUploadCache,msgPcPoolCache,cmsCache,bpmFormCache # 用户缓存 #userCache: # clearTaskPool: @@ -190,7 +190,7 @@ user: # 数据权限调试模式(会输出一些日志) dataScopeDebug: false - + # 数据权限使用 API 方式实现(适应 Cloud 环境,基础用户表与业务数据表跨库的情况) # 开启后设置 ctrlDataAttrName 加 AndChildren 后缀,ctrlDataParentCodesAttrName 清空 # 以方便读取树结构数据权限的表时包含子节点,举例如下: diff --git a/parent/pom.xml b/parent/pom.xml index 6a946b50..3a52633c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.12 + 2.5.13 com.jeesite @@ -21,43 +21,42 @@ - 2.7 + 2.11.0 1.9 1.9.4 2.57 - 1.2.78 - 2.13.0 + 1.2.80 1.5 - 1.1.1 + + 1.21 - 0.4.14 - 3.7.0 + 0.4.17 + 3.8.2 1.1.2 0.1.5 3.4.1 4.1.2 2.5.1 - 3.0.9 + 3.0.10 3.5.9 2.0.6 - 4.3 - 1.2.8 - 1.8.0 + 4.4 + 1.2.9 + 1.9.0 2.8.0-release - 3.8-SNAPSHOT 1.6.0 2.17.0 - 8.0.27 + 8.0.29 1.8 - 9.0.58 + true 2.18.1 false @@ -158,7 +157,6 @@ 3.2.3 - WEB-INF/classes/*.lic, userfiles/** ${project.build.directory}/${project.artifactId} diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index f470aaaa..313aa9be 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -275,7 +275,7 @@ spring: # # 缓存及会话共享(专业版) # isClusterMode: true # # 清理全部缓存按钮所清理的缓存列表 -# clearNames: sysCache,corpCache,userCache,cmsCache,msgPcPoolCache,roleCache,fileUploadCache,bpmFormCache +# clearNames: sysCache,corpCache,userCache,roleCache,fileUploadCache,msgPcPoolCache,cmsCache,bpmFormCache # # 用户缓存 # userCache: # clearTaskPool: diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 9a4ca92e..0100d944 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -275,7 +275,7 @@ spring: # # 缓存及会话共享(专业版) # isClusterMode: true # # 清理全部缓存按钮所清理的缓存列表 -# clearNames: sysCache,corpCache,userCache,cmsCache,msgPcPoolCache,roleCache,fileUploadCache,bpmFormCache +# clearNames: sysCache,corpCache,userCache,roleCache,fileUploadCache,msgPcPoolCache,cmsCache,bpmFormCache # # 用户缓存 # userCache: # clearTaskPool: