Merge remote-tracking branch 'origin/develop' into develop

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

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);
         }

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