From 2bb3ca8f5b8c374041f2018c7dc794742c29380e Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 2 Nov 2020 16:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20starter=20=E7=9A=84=20spri?= =?UTF-8?q?ng.factories=20=E6=96=87=E4=BB=B6=EF=BC=8C=20=E8=AE=BE=E5=AE=9A?= =?UTF-8?q?autoconfiguration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/restful/example/RestfulApplication.java | 4 ---- .../swagger/example/SwaggerExampleApplication.java | 4 ---- .../src/main/resources/META-INF/spring.factories | 3 +++ .../src/main/resources/META-INF/spring.factories | 3 +++ .../feign/starter/FeignStarterConfiguration.java | 2 ++ .../src/main/resources/META-INF/spring.factories | 3 +++ .../src/main/resoureces/META-INF/spring.factories | 3 +++ .../src/main/resources/META-INF/spring.factories | 3 +++ .../java/org/mall/ebtp/cloud/log/starter/App.java | 13 ------------- .../cloud/log/starter/LogStarterConfiguration.java | 10 ++++++++++ .../src/main/resources/META-INF/spring.factories | 3 +++ .../src/main/resources/log-configuration.properties | 0 .../cloud/mvc/starter/MvcStarterConfiguration.java | 2 ++ .../src/main/resources/META-INF/spring.factories | 3 +++ .../src/main/resources/META-INF/spring.factories | 3 +++ .../mall/ebtp/cloud/seata/starter/App.java | 13 ------------- .../seata/starter/SeataStarterConfiguration.java | 9 +++++++++ .../src/main/resources/META-INF/spring.factories | 3 +++ .../src/main/resources}/file.conf | 0 .../src/main/resources}/registry.conf | 0 .../main/resources/seata-configuration.properties | 7 +++++++ .../starter/SwaggerStarterConfiguration.java | 1 - .../src/main/resources/META-INF/spring.factories | 3 +++ 23 files changed, 60 insertions(+), 35 deletions(-) create mode 100644 mall-ebtp-cloud-apollo-starter/src/main/resources/META-INF/spring.factories create mode 100644 mall-ebtp-cloud-eureka-starter/src/main/resources/META-INF/spring.factories create mode 100644 mall-ebtp-cloud-feign-starter/src/main/resources/META-INF/spring.factories create mode 100644 mall-ebtp-cloud-jpa-starter/src/main/resoureces/META-INF/spring.factories create mode 100644 mall-ebtp-cloud-kafka-starter/src/main/resources/META-INF/spring.factories delete mode 100644 mall-ebtp-cloud-log-starter/src/main/java/org/mall/ebtp/cloud/log/starter/App.java create mode 100644 mall-ebtp-cloud-log-starter/src/main/java/org/mall/ebtp/cloud/log/starter/LogStarterConfiguration.java create mode 100644 mall-ebtp-cloud-log-starter/src/main/resources/META-INF/spring.factories create mode 100644 mall-ebtp-cloud-log-starter/src/main/resources/log-configuration.properties create mode 100644 mall-ebtp-cloud-mvc-starter/src/main/resources/META-INF/spring.factories create mode 100644 mall-ebtp-cloud-office-starter/src/main/resources/META-INF/spring.factories delete mode 100644 mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/App.java create mode 100644 mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/SeataStarterConfiguration.java create mode 100644 mall-ebtp-cloud-seata-starter/src/main/resources/META-INF/spring.factories rename {mall-ebtp-cloud-jpa-starter/src/main/resoureces => mall-ebtp-cloud-seata-starter/src/main/resources}/file.conf (100%) rename {mall-ebtp-cloud-jpa-starter/src/main/resoureces => mall-ebtp-cloud-seata-starter/src/main/resources}/registry.conf (100%) create mode 100644 mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties create mode 100644 mall-ebtp-cloud-swagger-starter/src/main/resources/META-INF/spring.factories diff --git a/examples/restful-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/restful/example/RestfulApplication.java b/examples/restful-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/restful/example/RestfulApplication.java index e572024..2527739 100644 --- a/examples/restful-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/restful/example/RestfulApplication.java +++ b/examples/restful-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/restful/example/RestfulApplication.java @@ -2,12 +2,8 @@ package com.chinaunicom.mall.ebtp.cloud.restful.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; - -import com.chinaunicom.mall.ebtp.cloud.mvc.starter.advice.BusinessExceptionHandlerAdvice; @SpringBootApplication -@Import(BusinessExceptionHandlerAdvice.class) public class RestfulApplication { public static void main(String[] args) { diff --git a/examples/swagger-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/swagger/example/SwaggerExampleApplication.java b/examples/swagger-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/swagger/example/SwaggerExampleApplication.java index 6ae5a6a..56dc6d6 100644 --- a/examples/swagger-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/swagger/example/SwaggerExampleApplication.java +++ b/examples/swagger-example/src/main/java/com/chinaunicom/mall/ebtp/cloud/swagger/example/SwaggerExampleApplication.java @@ -2,12 +2,8 @@ package com.chinaunicom.mall.ebtp.cloud.swagger.example; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; - -import com.chinaunicom.mall.ebtp.cloud.swagger.starter.SwaggerStarterConfiguration; @SpringBootApplication -@Import(SwaggerStarterConfiguration.class) public class SwaggerExampleApplication { public static void main(String[] args) { SpringApplication.run(SwaggerExampleApplication.class, args); diff --git a/mall-ebtp-cloud-apollo-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-apollo-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..9223476 --- /dev/null +++ b/mall-ebtp-cloud-apollo-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.apollo.stater.ApolloStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-eureka-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-eureka-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..907e9cf --- /dev/null +++ b/mall-ebtp-cloud-eureka-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.eureka.starter.EurekaStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java b/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java index d7251d2..332d331 100644 --- a/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java +++ b/mall-ebtp-cloud-feign-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/feign/starter/FeignStarterConfiguration.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.cloud.feign.starter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -17,6 +18,7 @@ public class FeignStarterConfiguration { } @Bean + @ConditionalOnMissingBean(RequestInterceptor.class) public RequestInterceptor requestInterceptor() { return requestTemplate -> { requestTemplate.header("user", "mall"); diff --git a/mall-ebtp-cloud-feign-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-feign-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..131859b --- /dev/null +++ b/mall-ebtp-cloud-feign-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.feign.starter.FeignStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-jpa-starter/src/main/resoureces/META-INF/spring.factories b/mall-ebtp-cloud-jpa-starter/src/main/resoureces/META-INF/spring.factories new file mode 100644 index 0000000..e41c992 --- /dev/null +++ b/mall-ebtp-cloud-jpa-starter/src/main/resoureces/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.jpa.starter.JpaStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-kafka-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-kafka-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..9cc59f9 --- /dev/null +++ b/mall-ebtp-cloud-kafka-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.kafka.starter.KafkaStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-log-starter/src/main/java/org/mall/ebtp/cloud/log/starter/App.java b/mall-ebtp-cloud-log-starter/src/main/java/org/mall/ebtp/cloud/log/starter/App.java deleted file mode 100644 index 7a08f1a..0000000 --- a/mall-ebtp-cloud-log-starter/src/main/java/org/mall/ebtp/cloud/log/starter/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.mall.ebtp.cloud.log.starter; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/mall-ebtp-cloud-log-starter/src/main/java/org/mall/ebtp/cloud/log/starter/LogStarterConfiguration.java b/mall-ebtp-cloud-log-starter/src/main/java/org/mall/ebtp/cloud/log/starter/LogStarterConfiguration.java new file mode 100644 index 0000000..22a0dbc --- /dev/null +++ b/mall-ebtp-cloud-log-starter/src/main/java/org/mall/ebtp/cloud/log/starter/LogStarterConfiguration.java @@ -0,0 +1,10 @@ +package org.mall.ebtp.cloud.log.starter; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +@PropertySource("classpath:log-configuration.properties") +public class LogStarterConfiguration { + +} diff --git a/mall-ebtp-cloud-log-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-log-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..667544f --- /dev/null +++ b/mall-ebtp-cloud-log-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +org.mall.ebtp.cloud.log.starter.LogStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-log-starter/src/main/resources/log-configuration.properties b/mall-ebtp-cloud-log-starter/src/main/resources/log-configuration.properties new file mode 100644 index 0000000..e69de29 diff --git a/mall-ebtp-cloud-mvc-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/mvc/starter/MvcStarterConfiguration.java b/mall-ebtp-cloud-mvc-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/mvc/starter/MvcStarterConfiguration.java index 60601f6..0d998cb 100644 --- a/mall-ebtp-cloud-mvc-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/mvc/starter/MvcStarterConfiguration.java +++ b/mall-ebtp-cloud-mvc-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/mvc/starter/MvcStarterConfiguration.java @@ -1,9 +1,11 @@ package com.chinaunicom.mall.ebtp.cloud.mvc.starter; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @Configuration +@ComponentScan(basePackages = "com.chinaunicom.mall.ebtp.cloud.mvc.starter") @PropertySource("classpath:mcv-configuration.properties") public class MvcStarterConfiguration { } diff --git a/mall-ebtp-cloud-mvc-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-mvc-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..82f5e3e --- /dev/null +++ b/mall-ebtp-cloud-mvc-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.mvc.starter.MvcStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-office-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-office-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..aadf421 --- /dev/null +++ b/mall-ebtp-cloud-office-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.office.starter.OfficeStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/App.java b/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/App.java deleted file mode 100644 index 6fb641b..0000000 --- a/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.chinaunicom.mall.ebtp.cloud.seata.starter; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/SeataStarterConfiguration.java b/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/SeataStarterConfiguration.java new file mode 100644 index 0000000..cbfc8bd --- /dev/null +++ b/mall-ebtp-cloud-seata-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/seata/starter/SeataStarterConfiguration.java @@ -0,0 +1,9 @@ +package com.chinaunicom.mall.ebtp.cloud.seata.starter; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +@PropertySource("classpath:seata-configuration.properties") +public class SeataStarterConfiguration { +} diff --git a/mall-ebtp-cloud-seata-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-seata-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..33f64d5 --- /dev/null +++ b/mall-ebtp-cloud-seata-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.seata.starter.SeataStarterConfiguration \ No newline at end of file diff --git a/mall-ebtp-cloud-jpa-starter/src/main/resoureces/file.conf b/mall-ebtp-cloud-seata-starter/src/main/resources/file.conf similarity index 100% rename from mall-ebtp-cloud-jpa-starter/src/main/resoureces/file.conf rename to mall-ebtp-cloud-seata-starter/src/main/resources/file.conf diff --git a/mall-ebtp-cloud-jpa-starter/src/main/resoureces/registry.conf b/mall-ebtp-cloud-seata-starter/src/main/resources/registry.conf similarity index 100% rename from mall-ebtp-cloud-jpa-starter/src/main/resoureces/registry.conf rename to mall-ebtp-cloud-seata-starter/src/main/resources/registry.conf diff --git a/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties b/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties new file mode 100644 index 0000000..c6805c6 --- /dev/null +++ b/mall-ebtp-cloud-seata-starter/src/main/resources/seata-configuration.properties @@ -0,0 +1,7 @@ +unifast.swagger.basePackage=com.chinaunicom.mall.ebtp.cloud +unifast.swagger.title=\u6d4b\u8bd5\u63a5\u53e3\u6587\u6863 +unifast.swagger.contactName=\u5409\u6797\u9879\u76ee\u7ec4 +unifast.swagger.contactUrl=http://chinaunicom.com +unifast.swagger.contactEmail=chinaunicom@chinaunicom.com +unifast.swagger.version=0.0.1 +unifast.swagger.description=\u7840\u540e\u53f0\u529f\u80fd\u6846\u67b6 \ No newline at end of file diff --git a/mall-ebtp-cloud-swagger-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/swagger/starter/SwaggerStarterConfiguration.java b/mall-ebtp-cloud-swagger-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/swagger/starter/SwaggerStarterConfiguration.java index 4920faa..854fe2d 100644 --- a/mall-ebtp-cloud-swagger-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/swagger/starter/SwaggerStarterConfiguration.java +++ b/mall-ebtp-cloud-swagger-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/swagger/starter/SwaggerStarterConfiguration.java @@ -9,5 +9,4 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @EnableSwagger2 @PropertySource("classpath:swagger-configuration.properties") public class SwaggerStarterConfiguration { - } diff --git a/mall-ebtp-cloud-swagger-starter/src/main/resources/META-INF/spring.factories b/mall-ebtp-cloud-swagger-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..1ea20a3 --- /dev/null +++ b/mall-ebtp-cloud-swagger-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +# AutoConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.chinaunicom.mall.ebtp.cloud.swagger.starter.SwaggerStarterConfiguration \ No newline at end of file