From 8328dfab95b32dada434c36e7f914aac67826566 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 28 Jun 2019 11:24:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=B8=B4=E6=97=B6=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E8=BF=87=E6=BB=A4=E6=8E=89=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  2 +-
 .../merchants/core/impls/ClientManagerImpl.java       | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 88b0914c5..ba0357228 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
-        <docker-image.version>1.1.8</docker-image.version>
+        <docker-image.version>1.1.9</docker-image.version>
     </properties>
 
     <dependencies>
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 5e1e71643..6bb7f33b4 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
@@ -5092,9 +5092,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }).start();
 
         List<String> needNotifyUsers = royalPayUsers.stream().filter(user -> StringUtils.isNotEmpty(user.getString("wx_openid"))).map(user -> user.getString("wx_openid")).collect(Collectors.toList());
+        List<JSONObject> sendAccounts = new ArrayList<>();
         needNotifyUsers.forEach(userOpenId -> {
             try {
-                String signStr = "?sign=" + AESencrypt(accounts.toString(), userOpenId);
+                accounts.forEach(account ->{
+                    JSONObject params = new JSONObject();
+                    params.put("client_moniker", account.getString("client_moniker"));
+                    params.put("role", account.getIntValue("role"));
+                    params.put("username", account.getString("username"));
+                    params.put("password", account.getString("password"));
+                    sendAccounts.add(params);
+                });
+                String signStr = "?sign=" + AESencrypt(sendAccounts.toString(), userOpenId);
                 MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
                 TemplateMessage msg = initSendTestPasswordTemplate(userOpenId, paymentApi.getTemplateId("test-merchant-password"), signStr.replace("+", "%2B"));
                 paymentApi.sendTemplateMessage(msg);