manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spring boot 2.5.13 shiro 1.9.0 等等

Browse Source
This commit is contained in:
thinkgem
2022-05-05 11:21:20 +08:00
parent 2633d6b06d
commit c5f1feafae
7 changed files with 38 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -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 * 持久层：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 * 视图层：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 * 前端组件：jQuery 3.5、jqGrid 4.7、layer 3.5、zTree 3.5、jQuery Validation

65
common/pom.xml
View File

@@ -22,12 +22,24 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- Servlet Api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Apache Commons --> <!-- Apache Commons -->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons-text.version}</version>
</dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
@@ -37,28 +49,11 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons-io.version}</version> <version>${commons-io.version}</version>
</dependency> </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons-fileupload.version}</version>
</dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version> <version>${commons-beanutils.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons-text.version}</version>
</dependency>
<!-- Apache Zip Tools
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${ant.version}</version>
</dependency> -->
<!-- Java serialization --> <!-- Java serialization -->
<dependency> <dependency>
@@ -88,23 +83,6 @@
<version>${fastjson.version}</version> <version>${fastjson.version}</version>
</dependency> </dependency>
<!-- Java xml
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
</dependency> -->
<!-- jdk11 JAXB module
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency> -->
<!-- XPath xml --> <!-- XPath xml -->
<dependency> <dependency>
<groupId>jaxen</groupId> <groupId>jaxen</groupId>
@@ -123,13 +101,6 @@
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<!-- Jsoup HTTP
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency> -->
<!-- Email --> <!-- Email -->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
@@ -294,19 +265,9 @@
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
</dependencies> </dependencies>
<build>
<plugins>
</plugins>
</build>
<developers> <developers>
<developer> <developer>
<id>thinkgem</id> <id>thinkgem</id>

4
common/src/main/java/com/jeesite/common/lang/ObjectUtils.java
View File

@@ -171,7 +171,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
return ObjectUtils.serializeFst(object); return ObjectUtils.serializeFst(object);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("serialize", e.getMessage()); logger.error("serialize: {}", e.getMessage(), e);
} }
return null; return null;
} }
@@ -189,7 +189,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
return ObjectUtils.unserializeFst(bytes); return ObjectUtils.unserializeFst(bytes);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("unserialize", e.getMessage()); logger.error("unserialize: {}", e.getMessage());
} }
return null; return null;
} }

2
modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java
View File

@@ -62,7 +62,7 @@ public class ShiroConfig {
@ConditionalOnMissingBean(name="shiroFilterProxy") @ConditionalOnMissingBean(name="shiroFilterProxy")
public FilterRegistrationBean<Filter> shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception { public FilterRegistrationBean<Filter> shiroFilterProxy(ShiroFilterFactoryBean shiroFilter) throws Exception {
FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>(); FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
bean.setFilter((Filter) shiroFilter.getInstance()); bean.setFilter(shiroFilter.getObject());
bean.addUrlPatterns("/*"); bean.addUrlPatterns("/*");
bean.setOrder(Ordered.HIGHEST_PRECEDENCE + 5000); bean.setOrder(Ordered.HIGHEST_PRECEDENCE + 5000);
return bean; return bean;

2
modules/core/src/main/resources/config/jeesite-core.yml
View File

@@ -85,7 +85,7 @@ spring:
# 缓存及会话共享（专业版） # 缓存及会话共享（专业版）
isClusterMode: false isClusterMode: false
# 清理全部缓存按钮所清理的缓存列表 # 清理全部缓存按钮所清理的缓存列表
clearNames: sysCache,corpCache,userCache,cmsCache,msgPcPoolCache,roleCache,fileUploadCache,bpmFormCache clearNames: sysCache,corpCache,userCache,roleCache,fileUploadCache,msgPcPoolCache,cmsCache,bpmFormCache
# 用户缓存 # 用户缓存
#userCache: #userCache:
# clearTaskPool: # clearTaskPool:

53
parent/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.12</version> <version>2.5.13</version>
</parent> </parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
@@ -19,48 +19,44 @@
<inceptionYear>2013-Now</inceptionYear> <inceptionYear>2013-Now</inceptionYear>
<properties> <properties>
<!-- common version setting --> <!-- common version setting -->
<commons-io.version>2.7</commons-io.version> <commons-io.version>2.11.0</commons-io.version>
<commons-fileupload.version>1.4</commons-fileupload.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-text.version>1.9</commons-text.version> <commons-text.version>1.9</commons-text.version>
<!-- <ant.version>1.10.7</ant.version> --> <commons-beanutils.version>1.9.4</commons-beanutils.version>
<fst.version>2.57</fst.version> <fst.version>2.57</fst.version>
<fastjson.version>1.2.78</fastjson.version> <fastjson.version>1.2.80</fastjson.version>
<jackson.version>2.13.0</jackson.version>
<!-- <dom4j.version>2.1.1</dom4j.version> -->
<!-- <jsoup.version>1.12.2</jsoup.version> -->
<commons-email.version>1.5</commons-email.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> <UserAgentUtils.version>1.21</UserAgentUtils.version>
<!-- <metadata-extractor.version>2.11.0</metadata-extractor.version> --> <!-- <metadata-extractor.version>2.11.0</metadata-extractor.version> -->
<thumbnailator.version>0.4.14</thumbnailator.version> <thumbnailator.version>0.4.17</thumbnailator.version>
<twelvemonkeys.version>3.7.0</twelvemonkeys.version> <twelvemonkeys.version>3.8.2</twelvemonkeys.version>
<blade-patchca.version>1.1.2</blade-patchca.version> <blade-patchca.version>1.1.2</blade-patchca.version>
<jmimemagic.version>0.1.5</jmimemagic.version> <jmimemagic.version>0.1.5</jmimemagic.version>
<zxing.version>3.4.1</zxing.version> <zxing.version>3.4.1</zxing.version>
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<pinyin4j.version>2.5.1</pinyin4j.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 --> <!-- framework version setting -->
<mybatis.version>3.5.9</mybatis.version> <mybatis.version>3.5.9</mybatis.version>
<mybatis-spring.version>2.0.6</mybatis-spring.version> <mybatis-spring.version>2.0.6</mybatis-spring.version>
<jsqlparser.version>4.3</jsqlparser.version> <jsqlparser.version>4.4</jsqlparser.version>
<druid.version>1.2.8</druid.version> <druid.version>1.2.9</druid.version>
<shiro.version>1.8.0</shiro.version> <shiro.version>1.9.0</shiro.version>
<j2cache.version>2.8.0-release</j2cache.version> <j2cache.version>2.8.0-release</j2cache.version>
<swagger.version>1.6.0</swagger.version> <swagger.version>1.6.0</swagger.version>
<log4j2.version>2.17.1</log4j2.version> <log4j2.version>2.17.0</log4j2.version>
<!-- jdbc setting --> <!-- jdbc setting -->
<!-- <mysql.version>5.1.49</mysql.version> --> <!-- <mysql.version>5.1.49</mysql.version> -->
<mysql.version>8.0.27</mysql.version> <mysql.version>8.0.29</mysql.version>
<!-- environment setting --> <!-- environment setting -->
<java.version>1.8</java.version> <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.test.skip>true</maven.test.skip>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version><!-- 降级到该版本，新版本可能会出现VM崩溃 --> <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version><!-- 降级到该版本，新版本可能会出现VM崩溃 -->
<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources> <eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
@@ -72,16 +68,6 @@
<docker.run.port>8980:8980</docker.run.port> <docker.run.port>8980:8980</docker.run.port>
</properties> </properties>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build> <build>
@@ -171,7 +157,6 @@
<version>3.2.3</version> <version>3.2.3</version>
<configuration> <configuration>
<warSourceExcludes> <warSourceExcludes>
WEB-INF/classes/*.lic,
userfiles/** userfiles/**
</warSourceExcludes> </warSourceExcludes>
<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory> <webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>

2
web/src/main/resources/config/application.yml
View File

@@ -272,7 +272,7 @@ spring:
# # 缓存及会话共享（专业版） # # 缓存及会话共享（专业版）
# isClusterMode: true # isClusterMode: true
# # 清理全部缓存按钮所清理的缓存列表 # # 清理全部缓存按钮所清理的缓存列表
# clearNames: sysCache,corpCache,userCache,cmsCache,msgPcPoolCache,roleCache,fileUploadCache,bpmFormCache # clearNames: sysCache,corpCache,userCache,roleCache,fileUploadCache,msgPcPoolCache,cmsCache,bpmFormCache
# # 用户缓存 # # 用户缓存
# userCache: # userCache:
# clearTaskPool: # clearTaskPool: