From a4fb42ef4b9d9b7f0f13feb64922261db941fb45 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Tue, 22 May 2018 17:15:19 +0800 Subject: [PATCH 01/49] fix --- .../core/SimpleClientApplyService.java | 14 ++++++++ .../web/SimpleClientApplyController.java | 33 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyService.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java 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 new file mode 100644 index 000000000..008d754c4 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyService.java @@ -0,0 +1,14 @@ +package au.com.royalpay.payment.manage.application.core; + +import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; +import com.alibaba.fastjson.JSONObject; + +public interface SimpleClientApplyService { + String getSMSVerifyCode(String codeKey); + + JSONObject newAccount(NewAccountBean accountBean); + + void deleteSMSVerifyCodeKey(String codeKey); + + String partnerSignIn(JSONObject account); +} 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 new file mode 100644 index 000000000..1a8a47e00 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java @@ -0,0 +1,33 @@ +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.tools.CommonConsts; +import au.com.royalpay.payment.tools.http.HttpUtils; +import com.alibaba.fastjson.JSONObject; +import org.springframework.validation.Errors; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +@RestController +@RequestMapping("/register") +public class SimpleClientApplyController { + @Resource + private SimpleClientApplyService simpleClientApplyService; + + @RequestMapping(value = "/account/{codeKey}", method = RequestMethod.POST) + public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response) throws Exception { + HttpUtils.handleValidErrors(errors); + String codeValue = simpleClientApplyService.getSMSVerifyCode(codeKey); + if (codeValue == null || !codeValue.equals(accountBean.getUsername())) { + throw new Exception("Verification code has expired or is not correct"); + } + JSONObject account = simpleClientApplyService.newAccount(accountBean); + simpleClientApplyService.deleteSMSVerifyCodeKey(codeKey); + String statusKey = simpleClientApplyService.partnerSignIn(account); + HttpUtils.setCookie(response, CommonConsts.CODE_KEY, statusKey); + } +} From de98a7c279500c9bd171e043aa953dd1f21faad7 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Wed, 23 May 2018 09:59:32 +0800 Subject: [PATCH 02/49] add --- src/main/ui/merchant_application.html | 929 ++++++++++++++++++ .../ui/static/css/merchant_application.css | 422 ++++++++ src/main/ui/static/images/step/gou.png | Bin 0 -> 2689 bytes src/main/ui/static/images/step/num1_1.png | Bin 0 -> 2413 bytes src/main/ui/static/images/step/num1_2.png | Bin 0 -> 2845 bytes src/main/ui/static/images/step/num1_3.png | Bin 0 -> 3172 bytes src/main/ui/static/images/step/num1_4.png | Bin 0 -> 2607 bytes src/main/ui/static/images/step/num1_5.png | Bin 0 -> 2946 bytes src/main/ui/static/images/step/send_code.png | Bin 0 -> 3582 bytes .../merchant_application.js | 204 ++++ 10 files changed, 1555 insertions(+) create mode 100644 src/main/ui/merchant_application.html create mode 100644 src/main/ui/static/css/merchant_application.css create mode 100644 src/main/ui/static/images/step/gou.png create mode 100644 src/main/ui/static/images/step/num1_1.png create mode 100644 src/main/ui/static/images/step/num1_2.png create mode 100644 src/main/ui/static/images/step/num1_3.png create mode 100644 src/main/ui/static/images/step/num1_4.png create mode 100644 src/main/ui/static/images/step/num1_5.png create mode 100644 src/main/ui/static/images/step/send_code.png create mode 100644 src/main/ui/static/merchantapplication/merchant_application.js diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html new file mode 100644 index 000000000..2006536b9 --- /dev/null +++ b/src/main/ui/merchant_application.html @@ -0,0 +1,929 @@ + + + + + + + RoyalPay | Merchant Application + + + + + + + + + + + + + + + + Partner Register + + + + + + + + + + + + +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + + +
+
+
+ +
+ +
+
+
+
+ + Account Information +
+
+ + Company Information +
+
+ + Bank Account +
+
+ + Submit Materials +
+
+ + Success +
+
+
+
+ +
+
+ + + +
+
+ + Required Field +
+ +
+ + Required Field +
+ +
+ + Required Field +
+ +
+ + Required Field +
+
+
+ + +
+

Required Field

+
+
+
+ +
+ + Required Field +
+ +
+
+ +
+

{{resError}}

+
+
+
+
+
+
+ + + +
+
+ + Required Field +
+
+ + + +
+
+ + Required Field +
+ +
+ + Required Field +
+
+ + Required Field +
+
+ + Required Field +
+
+ + Required Field +
+ +
+
+ +
+

{{resError}}

+
+
+
+
+
+
+ + Required Field +
+ +
+ + Required Field +
+ +
+ + Required Field +
+ +
+ + Required Field +
+
+ + Required Field +
+
+ + Required Field +
+
+ + Required Field +
+
+ + Required Field +
+
+ + Required Field +
+
+ + Required Field +
+ +
+
+ +
+

{{resError}}

+
+
+
+
+
+
+ +
{{rateConfig}}
+ Required Field +
+ +
+
+ +
%
+
+ Required Field +
+ +
+
+ +
%
+
+ Required Field +
+ +
+
+ +
%
+
+ Required Field +
+
+
+ +
%
+
+ Required Field +
+
+
+ +
%
+
+ Required Field +
+
+
+ +
+
+
+
+ +
+

{{resError}}

+
+
+
+
+ +
+
+
+ +
+
+
恭喜注册成功
+
欢迎使用RoyalPay收单服务
+
+
+
+
+
注意事项：
+

1、需要完成 合规材料的提交，具体请查看appxx菜单xx功能；

+

2、在完成合规认证之前，不会对交易进行清算；

+

3、账户名和密码以及相关信息已发送至账户邮箱，请妥善保护自己的密码，及时进行修改。

+
+
+
+ +
+

{{resError}}

+
+
+
+
+
+
+
+ +
+
+
+
+ +

Success

+
+
+ Registered merchant application has been submitted successfully +
+
+ +
+
+
+
+ +
+
+
+
+
+ CONTACT US +
+ Level 14
+ 383 Kent Street
+ Sydney NSW 2000
+
+ Level 11
+ 15 William Street
+ Melbourne VIC 3000
+
+ 1300-10-77-50
+ 03 9448 8865
+ info@royalpay.com.au +
+
+ SITE MAP +
+
+ +
+

RoyalPay

+

Gateway API

+

Industry Solution

+

Marketing Service

+
+
+

About Us

+

News

+

Career

+

Downloads

+
+
+
+
+ SUPPORT +
+
+ +
+ + RoyalPay WeChat Official Account +
+
+ + Customer Service +
+
+
+
+
+
+
+
+
+ © 2016 Tunnel Show Pty. Ltd. | Representative of AFSL licensee 448066 +
+
+
+
+
+
+
+ + +
+
+ + \ No newline at end of file diff --git a/src/main/ui/static/css/merchant_application.css b/src/main/ui/static/css/merchant_application.css new file mode 100644 index 000000000..49d16a26c --- /dev/null +++ b/src/main/ui/static/css/merchant_application.css @@ -0,0 +1,422 @@ +body .progress_inner #step-5:checked + div + div + div + div > .box_base, body .progress_inner #step-4:checked + input + div + div + div + div > .box_base, body .progress_inner #step-2:checked + input + input + input + div + div + div + div > .box_base, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_base, body .progress_inner #step-1:checked + input + input + input + input + div + div + div + div > .box_base { + top: 50%; + left: 0px; + opacity: 1; +} +body .progress_inner #step-5:checked + div + div + div + div > .box_item, body .progress_inner #step-4:checked + input + div + div + div + div > .box_item, body .progress_inner #step-2:checked + input + input + input + div + div + div + div > .box_item, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_item, body .progress_inner #step-1:checked + input + input + input + input + div + div + div + div > .box_item { + top: -30px; + left: 0px; + opacity: 0; +} + +body .progress_inner #step-5:checked + div + div + div + div > .box_lid, body .progress_inner #step-4:checked + input + div + div + div + div > .box_lid, body .progress_inner #step-2:checked + input + input + input + div + div + div + div > .box_lid { + top: -20px; + left: 0px; + opacity: 0; +} +body .progress_inner #step-5:checked + div + div + div + div > .box_item, body .progress_inner #step-4:checked + input + div + div + div + div > .box_item, body .progress_inner #step-2:checked + input + input + input + div + div + div + div > .box_item { + top: -10px; + left: 0px; + opacity: 1; +} + +body .progress_inner #step-5:checked + div + div + div + div > .box_item, body .progress_inner #step-4:checked + input + div + div + div + div > .box_item, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_item { + top: 10px; + left: 0px; + opacity: 1; +} +body .progress_inner #step-5:checked + div + div + div + div > .box_lid, body .progress_inner #step-4:checked + input + div + div + div + div > .box_lid, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_lid { + top: -1px; + left: 0px; + opacity: 1; +} +body .progress_inner #step-5:checked + div + div + div + div > .box_ribbon, body .progress_inner #step-4:checked + input + div + div + div + div > .box_ribbon, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_ribbon { + top: 70%; + left: 0px; + opacity: 0; +} +body .progress_inner #step-5:checked + div + div + div + div > .box_bow, body .progress_inner #step-4:checked + input + div + div + div + div > .box_bow, body .progress_inner #step-3:checked + input + input + div + div + div + div > .box_bow { + top: 0px; + left: 0px; + opacity: 0; +} + +body .progress_inner #step-5:checked + div + div + div + div > .box_ribbon, body .progress_inner #step-4:checked + input + div + div + div + div > .box_ribbon { + top: 50%; + left: 0px; + opacity: 1; +} +body .progress_inner #step-5:checked + div + div + div + div > .box_bow, body .progress_inner #step-4:checked + input + div + div + div + div > .box_bow { + top: -10px; + left: 0px; + opacity: 1; +} + +body .progress_inner #step-5:checked + div + div + div + div > .box_tag { + top: 10px; + left: 20px; + opacity: 1; +} +body .progress_inner #step-5:checked + div + div + div + div > .box_string { + top: 10px; + left: 20px; + opacity: 1; +} + +* { + box-sizing: border-box; +} + +body .progress_inner__step:before, body .progress_inner, body .progress_inner__status .box_base, body .progress_inner__status .box_item, body .progress_inner__status .box_ribbon, body .progress_inner__status .box_bow, body .progress_inner__status .box_bow__left, body .progress_inner__status .box_bow__right, body .progress_inner__status .box_tag, body .progress_inner__status .box_string { + position: absolute; + left: 0; + right: 0; + top:42%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); + margin: auto; +} + +body .progress_inner__bar, body .progress_inner__bar--set { + height: 6px; + left: 10%; + background: -webkit-repeating-linear-gradient(45deg, #1ea4ec, #1ea4ec 4px, #1f8bc5 4px, #1f8bc5 10px); + background: repeating-linear-gradient(45deg, #1ea4ec, #1ea4ec 4px, #1f8bc5 4px, #1f8bc5 10px); + -webkit-transition: width 800ms cubic-bezier(0.915, 0.015, 0.3, 1.005); + transition: width 800ms cubic-bezier(0.915, 0.015, 0.3, 1.005); + border-radius: 6px; + width: 0; + position: relative; + z-index: -1; +} + +body .progress_inner__step:before { + width: 30px; + height: 30px; + color: #70afd0; + background: white; + line-height: 30px; + border: 3px solid #a6cde2; + font-size: 12px; + top: 3px; + border-radius: 100%; + -webkit-transition: all .4s; + transition: all .4s; + cursor: pointer; + pointer-events: none; +} + +body .progress_inner__step { + width: 20%; + font-size: 14px; + padding: 0 10px; + -webkit-transition: all .4s; + transition: all .4s; + float: left; + text-align: center; + position: relative; +} +body .progress_inner__step label { + padding-top: 50px; + top: -20px; + display: block; + position: relative; + cursor: pointer; +} +/*body .progress_inner__step:hover { + color: white; +} +body .progress_inner__step:hover:before { + color: white; + background: #1ea4ec; +}*/ + +body { + font-family: "Nunito", sans-serif; + background: #a6cde2; + color: #2e6c8e; + text-align: center; + font-weight: 900; +} +body .progress_inner { + height: 200px; + width: 1000px; +} +body .progress_inner #step-5:checked + div { + width: 80%; +} +body .progress_inner #step-5:checked + div + div + div > .tab:nth-of-type(5) { + opacity: 1; + top: 0; +} +body .progress_inner #step-5:checked + div + div + div + div { + right: 10%; +} +body .progress_inner #step-4:checked + input + div { + width: 60%; +} +body .progress_inner #step-4:checked + input + div + div + div > .tab:nth-of-type(4) { + opacity: 1; + top: 0; +} +body .progress_inner #step-4:checked + input + div + div + div + div { + right: 30%; +} +body .progress_inner #step-3:checked + input + input + div { + width: 40%; +} +body .progress_inner #step-3:checked + input + input + div + div + div > .tab:nth-of-type(3) { + opacity: 1; + top: 0; +} +body .progress_inner #step-3:checked + input + input + div + div + div + div { + right: 50%; +} +body .progress_inner #step-2:checked + input + input + input + div { + width: 20%; +} +body .progress_inner #step-2:checked + input + input + input + div + div + div > .tab:nth-of-type(2) { + opacity: 1; + top: 0; +} +body .progress_inner #step-2:checked + input + input + input + div + div + div + div { + right: 70%; +} +body .progress_inner #step-1:checked + input + input + input + input + div { + width: 0%; +} +body .progress_inner #step-1:checked + input + input + input + input + div + div + div > .tab:nth-of-type(1) { + opacity: 1; + top: 0; +} +body .progress_inner #step-1:checked + input + input + input + input + div + div + div + div { + right: 90%; +} +body .progress_inner__step:nth-of-type(1):before { + content: "1"; +} +body .progress_inner__step:nth-of-type(2):before { + content: "2"; +} +body .progress_inner__step:nth-of-type(3):before { + content: "3"; +} +body .progress_inner__step:nth-of-type(4):before { + content: "4"; +} +body .progress_inner__step:nth-of-type(5):before { + content: "5"; +} +body .progress_inner__step:nth-of-type(6):before { + content: "6"; +} +body .progress_inner__bar--set { + width: 80%; + top: -6px; + background: #70afd0; + position: relative; + z-index: -2; +} +body .progress_inner__tabs .tab { + opacity: 0; + position: absolute; + top: 40px; + text-align: center; + margin-top: 80px; + box-shadow: 0px 2px 1px #80b7d5; + padding: 30px; + background: white; + border-radius: 10px; + -webkit-transition: all .2s; + transition: all .2s; +} +body .progress_inner__tabs .tab h1 { + margin: 0; +} +body .progress_inner__tabs .tab p { + font-weight: 400; + opacity: 0.8; +} +body .progress_inner__status { + width: 40px; + height: 40px; + top: -65px; + -webkit-transition: right 800ms cubic-bezier(0.915, 0.015, 0.3, 1.005); + transition: right 800ms cubic-bezier(0.915, 0.015, 0.3, 1.005); + -webkit-transform: translateX(50%); + transform: translateX(50%); + position: absolute; +} +body .progress_inner__status div { + opacity: 0; + -webkit-transition: all 600ms cubic-bezier(0.915, 0.015, 0.3, 1.005); + transition: all 600ms cubic-bezier(0.915, 0.015, 0.3, 1.005); + -webkit-transition-delay: 300ms; + transition-delay: 300ms; +} +body .progress_inner__status div { + position: absolute; +} +body .progress_inner__status .box_base { + background: -webkit-repeating-linear-gradient(45deg, #986c5d, #986c5d 2px, #775144 2px, #775144 4px); + background: repeating-linear-gradient(45deg, #986c5d, #986c5d 2px, #775144 2px, #775144 4px); + width: 36px; + height: 40px; + z-index: 1; + border-radius: 1px; +} +body .progress_inner__status .box_lid { + width: 40px; + height: 13.33333px; + background: #775144; + z-index: 2; + border-radius: 1px; + top: 0; +} +body .progress_inner__status .box_item { + width: 20px; + height: 20px; + background: #be69d2; + z-index: 0; + border-radius: 4px; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); +} +body .progress_inner__status .box_ribbon { + width: 10px; + height: 42px; + background: #ee0f29; + z-index: 4; + border-radius: 1px; +} +body .progress_inner__status .box_bow__left, body .progress_inner__status .box_bow__right { + width: 6px; + height: 10px; + background: #be0c21; + position: absolute; + z-index: 3; + opacity: 1; + border-radius: 1px; +} +body .progress_inner__status .box_bow { + top: -6px; + z-index: 1; + -webkit-transition-delay: 500ms; + transition-delay: 500ms; +} +body .progress_inner__status .box_bow__left { + left: 6px; + -webkit-transform: rotate(45deg); + transform: rotate(45deg); +} +body .progress_inner__status .box_bow__right { + left: -4px; + -webkit-transform: rotate(-45deg); + transform: rotate(-45deg); +} +body .progress_inner__status .box_tag { + width: 20px; + height: 10px; + background: #487ac7; + z-index: 4; + -webkit-transform: rotate(-10deg) translateX(-40px) translateY(0px); + transform: rotate(-10deg) translateX(-40px) translateY(0px); + border-radius: 2px; + -webkit-transition-delay: 500ms; + transition-delay: 500ms; +} +body .progress_inner__status .box_string { + width: 17px; + height: 2px; + background: #343434; + z-index: 4; + -webkit-transform: rotate(-39deg) translateX(-22px) translateY(-12px); + transform: rotate(-39deg) translateX(-22px) translateY(-12px); +} +body .progress_inner input[type="radio"] { + display: none; +} +.step_header{ + text-align: left; + padding-left:7%; +} +.step_header img{ + height: 30px; + width: 30px; +} + +.success_wrapper{ + margin-top: 30px; + text-align: center; +} +.success_img{ + display: inline-block; +} +.success_img img{ + vertical-align: baseline; +} +.success_text{ + text-align: left; + display: inline-block; + margin-left: 14px; +} +.success_text2{ + font-family: PingFangSC-Regular; + font-size: 15px; + color: #8B919D; + letter-spacing: 0px; +} +.success_content{ + margin-top: 50px; + font-family: PingFangSC-Regular; + font-size: 15px; + color: #8B919D; + letter-spacing: 0px; +} +.content_align{ + margin:0 auto; + width:50%; + text-align:left; +} +.margin-bottom2{ + margin-top: 120px; +} +.agree-text{ + font-family: SanFranciscoText-Regular; + font-size: 15px; + color: #FF6600; + letter-spacing: 0px; +} +.agree-to{ + border: 1px solid #FF6600; + padding: 6px 8px 6px 8px; + color: grey; + cursor: pointer; +} +.agree_left{ + text-align: left; +} +body .dis_before:nth-child(1):before{ + background: #1ea4ec; +} +body .dis_before:nth-child(2):before{ + background: #1ea4ec; +} +body .dis_before:nth-child(3):before{ + background: #1ea4ec; +} +body .dis_before:nth-child(4):before{ + background: #1ea4ec; +} +body .dis_before:nth-child(5):before { + background: #1ea4ec; + } +/*.progress_inner__step:before{ + background: #1ea4ec; +} +.step_submit_color{ + color: white; + +}*/ + + diff --git a/src/main/ui/static/images/step/gou.png b/src/main/ui/static/images/step/gou.png new file mode 100644 index 0000000000000000000000000000000000000000..f4a81919afecf302160917ec3afb445862dea74a GIT binary patch literal 2689 zcmV-{3V!v8P){oH=ECY0Yyk@4 z8jS0vK;aw!tAe9XpdH;}tKN@+Yd8*s699DoyzAoG_g4T92pFgeWU}1MLR^9QeK6X) zG5PE=&$1eT?!}~!DZd72K!k3YhMK&VnFRosc-(#;9Pb7upPlzvRszr+e|`;2PwF)9 zc{?(#JTqTnYx^`f++B4vbv>ZueXIhYNy5i0O(#!-h%m{32%JX3(0`+6HaaM z6KVxOj`7Uz+93RzMF7t5&^fK!N2mpW(5ruXXRAk_^%m>;dpL90Iu3@vTr93;=KP%K>d_NT>t=DgKY& zJ`&M>xo+@RGqbP+mH7qQ0qCCJ3en$r@%6#Wgp=T~cdGA>%R6ZWAQYcIdS_3+RKht7 zMtg5`-&q>~UVPostlzH+2($p;#jjrc$P7WNB`6I*=AMW`s72s?x4p^e+8poj#O%#4ZwIJ7IIp-AycJ+Z7svhzo`U>HUi)sKX>s_ zbqF^DFrIw$%eWnefbcRn>|JkaK`H<7sa}t26?aH1VwiKz1X|-w?p_IFmj6=|5 z@#E3JdI3<_yJi}KHi$1En1_R{2f(ByXp8vv0HCmWac;7zwghbwKL&ugB}qx1chW+| zG!MNh2-+q-GyV%ky&cidwFiRorZ>|KLEFT)E)FoCmH@1r^HvuGZ4}>10P29Ct>PyH zg6zozVrn>Ov-lwZ%giCxeGaY~g0_pl_BmM2v&XkL1o~AaK5n8+RSwHs zrW*n;{_@q0ZWXtBRj@7yy!fkjJ7HCDy}_VO!%A5Qy!flV8w~=|4var<61Yj&O6wM;nH^Jm0A!ACZS+MgRJ zF9fO`+ZOS|Dd1`n=}3M6H`2rChM-O21Ni!7*y~1LjOg}oXL1AUf}myMi~RsA32#DT9lOW9^oo|V8lGo8}O8F%3KNSGkVds;3oA&4B6+)hD|PejMjt=|5GIfIR={Bhvflp0Y2eCG;C%sylf$T)NICMqU-ktz#k`<)teUl zJ?pICLKeVJ3oTGqp$e*wpHd(w>3MDcqNbohZAJ3#f5;33rM0B%50r8HH& zSgYCBHVa6ry^j{E>Z(+(GV!(g0Dg+7BxbHca-L7ygWzyitj(AK z*Vhifa#;9&M8pS8o-)pazpTsLC&6L`01Im%W(z+)9TDNENgzn!2`47KdsWL|6##J% z035jNBZ$;2*ut5O!q5BKN&uqticIEUJ|K|Da9ztm(yDKhC?~_Wpi4Y-F6(seRO@U# z0IOEv+W??}ZBt0OJPULMOvU(KyJM#+z9{Dm0P#ji%P>VBggyZ;@-(_^St&U2H5k{} z+P<#xV@=t*W?kX{1X_G5<04 v!_;vpKcX8Di-g$#I`=NW*;#M?{O|t*H6u>jbVF#)00000NkvXXu0mjfe5x2^ literal 0 HcmV?d00001 diff --git a/src/main/ui/static/images/step/num1_1.png b/src/main/ui/static/images/step/num1_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e4a8e24962f35e91794d5bdf9cad4ecfa19443ff GIT binary patch literal 2413 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 literal 0 HcmV?d00001 diff --git a/src/main/ui/static/images/step/num1_2.png b/src/main/ui/static/images/step/num1_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c009a6baa8b20515cf59fbf8bc8038b5003d9540 GIT binary patch literal 2845 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 KMNUMnLSTYQqS^HT literal 0 HcmV?d00001 diff --git a/src/main/ui/static/images/step/num1_4.png b/src/main/ui/static/images/step/num1_4.png new file mode 100644 index 0000000000000000000000000000000000000000..e1b9e40285e180860fd34c74c9879191b1751223 GIT binary patch literal 2607 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 RvuFSS002ovPDHLkV1if=oPhuU literal 0 HcmV?d00001 diff --git a/src/main/ui/static/images/step/num1_5.png b/src/main/ui/static/images/step/num1_5.png new file mode 100644 index 0000000000000000000000000000000000000000..63524502e12b640e0e50423cd3b91bffa7434765 GIT binary patch literal 2946 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 P&;c~nv{lPg&_VwPVp`v8 literal 0 HcmV?d00001 diff --git a/src/main/ui/static/merchantapplication/merchant_application.js b/src/main/ui/static/merchantapplication/merchant_application.js new file mode 100644 index 000000000..3dc2f44da --- /dev/null +++ b/src/main/ui/static/merchantapplication/merchant_application.js @@ -0,0 +1,204 @@ +angular.module('applyPartnerApp', ['ngMessages']).controller('applyPartnerCtrl', ['$scope', '$http','$interval', function ($scope, $http,$interval) { + var countryMap = [{ + "label": "AUS", + "value": "AUS" + }, { + "label": "CHN", + "value": "CHN" + }]; + var stateMap = [ + { + "label": "ACT", + "value": "ACT" + }, + { + "label": "NSW", + "value": "NSW" + }, + { + "label": "NT", + "value": "NT" + }, + { + "label": "QLD", + "value": "QLD" + }, + { + "label": "SA", + "value": "SA" + }, + { + "label": "TAS", + "value": "TAS" + }, + { + "label": "VIC", + "value": "VIC" + }, + { + "label": "WA", + "value": "WA" + } + ]; + var industryMap = [ + { + "label": "综合商城 Integrated Store", + "value": 336 + }, + { + "label": "食品 Food", + "value": 335 + }, + { + "label": "化妆品 Cosmetics", + "value": 334 + }, + { + "label": "鞋包服饰 Clothes", + "value": 327 + }, + { + "label": "酒店行业 Hospitality industry", + "value": 328 + }, + { + "label": "数码电器 Electric appliances", + "value": 332 + }, + { + "label": "母婴 Baby and maternal products", + "value": 333 + }, + { + "label": "文具/办公用品 Office supplies", + "value": 337 + }, + { + "label": "机票行业 Airline tickets industry", + "value": 339 + }, + { + "label": "国际物流 International logistics", + "value": 330 + }, + { + "label": "教育行业 Education section", + "value": 329 + }, + { + "label": "其它服务行业 Other services industry", + "value": 331 + }, + { + "label": "其它货物贸易行业 Other goods trade industry", + "value": 338 + } + ]; + + function getQueryString(name) { + var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); + var r = window.location.search.substr(1).match(reg); + if (r != null)return unescape(r[2]); + return null; + } + + var from = getQueryString("from"); + + $scope.industries = angular.copy(industryMap); + $scope.states = angular.copy(stateMap); + $scope.countries = angular.copy(countryMap); + $scope.seconds = 6; + $scope.canClick=false; + $scope.description = "Send Code"; + + $scope.disabledArray = new Array(true, false, false, false, false); + $scope.chooseArray = new Array(true, false, false, false, false); + $scope.changeChoose = function (index) { + $scope.chooseArray = new Array(false, false, false, false, false); + $scope.chooseArray[index] = true; + $scope.disabledArray[index] = true; + }; + + $scope.goToLogin = function () { + $scope.seconds = $scope.seconds -1; + if ($scope.seconds == 0) { + location.href = '/login.html'; + } + }; + + $scope.partner = {}; + + if (from != null && from.toString().length == 1) { + $scope.partner.source = from; + } + $scope.validateForm = function (form,index) { + /* if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true; + } + }); + return; + }*/ + $scope.changeChoose(index); + + }; + + + $scope.getTestCode = function(){ + var second=59; + var timerHandler; + timerHandler =$interval(function(){ + if(second<=0){ + $interval.cancel(timerHandler); //当执行的时间59s,结束时，取消定时器 ，cancle方法取消 + second=59; + $scope.description="获取验证码"; + $scope.canClick=false; //因为 ng-disabled属于布尔值，设置按钮可以点击，可点击发送 + }else{ + $scope.description=second+"s后重发"; + second--; + $scope.canClick=true; + } + },1000) //每一秒执行一次$interval定时器方法 + }; + + $scope.sendVerificationCode = function () { + $scope.getTestCode(); + }; + + $scope.save = function (from,index) { + $scope.validateForm(from,index); + /* var timer = $interval(function(){ + $scope.goToLogin(); + },1000);*/ + } + + + + /* $scope.captchaImage = '/partners/application/captcha-image'; + $scope.changeCaptchaImage = function () { + $scope.captchaImage = '/partners/application/captcha-image?' + Math.floor(Math.random() * 100); + }; + $scope.save = function (form) { + if (form.$invalid) { + angular.forEach(form, function (item, key) { + if (key.indexOf('$') < 0) { + item.$dirty = true; + } + }); + return; + } + $scope.partner.company_name = $scope.partner.short_name; + $('#login-btn').attr('disabled', true); + $http.post('partners/application', $scope.partner).then(function (resp) { + alert("Registered merchant application has been submitted successfully"); + location.href = 'partner_register_success.html'; + //commonDialog.alert({title: 'Success', content: 'Registered merchant application has been submitted successfully', type: 'success'}); + }, function (resp) { + alert(resp.data.message); + $scope.resError = resp.data.message; + $scope.changeCaptchaImage(); + $('#login-btn').attr('disabled', false); + }); + };*/ +}]); \ No newline at end of file From 09976bbab9944c8e02dcfdd4b1e9f8226cfb8cf3 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 23 May 2018 13:42:54 +0800 Subject: [PATCH 03/49] tmp --- .../core/SimpleClientApplyService.java | 2 +- .../impls/SimpleClientApplyServiceImpl.java | 40 +++++++++++++++++++ .../web/SimpleClientApplyController.java | 2 +- .../merchants/beans/NewAccountBean.java | 10 +++++ src/main/resources/application.properties | 5 +++ 5 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java 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 008d754c4..9e02379d4 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 @@ -4,7 +4,7 @@ import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; import com.alibaba.fastjson.JSONObject; public interface SimpleClientApplyService { - String getSMSVerifyCode(String codeKey); + String getSMSVerifyCode(String codeKey,String phoneNumber,String nationCode); JSONObject newAccount(NewAccountBean accountBean); 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 new file mode 100644 index 000000000..658c11e0d --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java @@ -0,0 +1,40 @@ +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.tools.utils.sms.SmsSingleSender; + +import com.alibaba.fastjson.JSONObject; + +import org.springframework.beans.factory.annotation.Value; + +public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { + + @Value("${royalpay.sms.appid}") + private int appId; + @Value("${royalpay.sms.appkey}") + private String appKey; + + private final SmsSingleSender smsSingleSender = new SmsSingleSender(appId,appKey); + + @Override + String getSMSVerifyCode(String codeKey,String phoneNumber,String nationCode){ +// smsSingleSender.sendWithParam(); + return null; + } + + @Override + public JSONObject newAccount(NewAccountBean accountBean) { + return null; + } + + @Override + public void deleteSMSVerifyCodeKey(String codeKey) { + + } + + @Override + public String partnerSignIn(JSONObject account) { + return null; + } +} 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 1a8a47e00..b7ad70d2d 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 @@ -21,7 +21,7 @@ public class SimpleClientApplyController { @RequestMapping(value = "/account/{codeKey}", method = RequestMethod.POST) public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response) throws Exception { HttpUtils.handleValidErrors(errors); - String codeValue = simpleClientApplyService.getSMSVerifyCode(codeKey); + String codeValue = simpleClientApplyService.getSMSVerifyCode(codeKey,accountBean.getContactPhone(),accountBean.getNation_code()); if (codeValue == null || !codeValue.equals(accountBean.getUsername())) { throw new Exception("Verification code has expired or is not correct"); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/NewAccountBean.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/NewAccountBean.java index ca16c3f56..4fd5f8981 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/NewAccountBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/NewAccountBean.java @@ -18,6 +18,8 @@ public class NewAccountBean { private String displayName; @JSONField(name = "contact_phone") private String contactPhone; + @JSONField(name = "nation_code") + private String nation_code = "+61"; private int role = PartnerRole.CASHIER.getCode(); public JSONObject toJson() { @@ -70,4 +72,12 @@ public class NewAccountBean { public void setContactPhone(String contactPhone) { this.contactPhone = contactPhone; } + + public String getNation_code() { + return nation_code; + } + + public void setNation_code(String nation_code) { + this.nation_code = nation_code; + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bc53561d1..490a6d3f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -106,3 +106,8 @@ mail.mailgun.domain=mail.royalpay.com.au mail.mailgun.default.merchantlist=merchants@mail.royalpay.com.au +############## +##短信key +############## +royalpay.sms.appid=1400035361 +royalpay.sms.appkey=d6e7cc6400ecd159963c1972cdb088cf From 48cc6509c0ca6185eb97788a43a178dd6aa2d054 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 23 May 2018 14:09:56 +0800 Subject: [PATCH 04/49] tmp --- .../core/SimpleClientApplyService.java | 4 +- .../impls/SimpleClientApplyServiceImpl.java | 46 +++++++++++++++---- .../web/SimpleClientApplyController.java | 2 +- 3 files changed, 42 insertions(+), 10 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 9e02379d4..00f5f5aaa 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 @@ -4,11 +4,13 @@ import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; import com.alibaba.fastjson.JSONObject; public interface SimpleClientApplyService { - String getSMSVerifyCode(String codeKey,String phoneNumber,String nationCode); + String getSMSVerifyCode(String codeKey); JSONObject newAccount(NewAccountBean accountBean); void deleteSMSVerifyCodeKey(String codeKey); String partnerSignIn(JSONObject account); + + String getSmsCodeAndSend(); } 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 658c11e0d..56cbe39cb 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 @@ -1,12 +1,22 @@ 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.tools.utils.sms.SmsSingleSender; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; -import com.alibaba.fastjson.JSONObject; +import javax.annotation.Resource; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.redis.core.StringRedisTemplate; + +import com.alibaba.fastjson.JSONObject; + +import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService; +import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; +import au.com.royalpay.payment.tools.env.SysConfigManager; +import au.com.royalpay.payment.tools.utils.sms.SmsSingleSender; public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { @@ -14,13 +24,18 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { private int appId; @Value("${royalpay.sms.appkey}") private String appKey; + @Resource + private SysConfigManager sysConfigManager; + @Resource + private StringRedisTemplate stringRedisTemplate; private final SmsSingleSender smsSingleSender = new SmsSingleSender(appId,appKey); - + // TODO: 2018/5/23 kira 模板申请通过后修改 + private final int REGISTER_CLIENT_TEMPLID = 123; + private final String REGISTER_CLIENT_PREFIX = "REGISTER_CLIENT"; @Override - String getSMSVerifyCode(String codeKey,String phoneNumber,String nationCode){ -// smsSingleSender.sendWithParam(); - return null; + public String getSMSVerifyCode(String codeKey){ + return null; } @Override @@ -37,4 +52,19 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { public String partnerSignIn(JSONObject account) { return null; } + + @Override + public String getSmsCodeAndSend(String phoneNumber,String nationCode) { + JSONObject sysConfig = sysConfigManager.getSysConfig(); + List param = new ArrayList<>(); + String register_client_key = REGISTER_CLIENT_PREFIX+RandomStringUtils.random(6, true, true); + param.add(register_client_key); + String expireMin = (String) sysConfig.getOrDefault("sms.verification.code.expire",3); + param.add(expireMin); + stringRedisTemplate.boundValueOps(register_client_key).set(register_client_key, Long.parseLong(expireMin), TimeUnit.MINUTES); + + param.add(DateFormatUtils.format(coupon.getDate("expiry"), "yyyy-MM-dd")); + smsSingleSender.sendWithParam(nationCode,phoneNumber,REGISTER_CLIENT_TEMPLID,,"","",""); + return register_client_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 b7ad70d2d..1a8a47e00 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 @@ -21,7 +21,7 @@ public class SimpleClientApplyController { @RequestMapping(value = "/account/{codeKey}", method = RequestMethod.POST) public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response) throws Exception { HttpUtils.handleValidErrors(errors); - String codeValue = simpleClientApplyService.getSMSVerifyCode(codeKey,accountBean.getContactPhone(),accountBean.getNation_code()); + String codeValue = simpleClientApplyService.getSMSVerifyCode(codeKey); if (codeValue == null || !codeValue.equals(accountBean.getUsername())) { throw new Exception("Verification code has expired or is not correct"); } From 543964051bbccfe716888f8be6b0495ac13a2938 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 23 May 2018 16:23:13 +0800 Subject: [PATCH 05/49] tmp --- .../core/SimpleClientApplyService.java | 8 +- .../impls/SimpleClientApplyServiceImpl.java | 92 +++++++++++++++---- .../web/SimpleClientApplyController.java | 22 ++++- .../templates/mail/register_application.html | 55 +++++++++++ 4 files changed, 154 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/templates/mail/register_application.html 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 00f5f5aaa..147f63f4b 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 @@ -4,7 +4,7 @@ import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; import com.alibaba.fastjson.JSONObject; public interface SimpleClientApplyService { - String getSMSVerifyCode(String codeKey); + void verifyRegisterSMSCode(String codeKey, String accountName); JSONObject newAccount(NewAccountBean accountBean); @@ -12,5 +12,9 @@ public interface SimpleClientApplyService { String partnerSignIn(JSONObject account); - String getSmsCodeAndSend(); + String getSmsCodeAndSend(String phoneNumber,String nationCode,String accountName); + + void sendVerifyEmail(String address,JSONObject client); + + String generateRegisterProcessKey(String accountName); } 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 56cbe39cb..b2fef1ed9 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 @@ -1,21 +1,28 @@ package au.com.royalpay.payment.manage.application.core.impls; import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; +import java.util.Set; import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.lang3.time.DateFormatUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.StringRedisTemplate; +import org.thymeleaf.context.Context; +import org.thymeleaf.spring4.SpringTemplateEngine; import com.alibaba.fastjson.JSONObject; import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService; import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; +import au.com.royalpay.payment.manage.system.core.MailGunService; 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.mail.SendMail; import au.com.royalpay.payment.tools.utils.sms.SmsSingleSender; public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { @@ -26,16 +33,27 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { private String appKey; @Resource private SysConfigManager sysConfigManager; + @Resource + private MailGunService mailGunService; + @Resource + private SpringTemplateEngine thymeleaf; @Resource private StringRedisTemplate stringRedisTemplate; - private final SmsSingleSender smsSingleSender = new SmsSingleSender(appId,appKey); - // TODO: 2018/5/23 kira 模板申请通过后修改 - private final int REGISTER_CLIENT_TEMPLID = 123; + private final SmsSingleSender smsSingleSender = new SmsSingleSender(appId, appKey); + private final int REGISTER_CLIENT_TEMPLID = 126008; private final String REGISTER_CLIENT_PREFIX = "REGISTER_CLIENT"; + private final String REGISTER_CLIENT_PHONE_EXPIRE_PREFIX = "REGISTER_CLIENT_PHONE_EXPIRE"; + @Override - public String getSMSVerifyCode(String codeKey){ - return null; + public void verifyRegisterSMSCode(String codeKey,String accountName) { + String rediskey = getRegisterClientRedisKey(accountName); + String codeValue = stringRedisTemplate.boundValueOps(rediskey).get(); + if (codeValue == null || !codeValue.equals(codeKey)) { + throw new BadRequestException("Verification code has expired or is not correct"); + } + stringRedisTemplate.delete(rediskey); +// stringRedisTemplate.delete(getRegisterClientPhoneExpireRedisKey(phoneNumber)); } @Override @@ -54,17 +72,59 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { } @Override - public String getSmsCodeAndSend(String phoneNumber,String nationCode) { + public String getSmsCodeAndSend(String phoneNumber, String nationCode,String accountName) { + String reidsCheckCodeKey = getRegisterClientPhoneExpireRedisKey(phoneNumber); + String value = stringRedisTemplate.boundValueOps(reidsCheckCodeKey).get(); + 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(); - List param = new ArrayList<>(); - String register_client_key = REGISTER_CLIENT_PREFIX+RandomStringUtils.random(6, true, true); - param.add(register_client_key); - String expireMin = (String) sysConfig.getOrDefault("sms.verification.code.expire",3); + ArrayList param = new ArrayList<>(); + String registerClientKey = getRegisterClientRedisKey(accountName); + String registerClientCode = RandomStringUtils.random(6, true, true); + param.add(registerClientCode); + String expireMin = (String) sysConfig.getOrDefault("sms.verification.code.expire", 3); param.add(expireMin); - stringRedisTemplate.boundValueOps(register_client_key).set(register_client_key, Long.parseLong(expireMin), TimeUnit.MINUTES); + try { + smsSingleSender.sendWithParam(nationCode, phoneNumber, REGISTER_CLIENT_TEMPLID, param, "", "", ""); + } catch (Exception e) { + throw new ServerErrorException("System Error"); + } + stringRedisTemplate.boundValueOps(registerClientKey).set(registerClientCode, Long.parseLong(expireMin), TimeUnit.MINUTES); + stringRedisTemplate.boundValueOps(reidsCheckCodeKey).set(reidsCheckCodeKey, Long.parseLong(expireMin), TimeUnit.MINUTES); + + return registerClientCode; + } + + @Override + public void sendVerifyEmail(String address,JSONObject client) { + Context ctx = new Context(); + ctx.setVariable("url", url); + final String content = thymeleaf.process("mail/register_application", ctx); + - param.add(DateFormatUtils.format(coupon.getDate("expiry"), "yyyy-MM-dd")); - smsSingleSender.sendWithParam(nationCode,phoneNumber,REGISTER_CLIENT_TEMPLID,,"","",""); - return register_client_key; + SendMail sendMail = new SendMail(); + Set to = new HashSet<>(); + to.add(address); + sendMail.setMailTos(to); + sendMail.setFrom("info@mail.royalpay.com.au"); + sendMail.setTitle("Royalpay"); + sendMail.setContent(content); + sendMail.setTags(tags); + mailGunService.sendMail(sendMail); + } + + @Override + public String generateRegisterProcessKey(String accountName) { + + return null; + } + + private String getRegisterClientRedisKey(String accountName){ + return REGISTER_CLIENT_PREFIX +accountName; + } + private String getRegisterClientPhoneExpireRedisKey(String phoneNumber){ + return REGISTER_CLIENT_PHONE_EXPIRE_PREFIX +phoneNumber; } } 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 1a8a47e00..88b1fd437 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 @@ -19,15 +19,27 @@ public class SimpleClientApplyController { private SimpleClientApplyService simpleClientApplyService; @RequestMapping(value = "/account/{codeKey}", method = RequestMethod.POST) - public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response) throws Exception { + public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response) + throws Exception { HttpUtils.handleValidErrors(errors); - String codeValue = simpleClientApplyService.getSMSVerifyCode(codeKey); - if (codeValue == null || !codeValue.equals(accountBean.getUsername())) { - throw new Exception("Verification code has expired or is not correct"); - } + simpleClientApplyService.verifyRegisterSMSCode(codeKey,accountBean.getUsername()); + JSONObject account = simpleClientApplyService.newAccount(accountBean); simpleClientApplyService.deleteSMSVerifyCodeKey(codeKey); String statusKey = simpleClientApplyService.partnerSignIn(account); HttpUtils.setCookie(response, CommonConsts.CODE_KEY, statusKey); } + + +// @RequestMapping(value = "/account/mail/verify", method = RequestMethod.GET) +// public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response) +// throws Exception { +// HttpUtils.handleValidErrors(errors); +// simpleClientApplyService.verifyRegisterSMSCode(codeKey, accountBean.getContactPhone()); +// +// JSONObject account = simpleClientApplyService.newAccount(accountBean); +// simpleClientApplyService.deleteSMSVerifyCodeKey(codeKey); +// String statusKey = simpleClientApplyService.partnerSignIn(account); +// HttpUtils.setCookie(response, CommonConsts.CODE_KEY, statusKey); +// } } diff --git a/src/main/resources/templates/mail/register_application.html b/src/main/resources/templates/mail/register_application.html new file mode 100644 index 000000000..a3e88d8fd --- /dev/null +++ b/src/main/resources/templates/mail/register_application.html @@ -0,0 +1,55 @@ + + + + + + + \ No newline at end of file From 1842e10bb3a5b4961340b9f7e272be891f561f19 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 23 May 2018 17:58:05 +0800 Subject: [PATCH 06/49] tmp --- .../core/SimpleClientApplyService.java | 17 +- .../impls/SimpleClientApplyServiceImpl.java | 127 +++++++++----- .../web/SimpleClientApplyController.java | 46 +++-- .../resources/templates/mail/verify_mail.html | 158 ++++++++++++++++++ 4 files changed, 288 insertions(+), 60 deletions(-) create mode 100644 src/main/resources/templates/mail/verify_mail.html 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 147f63f4b..762a81c00 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 @@ -4,17 +4,22 @@ import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; import com.alibaba.fastjson.JSONObject; public interface SimpleClientApplyService { - void verifyRegisterSMSCode(String codeKey, String accountName); + void verifyRegisterSMSCode(String codeKey, String phoneNumber); JSONObject newAccount(NewAccountBean accountBean); - void deleteSMSVerifyCodeKey(String codeKey); - String partnerSignIn(JSONObject account); - String getSmsCodeAndSend(String phoneNumber,String nationCode,String accountName); + String getAndSendSmsCode(String phoneNumber, String nationCode); + + String checkOrGenerateRegisterProcessKey(String accountName, String codeKey); + + void deleteRegisterProcessKey(String codeKey); + + void sendVerifyEmail(String address, int client_id); + + String checkOrGenerateVerifyMailKey(String address, String codeKey); - void sendVerifyEmail(String address,JSONObject client); + void deleteVerifyMailKey(String codeKey); - String generateRegisterProcessKey(String accountName); } 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 b2fef1ed9..c0cca8e03 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 @@ -1,29 +1,34 @@ package au.com.royalpay.payment.manage.application.core.impls; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.TimeUnit; +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.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.mail.SendMail; +import au.com.royalpay.payment.tools.utils.sms.SmsSingleSender; -import javax.annotation.Resource; +import com.alibaba.fastjson.JSONObject; 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.util.Assert; import org.thymeleaf.context.Context; import org.thymeleaf.spring4.SpringTemplateEngine; -import com.alibaba.fastjson.JSONObject; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; -import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService; -import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; -import au.com.royalpay.payment.manage.system.core.MailGunService; -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.mail.SendMail; -import au.com.royalpay.payment.tools.utils.sms.SmsSingleSender; +import javax.annotation.PostConstruct; +import javax.annotation.Resource; public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { @@ -37,23 +42,31 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { private MailGunService mailGunService; @Resource private SpringTemplateEngine thymeleaf; + @Resource + private ClientManager clientManager; @Resource private StringRedisTemplate stringRedisTemplate; private final SmsSingleSender smsSingleSender = new SmsSingleSender(appId, appKey); private final int REGISTER_CLIENT_TEMPLID = 126008; private final String REGISTER_CLIENT_PREFIX = "REGISTER_CLIENT"; - private final String REGISTER_CLIENT_PHONE_EXPIRE_PREFIX = "REGISTER_CLIENT_PHONE_EXPIRE"; + private final String REGISTER_CLIENT_PROCESS_PREFIX = "REGISTER_CLIENT_PROCESS"; + private final String VERIFY_MAIL_PREFIX = "VERIFY_MAIL"; + private final List tags = new ArrayList<>(); + + @PostConstruct + public void init(){ + tags.add("account"); + } @Override - public void verifyRegisterSMSCode(String codeKey,String accountName) { - String rediskey = getRegisterClientRedisKey(accountName); + public void verifyRegisterSMSCode(String codeKey,String phoneNumber) { + String rediskey = getRegisterClientRedisKey(phoneNumber); String codeValue = stringRedisTemplate.boundValueOps(rediskey).get(); if (codeValue == null || !codeValue.equals(codeKey)) { throw new BadRequestException("Verification code has expired or is not correct"); } stringRedisTemplate.delete(rediskey); -// stringRedisTemplate.delete(getRegisterClientPhoneExpireRedisKey(phoneNumber)); } @Override @@ -61,19 +74,14 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { return null; } - @Override - public void deleteSMSVerifyCodeKey(String codeKey) { - - } - @Override public String partnerSignIn(JSONObject account) { return null; } @Override - public String getSmsCodeAndSend(String phoneNumber, String nationCode,String accountName) { - String reidsCheckCodeKey = getRegisterClientPhoneExpireRedisKey(phoneNumber); + public String getAndSendSmsCode(String phoneNumber, String nationCode) { + String reidsCheckCodeKey = getRegisterClientRedisKey(phoneNumber); String value = stringRedisTemplate.boundValueOps(reidsCheckCodeKey).get(); if (StringUtils.isNotEmpty(value)) { throw new BadRequestException("SMS has been sent，Please check your messages or try again in 3 minutes."); @@ -81,7 +89,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { JSONObject sysConfig = sysConfigManager.getSysConfig(); ArrayList param = new ArrayList<>(); - String registerClientKey = getRegisterClientRedisKey(accountName); String registerClientCode = RandomStringUtils.random(6, true, true); param.add(registerClientCode); String expireMin = (String) sysConfig.getOrDefault("sms.verification.code.expire", 3); @@ -91,19 +98,20 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { } catch (Exception e) { throw new ServerErrorException("System Error"); } - stringRedisTemplate.boundValueOps(registerClientKey).set(registerClientCode, Long.parseLong(expireMin), TimeUnit.MINUTES); - stringRedisTemplate.boundValueOps(reidsCheckCodeKey).set(reidsCheckCodeKey, Long.parseLong(expireMin), TimeUnit.MINUTES); - + stringRedisTemplate.boundValueOps(getRegisterClientRedisKey(phoneNumber)).set(registerClientCode,Long.parseLong(expireMin), TimeUnit.MINUTES); return registerClientCode; } @Override - public void sendVerifyEmail(String address,JSONObject client) { + 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); Context ctx = new Context(); - ctx.setVariable("url", url); + 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 to = new HashSet<>(); to.add(address); @@ -113,18 +121,59 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { sendMail.setContent(content); sendMail.setTags(tags); mailGunService.sendMail(sendMail); + } @Override - public String generateRegisterProcessKey(String accountName) { + public String checkOrGenerateRegisterProcessKey(String accountName, String codeKey) { + Assert.notNull(accountName,"accountName can't be null"); + if(StringUtils.isNotEmpty(codeKey)){ + String redisAccountName = stringRedisTemplate.boundValueOps(getRegisterClientProcessRedisKey(codeKey)).get(); + if(!accountName.equals(redisAccountName)){ + throw new BadRequestException("Data error,Please re-register for safety."); + }else { + return codeKey; + } + } + String key = RandomStringUtils.random(10, true, false); + stringRedisTemplate.boundValueOps(getRegisterClientProcessRedisKey(key)).set(accountName,1,TimeUnit.HOURS); + return key; + } - return null; + @Override + public void deleteRegisterProcessKey(String codeKey) { + stringRedisTemplate.delete(getRegisterClientProcessRedisKey(codeKey)); } - private String getRegisterClientRedisKey(String accountName){ - return REGISTER_CLIENT_PREFIX +accountName; + @Override + 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)){ + throw new BadRequestException("Data error"); + }else { + return codeKey; + } + } + String key = RandomStringUtils.random(10, true, false); + stringRedisTemplate.boundValueOps(getRegisterClientProcessRedisKey(key)).set(address,1,TimeUnit.HOURS); + return key; + + } + + @Override + public void deleteVerifyMailKey(String codeKey) { + stringRedisTemplate.delete(getVerifyMailRedisKey(codeKey)); + } + + private String getRegisterClientRedisKey(String phoneNumber){ + return REGISTER_CLIENT_PREFIX +phoneNumber; + } + private String getRegisterClientProcessRedisKey(String codeKey){ + return REGISTER_CLIENT_PROCESS_PREFIX+codeKey; } - private String getRegisterClientPhoneExpireRedisKey(String phoneNumber){ - return REGISTER_CLIENT_PHONE_EXPIRE_PREFIX +phoneNumber; + 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 88b1fd437..4d724308c 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 @@ -4,42 +4,58 @@ import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService; import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.http.HttpUtils; + import com.alibaba.fastjson.JSONObject; + +import org.springframework.stereotype.Controller; import org.springframework.validation.Errors; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -@RestController +@Controller @RequestMapping("/register") public class SimpleClientApplyController { @Resource private SimpleClientApplyService simpleClientApplyService; + @Resource @RequestMapping(value = "/account/{codeKey}", method = RequestMethod.POST) + @ResponseBody public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response) throws Exception { HttpUtils.handleValidErrors(errors); - simpleClientApplyService.verifyRegisterSMSCode(codeKey,accountBean.getUsername()); + simpleClientApplyService.verifyRegisterSMSCode(codeKey,accountBean.getContactPhone()); JSONObject account = simpleClientApplyService.newAccount(accountBean); - simpleClientApplyService.deleteSMSVerifyCodeKey(codeKey); String statusKey = simpleClientApplyService.partnerSignIn(account); HttpUtils.setCookie(response, CommonConsts.CODE_KEY, statusKey); } -// @RequestMapping(value = "/account/mail/verify", method = RequestMethod.GET) -// public void registerAccount(@PathVariable String codeKey, @RequestBody @Valid NewAccountBean accountBean, Errors errors, HttpServletResponse response) -// throws Exception { -// HttpUtils.handleValidErrors(errors); -// simpleClientApplyService.verifyRegisterSMSCode(codeKey, accountBean.getContactPhone()); -// -// JSONObject account = simpleClientApplyService.newAccount(accountBean); -// simpleClientApplyService.deleteSMSVerifyCodeKey(codeKey); -// String statusKey = simpleClientApplyService.partnerSignIn(account); -// HttpUtils.setCookie(response, CommonConsts.CODE_KEY, statusKey); -// } + @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"); + view.addObject("codeKey", codeKey); + return view; + } + + @RequestMapping(value = "/account/mail/{address}/verify/{codeKey}", method = RequestMethod.POST) + @ResponseBody + public void verifyMail(@PathVariable String codeKey, @PathVariable String address,@RequestBody JSONObject account){ + simpleClientApplyService.checkOrGenerateVerifyMailKey(address,codeKey); + + ModelAndView view = new ModelAndView("verify_mail"); + view.addObject("codeKey", codeKey); + + simpleClientApplyService.deleteVerifyMailKey(codeKey); + } } diff --git a/src/main/resources/templates/mail/verify_mail.html b/src/main/resources/templates/mail/verify_mail.html new file mode 100644 index 000000000..37ce3c593 --- /dev/null +++ b/src/main/resources/templates/mail/verify_mail.html @@ -0,0 +1,158 @@ + + + + + + RoyalPay | Reset Password + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 15fe2c59fb1204a59b76956dbd337e9749c784c6 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 23 May 2018 18:11:05 +0800 Subject: [PATCH 07/49] add verify mail & SMS code --- .../impls/SimpleClientApplyServiceImpl.java | 2 +- .../web/SimpleClientApplyController.java | 13 ++++++---- .../signin/core/SignInAccountService.java | 2 ++ .../core/impls/SignInAccountServiceImpl.java | 7 +++++ .../resources/templates/mail/verify_mail.html | 26 ++++++++++++------- 5 files changed, 35 insertions(+), 15 deletions(-) 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 c0cca8e03..52f322a93 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 @@ -151,7 +151,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { if(StringUtils.isNotEmpty(codeKey)){ String redisAddress = stringRedisTemplate.boundValueOps(getVerifyMailRedisKey(codeKey)).get(); if(!address.equals(redisAddress)){ - throw new BadRequestException("Data error"); + throw new BadRequestException("Mail expired"); }else { return 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 4d724308c..2d666d8ce 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,6 +2,8 @@ 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; @@ -26,7 +28,7 @@ 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) @@ -45,6 +47,7 @@ public class SimpleClientApplyController { simpleClientApplyService.checkOrGenerateVerifyMailKey(address,codeKey); ModelAndView view = new ModelAndView("verify_mail"); view.addObject("codeKey", codeKey); + view.addObject("address", address); return view; } @@ -52,10 +55,10 @@ public class SimpleClientApplyController { @ResponseBody public void verifyMail(@PathVariable String codeKey, @PathVariable String address,@RequestBody JSONObject account){ simpleClientApplyService.checkOrGenerateVerifyMailKey(address,codeKey); - - ModelAndView view = new ModelAndView("verify_mail"); - view.addObject("codeKey", codeKey); - + LoginInfo loginInfo = new LoginInfo(); + loginInfo.setLoginId(account.getString("userName")); + loginInfo.setPassword(account.getString("password")); + signInAccountService.accountCheck(loginInfo); simpleClientApplyService.deleteVerifyMailKey(codeKey); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java index 7d8920447..0cdaa4683 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java @@ -17,6 +17,8 @@ public interface SignInAccountService { JSONObject managerLoginCheck(LoginInfo loginInfo); + JSONObject accountCheck(LoginInfo loginInfo); + JSONObject clientLoginCheck(LoginInfo loginInfo); void changeManagerPassword(JSONObject manager, ChangePwdBean change); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index fd25de569..42b3d7849 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -166,6 +166,13 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati return account; } + @Override + public JSONObject accountCheck(LoginInfo loginInfo) { + JSONObject account = managerMapper.findAvailableByLoginId(loginInfo.getLoginId()); + validLoginInfo(loginInfo, account); + return account; + } + private void validLoginInfo(LoginInfo loginInfo, JSONObject account) { if (account == null) { throw new BadRequestException(LocaleSupport.localeMessage("error.login.password")); diff --git a/src/main/resources/templates/mail/verify_mail.html b/src/main/resources/templates/mail/verify_mail.html index 37ce3c593..e038622e9 100644 --- a/src/main/resources/templates/mail/verify_mail.html +++ b/src/main/resources/templates/mail/verify_mail.html @@ -78,14 +78,19 @@ +
+ + +
+
-
+
@@ -105,6 +110,9 @@ + - +