Merge branch 'master' into assembly

apolloconfig · Dec 13, 2023 · baf16c2 · baf16c2
2 parents 7bcc979 + ee1517b
commit baf16c2
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/apollo-adminservice/src/main/resources/apollo-adminservice.conf b/apollo-adminservice/src/main/resources/apollo-adminservice.conf
@@ -2,7 +2,7 @@ MODE=service
 PID_FOLDER=.
 # console appender log file folder
 LOG_FOLDER=/opt/logs/
-# console appender file name
-LOG_FILENAME=console.log
+# console appender log file name
+LOG_FILENAME=apollo-adminservice.console.log
 # write application logs only to file appender
 export LOG_APPENDERS=FILE
diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/BizDBPropertySource.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/BizDBPropertySource.java
@@ -67,7 +67,7 @@ public BizDBPropertySource(final ServerConfigRepository serverConfigRepository,
   @PostConstruct
   public void runSqlScript() throws Exception {
     if (env.acceptsProfiles(Profiles.of("h2"))) {
-      Resource resource = new ClassPathResource("jpa/init.h2.sql");
+      Resource resource = new ClassPathResource("jpa/configdb.init.h2.sql");
       if (resource.exists()) {
         DatabasePopulatorUtils.execute(new ResourceDatabasePopulator(resource), dataSource);
       }

diff --git a/apollo-configservice/src/main/resources/apollo-configservice.conf b/apollo-configservice/src/main/resources/apollo-configservice.conf
@@ -1,8 +1,8 @@
 MODE=service
 PID_FOLDER=.
 # console appender log file folder
-LOG_FOLDER=/opt/logs/100003171/
+LOG_FOLDER=/opt/logs/
 # console appender log file name
-LOG_FILENAME=console.log
+LOG_FILENAME=apollo-configservice.console.log
 # write application logs only to file appender
 export LOG_APPENDERS=FILE
diff --git a/...ervice/src/main/resources/jpa/init.h2.sql → ...c/main/resources/jpa/configdb.init.h2.sql b/...ervice/src/main/resources/jpa/init.h2.sql → ...c/main/resources/jpa/configdb.init.h2.sql
diff --git a/apollo-portal/src/assembly/assembly-descriptor.xml b/apollo-portal/src/assembly/assembly-descriptor.xml
@@ -48,6 +48,7 @@
 			<includes>
 				<include>application-github.properties</include>
 				<include>apollo-env.properties</include>
+				<include>application.properties</include>
 			</includes>
 		</fileSet>
 		<!--artifact -->

diff --git a/...ortal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalDBPropertySource.java b/...ortal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalDBPropertySource.java
@@ -63,7 +63,7 @@ public PortalDBPropertySource(final ServerConfigRepository serverConfigRepositor
   @PostConstruct
   public void runSqlScript() throws Exception {
     if (env.acceptsProfiles(Profiles.of("h2"))) {
-      Resource resource = new ClassPathResource("jpa/init.h2.sql");
+      Resource resource = new ClassPathResource("jpa/portaldb.init.h2.sql");
       if (resource.exists()) {
         DatabasePopulatorUtils.execute(new ResourceDatabasePopulator(resource), dataSource);
       }

diff --git a/apollo-portal/src/main/resources/apollo-portal.conf b/apollo-portal/src/main/resources/apollo-portal.conf
@@ -1,8 +1,8 @@
 MODE=service
 PID_FOLDER=.
 # console appender log file folder
-LOG_FOLDER=/opt/logs/100003173/
+LOG_FOLDER=/opt/logs/
 # console appender log file name
-LOG_FILENAME=console.log
+LOG_FILENAME=apollo-portal.console.log
 # write application logs only to file appender
 export LOG_APPENDERS=FILE
diff --git a/...portal/src/main/resources/jpa/init.h2.sql → ...c/main/resources/jpa/portaldb.init.h2.sql b/...portal/src/main/resources/jpa/init.h2.sql → ...c/main/resources/jpa/portaldb.init.h2.sql
diff --git a/pom.xml b/pom.xml
@@ -60,10 +60,10 @@
 	</developers>
 
 	<properties>
-		<revision>2.2.0-SNAPSHOT</revision>
+		<revision>2.2.0</revision>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<apollo-java.version>2.2.0-SNAPSHOT</apollo-java.version>
+		<apollo-java.version>2.2.0</apollo-java.version>
 		<spring-boot.version>2.7.11</spring-boot.version>
 		<spring-cloud.version>2021.0.5</spring-cloud.version>
 		<!-- sort by alphabet -->