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

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -2509,7 +2509,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject client = clientDetail(manager, clientMoniker);
         try {
             JSONObject qrboardConfig = new JSONObject();
-            qrboardConfig.put("src", PlatformEnvironment.getEnv().concatUrl("/static/images/aggregate_qr_board.png"));
+            qrboardConfig.put("src", PlatformEnvironment.getEnv().concatUrl("/static/images/aggretage_aps_board.jpg"));
             qrboardConfig.put("type", "royalpay");
             qrboardConfig.put("x", "835");
             qrboardConfig.put("y", "1290");

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java

@@ -131,8 +131,10 @@ public class PartnerManageController {
                                              HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream;");
         response.addHeader("Content-Disposition", "attachment; filename=qr_board.jpg");
-        OutputStream ous = response.getOutputStream();
-        clientManager.writeAggregateQrCodeBoard(manager, clientMoniker, config, ous, "PC");
+        try(OutputStream ous = response.getOutputStream()) {
+            clientManager.writeAggregateQrCodeBoard(manager, clientMoniker, config, ous, "PC");
+            ous.flush();
+        }
     }
 
     @ManagerMapping(value = "/{clientMoniker}/qrcode_board/CBBankAggregate", method = RequestMethod.GET)

src/main/ui/static/payment/partner/templates/client_payment_info.html

@@ -67,7 +67,7 @@
                 </p>
                 <p class="col-md-12">
                 <a ng-href="/client/partner_info/qrcode_board/aggregate?currency={{qrConfig.currency}}&preauth={{qrConfig.preauth==true}}&qrcode={{qrConfig.qrcode==true}}&customerrate={{qrConfig.customerrate==true}}"
-                   target="_blank"><i class="fa fa-download"></i>Download Aggregate QR Board Image (聚合支付水晶立牌:支持支付宝、微信、翼支付)
+                   target="_blank"><i class="fa fa-download"></i>Download Aggregate QR Board Image (聚合支付水晶立牌:支持支付宝、微信、A+)
                 </a>
                 </p>
             </div>