feat: use can change spring.profiles.active's value without rebuild p…

…roject (#4616) * refactor: move spring.profiles.active to application.properties * fix: h2 test error when spring.jpa.properties.hibernate.globally_quoted_identifiers=true * fix(adminservice): test fail h2 test error when globally_quoted_identifiers = true * fix(configservice): test fail h2 test error when globally_quoted_identifiers=true * fix(portal): test fail h2 test error when globally_quoted_identifiers=true * fix: ${apollo_profile} * fix: license * feat: user only need to uncomment spring.profiles.active * test: fix * refactor: rename back to application.properties in src/test/resources * fix: applicatioin.properties -> applicatioin.yaml forbid cover config * test: add config DB_CLOSE_DELAY=-1 * test: fix config apolloconfigdb -> apolloportaldb * refactor: remove @TestPropertySource("classpath:" + "application.properties") * Update distributed-deployment-guide.md * fix: delete kubernetes and nacos discovery in application.properties * Update docs/zh/deployment/distributed-deployment-guide.md Co-authored-by: Jason Song <[email protected]> * Update docs/zh/deployment/distributed-deployment-guide.md Co-authored-by: Jason Song <[email protected]> * Update docs/zh/deployment/distributed-deployment-guide.md Co-authored-by: Jason Song <[email protected]> * Apply suggestions from code review Co-authored-by: Jason Song <[email protected]> * move up `启用外部xxxxxx` * docs: Replace built-in eureka with another service registry * Update CHANGES.md Co-authored-by: Jason Song <[email protected]>
apolloconfig · Nov 6, 2022 · 821c855 · 821c855
1 parent 4604e30
commit 821c855
Show file tree

Hide file tree

Showing 15 changed files with 477 additions and 175 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -36,6 +36,7 @@ Apollo 2.1.0
 * [feat: support use database as a registry](https://github.com/apolloconfig/apollo/pull/4595)
 * [fix doc bug](https://github.com/apolloconfig/apollo/pull/4579)
 * [fix Grayscale release Item Value length limit can not be synchronized with its main version](https://github.com/apolloconfig/apollo/pull/4622)
+* [feat: use can change spring.profiles.active's value without rebuild project](https://github.com/apolloconfig/apollo/pull/4616)
 
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/11?closed=1)
diff --git a/apollo-adminservice/src/assembly/assembly-descriptor.xml b/apollo-adminservice/src/assembly/assembly-descriptor.xml
@@ -56,6 +56,7 @@
 			<outputDirectory>/config</outputDirectory>
 			<includes>
 				<include>application-github.properties</include>
+				<include>application.properties</include>
 			</includes>
 		</fileSet>
 		<!--artifact -->

diff --git a/apollo-adminservice/src/main/resources/application.properties b/apollo-adminservice/src/main/resources/application.properties
@@ -0,0 +1,21 @@
+#
+# Copyright 2022 Apollo Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# You may uncomment the following config to activate different spring profiles
+#spring.profiles.active=github,consul-discovery
+#spring.profiles.active=github,zookeeper-discovery
+#spring.profiles.active=github,custom-defined-discovery
+#spring.profiles.active=github,database-discovery
diff --git a/apollo-adminservice/src/test/resources/application.properties b/apollo-adminservice/src/test/resources/application.properties
@@ -13,13 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+spring.cloud.consul.enabled=false
+spring.cloud.zookeeper.enabled=false
+spring.cloud.discovery.enabled=false
+
 spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
+
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+spring.jpa.hibernate.globally_quoted_identifiers=false
+spring.jpa.properties.hibernate.globally_quoted_identifiers=false
 spring.jpa.properties.hibernate.show_sql=false
 spring.jpa.properties.hibernate.metadata_builder_contributor=com.ctrip.framework.apollo.common.jpa.SqlFunctionsMetadataBuilderContributor
+spring.jpa.defer-datasource-initialization=true
+
 spring.h2.console.enabled = true
 spring.h2.console.settings.web-allow-others=true
+
 spring.main.allow-bean-definition-overriding=true
-spring.cloud.consul.enabled=false
-spring.cloud.zookeeper.enabled=false
-spring.jpa.defer-datasource-initialization=true
diff --git a/apollo-assembly/src/test/resources/application.properties b/apollo-assembly/src/test/resources/application.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 spring.jpa.properties.hibernate.show_sql=false
 spring.jpa.properties.hibernate.metadata_builder_contributor=com.ctrip.framework.apollo.common.jpa.SqlFunctionsMetadataBuilderContributor

diff --git a/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/AbstractIntegrationTest.java b/apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/AbstractIntegrationTest.java
@@ -26,8 +26,10 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @Rollback
 @Transactional
-@SpringBootTest(classes = BizTestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT
-        , properties = {"spring.cloud.discovery.enabled=false"})
+@SpringBootTest(
+    classes = BizTestConfiguration.class,
+    webEnvironment = WebEnvironment.RANDOM_PORT
+)
 public abstract class AbstractIntegrationTest {
 
 }
diff --git a/apollo-biz/src/test/resources/application.properties b/apollo-biz/src/test/resources/application.properties
@@ -13,12 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE
+spring.cloud.consul.enabled=false
+spring.cloud.zookeeper.enabled=false
+spring.cloud.discovery.enabled=false
+
+spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
+
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+spring.jpa.hibernate.globally_quoted_identifiers=false
+spring.jpa.properties.hibernate.globally_quoted_identifiers=false
 spring.jpa.properties.hibernate.show_sql=false
 spring.jpa.properties.hibernate.metadata_builder_contributor=com.ctrip.framework.apollo.common.jpa.SqlFunctionsMetadataBuilderContributor
+spring.jpa.defer-datasource-initialization=true
+
 spring.h2.console.enabled = true
-spring.h2.console.settings.web-allow-others=true
-spring.cloud.consul.enabled=false
-spring.cloud.zookeeper.enabled=false
-spring.jpa.defer-datasource-initialization=true
+spring.h2.console.settings.web-allow-others=true
diff --git a/apollo-common/src/main/resources/application.properties b/apollo-common/src/main/resources/application.properties
diff --git a/apollo-common/src/main/resources/application.yaml b/apollo-common/src/main/resources/application.yaml
@@ -0,0 +1,57 @@
+#
+# Copyright 2022 Apollo Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+spring:
+  jpa:
+    properties:
+      hibernate:
+        globally_quoted_identifiers: 'true'
+    hibernate:
+      globally_quoted_identifiers: 'true'
+      # Naming strategy
+      naming:
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+  info:
+    # Project information
+    git:
+      location: classpath:apollo-git.properties
+  mvc:
+    converters:
+      preferred-json-mapper: gson
+  # DataSource
+  datasource:
+    hikari:
+      connectionInitSql: set names utf8mb4
+
+# Tomcat configuration
+server:
+  tomcat:
+    accept-count: '5000'
+  # Increase tomcat header size for longer GET query parameter, should be n * 1024
+  max-http-header-size: '10240'
+
+# Spring Boot 2.x
+management:
+  endpoints:
+    web:
+      exposure:
+        include: info,health,metrics,prometheus
+      base-path: /
+logging:
+  logback:
+    rollingpolicy:
+      max-history: '10'
+      max-file-size: 50MB
diff --git a/apollo-configservice/src/assembly/assembly-descriptor.xml b/apollo-configservice/src/assembly/assembly-descriptor.xml
@@ -56,6 +56,7 @@
 			<outputDirectory>/config</outputDirectory>
 			<includes>
 				<include>application-github.properties</include>
+				<include>application.properties</include>
 			</includes>
 		</fileSet>
 		<!--artifact -->

diff --git a/apollo-configservice/src/main/resources/application.properties b/apollo-configservice/src/main/resources/application.properties
@@ -0,0 +1,21 @@
+#
+# Copyright 2022 Apollo Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# You may uncomment the following config to activate different spring profiles
+#spring.profiles.active=github,consul-discovery
+#spring.profiles.active=github,zookeeper-discovery
+#spring.profiles.active=github,custom-defined-discovery
+#spring.profiles.active=github,database-discovery
diff --git a/apollo-configservice/src/test/resources/application.properties b/apollo-configservice/src/test/resources/application.properties
@@ -13,16 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+spring.cloud.consul.enabled=false
+spring.cloud.zookeeper.enabled=false
+
 spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
+
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+spring.jpa.hibernate.globally_quoted_identifiers=false
+spring.jpa.properties.hibernate.globally_quoted_identifiers=false
 spring.jpa.properties.hibernate.show_sql=false
 spring.jpa.properties.hibernate.metadata_builder_contributor=com.ctrip.framework.apollo.common.jpa.SqlFunctionsMetadataBuilderContributor
+spring.jpa.defer-datasource-initialization=true
+
 spring.h2.console.enabled = true
 spring.h2.console.settings.web-allow-others=true
-spring.cloud.consul.enabled=false
-spring.cloud.zookeeper.enabled=false
+
 spring.main.allow-bean-definition-overriding=true
-spring.jpa.defer-datasource-initialization=true
 
 # for ReleaseMessageScanner test
 apollo.message-scan.interval=100
diff --git a/apollo-portal/src/test/resources/application.properties b/apollo-portal/src/test/resources/application.properties
@@ -13,11 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-spring.session.store-type=none
+spring.cloud.consul.enabled=false
+spring.cloud.zookeeper.enabled=false
+spring.cloud.discovery.enabled=false
+
 spring.datasource.url = jdbc:h2:mem:~/apolloportaldb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1
+
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+spring.jpa.hibernate.globally_quoted_identifiers=false
+spring.jpa.properties.hibernate.globally_quoted_identifiers=false
 spring.jpa.properties.hibernate.show_sql=false
 spring.jpa.properties.hibernate.metadata_builder_contributor=com.ctrip.framework.apollo.common.jpa.SqlFunctionsMetadataBuilderContributor
+spring.jpa.defer-datasource-initialization=true
+
 spring.h2.console.enabled = true
 spring.h2.console.settings.web-allow-others=true
+
+spring.session.store-type=none
 spring.main.allow-bean-definition-overriding=true