BAEL-315 reducing the number of users to simplify the code.

This commit is contained in:
Tim Schimandle 2016-10-04 10:05:49 -06:00
parent 95b967858e
commit 317b596dd9
9 changed files with 13 additions and 35 deletions

View File

@ -3,6 +3,6 @@ server.port=8082
eureka.instance.hostname=localhost
eureka.client.serviceUrl.defaultZone=http://disc_discUser:discPassword@localhost:8082/eureka/
eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/
eureka.client.register-with-eureka=false
eureka.client.fetch-registry=false

View File

@ -3,7 +3,6 @@ server.port=8080
eureka.client.region = default
eureka.client.registryFetchIntervalSeconds = 5
eureka.client.serviceUrl.defaultZone=http://disc_gatewayUser:gatewayPassword@localhost:8082/eureka/
zuul.routes.resource.path=/resource/**
hystrix.command.resource.execution.isolation.thread.timeoutInMilliseconds: 5000

View File

@ -5,4 +5,3 @@ resource.returnString=hello cloud
eureka.client.region = default
eureka.client.registryFetchIntervalSeconds = 5
eureka.client.serviceUrl.defaultZone=http://disc_resourceUser:resourcePassword@localhost:8082/eureka/

View File

@ -14,16 +14,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception{
auth.inMemoryAuthentication()
.withUser("config_discUser")
.password("discPassword")
.roles("SYSTEM")
.and()
.withUser("config_gatewayUser")
.password("gatewayPassword")
.roles("SYSTEM")
.and()
.withUser("config_resourceUser")
.password("resourcePassword")
.withUser("configUser")
.password("configPassword")
.roles("SYSTEM");
}

View File

@ -5,4 +5,4 @@ spring.cloud.config.server.git.uri=file:///${user.home}/application-config
eureka.client.region = default
eureka.client.registryFetchIntervalSeconds = 5
eureka.client.serviceUrl.defaultZone=http://disc_configUser:configPassword@localhost:8082/eureka/
eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/

View File

@ -15,21 +15,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception{
auth.inMemoryAuthentication()
.withUser("disc_configUser")
.password("configPassword")
.roles("SYSTEM")
.and()
.withUser("disc_discUser")
.withUser("discUser")
.password("discPassword")
.roles("SYSTEM")
.and()
.withUser("disc_gatewayUser")
.password("gatewayPassword")
.roles("SYSTEM")
.and()
.withUser("disc_resourceUser")
.password("resourcePassword")
.roles("SYSTEM")
.and()
.withUser("admin")
.password("password")

View File

@ -1,4 +1,4 @@
spring.cloud.config.name=discovery
spring.cloud.config.uri=http://localhost:8081
spring.cloud.config.username=config_discUser
spring.cloud.config.password=discPassword
spring.cloud.config.username=configUser
spring.cloud.config.password=configPassword

View File

@ -1,7 +1,7 @@
spring.cloud.config.name=gateway
spring.cloud.config.discovery.service-id=config
spring.cloud.config.discovery.enabled=true
spring.cloud.config.username=config_gatewayUser
spring.cloud.config.password=gatewayPassword
spring.cloud.config.username=configUser
spring.cloud.config.password=configPassword
eureka.client.serviceUrl.defaultZone=http://disc_gatewayUser:gatewayPassword@localhost:8082/eureka/
eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/

View File

@ -1,7 +1,7 @@
spring.cloud.config.name=resource
spring.cloud.config.discovery.service-id=config
spring.cloud.config.discovery.enabled=true
spring.cloud.config.username=config_resourceUser
spring.cloud.config.password=resourcePassword
spring.cloud.config.username=configUser
spring.cloud.config.password=configPassword
eureka.client.serviceUrl.defaultZone=http://disc_resourceUser:resourcePassword@localhost:8082/eureka/
eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/