From 378e8f13affbdda862c8e5a1518bacf53c64d891 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 30 Aug 2023 16:59:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=ED=91=B8=EC=8B=9C=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=B4=20@Transactional(readOnly=20=3D?= =?UTF-8?q?=20true)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmController.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmController.kt index a35b138..eaaccea 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmController.kt @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.fcm import org.springframework.context.ApplicationEventPublisher import org.springframework.security.access.prepost.PreAuthorize +import org.springframework.transaction.annotation.Transactional import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping @@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController @PreAuthorize("hasRole('ADMIN')") class FcmController(private val applicationEventPublisher: ApplicationEventPublisher) { @PostMapping + @Transactional(readOnly = true) fun send( @RequestBody request: PushRequest ) = run { -- 2.40.1 From 42f5c49cbc5b7b189cf2dd39979e184753daa0a7 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 30 Aug 2023 17:00:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=91=B8=EC=8B=9C=20=EB=B0=9C=EC=86=A1=20-?= =?UTF-8?q?=20=EC=9A=B0=EC=84=A0=EC=88=9C=EC=9C=84=EC=99=80=20=EC=86=8C?= =?UTF-8?q?=EB=A6=AC/=EC=A7=84=EB=8F=99=EC=9D=84=20=EC=9C=84=ED=95=B4=20Ap?= =?UTF-8?q?nsConfig,=20AndroidConfig=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/fcm/FcmService.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt index 1b08b35..f5e8fbf 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt @@ -1,5 +1,8 @@ package kr.co.vividnext.sodalive.fcm +import com.google.firebase.messaging.AndroidConfig +import com.google.firebase.messaging.ApnsConfig +import com.google.firebase.messaging.Aps import com.google.firebase.messaging.FirebaseMessaging import com.google.firebase.messaging.MulticastMessage import com.google.firebase.messaging.Notification @@ -27,6 +30,22 @@ class FcmService { val multicastMessage = MulticastMessage.builder() .addAllTokens(tokens) + multicastMessage.setAndroidConfig( + AndroidConfig.builder() + .setPriority(AndroidConfig.Priority.HIGH) + .build() + ) + + multicastMessage.setApnsConfig( + ApnsConfig.builder() + .setAps( + Aps.builder() + .setSound("default") + .build() + ) + .build() + ) + if (container == "ios") { multicastMessage .setNotification( -- 2.40.1