spring boot 2.5.13 shiro 1.9.0 等等

396175371 · May 5, 2022 · a516967 · a516967
1 parent 39d4265
commit a516967
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git 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
@@ -62,7 +62,7 @@ public class ShiroConfig {
 	@ConditionalOnMissingBean(name="shiroFilterProxy")
 	public FilterRegistrationBean<Filter> shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception {
 		FilterRegistrationBean<Filter> 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
@@ -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
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.12</version>
+		<version>2.5.13</version>
 	</parent>
 
 	<groupId>com.jeesite</groupId>
@@ -21,43 +21,42 @@
 	<properties>
 
 		<!-- common version setting -->
-		<commons-io.version>2.7</commons-io.version>
+		<commons-io.version>2.11.0</commons-io.version>
 		<commons-text.version>1.9</commons-text.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<fst.version>2.57</fst.version>
-		<fastjson.version>1.2.78</fastjson.version>
-		<jackson.version>2.13.0</jackson.version>
+		<fastjson.version>1.2.80</fastjson.version>
 		<commons-email.version>1.5</commons-email.version>
-		<activation.version>1.1.1</activation.version>
+		<!-- <jackson.version>2.12.6</jackson.version> -->
+		<!-- <activation.version>1.1.1</activation.version> -->
 		<UserAgentUtils.version>1.21</UserAgentUtils.version>
 		<!-- <metadata-extractor.version>2.11.0</metadata-extractor.version> -->
-		<thumbnailator.version>0.4.14</thumbnailator.version>
-		<twelvemonkeys.version>3.7.0</twelvemonkeys.version>
+		<thumbnailator.version>0.4.17</thumbnailator.version>
+		<twelvemonkeys.version>3.8.2</twelvemonkeys.version>
 		<blade-patchca.version>1.1.2</blade-patchca.version>
 		<jmimemagic.version>0.1.5</jmimemagic.version>
 		<zxing.version>3.4.1</zxing.version>
 		<poi.version>4.1.2</poi.version>
 		<pinyin4j.version>2.5.1</pinyin4j.version>
-		<groovy.version>3.0.9</groovy.version>
+		<groovy.version>3.0.10</groovy.version>
 
 		<!-- framework version setting -->
 		<mybatis.version>3.5.9</mybatis.version>
 		<mybatis-spring.version>2.0.6</mybatis-spring.version>
-		<jsqlparser.version>4.3</jsqlparser.version>
-		<druid.version>1.2.8</druid.version>
-		<shiro.version>1.8.0</shiro.version>
+		<jsqlparser.version>4.4</jsqlparser.version>
+		<druid.version>1.2.9</druid.version>
+		<shiro.version>1.9.0</shiro.version>
 		<j2cache.version>2.8.0-release</j2cache.version>
-		<beetl.version>3.8-SNAPSHOT</beetl.version>
 		<swagger.version>1.6.0</swagger.version>
 		<log4j2.version>2.17.0</log4j2.version>
 
 		<!-- jdbc setting -->
 		<!-- <mysql.version>5.1.49</mysql.version> -->
-		<mysql.version>8.0.27</mysql.version>
+		<mysql.version>8.0.29</mysql.version>
 
 		<!-- environment setting -->
 		<java.version>1.8</java.version>
-		<tomcat.version>9.0.58</tomcat.version>
+		<!-- <tomcat.version>9.0.58</tomcat.version> -->
 		<maven.test.skip>true</maven.test.skip>
 		<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version><!-- 降级到该版本，新版本可能会出现VM崩溃 -->
 		<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
@@ -158,7 +157,6 @@
 					<version>3.2.3</version>
 					<configuration>
 						<warSourceExcludes>
-							WEB-INF/classes/*.lic,
 							userfiles/**
 						</warSourceExcludes>
 						<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>

diff --git 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
@@ -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: