Alawn/micro-fast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新

Browse Source
This commit is contained in:
lsy
2017-10-10 16:37:51 +08:00
parent 0fb598ef37
commit 29c003f05a
21 changed files with 130 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-starter-elasticsearch/pom.xml
+14
View File
@@ -30,6 +30,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>
@@ -38,6 +44,14 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java
+2
View File
@@ -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热插拔模块启动类
boot-starter-fastdfs-client/pom.xml
+14
View File
@@ -30,6 +30,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>
@@ -38,6 +44,14 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java
+2
View File
@@ -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热插拔模块启动类
boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+3
View File
@@ -0,0 +1,3 @@
{
}
boot-starter-fastdfs-client/src/main/resources/application.yml
+2 -1
View File
@@ -6,4 +6,5 @@ fastdfs:
httpAntiStealToken : false
httpSecretKey : FastDFS1234567890
httpTrackerHttpPort : 80
trackerServers : 192.168.0.107:22122
trackerServers : 10.129.46.11:22122
boot-starter-util/pom.xml
+10
View File
@@ -55,5 +55,15 @@
<build>
<finalName>util</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
cms/pom.xml
+8
View File
@@ -117,6 +117,14 @@
<verbose>true</verbose>
<overwrite>true</overwrite>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
common/pom.xml
+4 -24
View File
@@ -106,30 +106,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<compilerArguments>
<extdirs>${project.basedir}/src/main/resources/lib</extdirs>
</compilerArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
common/src/main/java/com/micro/fast/common/CommonApplication.java
-2
View File
@@ -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;
common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
+4 -4
View File
@@ -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<String, String> 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("/*");
common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java
+2 -2
View File
@@ -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;
/**
common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java
+1 -2
View File
@@ -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 {
/**
common/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+3
View File
@@ -0,0 +1,3 @@
{
}
config-server/pom.xml
+8
View File
@@ -46,6 +46,14 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
eureka-server/pom.xml
+8
View File
@@ -50,6 +50,14 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
eureka-server2/pom.xml
+8
View File
@@ -50,6 +50,14 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
pom.xml
+20
View File
@@ -27,6 +27,7 @@
<module>config-server</module>
<module>eureka-server</module>
<module>eureka-server2</module>
<module>gateway</module>
<module>upms</module>
<module>cms</module>
<module>ucenter</module>
@@ -65,6 +66,7 @@
<fastdfs-client-java.version>1.27-SNAPSHOT</fastdfs-client-java.version>
<mybatis-generator-maven-plugin.version>1.3.2</mybatis-generator-maven-plugin.version>
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven.javadoc.plugin.version>2.10.2</maven.javadoc.plugin.version>
</properties>
<!--对依赖的版本进行统一管理-->
@@ -250,6 +252,24 @@
</compilerArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.plugin.version}</version>
<executions>
<execution>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
ucenter/pom.xml
+9
View File
@@ -129,6 +129,15 @@
<overwrite>true</overwrite>
</configuration>
</plugin>
<!--将lib目录下的文件编译时打包-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
upms/pom.xml
+8
View File
@@ -122,6 +122,14 @@
<overwrite>true</overwrite>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
upms/src/main/resources/application.yml
View File