fix : server url

JunKyung-Jo · Jan 5, 2024 · 93e9fe1 · 93e9fe1
1 parent 53eb917
commit 93e9fe1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedListService.java b/src/main/java/com/investment/findfriend/domain/feed/service/GetFeedListService.java
@@ -29,7 +29,7 @@ public ResponseEntity<List<FeedListResponse>> execute(Long friendId) {
         return ResponseEntity.ok(feedRepository.findAllByFriend(friend).stream()
                 .map(feed -> FeedListResponse.builder()
                         .id(feed.getId())
-                        .url(serverProperties.getPath() + "/file?fileId=" + feed.getFile().getId())
+                        .url(serverProperties.getUrl() + "/file?fileId=" + feed.getFile().getId())
                         .build()).toList());
     }
 }
diff --git a/src/main/java/com/investment/findfriend/domain/friend/service/GetFriendListService.java b/src/main/java/com/investment/findfriend/domain/friend/service/GetFriendListService.java
@@ -42,7 +42,7 @@ public ResponseEntity<List<FriendResponse>> execute(HttpServletRequest httpServl
                         .authority(friend.getAuthority())
                         .statusMessage(friend.getStatusMessage())
                         .name(friend.getName())
-                        .url(serverProperties.getPath() + "/file?fileId=" + friend.getFile().getId())
+                        .url(serverProperties.getUrl() + "/file?fileId=" + friend.getFile().getId())
                         .build())
                 .toList());
     }

diff --git a/src/main/java/com/investment/findfriend/domain/user/service/GetUserInfoService.java b/src/main/java/com/investment/findfriend/domain/user/service/GetUserInfoService.java
@@ -35,7 +35,7 @@ public ResponseEntity<UserResponse> execute(HttpServletRequest httpServletReques
                                 .name(friend.getName())
                                 .statusMessage(friend.getStatusMessage())
                                 .authority(friend.getAuthority())
-                                .url(serverProperties.getPath() + "/file?fileId=" + user.getFile().getId())
+                                .url(serverProperties.getUrl() + "/file?fileId=" + user.getFile().getId())
                                 .build())
                         .toList())
                 .build());

diff --git a/src/main/java/com/investment/findfriend/global/properties/ServerProperties.java b/src/main/java/com/investment/findfriend/global/properties/ServerProperties.java
@@ -5,8 +5,9 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @Getter
-@ConfigurationProperties(prefix = "root")
+@ConfigurationProperties(prefix = "server")
 @AllArgsConstructor
 public class ServerProperties {
     private String path;
+    private String url;
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -17,6 +17,7 @@ spring:
 
 server:
   url: ${SERVER_URL}
+  path: ${ROOT_PATH}
   servlet:
     context-path: /api
 
@@ -37,7 +38,4 @@ jwt:
 openai:
   apiKey: ${OPENAI_API_KEY}
   model: ${OPENAI_MODEL}
-  temperature: ${OPENAI_TEMPERATURE}
-
-root:
-  path: ${ROOT_PATH}
+  temperature: ${OPENAI_TEMPERATURE}