From ac20d64c6ac331c7426c516f49bb6a8b3df496cf Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 10 Feb 2020 17:29:02 +0800
Subject: [PATCH] fix dev controller class

---
 pom.xml                                       |  2 +-
 .../manage/dev/web/TestController.java        | 21 ++++++++++++++++++-
 .../manage/gateway/advice/Gtw2SignAspect.java |  3 +--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbacd19fb..83deeaaf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.25</version>
+    <version>1.3.26</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
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 9577bb034..58fd816ab 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
@@ -11,6 +11,7 @@ import au.com.royalpay.payment.core.PaymentApi;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
 import au.com.royalpay.payment.core.exceptions.OrderNotExistsException;
 import au.com.royalpay.payment.core.mappers.PmtCustomReportMapper;
+import au.com.royalpay.payment.manage.analysis.core.ATOReportService;
 import au.com.royalpay.payment.manage.analysis.core.DashboardService;
 import au.com.royalpay.payment.manage.analysis.core.PlatformClearService;
 import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
@@ -27,6 +28,7 @@ import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.SysClientLegalPersonMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
+import au.com.royalpay.payment.manage.pos.datasource.ReadOnlyConnection;
 import au.com.royalpay.payment.manage.system.core.TradeSecureService;
 import au.com.royalpay.payment.manage.tradelog.core.TradeLogService;
 import au.com.royalpay.payment.tools.CommonConsts;
@@ -58,6 +60,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.util.Assert;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -69,8 +72,10 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -90,6 +95,8 @@ public class TestController implements ApplicationEventPublisherAware {
     @Resource
     private ClientMapper clientMapper;
     @Resource
+    private ATOReportService atoReportService;
+    @Resource
     private NotifyErrorLogMapper notifyErrorLogMapper;
     @Value("${app.agreetemplate.classic.path}")
     private String pdfPath;
@@ -562,6 +569,19 @@ public class TestController implements ApplicationEventPublisherAware {
                 });
     }
 
+    @ManagerMapping(value = "/reports/ato_reports/royalpay_ato_report_{year}.bttps", role = ManagerRole.DEVELOPER, method = RequestMethod.GET)
+    @ReadOnlyConnection
+    public void downloadATOReport(@PathVariable String year, HttpServletResponse resp) throws IOException {
+        DateTime from = DateTime.parse(year + "-07-01");
+        DateTime to = from.plusYears(1).plusDays(-1);
+        String atoReport = atoReportService.exportBTTPSFile(from.toDate(), to.toDate());
+        resp.setContentType(MimeTypeUtils.APPLICATION_OCTET_STREAM_VALUE);
+        try (OutputStream out = resp.getOutputStream()) {
+            out.write(atoReport.getBytes(StandardCharsets.UTF_8));
+            out.flush();
+        }
+    }
+
     @ManagerMapping(value = "/custom_declare_check/{reportId}/detail", method = RequestMethod.GET, role = ManagerRole.DEVELOPER)
     public JSONObject checkCustomDeclareOrderDetail(@PathVariable String reportId) {
         JSONObject report = pmtCustomReportsMapper.findCustomReport(reportId);
@@ -583,7 +603,6 @@ public class TestController implements ApplicationEventPublisherAware {
         return res;
     }
 
-
     @GetMapping("/client/customer")
     public ModelAndView redirectClientCustomer() {
         JSONObject result = new JSONObject();
diff --git a/src/main/java/au/com/royalpay/payment/manage/gateway/advice/Gtw2SignAspect.java b/src/main/java/au/com/royalpay/payment/manage/gateway/advice/Gtw2SignAspect.java
index be5a5ece8..e87b87e53 100644
--- a/src/main/java/au/com/royalpay/payment/manage/gateway/advice/Gtw2SignAspect.java
+++ b/src/main/java/au/com/royalpay/payment/manage/gateway/advice/Gtw2SignAspect.java
@@ -131,8 +131,7 @@ public class Gtw2SignAspect {
         if (!signInfo.containsKey("mch_public_key")) {
             throw new ServerErrorException("error.payment.valid.invalid.mch_public_key");
         }
-//        return checkSign(JSONObject.toJSONBytes(requestData, SerializerFeature.MapSortField), requestSign, signInfo.getString("mch_public_key"));
-        return true;
+        return checkSign(JSONObject.toJSONBytes(requestData, SerializerFeature.MapSortField), requestSign, signInfo.getString("mch_public_key"));
     }
 
     public String sign(byte[] source, String privateKey) {