From 8e0ef8cdbcd60876ab468fb661b6ee924d9a2f33 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 20 Feb 2019 15:36:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/dev/web/TestController.java     | 10 ----------
 .../manage/merchants/core/ClientManager.java       |  1 -
 .../merchants/core/impls/ClientManagerImpl.java    | 14 --------------
 3 files changed, 25 deletions(-)

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 840bb9157..570197848 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
@@ -462,14 +462,4 @@ public class TestController implements ApplicationEventPublisherAware {
         tradeSecureService.uploadSecureReport(DateTime.parse(date).toDate());
     }
 
-    @RequestMapping(value = "/tempSend",method = RequestMethod.GET)
-    public String tempSend() {
-        try {
-            clientManager.tempSend();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "false";
-        }
-        return "success";
-    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 40e190d7b..44511c48a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -385,5 +385,4 @@ public interface ClientManager {
 
     void partnerCBChannelConfig(String clientMoniker, String channelKey, String channel_id);
 
-    void tempSend();
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 102c55dc3..d2eb34f8f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -4486,20 +4486,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
     }
 
-    @Override
-    public void tempSend() {
-        String tmpOpenId = "o32MzuPR4AnVN94C4ISc6Y1n7xKI";
-        String account = "?accounts=aa,a123456a,1,PINE&accounts=dadasa,a123456a,1,PINE&accounts=asdasdasd,a123456a,1,PINE&accounts=tetsa,a123456a,1,PINE";
-        try {
-            MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
-            TemplateMessage msg = initSendTestPasswordTemplate(tmpOpenId, paymentApi.getTemplateId("test-merchant-password"), account);
-            paymentApi.sendTemplateMessage(msg);
-        } catch (WechatException e) {
-            logger.error("Wechat Message Error,密码修改完成" + e.getMessage());
-            publisher.publishEvent(new WechatExceptionEvent(this, e, "测试商户密码修改完成"));
-        }
-    }
-
     private TemplateMessage initSendTestPasswordTemplate(String wxopenid, String templateId,String url) {
         TemplateMessage msg = new TemplateMessage(wxopenid, templateId, "https://mpay.royalpay.com.au/testMerchantPassword" + url);
         msg.put("first", "尊敬的用户，该商户下账号密码已重置。", "#000000");