Skip to content

Commit

Permalink
Merge pull request #10 from AO-StreetArt/enableConsulConfiguration
Browse files Browse the repository at this point in the history
#5: Add support for configuring from Consul.
  • Loading branch information
AO-StreetArt committed Oct 7, 2018
2 parents 19ce9d6 + 3a50e2b commit 014798b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,12 @@ dependencies {
compile('org.springframework.boot:spring-boot-starter-log4j2')
compile('de.codecentric:spring-boot-admin-starter-server')
compile('org.springframework.cloud:spring-cloud-starter-consul-discovery')
compile('org.springframework.cloud:spring-cloud-starter-consul-config')
compile('com.fasterxml.jackson.core:jackson-databind')
compile('com.fasterxml.jackson.dataformat:jackson-dataformat-yaml')
compile('com.fasterxml.jackson.core:jackson-annotations')
compile('org.springframework.retry:spring-retry')
compile group: 'org.springframework.boot', name: 'spring-boot-starter-aop', version: '2.0.5.RELEASE'
runtime('org.springframework.boot:spring-boot-devtools')
errorprone 'com.google.errorprone:error_prone_core:2.2.0'
compileOnly('org.projectlombok:lombok')
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ao/avc/AvcApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
import org.springframework.data.mongodb.gridfs.GridFsTemplate;
import org.springframework.retry.annotation.EnableRetry;

@EnableDiscoveryClient
@Configuration
@EnableRetry
@EnableAutoConfiguration
@SpringBootApplication(exclude = {SolrAutoConfiguration.class})
public class AvcApplication extends AbstractMongoConfiguration {

Expand Down
11 changes: 11 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,18 @@ management.address: 127.0.0.1
spring.application.name=Avc
# Spring Profile
spring.profiles.active=dev
# Consul Setup
spring.cloud.consul.host=localhost
spring.cloud.consul.port=8500
spring.cloud.consul.discovery.enabled=true
spring.cloud.consul.discovery.register=true
spring.cloud.consul.discovery.preferIpAddress=false
spring.cloud.consul.discovery.healthCheckPath=${management.context-path}/health
spring.cloud.consul.discovery.healthCheckInterval=15s
spring.cloud.consul.config.enabled=true
spring.cloud.consul.config.prefix=configuration
spring.cloud.consul.config.defaultContext=apps
spring.cloud.consul.config.profileSeparator='::'
# Asset File Upload Limits
spring.http.multipart.max-file-size=128MB
spring.http.multipart.max-request-size=128MB
Expand Down

0 comments on commit 014798b

Please sign in to comment.