From 532a122a2840b8fba3f2416a463f4f5999597005 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 9 Jan 2018 10:47:27 +0800 Subject: [PATCH 1/2] compileError --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index f022a5aa3..bb6d1edd3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -435,7 +435,7 @@ public class RetailAppServiceImp implements RetailAppService { @Override public void updateDevToken(JSONObject device, String devToken) { - deviceSupport.updateIphoneMessageToken(device, devToken); + deviceSupport.updateDeviceMessageToken(device, devToken); } @Override From 30485cde91a7c60321afa83ccd56c7946c8ca81b Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 9 Jan 2018 11:22:15 +0800 Subject: [PATCH 2/2] config --- .../au/com/royalpay/payment/manage/dev/web/TestController.java | 1 + src/main/resources/application.properties | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index f735826e8..2e0594400 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -314,6 +314,7 @@ public class TestController implements ApplicationEventPublisherAware { elem = alipayClient.onlineRefund(refundOrder, type == TradeType.GATEWAY_H5); xmlStr = XmlFormatUtils.formatXml(elem); res.put("xml", xmlStr); + break; default: throw new BadRequestException("Not Support channel:" + channel); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 548187901..1626209c0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -85,6 +85,8 @@ app.mail.host=https://mailsupport.royalpay.com.au mail.send.credentialCode=Fd1aRfdjc9 apple.message.apns.password=F1b5*ChJPp73 +android.message.secret=2b96d9bc6169c9554218aab1 +android.message.appkey=3f33a10d0a7d4ac94d8f2431 spring.thymeleaf.mode=LEGACYHTML5