Compare commits
No commits in common. "42f5c49cbc5b7b189cf2dd39979e184753daa0a7" and "6cf401539f4535d3babc5ac4c80a54968c6b0933" have entirely different histories.
42f5c49cbc
...
6cf401539f
|
@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.fcm
|
||||||
|
|
||||||
import org.springframework.context.ApplicationEventPublisher
|
import org.springframework.context.ApplicationEventPublisher
|
||||||
import org.springframework.security.access.prepost.PreAuthorize
|
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.PostMapping
|
||||||
import org.springframework.web.bind.annotation.RequestBody
|
import org.springframework.web.bind.annotation.RequestBody
|
||||||
import org.springframework.web.bind.annotation.RequestMapping
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
|
@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController
|
||||||
@PreAuthorize("hasRole('ADMIN')")
|
@PreAuthorize("hasRole('ADMIN')")
|
||||||
class FcmController(private val applicationEventPublisher: ApplicationEventPublisher) {
|
class FcmController(private val applicationEventPublisher: ApplicationEventPublisher) {
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@Transactional(readOnly = true)
|
|
||||||
fun send(
|
fun send(
|
||||||
@RequestBody request: PushRequest
|
@RequestBody request: PushRequest
|
||||||
) = run {
|
) = run {
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package kr.co.vividnext.sodalive.fcm
|
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.FirebaseMessaging
|
||||||
import com.google.firebase.messaging.MulticastMessage
|
import com.google.firebase.messaging.MulticastMessage
|
||||||
import com.google.firebase.messaging.Notification
|
import com.google.firebase.messaging.Notification
|
||||||
|
@ -30,22 +27,6 @@ class FcmService {
|
||||||
val multicastMessage = MulticastMessage.builder()
|
val multicastMessage = MulticastMessage.builder()
|
||||||
.addAllTokens(tokens)
|
.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") {
|
if (container == "ios") {
|
||||||
multicastMessage
|
multicastMessage
|
||||||
.setNotification(
|
.setNotification(
|
||||||
|
|
Loading…
Reference in New Issue