From 8049af7d79109f5b722fe35a7713d1e6ade3bb0b Mon Sep 17 00:00:00 2001
From: haerong22 <haerong22@naver.com>
Date: Sat, 25 Sep 2021 21:34:57 +0900
Subject: [PATCH] spring cloud : e-commerce(user-service) - spring cloud
 config(actuator refresh)

---
 .../src/main/resources/application.yml               |  3 ++-
 springcloud/user-service/build.gradle                |  4 ++++
 .../userservice/controller/UserController.java       |  7 +++++--
 .../example/userservice/security/WebSecurity.java    |  3 ++-
 .../user-service/src/main/resources/application.yml  | 12 +++++++++---
 .../user-service/src/main/resources/bootstrap.yml    |  5 +++++
 6 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 springcloud/user-service/src/main/resources/bootstrap.yml

diff --git a/springcloud/config-service/src/main/resources/application.yml b/springcloud/config-service/src/main/resources/application.yml
index f7b0047a..33808ce8 100644
--- a/springcloud/config-service/src/main/resources/application.yml
+++ b/springcloud/config-service/src/main/resources/application.yml
@@ -9,4 +9,5 @@ spring:
     config:
       server:
         git:
-          uri: file://C:/Users/Woojin/Desktop/study/config
\ No newline at end of file
+#          uri: file://C:/Users/Woojin/Desktop/study/config
+          uri: file:///Users/bobby/Desktop/kim/study/config
\ No newline at end of file
diff --git a/springcloud/user-service/build.gradle b/springcloud/user-service/build.gradle
index 07e41edd..e4c2077d 100644
--- a/springcloud/user-service/build.gradle
+++ b/springcloud/user-service/build.gradle
@@ -26,6 +26,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+    implementation 'org.springframework.cloud:spring-cloud-starter-config'
+    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
 
diff --git a/springcloud/user-service/src/main/java/com/example/userservice/controller/UserController.java b/springcloud/user-service/src/main/java/com/example/userservice/controller/UserController.java
index 5738dec7..3c721cd5 100644
--- a/springcloud/user-service/src/main/java/com/example/userservice/controller/UserController.java
+++ b/springcloud/user-service/src/main/java/com/example/userservice/controller/UserController.java
@@ -33,8 +33,11 @@ public class UserController {
 
     @GetMapping("/health_check")
     public String status() {
-        return String.format("It's working in User Service on PORT %s",
-                env.getProperty("local.server.port"));
+        return "It's working in User Service"
+                + ", port(local.server.port)=" + env.getProperty("local.server.port")
+                + ", port(server.port)=" + env.getProperty("server.port")
+                + ", token secret=" + env.getProperty("token.secret")
+                + ", token expiration time=" + env.getProperty("token.expiration_time");
     }
 
     @GetMapping("/welcome")
diff --git a/springcloud/user-service/src/main/java/com/example/userservice/security/WebSecurity.java b/springcloud/user-service/src/main/java/com/example/userservice/security/WebSecurity.java
index 84e6987c..8957b5c0 100644
--- a/springcloud/user-service/src/main/java/com/example/userservice/security/WebSecurity.java
+++ b/springcloud/user-service/src/main/java/com/example/userservice/security/WebSecurity.java
@@ -31,8 +31,9 @@ public class WebSecurity extends WebSecurityConfigurerAdapter {
         http.csrf().disable().headers().frameOptions().disable();
 
 //        http.authorizeRequests().antMatchers("/users/**").permitAll();
+        http.authorizeRequests().antMatchers("/actuator/**").permitAll();
         http.authorizeRequests().antMatchers("/**")
-                .hasIpAddress("172.30.1.7")
+                .hasIpAddress("127.0.0.1")
                 .and()
                 .addFilter(getAuthenticationFilter());
 
diff --git a/springcloud/user-service/src/main/resources/application.yml b/springcloud/user-service/src/main/resources/application.yml
index 37f6177d..71307df2 100644
--- a/springcloud/user-service/src/main/resources/application.yml
+++ b/springcloud/user-service/src/main/resources/application.yml
@@ -32,6 +32,12 @@ logging:
   level:
     com.example.userservice: DEBUG
 
-token:
-  expiration_time: 86400000
-  secret: user_token
\ No newline at end of file
+management:
+  endpoints:
+    web:
+      exposure:
+        include: refresh, health, beans
+
+#token:
+#  expiration_time: 86400000
+#  secret: user_token
\ No newline at end of file
diff --git a/springcloud/user-service/src/main/resources/bootstrap.yml b/springcloud/user-service/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..9b3dfcb6
--- /dev/null
+++ b/springcloud/user-service/src/main/resources/bootstrap.yml
@@ -0,0 +1,5 @@
+spring:
+  cloud:
+    config:
+      uri: http://127.0.0.1:8888
+      name: ecommerce
\ No newline at end of file