Skip to content

Commit 51d8088

Browse files
authored
Merge pull request #39 from PU-Track/main
merge for deployment
2 parents ddbce56 + 5e1197c commit 51d8088

File tree

5 files changed

+20
-2
lines changed

5 files changed

+20
-2
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ cmake-build-*/
5555

5656
# Firebase
5757
pu-track-firebase-adminsdk-fbsvc-cdd71ffb70.json
58-
pu-track-pushnotification-firebase-adminsdk-fbsvc-3176775bf4.json
58+
pu-track-pushnotification-firebase-adminsdk.json

src/main/java/putrack/server/config/FirebaseConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public void init() throws IOException {
4242
FileInputStream fcmServiceAccount = new FileInputStream(fcmCredentialsPath);
4343
FirebaseOptions fcmOptions = FirebaseOptions.builder()
4444
.setCredentials(GoogleCredentials.fromStream(fcmServiceAccount))
45+
.setProjectId("pu-track-pushnotification")
4546
.build();
4647

4748
boolean hasFcmApp = FirebaseApp.getApps().stream()
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package putrack.server.config;
2+
3+
import org.springframework.context.annotation.Configuration;
4+
import org.springframework.web.servlet.config.annotation.CorsRegistry;
5+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
6+
7+
@Configuration
8+
public class WebConfig implements WebMvcConfigurer {
9+
@Override
10+
public void addCorsMappings(CorsRegistry registry) {
11+
registry.addMapping("/**")
12+
.allowedOriginPatterns("*")
13+
.allowedMethods("GET", "POST", "OPTIONS")
14+
.allowCredentials(true);
15+
}
16+
}

src/main/java/putrack/server/service/FcmService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public String sendMessage(String code, String title, String body) throws Firebas
2424

2525
String targetToken = caregiver.getPushToken();
2626

27+
System.out.println("FirebaseApp.getApps():" + FirebaseApp.getApps());
2728
FirebaseApp fcmApp = FirebaseApp.getInstance("fcmApp");
2829
FirebaseMessaging messaging = FirebaseMessaging.getInstance(fcmApp);
2930

src/main/java/putrack/server/service/PollingService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class PollingService {
1212
private final FirebaseService firebaseService;
1313

14-
@Scheduled(fixedRate = 60000)
14+
@Scheduled(fixedRate = 6000000)
1515
public void pollingFirebase() {
1616
System.out.println("Firebase 데이터 체크 중: " + LocalDateTime.now());
1717
firebaseService.readData();

0 commit comments

Comments
 (0)