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

upgrade spring boot 2.7

Browse Source
This commit is contained in:
thinkgem
2022-10-12 13:53:05 +08:00
parent 21fcae1e97
commit b40fc1c35c
16 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath> <relativePath>../parent/pom.xml</relativePath>
</parent> </parent>

2
modules/cms/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath> <relativePath>../../parent/pom.xml</relativePath>
</parent> </parent>

2
modules/core/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath> <relativePath>../../parent/pom.xml</relativePath>
</parent> </parent>

25
modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java
View File

@@ -4,35 +4,22 @@
*/ */
package com.jeesite.autoconfigure.sys; package com.jeesite.autoconfigure.sys;
import com.jeesite.common.mybatis.MyBatisFactoryBean;
import com.jeesite.modules.msg.service.MsgInnerService;
import com.jeesite.modules.sys.service.*;
import com.jeesite.modules.sys.service.support.*;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.jeesite.common.mybatis.MyBatisFactoryBean;
import com.jeesite.modules.msg.service.MsgInnerService;
import com.jeesite.modules.sys.service.AreaService;
import com.jeesite.modules.sys.service.CompanyService;
import com.jeesite.modules.sys.service.EmpUserService;
import com.jeesite.modules.sys.service.EmployeeService;
import com.jeesite.modules.sys.service.LogService;
import com.jeesite.modules.sys.service.OfficeService;
import com.jeesite.modules.sys.service.PostService;
import com.jeesite.modules.sys.service.support.AreaServiceSupport;
import com.jeesite.modules.sys.service.support.CompanyServiceSupport;
import com.jeesite.modules.sys.service.support.EmpUserServiceSupport;
import com.jeesite.modules.sys.service.support.EmployeeServiceSupport;
import com.jeesite.modules.sys.service.support.LogServiceSupport;
import com.jeesite.modules.sys.service.support.OfficeServiceSupport;
import com.jeesite.modules.sys.service.support.PostServiceSupport;
/** /**
* 系统核心实现类 * 系统核心实现类
* @author ThinkGem * @author ThinkGem
* @version 2018-10-13 * @version 2018-10-13
*/ */
@Configuration(proxyBeanMethods = false) @AutoConfiguration
@ConditionalOnBean(MyBatisFactoryBean.class) @ConditionalOnBean(MyBatisFactoryBean.class)
@ConditionalOnProperty(name="user.enabled", havingValue="true", matchIfMissing=true) @ConditionalOnProperty(name="user.enabled", havingValue="true", matchIfMissing=true)
public class SysAutoConfiguration { public class SysAutoConfiguration {

3
modules/core/src/main/resources/META-INF/spring.factories
View File

@@ -1,3 +0,0 @@
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.jeesite.autoconfigure.sys.SysAutoConfiguration

1
modules/core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports Normal file
View File

@@ -0,0 +1 @@
com.jeesite.autoconfigure.sys.SysAutoConfiguration

2
modules/core/src/test/resources/application.yml
View File

@@ -4,7 +4,7 @@ productName: JeeSite Demo
companyName: ThinkGem companyName: ThinkGem
# 产品版本、版权年份 # 产品版本、版权年份
productVersion: V5.1 productVersion: V5.2
copyrightYear: 2022 copyrightYear: 2022
# 数据库连接 # 数据库连接

23
parent/pom.xml
View File

@@ -6,13 +6,13 @@
<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.6.11</version> <version>2.7.4</version>
<relativePath /> <relativePath />
</parent> </parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>JeeSite Parent</name> <name>JeeSite Parent</name>
@@ -28,10 +28,10 @@
<commons-email.version>1.5</commons-email.version> <commons-email.version>1.5</commons-email.version>
<fst.version>2.57</fst.version> <fst.version>2.57</fst.version>
<fastjson.version>1.2.83_noneautotype</fastjson.version> <fastjson.version>1.2.83_noneautotype</fastjson.version>
<!-- <jackson.version>2.12.6</jackson.version> --> <!--<jackson.version>2.12.6</jackson.version>-->
<!-- <activation.version>1.1.1</activation.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.17</thumbnailator.version> <thumbnailator.version>0.4.17</thumbnailator.version>
<twelvemonkeys.version>3.8.2</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>
@@ -52,12 +52,12 @@
<log4j2.version>2.18.0</log4j2.version> <log4j2.version>2.18.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.29</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>
<resource.delimiter>@</resource.delimiter> <resource.delimiter>@</resource.delimiter>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -189,6 +189,13 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- exec插件 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<!-- springboot插件 --> <!-- springboot插件 -->
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

2
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite</artifactId> <artifactId>jeesite</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>JeeSite</name> <name>JeeSite</name>

2
root/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-root</artifactId> <artifactId>jeesite-root</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>JeeSite Root</name> <name>JeeSite Root</name>

2
web-api/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath> <relativePath>../parent/pom.xml</relativePath>
</parent> </parent>

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

@@ -8,7 +8,7 @@ productName: JeeSite Demo
companyName: ThinkGem companyName: ThinkGem
# 产品版本、版权年份 # 产品版本、版权年份
productVersion: V5.1 productVersion: V5.2
copyrightYear: 2022 copyrightYear: 2022
# 是否演示模式 # 是否演示模式

2
web-fast/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath> <relativePath>../parent/pom.xml</relativePath>
</parent> </parent>

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

@@ -8,7 +8,7 @@ productName: JeeSite Demo
companyName: ThinkGem companyName: ThinkGem
# 产品版本、版权年份 # 产品版本、版权年份
productVersion: V5.1 productVersion: V5.2
copyrightYear: 2022 copyrightYear: 2022
# 是否演示模式 # 是否演示模式

2
web/pom.xml
View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>5.1.0-SNAPSHOT</version> <version>5.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath> <relativePath>../parent/pom.xml</relativePath>
</parent> </parent>

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

@@ -8,7 +8,7 @@ productName: JeeSite Demo
companyName: ThinkGem companyName: ThinkGem
# 产品版本、版权年份 # 产品版本、版权年份
productVersion: V5.1 productVersion: V5.2
copyrightYear: 2022 copyrightYear: 2022
# 是否演示模式 # 是否演示模式