[#55] 외부에서 주입한 설정 값을 사용할 수 있도록 수정

src/main/java/me/liiot/snsserver/config/FirebaseConfig.java

@@ -6,9 +6,9 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
 
 import javax.annotation.PostConstruct;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -29,7 +29,7 @@ public class FirebaseConfig {
  @PostConstruct
  public void initialize() {
  try {
- InputStream serviceAccount = new ClassPathResource(apiKeyPath).getInputStream();
+ InputStream serviceAccount = new FileInputStream(apiKeyPath);
 
  FirebaseOptions options = new FirebaseOptions.Builder()
  .setCredentials(GoogleCredentials.fromStream(serviceAccount))
@@ -39,7 +39,7 @@ public void initialize() {
  FirebaseApp.initializeApp(options);
  }
  } catch (IOException e) {
- log.error("Failed initializing FilebaseApp: {}", e.getMessage());
+ log.error("Failed initializing FilebaseApp: ", e);
  }
  }
 }

src/main/java/me/liiot/snsserver/service/FirebasePushService.java

@@ -6,10 +6,11 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.liiot.snsserver.enumeration.PushType;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -20,6 +21,9 @@
 @Slf4j
 public class FirebasePushService implements PushService {
 
+ @Value("${firebase.account.key.path}")
+ private String apiKeyPath;
+
  private final RedisTemplate<String, Object> redisTemplate;
 
  public void setToken(String userId) {
@@ -57,13 +61,13 @@ public void sendPushMessage(String userId, String receiverId, PushType type, Str
  private String getAccessToken() {
  try {
  GoogleCredential googleCredential = GoogleCredential
- .fromStream(new ClassPathResource("sns-itda-firebase-adminsdk.json").getInputStream())
+ .fromStream(new FileInputStream(apiKeyPath))
  .createScoped(Arrays.asList("https://www.googleapis.com/auth/cloud-platform",
  "https://www.googleapis.com/auth/firebase.messaging"));
  googleCredential.refreshToken();
  return googleCredential.getAccessToken();
  } catch (IOException e) {
- log.error("Failed getting access token: {}", e.getMessage());
+ log.error("Failed getting access token: ", e);
  }
  return null;
  }

src/main/java/me/liiot/snsserver/service/LocalFileService.java

@@ -23,7 +23,7 @@
 
 @Service
 @RequiredArgsConstructor
-@Profile("dev")
+@Profile("local")
 public class LocalFileService implements FileService {
 
  @Value("${itda.local.file.base.directory}")

src/main/resources/application-local.properties

@@ -0,0 +1,13 @@
+#Image Directory Path
+itda.local.file.base.directory = C:\\Users\\cyj19\\Desktop\\Project\\sns-server\\images
+
+# Redis Session Local Config
+spring.redis.session.host=localhost
+spring.redis.session.port=6379
+
+# Redis Cache Local Config
+spring.redis.cache.host=localhost
+spring.redis.cache.port=6380
+
+#Firebase Service Local Config
+firebase.account.key.path=C:\\Users\\cyj19\\Desktop\\Project\\sns-server\\src\\main\\resources\\sns-itda-firebase-adminsdk.json

src/main/resources/application.properties

@@ -1,14 +1,3 @@
-spring.profiles.active=dev
+spring.profiles.active=local
 spring.session.store-type=redis
-spring.cache.type=redis
-
-# Redis Session Config
-spring.redis.session.host=localhost
-spring.redis.session.port=6379
-
-# Redis Cache Config
-spring.redis.cache.host=localhost
-spring.redis.cache.port=6380
-
-#Firebase Service
-firebase.account.key.path=sns-itda-firebase-adminsdk.json
+spring.cache.type=redis