From 7dd0ba436b4d9811c17139d793dc79bfe4b9ddf0 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 16 Apr 2020 11:18:00 +0800 Subject: [PATCH] add get pine account password --- pom.xml | 2 +- .../payment/manage/dev/web/TestController.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 206c39ee3..ee1052640 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.1.7 + 2.1.8 UTF-8 1.8.0 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 c4d187d1f..bd05afa1d 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 @@ -18,6 +18,7 @@ import au.com.royalpay.payment.manage.appclient.core.RetailAppService; import au.com.royalpay.payment.manage.dev.bean.AliExcel; import au.com.royalpay.payment.manage.dev.bean.Message; import au.com.royalpay.payment.manage.dev.bean.SendWechatMessage; +import au.com.royalpay.payment.manage.dev.bean.TestMerchantAccountInfo; import au.com.royalpay.payment.manage.dev.core.AliforexcelService; import au.com.royalpay.payment.manage.dev.core.HfClearAmountService; import au.com.royalpay.payment.manage.dev.core.HfUpdateService; @@ -58,6 +59,8 @@ import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.util.Assert; import org.springframework.util.MimeTypeUtils; import org.springframework.validation.Errors; @@ -77,6 +80,7 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -149,6 +153,8 @@ public class TestController { private SynchronizedScheduler synchronizedScheduler; @Resource private PmtCustomReportMapper pmtCustomReportsMapper; + @Resource + private MongoTemplate mongoTemplate; @ManagerMapping(value = "/{clientMoniker}/export/agreepdf", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.DIRECTOR, ManagerRole.OPERATOR}) public void exportAgreeFile(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HttpServletResponse httpResponse) throws Exception { @@ -476,6 +482,17 @@ public class TestController { clientManager.updateAllPartnerPassword("PINE"); } + @ManagerMapping(value = "/getPineAccoutPasswd", method = RequestMethod.GET, role = ManagerRole.DEVELOPER) + public List getPineAccountPasswd() { + Query query = new Query(); + List accountInfos = mongoTemplate.find(query,TestMerchantAccountInfo.class); + List accounts = new ArrayList<>(); + for (TestMerchantAccountInfo accountInfo : accountInfos) { + accounts.add(accountInfo.toJSON()); + } + return accounts; + } + @ManagerMapping(value = "/secure/hanyin_reports/{date}", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) public void downloadHanyinSecureReports(@PathVariable String date, @RequestParam(defaultValue = "false") boolean upload, HttpServletResponse resp) { tradeSecureService.manualDownloadHanyinSecureReport(DateTime.parse(date).toDate(), upload, resp);