assembly profile

apolloconfig · Dec 13, 2023 · c22644a · c22644a
1 parent af7f56e
commit c22644a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.../src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceAutoConfiguration.java b/.../src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceAutoConfiguration.java
@@ -54,7 +54,7 @@ public FilterRegistrationBean<AdminServiceAuthenticationFilter> adminServiceAuth
    * for apollo-assembly
    */
   @Order(99)
-  @Profile("auth")
+  @Profile("assembly")
   @Configuration
   static class AdminServiceSecurityConfigurer extends WebSecurityConfigurerAdapter {
 

diff --git a/apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java b/apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java
@@ -56,6 +56,7 @@ public static void main(String[] args) throws Exception {
      */
     ConfigurableApplicationContext configContext =
         new SpringApplicationBuilder(ConfigServiceApplication.class).parent(commonContext)
+            .profiles("assembly")
             .sources(RefreshScope.class).run(args);
     logger.info("configContext [{}] isActive: {}", configContext.getId(), configContext.isActive());
 
@@ -64,6 +65,7 @@ public static void main(String[] args) throws Exception {
      */
     ConfigurableApplicationContext adminContext =
         new SpringApplicationBuilder(AdminServiceApplication.class).parent(commonContext)
+            .profiles("assembly")
             .sources(RefreshScope.class).run(args);
     logger.info("adminContext [{}] isActive: {}" , adminContext.getId(), adminContext.isActive());
 
@@ -72,6 +74,7 @@ public static void main(String[] args) throws Exception {
      */
     ConfigurableApplicationContext portalContext =
         new SpringApplicationBuilder(PortalApplication.class).parent(commonContext)
+            .profiles("assembly")
             .sources(RefreshScope.class).run(args);
     logger.info("portalContext [{}] isActive: {}", portalContext.getId(), portalContext.isActive());
   }

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
@@ -66,7 +66,7 @@ public BizDBPropertySource(final ServerConfigRepository serverConfigRepository,
 
   @PostConstruct
   public void runSqlScript() throws Exception {
-    if (env.acceptsProfiles(Profiles.of("h2"))) {
+    if (env.acceptsProfiles(Profiles.of("h2")) && !env.acceptsProfiles(Profiles.of("assembly"))) {
       Resource resource = new ClassPathResource("jpa/configdb.init.h2.sql");
       if (resource.exists()) {
         DatabasePopulatorUtils.execute(new ResourceDatabasePopulator(resource), dataSource);

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
@@ -62,7 +62,7 @@ public PortalDBPropertySource(final ServerConfigRepository serverConfigRepositor
 
   @PostConstruct
   public void runSqlScript() throws Exception {
-    if (env.acceptsProfiles(Profiles.of("h2"))) {
+    if (env.acceptsProfiles(Profiles.of("h2"))  && !env.acceptsProfiles(Profiles.of("assembly"))) {
       Resource resource = new ClassPathResource("jpa/portaldb.init.h2.sql");
       if (resource.exists()) {
         DatabasePopulatorUtils.execute(new ResourceDatabasePopulator(resource), dataSource);