From fd74bf0e22aeb06a8e1d8fd5fcfb10dcca0c3627 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 24 May 2018 11:53:07 +0800
Subject: [PATCH 1/6] update

---
 .../impls/SimpleClientApplyServiceImpl.java   |  4 +-
 .../web/SimpleClientApplyController.java      |  3 +-
 .../templates/mail/register_application.html  | 26 ++++++---
 .../resources/templates/mail/verify_mail.html | 41 ++-----------
 .../SimpleClientApplyServiceImplTest.java     | 58 +++++++++++++++++++
 5 files changed, 87 insertions(+), 45 deletions(-)
 create mode 100644 src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java

diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
index 52f322a93..994be043e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
@@ -17,6 +17,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring4.SpringTemplateEngine;
@@ -30,6 +31,7 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
+@Service
 public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
 
     @Value("${royalpay.sms.appid}")
@@ -157,7 +159,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
             }
         }
         String key =  RandomStringUtils.random(10, true, false);
-        stringRedisTemplate.boundValueOps(getRegisterClientProcessRedisKey(key)).set(address,1,TimeUnit.HOURS);
+        stringRedisTemplate.boundValueOps(getVerifyMailRedisKey(key)).set(address,1,TimeUnit.HOURS);
         return key;
 
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java
index 2d666d8ce..15736eea2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java
@@ -45,7 +45,7 @@ public class SimpleClientApplyController {
     @RequestMapping(value = "/account/mail/{address}/verify/{codeKey}/jump", method = RequestMethod.GET)
     public ModelAndView jumpVerifyMail(@PathVariable String codeKey, @PathVariable String address){
         simpleClientApplyService.checkOrGenerateVerifyMailKey(address,codeKey);
-        ModelAndView view = new ModelAndView("verify_mail");
+        ModelAndView view = new ModelAndView("mail/register_application");
         view.addObject("codeKey", codeKey);
         view.addObject("address", address);
         return view;
@@ -61,4 +61,5 @@ public class SimpleClientApplyController {
         signInAccountService.accountCheck(loginInfo);
         simpleClientApplyService.deleteVerifyMailKey(codeKey);
     }
+
 }
diff --git a/src/main/resources/templates/mail/register_application.html b/src/main/resources/templates/mail/register_application.html
index a3e88d8fd..c0ffe09f0 100644
--- a/src/main/resources/templates/mail/register_application.html
+++ b/src/main/resources/templates/mail/register_application.html
@@ -19,17 +19,14 @@
 
                 <tr class="header">
                     <td align="center">
-                        <h1 style="font-size: 24px; line-height: 1.3em; margin-bottom: 5px;">Register Invitation</h1>
+                        <h1 style="font-size: 24px; line-height: 1.3em; margin-bottom: 5px;">Verify mail address</h1>
                     </td>
                 </tr>
 
 
                 <tr class="content">
                     <td>
-                        <p style="font-size: 15px; font-weight: normal; line-height: 22px;">Dear Partner, </p>
-                        <p style="font-size: 15px; font-weight: normal; line-height: 22px;">Thank you for registering an account with us!</p>
-                        <p style="font-size: 15px; font-weight: normal; line-height: 22px;">This is a system verification email from RoyalPay.  RoyalPay is an exciting platform that makes international payments as easy as local ones.
-                            To get started, click on the button below:</p>
+                        <p style="font-size: 15px; font-weight: normal; line-height: 22px;">Before you can use RoyalPay Cross-border Payment, you need to verify your email address. </p>
                     </td>
                 </tr>
 
@@ -39,15 +36,28 @@
                             <table cellpadding="12" border="0" style="font-family: Lato, 'Lucida Sans', 'Lucida Grande', SegoeUI, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: bold; line-height: 25px; color: #444444; text-align: left;">
                                 <tbody><tr>
                                     <td class="button" style="color: rgb(255, 255, 255); font-size: 16px; line-height: 24px; text-align: center; display: block;">
-                                        <a th:href="${url}" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><strong>Register your account right now!</strong></a>
+<!--
+                                        <a th:href="${url}" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><strong>Verify email address right now!</strong></a>
+-->
                                     </td>
                                 </tr>
-                                </tbody></table>
-
+                                </tbody>
+                            </table>
                     </td>
                 </tr>
 
+                <tr>
+                    <td>
+                        <p> Once you're ready ro start integrating RoyalPay, we recommend taking a look at our
+                        <a href="https://mpay.royalpay.com.au/docs/en/">docs</a>
+                        <p> if you have any question please contact us</p>
+                        Email: <a href="mailto:info@royalpay.com.au">info@royalpay.com.au</a><br>
+                        Tel: 1300 10 77 50<br>
 
+                        Customer Service:
+                        <img src="https://mpay.royalpay.com.au/static/css/img/qr_service.png">
+                    </td>
+                </tr>
                 </tbody>
             </table>
         </td>
diff --git a/src/main/resources/templates/mail/verify_mail.html b/src/main/resources/templates/mail/verify_mail.html
index e038622e9..421c98c45 100644
--- a/src/main/resources/templates/mail/verify_mail.html
+++ b/src/main/resources/templates/mail/verify_mail.html
@@ -4,37 +4,16 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>RoyalPay | Reset Password</title>
-    <link rel="apple-touch-icon" sizes="57x57" href="ico/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="ico/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="ico/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="ico/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="ico/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="ico/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="ico/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="ico/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="ico/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="ico/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="ico/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="ico/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="ico/favicon-16x16.png">
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
     <!-- Bootstrap 3.3.5 -->
-    <link href="static/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://mpay.royalpay.com.au/static/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <!-- Font Awesome -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <!-- Ionicons -->
     <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
     <!-- Theme style -->
-    <link rel="stylesheet" href="./static/lib/dist/css/AdminLTE.min.css">
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-
+    <link rel="stylesheet" href="https://mpay.royalpay.com.au/static/lib/dist/css/AdminLTE.min.css">
     <style type="text/css">
         #bg {
             display: block;
@@ -65,8 +44,7 @@
 <body class="hold-transition login-page">
 <div class="login-box">
     <div class="login-logo">
-        <p><img src="static/images/rp_logo.svg" style="width:45%"></p>
-        <a href="index.html"><b>RoyalPay</b></a>
+        <p><img src="https://mpay.royalpay.com.au/static/images/rp_logo.svg" style="width:45%"></p>
     </div>
     <!-- /.login-logo -->
     <div class="login-box-body">
@@ -84,19 +62,12 @@
             </div>
 
             <div class="row">
-               <!-- <div class="form-group col-xs-12">
-                    <input type="text" name="codeKey" class="form-control" style="width: 70%;display: inline"
-                           id="codeKey" placeholder="Verification Code">
-                    <img style="width:30%;display:inline;height: 34px;float: right" id="email-kaptcha"
-                         src="/global/userstatus/captcha-login"
-                         title="点击更换"/>
-                </div>-->
                 <div class="col-xs-12 margin-bottom">
                     <button type="button" id="submitEmail-btn" class="btn btn-success btn-block btn-flat">Submit</button>
                 </div>
             </div>
             <p style="font-size: smaller">
-                文案修改 We need your partner code to confirm your identity information, please enter it. (Your partner code is the same as the first four letters of your order ID.)
+               We need your user name & password to confirm your identity information, please enter it.
             </p>
         </form>
 
@@ -105,9 +76,9 @@
 </div>
 <!-- /.login-box -->
 
-<script src="static/lib/jquery/jquery-2.1.4.min.js"></script>
+<script src="https://mpay.royalpay.com.au/static/lib/jquery/jquery-2.1.4.min.js"></script>
 <!-- Bootstrap 3.3.5 -->
-<script src="static/lib/bootstrap/js/bootstrap.min.js"></script>
+<script src="https://mpay.royalpay.com.au/static/lib/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" data-th-inline="javascript">
     $(document).ready(function () {
         window.address =  /*[[${address}]]*/'';
diff --git a/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java b/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java
new file mode 100644
index 000000000..555727acf
--- /dev/null
+++ b/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java
@@ -0,0 +1,58 @@
+package au.com.royalpay.payment.manage.application.core.impls;
+
+import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+
+@SpringBootTest
+@ActiveProfiles({ "dev", "alipay", "wechat", "jd", "bestpay" })
+@RunWith(SpringRunner.class)
+public class SimpleClientApplyServiceImplTest {
+
+    @Resource
+    private SimpleClientApplyService simpleClientApplyService;
+
+    @Test
+    public void verifyRegisterSMSCode() {
+    }
+
+    @Test
+    public void newAccount() {
+    }
+
+    @Test
+    public void partnerSignIn() {
+    }
+
+    @Test
+    public void getAndSendSmsCode() {
+    }
+
+    @Test
+    public void sendVerifyEmail() {
+        simpleClientApplyService.sendVerifyEmail("kira.wang@royalpay.com.au",9);
+
+    }
+
+    @Test
+    public void checkOrGenerateRegisterProcessKey() {
+    }
+
+    @Test
+    public void deleteRegisterProcessKey() {
+    }
+
+    @Test
+    public void checkOrGenerateVerifyMailKey() {
+    }
+
+    @Test
+    public void deleteVerifyMailKey() {
+    }
+}
\ No newline at end of file

From 82562fb04509b6553bd13840d0587a336ca884d3 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 24 May 2018 13:58:46 +0800
Subject: [PATCH 2/6] tmp

---
 .../templates/mail/register_application.html  | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/mail/register_application.html b/src/main/resources/templates/mail/register_application.html
index c0ffe09f0..1b1268fbd 100644
--- a/src/main/resources/templates/mail/register_application.html
+++ b/src/main/resources/templates/mail/register_application.html
@@ -16,14 +16,6 @@
                             </tbody></table>
                     </td>
                 </tr>
-
-                <tr class="header">
-                    <td align="center">
-                        <h1 style="font-size: 24px; line-height: 1.3em; margin-bottom: 5px;">Verify mail address</h1>
-                    </td>
-                </tr>
-
-
                 <tr class="content">
                     <td>
                         <p style="font-size: 15px; font-weight: normal; line-height: 22px;">Before you can use RoyalPay Cross-border Payment, you need to verify your email address. </p>
@@ -36,9 +28,7 @@
                             <table cellpadding="12" border="0" style="font-family: Lato, 'Lucida Sans', 'Lucida Grande', SegoeUI, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: bold; line-height: 25px; color: #444444; text-align: left;">
                                 <tbody><tr>
                                     <td class="button" style="color: rgb(255, 255, 255); font-size: 16px; line-height: 24px; text-align: center; display: block;">
-<!--
-                                        <a th:href="${url}" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><strong>Verify email address right now!</strong></a>
--->
+                                        <a th:href="${url}" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><strong>Verify mail address</strong></a>
                                     </td>
                                 </tr>
                                 </tbody>
@@ -50,12 +40,20 @@
                     <td>
                         <p> Once you're ready ro start integrating RoyalPay, we recommend taking a look at our
                         <a href="https://mpay.royalpay.com.au/docs/en/">docs</a>
+                        <div>
                         <p> if you have any question please contact us</p>
                         Email: <a href="mailto:info@royalpay.com.au">info@royalpay.com.au</a><br>
                         Tel: 1300 10 77 50<br>
 
-                        Customer Service:
-                        <img src="https://mpay.royalpay.com.au/static/css/img/qr_service.png">
+                        <div  style="width: 40%;padding: 0 15px;float: left;text-align: center;margin-right: 26px;" >
+                            <img style="width: 100%" src="https://mpay.royalpay.com.au/static/css/img/qr_service.png">
+                            Customer Service
+                        </div>
+                        <div  style="width: 40%;padding: 0 15px;float: left;text-align: center;" >
+                            <img style="width: 100%" src="https://mpay.royalpay.com.au/static/css/img/qr_service.png">
+                            RoyalPay WeChat Official Account
+                        </div>
+                        </div>
                     </td>
                 </tr>
                 </tbody>

From e9be935d2a79ac578f57c10e2b29c072ed05a90e Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 24 May 2018 14:39:16 +0800
Subject: [PATCH 3/6] update

---
 .../templates/mail/register_application.html  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/mail/register_application.html b/src/main/resources/templates/mail/register_application.html
index 1b1268fbd..8e4e8fc38 100644
--- a/src/main/resources/templates/mail/register_application.html
+++ b/src/main/resources/templates/mail/register_application.html
@@ -25,35 +25,35 @@
 
                 <tr>
                     <td align="center">
-                            <table cellpadding="12" border="0" style="font-family: Lato, 'Lucida Sans', 'Lucida Grande', SegoeUI, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: bold; line-height: 25px; color: #444444; text-align: left;">
-                                <tbody><tr>
-                                    <td class="button" style="color: rgb(255, 255, 255); font-size: 16px; line-height: 24px; text-align: center; display: block;">
-                                        <a th:href="${url}" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><strong>Verify mail address</strong></a>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
+                        <table cellpadding="12" border="0" style="font-family: Lato, 'Lucida Sans', 'Lucida Grande', SegoeUI, 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: bold; line-height: 25px; color: #444444; text-align: left;">
+                            <tbody><tr>
+                                <td class="button" style="color: rgb(255, 255, 255); font-size: 16px; line-height: 24px; text-align: center; display: block;">
+                                    <a th:href="${url}" style="color: rgb(255, 255, 255); text-align: center; display: block; padding: 12px 20px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: rgb(43, 136, 217); min-width: 150px;"><strong>Verify mail address</strong></a>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
                     </td>
                 </tr>
 
                 <tr>
                     <td>
+                        <br>
+                        <br>
                         <p> Once you're ready ro start integrating RoyalPay, we recommend taking a look at our
-                        <a href="https://mpay.royalpay.com.au/docs/en/">docs</a>
-                        <div>
+                            <a href="https://mpay.royalpay.com.au/docs/en/">docs</a>
                         <p> if you have any question please contact us</p>
                         Email: <a href="mailto:info@royalpay.com.au">info@royalpay.com.au</a><br>
                         Tel: 1300 10 77 50<br>
 
                         <div  style="width: 40%;padding: 0 15px;float: left;text-align: center;margin-right: 26px;" >
-                            <img style="width: 100%" src="https://mpay.royalpay.com.au/static/css/img/qr_service.png">
+                            <img style="width: 100%;background-color: black;" src="https://mpay.royalpay.com.au/static/css/img/qr_service.png">
                             Customer Service
                         </div>
                         <div  style="width: 40%;padding: 0 15px;float: left;text-align: center;" >
-                            <img style="width: 100%" src="https://mpay.royalpay.com.au/static/css/img/qr_service.png">
+                            <img style="width: 100%;background-color: black;" src="https://mpay.royalpay.com.au/static/css/img/qr_service.png">
                             RoyalPay WeChat Official Account
                         </div>
-                        </div>
                     </td>
                 </tr>
                 </tbody>

From 3f03b2aa18f752ad99b521db32c28e63ec080e65 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 24 May 2018 15:45:43 +0800
Subject: [PATCH 4/6] tmp

---
 .../core/SimpleClientApplyService.java        |  2 +
 .../impls/SimpleClientApplyServiceImpl.java   | 83 ++++++++++++-------
 .../web/SimpleClientApplyController.java      | 10 +--
 .../SimpleClientApplyServiceImplTest.java     | 26 +++++-
 4 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyService.java b/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyService.java
index 762a81c00..3d4f2ecca 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyService.java
@@ -22,4 +22,6 @@ public interface SimpleClientApplyService {
 
     void deleteVerifyMailKey(String codeKey);
 
+    void verifyMail(String address, JSONObject loginAccount);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
index 994be043e..553138a34 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
@@ -3,13 +3,17 @@ package au.com.royalpay.payment.manage.application.core.impls;
 import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService;
 import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
+import au.com.royalpay.payment.manage.signin.beans.LoginInfo;
+import au.com.royalpay.payment.manage.signin.core.SignInAccountService;
 import au.com.royalpay.payment.manage.system.core.MailGunService;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.env.SysConfigManager;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
+import au.com.royalpay.payment.tools.locale.LocaleSupport;
 import au.com.royalpay.payment.tools.mail.SendMail;
 import au.com.royalpay.payment.tools.utils.sms.SmsSingleSender;
+import au.com.royalpay.payment.tools.utils.sms.SmsSingleSenderResult;
 
 import com.alibaba.fastjson.JSONObject;
 
@@ -46,23 +50,26 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
     private SpringTemplateEngine thymeleaf;
     @Resource
     private ClientManager clientManager;
+    @Resource
+    private SignInAccountService signInAccountService;
 
     @Resource
     private StringRedisTemplate stringRedisTemplate;
     private final SmsSingleSender smsSingleSender = new SmsSingleSender(appId, appKey);
-    private final int REGISTER_CLIENT_TEMPLID = 126008;
+//    private final int REGISTER_CLIENT_TEMPLID = 126008;//正式
+    private final int REGISTER_CLIENT_TEMPLID = 110449;
     private final String REGISTER_CLIENT_PREFIX = "REGISTER_CLIENT";
     private final String REGISTER_CLIENT_PROCESS_PREFIX = "REGISTER_CLIENT_PROCESS";
     private final String VERIFY_MAIL_PREFIX = "VERIFY_MAIL";
     private final List<String> tags = new ArrayList<>();
 
     @PostConstruct
-    public void init(){
+    public void init() {
         tags.add("account");
     }
 
     @Override
-    public void verifyRegisterSMSCode(String codeKey,String phoneNumber) {
+    public void verifyRegisterSMSCode(String codeKey, String phoneNumber) {
         String rediskey = getRegisterClientRedisKey(phoneNumber);
         String codeValue = stringRedisTemplate.boundValueOps(rediskey).get();
         if (codeValue == null || !codeValue.equals(codeKey)) {
@@ -96,23 +103,26 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         String expireMin = (String) sysConfig.getOrDefault("sms.verification.code.expire", 3);
         param.add(expireMin);
         try {
-            smsSingleSender.sendWithParam(nationCode, phoneNumber, REGISTER_CLIENT_TEMPLID, param, "", "", "");
+            SmsSingleSenderResult result = smsSingleSender.sendWithParam(nationCode, phoneNumber, REGISTER_CLIENT_TEMPLID, param, "", "", "");
+            System.out.println(result);
+            System.out.println(result);
+            System.out.println(result);
         } catch (Exception e) {
             throw new ServerErrorException("System Error");
         }
-        stringRedisTemplate.boundValueOps(getRegisterClientRedisKey(phoneNumber)).set(registerClientCode,Long.parseLong(expireMin), TimeUnit.MINUTES);
+        stringRedisTemplate.boundValueOps(getRegisterClientRedisKey(phoneNumber)).set(registerClientCode, Long.parseLong(expireMin), TimeUnit.MINUTES);
         return registerClientCode;
     }
 
     @Override
-    public void sendVerifyEmail(String address,int client_id) {
-        JSONObject client= clientManager.getClientInfo(client_id);
-        if(client==null){
+    public void sendVerifyEmail(String address, int client_id) {
+        JSONObject client = clientManager.getClientInfo(client_id);
+        if (client == null) {
             throw new BadRequestException("Merchant not found");
         }
-        String key = checkOrGenerateVerifyMailKey(address,null);
+        String key = checkOrGenerateVerifyMailKey(address, null);
         Context ctx = new Context();
-        ctx.setVariable("url", PlatformEnvironment.getEnv().concatUrl("/register/account/mail/"+address+"/verify/" + key+"/jump"));
+        ctx.setVariable("url", PlatformEnvironment.getEnv().concatUrl("/register/account/mail/" + address + "/verify/" + key + "/jump"));
         final String content = thymeleaf.process("mail/register_application", ctx);
         SendMail sendMail = new SendMail();
         Set<String> to = new HashSet<>();
@@ -128,17 +138,17 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
 
     @Override
     public String checkOrGenerateRegisterProcessKey(String accountName, String codeKey) {
-        Assert.notNull(accountName,"accountName can't be null");
-        if(StringUtils.isNotEmpty(codeKey)){
+        Assert.notNull(accountName, "accountName can't be null");
+        if (StringUtils.isNotEmpty(codeKey)) {
             String redisAccountName = stringRedisTemplate.boundValueOps(getRegisterClientProcessRedisKey(codeKey)).get();
-            if(!accountName.equals(redisAccountName)){
+            if (!accountName.equals(redisAccountName)) {
                 throw new BadRequestException("Data error,Please re-register for safety.");
-            }else {
+            } else {
                 return codeKey;
             }
         }
-        String key =  RandomStringUtils.random(10, true, false);
-        stringRedisTemplate.boundValueOps(getRegisterClientProcessRedisKey(key)).set(accountName,1,TimeUnit.HOURS);
+        String key = RandomStringUtils.random(10, true, false);
+        stringRedisTemplate.boundValueOps(getRegisterClientProcessRedisKey(key)).set(accountName, 1, TimeUnit.HOURS);
         return key;
     }
 
@@ -148,18 +158,18 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
     }
 
     @Override
-    public String checkOrGenerateVerifyMailKey(String address, String codeKey){
-        Assert.notNull(address,"address can't be null");
-        if(StringUtils.isNotEmpty(codeKey)){
+    public String checkOrGenerateVerifyMailKey(String address, String codeKey) {
+        Assert.notNull(address, "address can't be null");
+        if (StringUtils.isNotEmpty(codeKey)) {
             String redisAddress = stringRedisTemplate.boundValueOps(getVerifyMailRedisKey(codeKey)).get();
-            if(!address.equals(redisAddress)){
+            if (!address.equals(redisAddress)) {
                 throw new BadRequestException("Mail expired");
-            }else {
+            } else {
                 return codeKey;
             }
         }
-        String key =  RandomStringUtils.random(10, true, false);
-        stringRedisTemplate.boundValueOps(getVerifyMailRedisKey(key)).set(address,1,TimeUnit.HOURS);
+        String key = RandomStringUtils.random(10, true, false);
+        stringRedisTemplate.boundValueOps(getVerifyMailRedisKey(key)).set(address, 1, TimeUnit.HOURS);
         return key;
 
     }
@@ -169,13 +179,28 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         stringRedisTemplate.delete(getVerifyMailRedisKey(codeKey));
     }
 
-    private String getRegisterClientRedisKey(String phoneNumber){
-        return REGISTER_CLIENT_PREFIX +phoneNumber;
+    @Override
+    public void verifyMail(String address, JSONObject loginAccount) {
+        LoginInfo loginInfo = new LoginInfo();
+        loginInfo.setLoginId(loginAccount.getString("userName"));
+        loginInfo.setPassword(loginAccount.getString("password"));
+        JSONObject account = signInAccountService.accountCheck(loginInfo);
+        JSONObject client = clientManager.getClientInfo(account.getIntValue("client_id"));
+        if (!address.equals(client.getString("contact_email"))) {
+            throw new BadRequestException(LocaleSupport.localeMessage("error.login.password"));
+        }
+
+    }
+
+    private String getRegisterClientRedisKey(String phoneNumber) {
+        return REGISTER_CLIENT_PREFIX + phoneNumber;
     }
-    private String getRegisterClientProcessRedisKey(String codeKey){
-        return REGISTER_CLIENT_PROCESS_PREFIX+codeKey;
+
+    private String getRegisterClientProcessRedisKey(String codeKey) {
+        return REGISTER_CLIENT_PROCESS_PREFIX + codeKey;
     }
-    private String getVerifyMailRedisKey(String codekey){
-        return VERIFY_MAIL_PREFIX+codekey;
+
+    private String getVerifyMailRedisKey(String codekey) {
+        return VERIFY_MAIL_PREFIX + codekey;
     }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java
index 15736eea2..e6303cea5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java
@@ -2,8 +2,6 @@ package au.com.royalpay.payment.manage.application.web;
 
 import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService;
 import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean;
-import au.com.royalpay.payment.manage.signin.beans.LoginInfo;
-import au.com.royalpay.payment.manage.signin.core.SignInAccountService;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 
@@ -27,8 +25,7 @@ import javax.validation.Valid;
 public class SimpleClientApplyController {
     @Resource
     private SimpleClientApplyService simpleClientApplyService;
-    @Resource
-    private SignInAccountService signInAccountService;
+
     @RequestMapping(value = "/account/{codeKey}", method = RequestMethod.POST)
     @ResponseBody
     public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response)
@@ -55,10 +52,7 @@ public class SimpleClientApplyController {
     @ResponseBody
     public void verifyMail(@PathVariable String codeKey, @PathVariable String address,@RequestBody JSONObject account){
         simpleClientApplyService.checkOrGenerateVerifyMailKey(address,codeKey);
-        LoginInfo loginInfo = new LoginInfo();
-        loginInfo.setLoginId(account.getString("userName"));
-        loginInfo.setPassword(account.getString("password"));
-        signInAccountService.accountCheck(loginInfo);
+        simpleClientApplyService.verifyMail(address,account);
         simpleClientApplyService.deleteVerifyMailKey(codeKey);
     }
 
diff --git a/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java b/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java
index 555727acf..71dd9d432 100644
--- a/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java
+++ b/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java
@@ -32,11 +32,35 @@ public class SimpleClientApplyServiceImplTest {
 
     @Test
     public void getAndSendSmsCode() {
+        String phone = "17626011667";
+        String nationCode = "+86";
+        String code = simpleClientApplyService.getAndSendSmsCode(phone, nationCode);
+        System.out.println(code);
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException e) {
+        }
+        try {
+            simpleClientApplyService.getAndSendSmsCode(phone, nationCode);
+
+        } catch (Exception e) {
+            System.out.println("之前应当报错，短信已经发送");
+        }
+        simpleClientApplyService.verifyRegisterSMSCode(code, phone);
+
+        try {
+            simpleClientApplyService.verifyRegisterSMSCode(code, phone);
+            System.out.println(code);
+        } catch (Exception e) {
+            System.out.println("报错  无法验证");
+
+        }
+
     }
 
     @Test
     public void sendVerifyEmail() {
-        simpleClientApplyService.sendVerifyEmail("kira.wang@royalpay.com.au",9);
+        simpleClientApplyService.sendVerifyEmail("kira.wang@royalpay.com.au", 9);
 
     }
 

From 45c8e9248ca57aed92ed37ab20da782136a891ca Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 24 May 2018 17:49:24 +0800
Subject: [PATCH 5/6] update

---
 pom.xml                                       |  6 ++++-
 .../impls/SimpleClientApplyServiceImpl.java   | 15 ++++-------
 .../SimpleClientApplyServiceImplTest.java     | 26 ++-----------------
 3 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2d370dfe..c7dd78e36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,11 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.github.qcloudsms</groupId>
+            <artifactId>qcloudsms</artifactId>
+            <version>1.0.3</version>
+        </dependency>
         <!--jpush start -->
         <dependency>
             <groupId>cn.jpush.api</groupId>
diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
index 553138a34..75de65512 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
@@ -12,10 +12,9 @@ import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
 import au.com.royalpay.payment.tools.locale.LocaleSupport;
 import au.com.royalpay.payment.tools.mail.SendMail;
-import au.com.royalpay.payment.tools.utils.sms.SmsSingleSender;
-import au.com.royalpay.payment.tools.utils.sms.SmsSingleSenderResult;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.qcloudsms.SmsSingleSender;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -55,9 +54,9 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
 
     @Resource
     private StringRedisTemplate stringRedisTemplate;
-    private final SmsSingleSender smsSingleSender = new SmsSingleSender(appId, appKey);
-//    private final int REGISTER_CLIENT_TEMPLID = 126008;//正式
-    private final int REGISTER_CLIENT_TEMPLID = 110449;
+    private final SmsSingleSender ssender = new SmsSingleSender(appId, appKey);
+    // TODO: 2018/5/24 kira
+    private final int REGISTER_CLIENT_TEMPLID = 126008;
     private final String REGISTER_CLIENT_PREFIX = "REGISTER_CLIENT";
     private final String REGISTER_CLIENT_PROCESS_PREFIX = "REGISTER_CLIENT_PROCESS";
     private final String VERIFY_MAIL_PREFIX = "VERIFY_MAIL";
@@ -95,7 +94,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         if (StringUtils.isNotEmpty(value)) {
             throw new BadRequestException("SMS has been sent，Please check your messages or try again in 3 minutes.");
         }
-
         JSONObject sysConfig = sysConfigManager.getSysConfig();
         ArrayList<String> param = new ArrayList<>();
         String registerClientCode = RandomStringUtils.random(6, true, true);
@@ -103,10 +101,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         String expireMin = (String) sysConfig.getOrDefault("sms.verification.code.expire", 3);
         param.add(expireMin);
         try {
-            SmsSingleSenderResult result = smsSingleSender.sendWithParam(nationCode, phoneNumber, REGISTER_CLIENT_TEMPLID, param, "", "", "");
-            System.out.println(result);
-            System.out.println(result);
-            System.out.println(result);
+            ssender.sendWithParam(nationCode, phoneNumber, REGISTER_CLIENT_TEMPLID, param, "RoyalPay", "", ""); //
         } catch (Exception e) {
             throw new ServerErrorException("System Error");
         }
diff --git a/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java b/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java
index 71dd9d432..e8aca7c16 100644
--- a/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java
+++ b/src/test/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImplTest.java
@@ -28,34 +28,12 @@ public class SimpleClientApplyServiceImplTest {
 
     @Test
     public void partnerSignIn() {
+        simpleClientApplyService.partnerSignIn(null);
     }
 
     @Test
     public void getAndSendSmsCode() {
-        String phone = "17626011667";
-        String nationCode = "+86";
-        String code = simpleClientApplyService.getAndSendSmsCode(phone, nationCode);
-        System.out.println(code);
-        try {
-            Thread.sleep(10000);
-        } catch (InterruptedException e) {
-        }
-        try {
-            simpleClientApplyService.getAndSendSmsCode(phone, nationCode);
-
-        } catch (Exception e) {
-            System.out.println("之前应当报错，短信已经发送");
-        }
-        simpleClientApplyService.verifyRegisterSMSCode(code, phone);
-
-        try {
-            simpleClientApplyService.verifyRegisterSMSCode(code, phone);
-            System.out.println(code);
-        } catch (Exception e) {
-            System.out.println("报错  无法验证");
-
-        }
-
+        simpleClientApplyService.getAndSendSmsCode("0451120326","61");
     }
 
     @Test

From c4f2de599e2e25feb2395f5a15eb3f53780e96b7 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 24 May 2018 18:04:10 +0800
Subject: [PATCH 6/6] update

---
 .../manage/application/beans/ClientPreApplyBean.java |  3 ---
 .../merchants/core/impls/ClientManagerImpl.java      | 12 ++++++------
 .../apps/core/impls/CustomerImpressionImplTest.java  |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java
index 6520aa333..abe3c616c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java
@@ -2,9 +2,6 @@ package au.com.royalpay.payment.manage.application.beans;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.time.DateUtils;
-
-import java.util.Date;
 
 /**
  * Created by yuan on 2018/5/23.
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 827aaa9a4..ec73b90f2 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
@@ -1633,8 +1633,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Override
     public String getQrCodeBoard(JSONObject client, QRCodeConfig config,JSONObject account,String plantform) {
         // JSONObject org = orgMapper.findOne(client.getIntValue("org_id"));
-//        return merchantInfoProvider.getQrCodeBoard(client, config);
-        return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform);
+        return merchantInfoProvider.getQrCodeBoard(client, config);
+//        return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform);
     }
 
     @Override
@@ -1658,8 +1658,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             qrboardConfig.put("brandw", "600");
             qrboardConfig.put("brandh", "200");
             String type = qrboardConfig.getString("type");
-            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
-//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
+//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
+            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
             board.drawBoardImage(ous);
         } catch (Exception e) {
             throw new ServerErrorException("QR board config not set for current organize", e);
@@ -1679,8 +1679,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             JSONObject qrboardConfig = JSON.parseObject(qrBoardConfigString);
 
             String type = qrboardConfig.getString("type");
-            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
-//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
+//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
+            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
             board.drawBoardImage(ous);
         } catch (Exception e) {
             throw new ServerErrorException("QR board config not set for current organize", e);
diff --git a/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java b/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
index 75473b0f3..907164b45 100644
--- a/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
+++ b/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
@@ -185,7 +185,7 @@ public class CustomerImpressionImplTest {
         JSONObject var = new JSONObject();
         var.put("client_moniker", client.getString("client_moniker"));
         var.put("short_name", client.getString("short_name"));
-        JSONObject result = mailGunClient.addListMember(client.getString("contact_email"), "merchants@mail.royalpay.com.au", client.getString("contact_person"),
+        JSONObject result = mailGunClient.addListMember(client.getString("contact_email"), "merchants@mail.royalpay.com.au", client.getString("contact_person"),"",
                 var);
     }