apollo assembly optimization

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceApplication.java

@@ -21,6 +21,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -29,7 +30,9 @@
 @EnableAspectJAutoProxy
 @Configuration
 @PropertySource(value = {"classpath:adminservice.properties"})
-@EnableAutoConfiguration
+@EnableAutoConfiguration(exclude = {
+    UserDetailsServiceAutoConfiguration.class,
+})
 @EnableTransactionManagement
 @ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
     ApolloBizConfig.class,

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceAutoConfiguration.java

@@ -21,6 +21,9 @@
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @Configuration
 public class AdminServiceAutoConfiguration {
@@ -45,4 +48,18 @@
 
     return filterRegistrationBean;
   }
+
+  /**
+   * for apollo-assembly
+   */
+  @Order(99)
+  @Configuration
+  static class AdminServiceSecurityConfigurer extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+      http.csrf().disable();
+      http.httpBasic();
+    }
+  }
 }

apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java

@@ -17,6 +17,7 @@
 package com.ctrip.framework.apollo.assembly;
 
 import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
+import com.ctrip.framework.apollo.assembly.datasource.ApolloAssemblySqlInitializationConfig;
 import com.ctrip.framework.apollo.audit.configuration.ApolloAuditAutoConfiguration;
 import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
 import com.ctrip.framework.apollo.portal.PortalApplication;
@@ -25,14 +26,19 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Import;
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
-    HibernateJpaAutoConfiguration.class, ApolloAuditAutoConfiguration.class})
+@Import({
+    ApolloAssemblySqlInitializationConfig.class,
+})
+@SpringBootApplication(exclude = {
+    HibernateJpaAutoConfiguration.class,
+    ApolloAuditAutoConfiguration.class,
+})
 public class ApolloApplication {
 
   private static final Logger logger = LoggerFactory.getLogger(ApolloApplication.class);
@@ -43,37 +49,31 @@ public static void main(String[] args) throws Exception {
      */
     ConfigurableApplicationContext commonContext =
         new SpringApplicationBuilder(ApolloApplication.class).web(WebApplicationType.NONE).run(args);
-    logger.info(commonContext.getId() + " isActive: " + commonContext.isActive());
+    logger.info("commonContext [{}] isActive: {}", commonContext.getId(), commonContext.isActive());
 
     /**
      * ConfigService
      */
-    if (commonContext.getEnvironment().containsProperty("configservice")) {
-      ConfigurableApplicationContext configContext =
-          new SpringApplicationBuilder(ConfigServiceApplication.class).parent(commonContext)
-              .sources(RefreshScope.class).run(args);
-      logger.info(configContext.getId() + " isActive: " + configContext.isActive());
-    }
+    ConfigurableApplicationContext configContext =
+        new SpringApplicationBuilder(ConfigServiceApplication.class).parent(commonContext)
+            .sources(RefreshScope.class).run(args);
+    logger.info("configContext [{}] isActive: {}", configContext.getId(), configContext.isActive());
 
     /**
      * AdminService
      */
-    if (commonContext.getEnvironment().containsProperty("adminservice")) {
-      ConfigurableApplicationContext adminContext =
-          new SpringApplicationBuilder(AdminServiceApplication.class).parent(commonContext)
-              .sources(RefreshScope.class).run(args);
-      logger.info(adminContext.getId() + " isActive: " + adminContext.isActive());
-    }
+    ConfigurableApplicationContext adminContext =
+        new SpringApplicationBuilder(AdminServiceApplication.class).parent(commonContext)
+            .sources(RefreshScope.class).run(args);
+    logger.info("adminContext [{}] isActive: {}" , adminContext.getId(), adminContext.isActive());
 
     /**
      * Portal
      */
-    if (commonContext.getEnvironment().containsProperty("portal")) {
-      ConfigurableApplicationContext portalContext =
-          new SpringApplicationBuilder(PortalApplication.class).parent(commonContext)
-              .sources(RefreshScope.class).run(args);
-      logger.info(portalContext.getId() + " isActive: " + portalContext.isActive());
-    }
+    ConfigurableApplicationContext portalContext =
+        new SpringApplicationBuilder(PortalApplication.class).parent(commonContext)
+            .sources(RefreshScope.class).run(args);
+    logger.info("portalContext [{}] isActive: {}", portalContext.getId(), portalContext.isActive());
   }
 
 }

apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/datasource/ApolloAssemblyDataSourceScriptDatabaseInitializer.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2023 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.
+ *
+ */
+package com.ctrip.framework.apollo.assembly.datasource;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.sql.DataSource;
+import org.springframework.boot.autoconfigure.sql.init.SqlDataSourceScriptDatabaseInitializer;
+import org.springframework.boot.autoconfigure.sql.init.SqlInitializationProperties;
+import org.springframework.boot.jdbc.DatabaseDriver;
+import org.springframework.boot.jdbc.init.PlatformPlaceholderDatabaseDriverResolver;
+import org.springframework.boot.sql.init.DatabaseInitializationSettings;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+public class ApolloAssemblyDataSourceScriptDatabaseInitializer extends
+    SqlDataSourceScriptDatabaseInitializer {
+
+  public ApolloAssemblyDataSourceScriptDatabaseInitializer(DataSource dataSource,
+      SqlInitializationProperties properties) {
+    super(dataSource, getSettings(dataSource, properties));
+  }
+
+  public static DatabaseInitializationSettings getSettings(DataSource dataSource,
+      SqlInitializationProperties properties) {
+
+    PlatformPlaceholderDatabaseDriverResolver platformResolver = new PlatformPlaceholderDatabaseDriverResolver().withDriverPlatform(
+        DatabaseDriver.MARIADB, "mysql");
+
+    List<String> schemaLocations = resolveLocations(properties.getSchemaLocations(),
+        platformResolver,
+        dataSource, properties);
+    List<String> dataLocations = resolveLocations(properties.getDataLocations(), platformResolver,
+        dataSource, properties);
+
+    DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
+    settings.setSchemaLocations(
+        scriptLocations(schemaLocations, "schema", properties.getPlatform()));
+    settings.setDataLocations(scriptLocations(dataLocations, "data", properties.getPlatform()));
+    settings.setContinueOnError(properties.isContinueOnError());
+    settings.setSeparator(properties.getSeparator());
+    settings.setEncoding(properties.getEncoding());
+    settings.setMode(properties.getMode());
+    return settings;
+  }
+
+
+  private static List<String> resolveLocations(Collection<String> locations,
+      PlatformPlaceholderDatabaseDriverResolver platformResolver, DataSource dataSource,
+      SqlInitializationProperties properties) {
+
+    if (CollectionUtils.isEmpty(locations)) {
+      return null;
+    }
+
+    String platform = properties.getPlatform();
+    if (StringUtils.hasText(platform) && !"all".equals(platform)) {
+      return platformResolver.resolveAll(platform, locations.toArray(new String[0]));
+    }
+    return platformResolver.resolveAll(dataSource, locations.toArray(new String[0]));
+  }
+
+  private static List<String> scriptLocations(List<String> locations, String fallback,
+      String platform) {
+    if (locations != null) {
+      return locations;
+    }
+    List<String> fallbackLocations = new ArrayList<>();
+    fallbackLocations.add("optional:classpath*:" + fallback + "-" + platform + ".sql");
+    fallbackLocations.add("optional:classpath*:" + fallback + ".sql");
+    return fallbackLocations;
+  }
+}

apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/datasource/ApolloAssemblySqlInitializationConfig.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2023 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.
+ *
+ */
+package com.ctrip.framework.apollo.assembly.datasource;
+
+import javax.sql.DataSource;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.sql.init.SqlInitializationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+import org.springframework.util.StringUtils;
+
+@ConditionalOnProperty(prefix = "spring.sql.init", name = "enabled", matchIfMissing = true)
+@Configuration
+public class ApolloAssemblySqlInitializationConfig {
+
+  @Bean
+  ApolloAssemblyDataSourceScriptDatabaseInitializer dataSourceScriptDatabaseInitializer(DataSource dataSource,
+      SqlInitializationProperties properties) {
+    return new ApolloAssemblyDataSourceScriptDatabaseInitializer(
+        determineDataSource(dataSource, properties.getUsername(), properties.getPassword()), properties);
+  }
+
+  private static DataSource determineDataSource(DataSource dataSource, String username, String password) {
+    if (StringUtils.hasText(username) && StringUtils.hasText(password)) {
+      return DataSourceBuilder.derivedFrom(dataSource)
+          .username(username)
+          .password(password)
+          .type(SimpleDriverDataSource.class)
+          .build();
+    }
+    return dataSource;
+  }
+}

apollo-assembly/src/main/resources/application-github.properties

@@ -0,0 +1,38 @@
+#
+# Copyright 2023 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.
+#
+# DataSource
+spring.datasource.url=${spring_datasource_url}
+spring.datasource.username=${spring_datasource_username}
+spring.datasource.password=${spring_datasource_password}
+
+# Default datasource
+spring_datasource_url=jdbc:h2:mem:~/apolloassemblydb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;BUILTIN_ALIAS_OVERRIDE=TRUE;DATABASE_TO_UPPER=FALSE
+
+# Table prefix
+spring.jpa.hibernate.naming.physical-strategy=com.ctrip.framework.apollo.common.jpa.TablePrefixNamingStrategy
+spring.jpa.table-prefix.config-prefix=C_0_
+spring.jpa.table-prefix.portal-prefix=P_0_
+
+# H2 datasource
+spring.sql.init.schema-locations=classpath:jpa/@@platform@@/apolloconfigdb.sql, classpath:jpa/@@platform@@/apolloportaldb.sql
+spring.sql.init.mode=embedded
+spring.jpa.properties.hibernate.show_sql=false
+spring.jpa.properties.hibernate.metadata_builder_contributor=com.ctrip.framework.apollo.common.jpa.SqlFunctionsMetadataBuilderContributor
+spring.h2.console.enabled=true
+spring.h2.console.settings.web-allow-others=true
+
+# Default env
+apollo.portal.envs=local