diff --git a/README.md b/README.md
index 7460a244..eb1949c9 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/common/pom.xml b/common/pom.xml
index d7d2c225..c54b585f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,12 +22,24 @@
+
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+
org.apache.commons
commons-lang3
+
+ org.apache.commons
+ commons-text
+ ${commons-text.version}
+
commons-codec
commons-codec
@@ -37,28 +49,11 @@
commons-io
${commons-io.version}
-
- commons-fileupload
- commons-fileupload
- ${commons-fileupload.version}
-
commons-beanutils
commons-beanutils
- ${commons-beanutils.version}
+ ${commons-beanutils.version}
-
- org.apache.commons
- commons-text
- ${commons-text.version}
-
-
-
@@ -88,23 +83,6 @@
${fastjson.version}
-
-
-
-
jaxen
@@ -123,13 +101,6 @@
httpclient
-
-
org.apache.commons
@@ -294,19 +265,9 @@
junit
junit
-
- org.springframework
- spring-test
-
-
-
-
-
-
-
thinkgem
diff --git a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
index 75e824a0..b21ba7d0 100644
--- a/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
@@ -171,7 +171,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
return ObjectUtils.serializeFst(object);
}
} catch (Exception e) {
- logger.error("serialize", e.getMessage());
+ logger.error("serialize: {}", e.getMessage(), e);
}
return null;
}
@@ -189,7 +189,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
return ObjectUtils.unserializeFst(bytes);
}
} catch (Exception e) {
- logger.error("unserialize", e.getMessage());
+ logger.error("unserialize: {}", e.getMessage());
}
return null;
}
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 60156779..4ef8fbca 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:
diff --git a/parent/pom.xml b/parent/pom.xml
index 99a267d1..577fd189 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
@@ -19,48 +19,44 @@
2013-Now
-
+
- 2.7
- 1.4
- 1.9.4
+ 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
1.6.0
- 2.17.1
-
+ 2.17.0
+
- 8.0.27
-
+ 8.0.29
+
1.8
- 9.0.58
+
true
2.18.1
false
@@ -72,16 +68,6 @@
8980:8980
-
-
-
-
- javax.servlet
- javax.servlet-api
- provided
-
-
-
@@ -171,7 +157,6 @@
3.2.3
- WEB-INF/classes/*.lic,
userfiles/**
${project.build.directory}/${project.artifactId}
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 7e813d5c..3cfb2660 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -272,7 +272,7 @@ spring:
# # 缓存及会话共享（专业版）
# isClusterMode: true
# # 清理全部缓存按钮所清理的缓存列表
-# clearNames: sysCache,corpCache,userCache,cmsCache,msgPcPoolCache,roleCache,fileUploadCache,bpmFormCache
+# clearNames: sysCache,corpCache,userCache,roleCache,fileUploadCache,msgPcPoolCache,cmsCache,bpmFormCache
# # 用户缓存
# userCache:
# clearTaskPool: