From e59883442c86975a80acc5e467ade2c5d422fa61 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 12 Apr 2019 10:42:45 +0800 Subject: [PATCH] =?UTF-8?q?fix=20app=E6=8E=A8=E9=80=81=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/pushMessage/APNSMessageHelper.java | 10 ++++++---- .../resources/apple_message_cert_product.p12 | Bin 3185 -> 0 bytes .../apple_message_cert_product20180413.p12 | Bin 3325 -> 0 bytes 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 src/main/resources/apple_message_cert_product.p12 delete mode 100644 src/main/resources/apple_message_cert_product20180413.p12 diff --git a/src/main/java/au/com/royalpay/payment/manage/pushMessage/APNSMessageHelper.java b/src/main/java/au/com/royalpay/payment/manage/pushMessage/APNSMessageHelper.java index 3dffffcd3..781fc0776 100644 --- a/src/main/java/au/com/royalpay/payment/manage/pushMessage/APNSMessageHelper.java +++ b/src/main/java/au/com/royalpay/payment/manage/pushMessage/APNSMessageHelper.java @@ -9,6 +9,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -21,14 +23,14 @@ public class APNSMessageHelper { @Value("classpath:apple_message_cert_dev.p12") private org.springframework.core.io.Resource appleMessageFileDev; - @Value("classpath:apple_message_cert_product.p12") - private org.springframework.core.io.Resource appleMessageFileProduct; + @Value("${apple.message.apns.file}") + private String appleApnsFile; @Value("${apple.message.apns.password}") private String appleMessagePassword; public void sendAppleMessage(String title, String body, String token, JSONObject data, JSONObject type) throws IOException { /**设置参数，发送数据**/ - InputStream keyIns = appleMessageFileProduct.getInputStream(); + InputStream keyIns = new FileInputStream(new File(appleApnsFile)); ApnsService service = APNS.newService().withCert(keyIns, appleMessagePassword).withProductionDestination().build(); String payload = APNS.newPayload().alertTitle(title).alertBody(body).badge(1).sound("default").customField("data", data).customField("type", type).build(); service.push(token, payload); @@ -37,7 +39,7 @@ public class APNSMessageHelper { public void sendAppleMessageDetail(String title, String body, String token, JSONObject data, JSONObject type) throws IOException { /**设置参数，发送数据**/ - InputStream keyIns = appleMessageFileProduct.getInputStream(); + InputStream keyIns = new FileInputStream(new File(appleApnsFile)); ApnsService service = APNS.newService().withCert(keyIns, appleMessagePassword).withProductionDestination().build(); String payload = APNS.newPayload().alertTitle(title).alertBody(body).category("myNotificationCategory").badge(1).sound("default").customField("data", data).customField("type", type).build(); service.push(token, payload); diff --git a/src/main/resources/apple_message_cert_product.p12 b/src/main/resources/apple_message_cert_product.p12 deleted file mode 100644 index 905e2cc1f9a781dadadea431f38b687ef7fc156c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3185 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 OgM9UD2OCoX0RIJhlkN%t diff --git a/src/main/resources/apple_message_cert_product20180413.p12 b/src/main/resources/apple_message_cert_product20180413.p12 deleted file mode 100644 index 58c694512551af6a89e5da57a0a8b813564227e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3325 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