diff --git a/common/pom.xml b/common/pom.xml
index ff0aca9d..7728d9de 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
com.jeesite
jeesite-parent
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
../parent/pom.xml
diff --git a/modules/cms/pom.xml b/modules/cms/pom.xml
index 5bde3b5a..3d302430 100644
--- a/modules/cms/pom.xml
+++ b/modules/cms/pom.xml
@@ -6,7 +6,7 @@
com.jeesite
jeesite-parent
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
../../parent/pom.xml
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index a48b26fa..bf26af7b 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -6,7 +6,7 @@
com.jeesite
jeesite-parent
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
../../parent/pom.xml
diff --git a/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java
index d2bb0244..aaf1db4b 100644
--- a/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java
+++ b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java
@@ -4,35 +4,22 @@
*/
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.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
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
* @version 2018-10-13
*/
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
@ConditionalOnBean(MyBatisFactoryBean.class)
@ConditionalOnProperty(name="user.enabled", havingValue="true", matchIfMissing=true)
public class SysAutoConfiguration {
diff --git a/modules/core/src/main/resources/META-INF/spring.factories b/modules/core/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 0233b2b2..00000000
--- a/modules/core/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.jeesite.autoconfigure.sys.SysAutoConfiguration
diff --git a/modules/core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/modules/core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..d1d18b93
--- /dev/null
+++ b/modules/core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.jeesite.autoconfigure.sys.SysAutoConfiguration
\ No newline at end of file
diff --git a/modules/core/src/test/resources/application.yml b/modules/core/src/test/resources/application.yml
index 95012f9a..e449eaa7 100644
--- a/modules/core/src/test/resources/application.yml
+++ b/modules/core/src/test/resources/application.yml
@@ -4,7 +4,7 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
-productVersion: V5.1
+productVersion: V5.2
copyrightYear: 2022
# 数据库连接
diff --git a/parent/pom.xml b/parent/pom.xml
index eea020e6..2c3c4d0c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -6,13 +6,13 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.11
+ 2.7.4
com.jeesite
jeesite-parent
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
pom
JeeSite Parent
@@ -28,10 +28,10 @@
1.5
2.57
1.2.83_noneautotype
-
-
+
+
1.21
-
+
0.4.17
3.8.2
1.1.2
@@ -52,12 +52,12 @@
2.18.0
-
- 8.0.29
+
+
1.8
-
+
true
@
${java.version}
@@ -189,6 +189,13 @@
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 3.1.0
+
+
org.springframework.boot
diff --git a/pom.xml b/pom.xml
index e9413ea2..d4115721 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.jeesite
jeesite
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
pom
JeeSite
diff --git a/root/pom.xml b/root/pom.xml
index e56892c8..95b7d63e 100644
--- a/root/pom.xml
+++ b/root/pom.xml
@@ -5,7 +5,7 @@
com.jeesite
jeesite-root
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
pom
JeeSite Root
diff --git a/web-api/pom.xml b/web-api/pom.xml
index 31ff8091..41694235 100644
--- a/web-api/pom.xml
+++ b/web-api/pom.xml
@@ -6,7 +6,7 @@
com.jeesite
jeesite-parent
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
../parent/pom.xml
diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index c768be79..753383b4 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
-productVersion: V5.1
+productVersion: V5.2
copyrightYear: 2022
# 是否演示模式
diff --git a/web-fast/pom.xml b/web-fast/pom.xml
index c2163ec7..d6bc6e58 100644
--- a/web-fast/pom.xml
+++ b/web-fast/pom.xml
@@ -6,7 +6,7 @@
com.jeesite
jeesite-parent
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
../parent/pom.xml
diff --git a/web-fast/src/main/resources/config/application.yml b/web-fast/src/main/resources/config/application.yml
index a8211f27..472840cf 100644
--- a/web-fast/src/main/resources/config/application.yml
+++ b/web-fast/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
-productVersion: V5.1
+productVersion: V5.2
copyrightYear: 2022
# 是否演示模式
diff --git a/web/pom.xml b/web/pom.xml
index 83f46058..10c3f77f 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
com.jeesite
jeesite-parent
- 5.1.0-SNAPSHOT
+ 5.2.0-SNAPSHOT
../parent/pom.xml
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 623ef1ed..caa6469f 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
-productVersion: V5.1
+productVersion: V5.2
copyrightYear: 2022
# 是否演示模式