diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index bb54b3dd..44cfafdf 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -305,6 +305,11 @@ spring-cloud-stream-binder-rocketmq ${project.version} + + org.springframework.cloud + spring-cloud-alibaba-dubbo + ${project.version} + diff --git a/spring-cloud-alibaba-examples/env-extension/pom.xml b/spring-cloud-alibaba-examples/env-extension/pom.xml deleted file mode 100644 index e84e953a..00000000 --- a/spring-cloud-alibaba-examples/env-extension/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - org.springframework.boot - spring-boot-starter-parent - 2.0.6.RELEASE - - - - 4.0.0 - - alibaba.com - env-extension - 0.2.2.BUILD-SNAPSHOT - jar - - env-extension - Demo project for Spring Boot - - - UTF-8 - UTF-8 - 1.8 - - - - - - org.springframework.boot - spring-boot-starter-web - provided - - - - diff --git a/spring-cloud-alibaba-examples/env-extension/src/main/java/org/springframework/alicloud/env/extension/ImportExtraConfig.java b/spring-cloud-alibaba-examples/env-extension/src/main/java/org/springframework/alicloud/env/extension/ImportExtraConfig.java deleted file mode 100644 index 1585c4a9..00000000 --- a/spring-cloud-alibaba-examples/env-extension/src/main/java/org/springframework/alicloud/env/extension/ImportExtraConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.springframework.alicloud.env.extension; - - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface ImportExtraConfig { - - String[] name() default ""; -} diff --git a/spring-cloud-alibaba-examples/env-extension/src/main/java/org/springframework/alicloud/env/extension/LoadExtraConfigApplicationListener.java b/spring-cloud-alibaba-examples/env-extension/src/main/java/org/springframework/alicloud/env/extension/LoadExtraConfigApplicationListener.java deleted file mode 100644 index 747ca68a..00000000 --- a/spring-cloud-alibaba-examples/env-extension/src/main/java/org/springframework/alicloud/env/extension/LoadExtraConfigApplicationListener.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2019 the original author or 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 org.springframework.alicloud.env.extension; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.core.env.PropertiesPropertySource; - -import java.io.FileInputStream; -import java.io.IOException; -import java.util.Properties; - -/** - * @author pbting - * @date 2019-01-09 9:00 PM - */ -public class LoadExtraConfigApplicationListener implements ApplicationListener { - - @Override - public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) { - SpringApplication springApplication = event.getSpringApplication(); - Class clazz = springApplication.getMainApplicationClass(); - if (!clazz.isAnnotationPresent(ImportExtraConfig.class)) { - return; - } - ImportExtraConfig annotation = (ImportExtraConfig) clazz - .getAnnotation(ImportExtraConfig.class); - - String[] extraConfig = annotation.name(); - - if (extraConfig == null || extraConfig.length == 0) { - return; - } - - for (String config : extraConfig) { - try { - Properties properties = new Properties(); - properties.load(new FileInputStream(config)); - event.getEnvironment().getPropertySources() - .addFirst(new PropertiesPropertySource(config, properties)); - } - catch (IOException e) { - e.printStackTrace(); - } - } - } -} \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/env-extension/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-examples/env-extension/src/main/resources/META-INF/spring.factories deleted file mode 100644 index d264a372..00000000 --- a/spring-cloud-alibaba-examples/env-extension/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.context.ApplicationListener=\ - org.springframework.alicloud.env.extension.LoadExtraConfigApplicationListener \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml index b4a0ae8c..b1400d44 100644 --- a/spring-cloud-alibaba-examples/pom.xml +++ b/spring-cloud-alibaba-examples/pom.xml @@ -24,7 +24,6 @@ nacos-example/nacos-discovery-example nacos-example/nacos-config-example nacos-example/nacos-gateway-example - env-extension oss-example ans-example/ans-consumer-feign-example ans-example/ans-consumer-ribbon-example