update config

zhangxd1989 · zhangxd1989 · commit 79b227282024 · 2017-05-16T10:46:28.000+08:00
diff --git a/config-repo/application.yml b/config-repo/application.yml
@@ -29,11 +29,12 @@ spring:
     scheduled:
       skip-pattern: "^org.*HystrixStreamTask$"
 
-management:
-  security:
-    enabled: false
+authserver:
+    hostname: auth-service
+    port: 5000
+    contextPath: /uaa
 
 security:
   oauth2:
     resource:
-      user-info-uri: http://localhost:5000/uaa/current
+      user-info-uri: http://${authserver.hostname}:${authserver.port}${authserver.contextPath}/current
diff --git a/config-repo/gateway.yml b/config-repo/gateway.yml
@@ -13,11 +13,6 @@ ribbon:
   ReadTimeout: 10000
   ConnectTimeout: 10000
 
-security:
-  oauth2:
-    resource:
-      userInfoUri: http://localhost:5000/uaa/current
-
 zuul:
   ignoredServices: '*'
   routes:
diff --git a/config-repo/svca-service.yml b/config-repo/svca-service.yml
@@ -3,16 +3,20 @@ server:
 
 name: zhangxd
 
-authserver:
-    hostname: auth-service
-    port: 5000
-    contextPath: uaa
+eureka:
+  instance:
+    metadata-map:
+      user.name: ${security.user.name}
+      user.password: ${security.user.password}
 
 security:
+  user:
+    name: user
+    password: password
   oauth2:
     client:
       clientId: svca-service
-      clientSecret: ${SVCA_SERVICE_PASSWORD:password}
-      accessTokenUri: http://localhost:5000/uaa/oauth/token
+      clientSecret: ${security.user.password}
+      accessTokenUri: http://${authserver.hostname}:${authserver.port}${authserver.contextPath}/oauth/token
       grant-type: client_credentials
       scope: server
diff --git a/config-repo/svcb-service.yml b/config-repo/svcb-service.yml
@@ -3,11 +3,20 @@ server:
   
 msg: Hello
 
+eureka:
+  instance:
+    metadata-map:
+      user.name: ${security.user.name}
+      user.password: ${security.user.password}
+
 security:
+  user:
+    name: user
+    password: password
   oauth2:
     client:
       clientId: svcb-service
-      clientSecret: ${SVCB_SERVICE_PASSWORD:password}
-      accessTokenUri: http://localhost:5000/uaa/oauth/token
+      clientSecret: ${security.user.password}
+      accessTokenUri: http://${authserver.hostname}:${authserver.port}${authserver.contextPath}/oauth/token
       grant-type: client_credentials
       scope: server
diff --git a/svca-service/src/main/java/cn/zhangxd/svca/config/ServiceAConfiguration.java b/svca-service/src/main/java/cn/zhangxd/svca/config/ServiceAConfiguration.java
@@ -50,7 +50,6 @@ public ResourceServerTokenServices tokenServices() {
     @Override
     public void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
-                .antMatchers("/").permitAll()
                 .anyRequest().authenticated();
     }
 }
diff --git a/svcb-service/src/main/java/cn/zhangxd/svcb/config/ServiceBConfiguration.java b/svcb-service/src/main/java/cn/zhangxd/svcb/config/ServiceBConfiguration.java
@@ -50,7 +50,6 @@ public ResourceServerTokenServices tokenServices() {
     @Override
     public void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
-                .antMatchers("/", "/demo").permitAll()
                 .anyRequest().authenticated();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ public ResourceServerTokenServices tokenServices() {`
`50`	`50`	`@Override`
`51`	`51`	`public void configure(HttpSecurity http) throws Exception {`
`52`	`52`	`http.authorizeRequests()`
`53`		`- .antMatchers("/").permitAll()`
`54`	`53`	`.anyRequest().authenticated();`
`55`	`54`	`}`
`56`	`55`	`}`