From 29c003f05a81d14a4f5a75bbe856fce3008dcd08 Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Tue, 10 Oct 2017 16:37:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boot-starter-elasticsearch/pom.xml | 14 ++++++++++ .../BootStarterElasticsearchApplication.java | 2 ++ boot-starter-fastdfs-client/pom.xml | 14 ++++++++++ .../BootStartFastdfsClientApplication.java | 2 ++ ...itional-spring-configuration-metadata.json | 3 ++ .../src/main/resources/application.yml | 3 +- boot-starter-util/pom.xml | 10 +++++++ cms/pom.xml | 8 ++++++ common/pom.xml | 28 +++---------------- .../micro/fast/common/CommonApplication.java | 2 -- .../common/config/DataSourceMasterConfig.java | 8 +++--- .../common/config/DataSourceSlaveConfig.java | 4 +-- .../param/JdbcConnectionSlaveParamConfig.java | 3 +- ...itional-spring-configuration-metadata.json | 3 ++ config-server/pom.xml | 8 ++++++ eureka-server/pom.xml | 8 ++++++ eureka-server2/pom.xml | 8 ++++++ pom.xml | 20 +++++++++++++ ucenter/pom.xml | 9 ++++++ upms/pom.xml | 8 ++++++ upms/src/main/resources/application.yml | 0 21 files changed, 130 insertions(+), 35 deletions(-) create mode 100644 boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 common/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 upms/src/main/resources/application.yml diff --git a/boot-starter-elasticsearch/pom.xml b/boot-starter-elasticsearch/pom.xml index 6e2295e..4b9454f 100644 --- a/boot-starter-elasticsearch/pom.xml +++ b/boot-starter-elasticsearch/pom.xml @@ -30,6 +30,12 @@ spring-boot-starter-test test + + + org.springframework.boot + spring-boot-configuration-processor + true + @@ -38,6 +44,14 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + diff --git a/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java b/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java index b2ee258..787cabe 100644 --- a/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java +++ b/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java @@ -1,7 +1,9 @@ package com.micro.fast.elasticsearch; +import com.micro.fast.elasticsearch.config.param.ElasticsearchParamConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; /** * elasticsearch的springboot热插拔模块启动类 diff --git a/boot-starter-fastdfs-client/pom.xml b/boot-starter-fastdfs-client/pom.xml index e6ba199..da057a7 100644 --- a/boot-starter-fastdfs-client/pom.xml +++ b/boot-starter-fastdfs-client/pom.xml @@ -30,6 +30,12 @@ spring-boot-starter-test test + + + org.springframework.boot + spring-boot-configuration-processor + true + @@ -38,6 +44,14 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + diff --git a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java b/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java index 35b54d9..089d94f 100644 --- a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java +++ b/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java @@ -1,7 +1,9 @@ package com.micro.fast.fastdfs; +import com.micro.fast.fastdfs.config.param.FastDFSClientParamConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; /** * fastdfs-client的springboot热插拔模块启动类 diff --git a/boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..0e0dcd2 --- /dev/null +++ b/boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/boot-starter-fastdfs-client/src/main/resources/application.yml b/boot-starter-fastdfs-client/src/main/resources/application.yml index bfe6156..f3b53ef 100644 --- a/boot-starter-fastdfs-client/src/main/resources/application.yml +++ b/boot-starter-fastdfs-client/src/main/resources/application.yml @@ -6,4 +6,5 @@ fastdfs: httpAntiStealToken : false httpSecretKey : FastDFS1234567890 httpTrackerHttpPort : 80 - trackerServers : 192.168.0.107:22122 \ No newline at end of file + trackerServers : 10.129.46.11:22122 + diff --git a/boot-starter-util/pom.xml b/boot-starter-util/pom.xml index 7b5de44..a0a34e7 100644 --- a/boot-starter-util/pom.xml +++ b/boot-starter-util/pom.xml @@ -55,5 +55,15 @@ util + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + diff --git a/cms/pom.xml b/cms/pom.xml index 607d336..be02016 100644 --- a/cms/pom.xml +++ b/cms/pom.xml @@ -117,6 +117,14 @@ true true + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin diff --git a/common/pom.xml b/common/pom.xml index 4664ced..eee62cd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -106,30 +106,10 @@ org.apache.maven.plugins maven-compiler-plugin - - - compile - compile - - compile - - - - testCompile - test-compile - - testCompile - - - - - 1.8 - 1.8 - UTF-8 - - ${project.basedir}/src/main/resources/lib - - + + + org.apache.maven.plugins + maven-javadoc-plugin diff --git a/common/src/main/java/com/micro/fast/common/CommonApplication.java b/common/src/main/java/com/micro/fast/common/CommonApplication.java index ad4180c..fbfc9d2 100644 --- a/common/src/main/java/com/micro/fast/common/CommonApplication.java +++ b/common/src/main/java/com/micro/fast/common/CommonApplication.java @@ -1,7 +1,5 @@ package com.micro.fast.common; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java b/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java index fd58847..ca2812a 100644 --- a/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java +++ b/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java @@ -100,9 +100,9 @@ public class DataSourceMasterConfig { logger.info("micro-fast common druidServlet使用自定义访问地址:{}", servletUrl); } } else { - servletRegistrationBean.addUrlMappings("/masterDruid/*"); + servletRegistrationBean.addUrlMappings("/druid/*"); if (logger.isInfoEnabled()) { - logger.info("micro-fast common druidServlet使用默认访问地址:{}", "/masterDruid/*"); + logger.info("micro-fast common druidServlet使用默认访问地址:{}", "/druid/*"); } } return servletRegistrationBean; @@ -118,9 +118,9 @@ public class DataSourceMasterConfig { filterRegistrationBean.setFilter(new WebStatFilter()); Map initParams = new HashMap<>(); //设置忽略请求 - initParams.put("exclusions", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/static/*,/masterDruid/*"); + initParams.put("exclusions", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/static/*,/druid/*"); if (logger.isInfoEnabled()) { - logger.info("micro-fast common druidFilter使用默认不拦截的patterns:{}", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/static/*,/masterDruid/*"); + logger.info("micro-fast common druidFilter使用默认不拦截的patterns:{}", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/static/*,/druid/*"); } filterRegistrationBean.setInitParameters(initParams); filterRegistrationBean.addUrlPatterns("/*"); diff --git a/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java b/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java index 87b279d..704dad7 100644 --- a/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java +++ b/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java @@ -33,14 +33,14 @@ public class DataSourceSlaveConfig { * jdbc连接参数配置对象 * @see JdbcConnectionSlaveParamConfig */ - @Autowired + @Autowired(required = false) private JdbcConnectionSlaveParamConfig jdbcConnectionSlaveParamConfig; /** * druid数据库连接池参数配置对象 * @see DruidSlaveParamConfig */ - @Autowired + @Autowired(required = false) private DruidSlaveParamConfig druidSlaveParamConfig; /** diff --git a/common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java b/common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java index 34f2069..3b50fe3 100644 --- a/common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java +++ b/common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java @@ -2,7 +2,6 @@ package com.micro.fast.common.config.param; import com.micro.fast.common.condition.SalveDataSourceCondition; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -18,8 +17,8 @@ import javax.validation.constraints.NotNull; */ @Configuration @Conditional(SalveDataSourceCondition.class)//根据SalveDataSourceCondition条件化装配bean -@AutoConfigureBefore(com.micro.fast.common.config.DataSourceSlaveConfig.class) @ConfigurationProperties(prefix = "jdbc.slave") +@AutoConfigureBefore(com.micro.fast.common.config.DataSourceSlaveConfig.class) @Validated public class JdbcConnectionSlaveParamConfig { /** diff --git a/common/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/common/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..0e0dcd2 --- /dev/null +++ b/common/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/config-server/pom.xml b/config-server/pom.xml index c3dce35..d0649f9 100644 --- a/config-server/pom.xml +++ b/config-server/pom.xml @@ -46,6 +46,14 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml index 7e7a5f1..2b784ed 100644 --- a/eureka-server/pom.xml +++ b/eureka-server/pom.xml @@ -50,6 +50,14 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + diff --git a/eureka-server2/pom.xml b/eureka-server2/pom.xml index 84dbe17..dc8a082 100644 --- a/eureka-server2/pom.xml +++ b/eureka-server2/pom.xml @@ -50,6 +50,14 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + diff --git a/pom.xml b/pom.xml index 3dfe8ba..2e34ab3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ config-server eureka-server eureka-server2 + gateway upms cms ucenter @@ -65,6 +66,7 @@ 1.27-SNAPSHOT 1.3.2 3.1 + 2.10.2 @@ -250,6 +252,24 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin.version} + + + attach-javadoc + + jar + + + + + UTF-8 + UTF-8 + UTF-8 + + diff --git a/ucenter/pom.xml b/ucenter/pom.xml index 0abfa3d..168a461 100644 --- a/ucenter/pom.xml +++ b/ucenter/pom.xml @@ -129,6 +129,15 @@ true + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + diff --git a/upms/pom.xml b/upms/pom.xml index 62c2c47..6b75417 100644 --- a/upms/pom.xml +++ b/upms/pom.xml @@ -122,6 +122,14 @@ true + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + diff --git a/upms/src/main/resources/application.yml b/upms/src/main/resources/application.yml new file mode 100644 index 0000000..e69de29