revert: 回退排除默认资源池配置操作，增加覆盖配置

api-test/backend/src/main/java/io/metersphere/ApiApplication.java

@@ -5,7 +5,6 @@ import io.metersphere.config.KafkaProperties;
 import io.metersphere.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
@@ -14,7 +13,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
         QuartzAutoConfiguration.class,
         LdapAutoConfiguration.class,
         Neo4jAutoConfiguration.class

api-test/backend/src/main/resources/application.properties

@@ -14,4 +14,6 @@ spring.flyway.locations=classpath:db/migration
 spring.flyway.table=api_version
 spring.flyway.baseline-version=0
 spring.flyway.encoding=UTF-8
-spring.flyway.validate-on-migrate=false
+spring.flyway.validate-on-migrate=false
+#
+spring.main.allow-bean-definition-overriding=true

performance-test/backend/src/main/java/io/metersphere/PerformanceApplication.java

@@ -5,7 +5,6 @@ import io.metersphere.config.KafkaProperties;
 import io.metersphere.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
@@ -14,7 +13,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
         QuartzAutoConfiguration.class,
         LdapAutoConfiguration.class,
         Neo4jAutoConfiguration.class

performance-test/backend/src/main/resources/application.properties

@@ -13,4 +13,6 @@ spring.flyway.locations=classpath:db/migration
 spring.flyway.table=performance_version
 spring.flyway.baseline-version=0
 spring.flyway.encoding=UTF-8
-spring.flyway.validate-on-migrate=false
+spring.flyway.validate-on-migrate=false
+#
+spring.main.allow-bean-definition-overriding=true

project-management/backend/src/main/java/io/metersphere/ProjectApplication.java

@@ -3,7 +3,6 @@ package io.metersphere;
 import io.metersphere.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
@@ -12,7 +11,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
         QuartzAutoConfiguration.class,
         LdapAutoConfiguration.class,
         Neo4jAutoConfiguration.class

project-management/backend/src/main/resources/application.properties

@@ -14,4 +14,6 @@ spring.flyway.locations=classpath:db/migration
 spring.flyway.table=project_management_version
 spring.flyway.baseline-version=0
 spring.flyway.encoding=UTF-8
-spring.flyway.validate-on-migrate=false
+spring.flyway.validate-on-migrate=false
+#
+spring.main.allow-bean-definition-overriding=true

report-stat/backend/src/main/java/io/metersphere/ReportApplication.java

@@ -5,7 +5,6 @@ import io.metersphere.config.KafkaProperties;
 import io.metersphere.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
@@ -14,7 +13,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
         QuartzAutoConfiguration.class,
         LdapAutoConfiguration.class,
         Neo4jAutoConfiguration.class

report-stat/backend/src/main/resources/application.properties

@@ -13,4 +13,6 @@ spring.flyway.locations=classpath:db/migration
 spring.flyway.table=report_version
 spring.flyway.baseline-version=0
 spring.flyway.encoding=UTF-8
-spring.flyway.validate-on-migrate=false
+spring.flyway.validate-on-migrate=false
+#
+spring.main.allow-bean-definition-overriding=true

system-setting/backend/src/main/java/io/metersphere/SettingApplication.java

@@ -3,7 +3,6 @@ package io.metersphere;
 import io.metersphere.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
@@ -12,7 +11,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
         QuartzAutoConfiguration.class,
         LdapAutoConfiguration.class,
         Neo4jAutoConfiguration.class

system-setting/backend/src/main/resources/application.properties

@@ -12,6 +12,8 @@ spring.flyway.table=metersphere_version
 spring.flyway.baseline-version=0
 spring.flyway.encoding=UTF-8
 spring.flyway.validate-on-migrate=false
+#
+spring.main.allow-bean-definition-overriding=true
 
 #
 logging.file.path=/opt/metersphere/logs/system-setting

test-track/backend/src/main/java/io/metersphere/TrackApplication.java

@@ -5,7 +5,6 @@ import io.metersphere.config.KafkaProperties;
 import io.metersphere.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
@@ -14,7 +13,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
         QuartzAutoConfiguration.class,
         LdapAutoConfiguration.class,
         Neo4jAutoConfiguration.class

test-track/backend/src/main/resources/application.properties

@@ -13,4 +13,6 @@ spring.flyway.locations=classpath:db/migration
 spring.flyway.table=track_version
 spring.flyway.baseline-version=0
 spring.flyway.encoding=UTF-8
-spring.flyway.validate-on-migrate=false
+spring.flyway.validate-on-migrate=false
+#
+spring.main.allow-bean-definition-overriding=true

workstation/backend/src/main/java/io/metersphere/WorkstationApplication.java

@@ -5,7 +5,6 @@ import io.metersphere.config.KafkaProperties;
 import io.metersphere.config.MinioProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.autoconfigure.neo4j.Neo4jAutoConfiguration;
 import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
@@ -14,7 +13,6 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication(exclude = {
-        DataSourceAutoConfiguration.class,
         QuartzAutoConfiguration.class,
         LdapAutoConfiguration.class,
         Neo4jAutoConfiguration.class

workstation/backend/src/main/resources/application.properties

@@ -5,4 +5,6 @@ management.server.port=7007
 quartz.enabled=false
 quartz.scheduler-name=workstationScheduler
 #
+spring.main.allow-bean-definition-overriding=true
+#
 logging.file.path=/opt/metersphere/logs/workstation