From d5c47133238132c6934544143a5af91fc98467bc Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 5 Nov 2019 10:21:36 +0800 Subject: [PATCH 01/17] =?UTF-8?q?fix=20=E5=BE=AE=E4=BF=A1=E5=AD=90?= =?UTF-8?q?=E5=95=86=E6=88=B7=E5=8F=B7=E7=94=B3=E8=AF=B7store=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../payment/manage/merchants/beans/SubMerchantIdApply.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 72d9d83a8..b829f37c1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.56 + 1.2.57 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java index f156abc3a..2bc113649 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/SubMerchantIdApply.java @@ -100,12 +100,12 @@ public class SubMerchantIdApply { this.merchant_name = merchant_name; } - public String getMerchant_shortname() { + public String getMerchant_storename() { return this.merchant_storename; } - public void setMerchant_shortname(String merchant_shortname) { - this.merchant_storename = merchant_shortname; + public void setMerchant_storename(String merchant_storename) { + this.merchant_storename = merchant_storename; } public String getOffice_phone() { From 671f143d28060de02ba1fb3c44d459f3e77b30e1 Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 5 Nov 2019 14:00:42 +0800 Subject: [PATCH 02/17] =?UTF-8?q?Upd:=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b829f37c1..d7f598683 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.57 + 1.2.58 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index fb02576de..bec9140bc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2270,7 +2270,7 @@ public class RetailAppServiceImp implements RetailAppService { result.put("contact_phone",account.getString("contact_phone")); String contact_phone = account.getString("contact_phone").replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2"); result.put("remark_contact_phone",contact_phone); - result.put("naticon_code",account.getString("nation_code")); + result.put("nation_code",account.getString("nation_code")); } result.put("wechat_bind_status",account.containsKey("wechat_openid")); if(account.containsKey("wechat_openid")){ From e028ec8a6d1e5c6bf26d2c2573cf4e8901ddbbfe Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 5 Nov 2019 14:31:07 +0800 Subject: [PATCH 03/17] =?UTF-8?q?Upd:=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../payment/manage/appclient/core/RetailAppService.java | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 7 ++++--- .../payment/manage/appclient/web/RetailAppController.java | 5 ++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index d7f598683..7944e31da 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.58 + 1.2.59 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java index 90eac6ea6..782c9d590 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java @@ -189,7 +189,7 @@ public interface RetailAppService { void updateAccountEmail(JSONObject device, JSONObject codekey); - void bindAccountPhone(JSONObject device, JSONObject phone); + void bindAccountPhone(JSONObject device); JSONObject updateAccountPhone(JSONObject device,JSONObject codekey); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index bec9140bc..e162f3ce1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2133,15 +2133,16 @@ public class RetailAppServiceImp implements RetailAppService { } @Override - public void bindAccountPhone(JSONObject device, JSONObject phone) { + public void bindAccountPhone(JSONObject device) { String codeKey = device.getString("account_id"); String codeKeyValueRedis = stringRedisTemplate.boundValueOps(getUpdateAccountPhoneKey(codeKey)).get(); if (StringUtils.isNotEmpty(codeKeyValueRedis)) { throw new BadRequestException("Captcha has been sent.Please check your phone or try again in 1 minutes."); } + JSONObject client = clientAccountMapper.findById(device.getString("account_id")); String codeKeyValue = RandomStringUtils.random(6, false, true); - String nationCode = phone.getString("nation_code").contains("+")?phone.getString("nation_code").substring(1):phone.getString("nation_code"); - String phoneNumber = phone.getString("contact_phone"); + String nationCode = client.getString("nation_code").contains("+")?client.getString("nation_code").substring(1):client.getString("nation_code"); + String phoneNumber = client.getString("contact_phone"); ArrayList param = new ArrayList<>(); param.add("绑定手机号"); param.add(codeKeyValue); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index f4dd25f22..24553e60c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -725,12 +725,11 @@ public class RetailAppController { * 接收关联手机的验证码 * * @param device - * @param phone contact_phone * @throws Exception */ @PutMapping("/account/phone") - public JSONObject bindAccountPhone(@ModelAttribute(RETAIL_DEVICE) JSONObject device, @RequestBody JSONObject phone) throws Exception { - retailAppService.bindAccountPhone(device, phone); + public JSONObject bindAccountPhone(@ModelAttribute(RETAIL_DEVICE) JSONObject device) throws Exception { + retailAppService.bindAccountPhone(device); return new JSONObject(); } From ea57a16d9a14b477afe65c758ba828a99ddb7361 Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 5 Nov 2019 15:30:51 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E6=94=B6=E8=A7=A3=E7=BB=91=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../appclient/core/RetailAppService.java | 4 ++- .../core/impls/RetailAppServiceImp.java | 27 +++++++++++++++++-- .../appclient/web/RetailAppController.java | 21 ++++++++++++--- 4 files changed, 46 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 7944e31da..6dafecfa8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.59 + 1.2.60 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java index 782c9d590..5836b9e72 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java @@ -189,7 +189,9 @@ public interface RetailAppService { void updateAccountEmail(JSONObject device, JSONObject codekey); - void bindAccountPhone(JSONObject device); + void sendBindAccountPhone(JSONObject device,JSONObject phone); + + void sendUnbindAccountPhone(JSONObject device); JSONObject updateAccountPhone(JSONObject device,JSONObject codekey); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index e162f3ce1..bd7a62c6f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2133,7 +2133,30 @@ public class RetailAppServiceImp implements RetailAppService { } @Override - public void bindAccountPhone(JSONObject device) { + public void sendBindAccountPhone(JSONObject device, JSONObject phone) { + String codeKey = device.getString("account_id"); + String codeKeyValueRedis = stringRedisTemplate.boundValueOps(getUpdateAccountPhoneKey(codeKey)).get(); + if (StringUtils.isNotEmpty(codeKeyValueRedis)) { + throw new BadRequestException("Captcha has been sent.Please check your phone or try again in 1 minutes."); + } + String codeKeyValue = RandomStringUtils.random(6, false, true); + String nationCode = phone.getString("nation_code").contains("+")?phone.getString("nation_code").substring(1):phone.getString("nation_code"); + String phoneNumber = phone.getString("contact_phone"); + ArrayList param = new ArrayList<>(); + param.add("绑定手机号"); + param.add(codeKeyValue); + String expireMin = "1"; + param.add(expireMin); + try { + smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, BIND_PHONE_TEMPLID, param, "RoyalPay", "", ""); + } catch (Exception e) { + logger.error(e.getMessage(), e); + throw new BadRequestException("Phone number is wrong.Please try again."); + } + stringRedisTemplate.boundValueOps(getUpdateAccountPhoneKey(codeKey)).set(codeKeyValue + "&" + nationCode + "&" + phoneNumber, Long.parseLong(expireMin), TimeUnit.MINUTES); + } + @Override + public void sendUnbindAccountPhone(JSONObject device) { String codeKey = device.getString("account_id"); String codeKeyValueRedis = stringRedisTemplate.boundValueOps(getUpdateAccountPhoneKey(codeKey)).get(); if (StringUtils.isNotEmpty(codeKeyValueRedis)) { @@ -2144,7 +2167,7 @@ public class RetailAppServiceImp implements RetailAppService { String nationCode = client.getString("nation_code").contains("+")?client.getString("nation_code").substring(1):client.getString("nation_code"); String phoneNumber = client.getString("contact_phone"); ArrayList param = new ArrayList<>(); - param.add("绑定手机号"); + param.add("解綁绑定手机号"); param.add(codeKeyValue); String expireMin = "1"; param.add(expireMin); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index 24553e60c..9d7bae19e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -725,12 +725,25 @@ public class RetailAppController { * 接收关联手机的验证码 * * @param device + * @param phone contact_phone * @throws Exception */ - @PutMapping("/account/phone") - public JSONObject bindAccountPhone(@ModelAttribute(RETAIL_DEVICE) JSONObject device) throws Exception { - retailAppService.bindAccountPhone(device); - return new JSONObject(); + @PutMapping("/account/phone/bind") + public JSONObject sendBindAccountPhone(@ModelAttribute(RETAIL_DEVICE) JSONObject device, @RequestBody JSONObject phone) throws Exception { + retailAppService.sendBindAccountPhone(device, phone); + return new JSONObject(); + } + + /** + * 接收解绑手机的验证码 + * + * @param device + * @throws Exception + */ + @PutMapping("/account/phone/unbind") + public JSONObject unBindAccountPhone(@ModelAttribute(RETAIL_DEVICE) JSONObject device) throws Exception { + retailAppService.sendUnbindAccountPhone(device); + return new JSONObject(); } /** From bec879cf5666661ff85d8916c4327f18eafec6b6 Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 5 Nov 2019 15:45:45 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E6=94=B6=E8=A7=A3=E7=BB=91=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../payment/manage/appclient/web/RetailAppController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6dafecfa8..b308319f1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.60 + 1.2.61 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index 9d7bae19e..8049f5c7f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -728,7 +728,7 @@ public class RetailAppController { * @param phone contact_phone * @throws Exception */ - @PutMapping("/account/phone/bind") + @PutMapping("/account/phone_verify/bind") public JSONObject sendBindAccountPhone(@ModelAttribute(RETAIL_DEVICE) JSONObject device, @RequestBody JSONObject phone) throws Exception { retailAppService.sendBindAccountPhone(device, phone); return new JSONObject(); @@ -740,7 +740,7 @@ public class RetailAppController { * @param device * @throws Exception */ - @PutMapping("/account/phone/unbind") + @PutMapping("/account/phone_verify/unbind") public JSONObject unBindAccountPhone(@ModelAttribute(RETAIL_DEVICE) JSONObject device) throws Exception { retailAppService.sendUnbindAccountPhone(device); return new JSONObject(); From b533845741738876fcb488e8ce50e57fba71537b Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 5 Nov 2019 17:04:51 +0800 Subject: [PATCH 06/17] =?UTF-8?q?add=20=E8=87=AA=E5=8A=A9=E8=BF=9B?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../merchants/core/impls/ClientManagerImpl.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b308319f1..1ea51bcdb 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.61 + 1.2.62 UTF-8 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 6e1885f6e..d6dea6438 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 @@ -522,6 +522,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid @Override public void exportClients(JSONObject manager, PartnerQuery query, HttpServletResponse resp) { JSONObject params = prepareListClientsParameter(manager, query); + logger.info("exporting_clients:--->{}", params); JSONObject retResp = serverlessFunctionTrigger.triggerFunction("export_merchants", params); String contentB64 = retResp.getString("content"); resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); @@ -3615,7 +3616,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid Date endDate = TimeZoneUtils.nextYearByCurrDay(); String end_date = DateFormatUtils.format(endDate, "dd/MM/yyyy"); client.put("end_date", end_date); - client.put("full_name", URLDecoder.decode(file.getOriginalFilename(),"UTF-8")); + client.put("full_name", URLDecoder.decode(file.getOriginalFilename(), "UTF-8")); BufferedImage img = ImageIO.read(file.getInputStream()); ByteArrayOutputStream out = new ByteArrayOutputStream(); ImageIO.write(img, "png", out); @@ -4976,11 +4977,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid String[] payType = clientConfig.getString("client_pay_type").split(","); if (Arrays.asList(payType).contains("1")) { registerAlipayOnlineGms(clientMoniker, null); - switchChannelPermission(account, clientMoniker, "Alipay", true); + enableGatewayAlipayOnline(account, clientMoniker, true); } if (Arrays.asList(payType).contains("2")) { registerAlipayGms(clientMoniker, null); - enableGatewayAlipayOnline(account, clientMoniker, true); + switchChannelPermission(account, clientMoniker, "Alipay", true); } } } @@ -5293,12 +5294,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new BadRequestException("The Partner's Bank Account is not config!"); } JSONObject representativeInfo = sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id")); - for(String str:representativeInfo.keySet()){ - if(representativeInfo.getString(str) == null || !(representativeInfo.getString(str).length()>0)|| !(client.getString("contact_job")!=null && client.getString("contact_job").length()>0)) { + for (String str : representativeInfo.keySet()) { + if (representativeInfo.getString(str) == null || !(representativeInfo.getString(str).length() > 0) || !(client.getString("contact_job") != null && client.getString("contact_job").length() > 0)) { throw new BadRequestException("The LegalPersonInfo is not config!Please upgrade the RoyalPay App version"); } } - if ( !(StringUtils.isNotBlank(client.getString("client_pay_type"))) || !(StringUtils.isNotBlank(client.getString("client_pay_desc"))) ) { + if (!(StringUtils.isNotBlank(client.getString("client_pay_type"))) || !(StringUtils.isNotBlank(client.getString("client_pay_desc")))) { throw new BadRequestException("Merchant Payment Scenario is not config!"); } From 90d5ba0bc42b6ae17422d54ddb6fb72cc8b06f58 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 5 Nov 2019 17:17:17 +0800 Subject: [PATCH 07/17] =?UTF-8?q?add=20phone=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E3=80=81=E6=B3=A8=E9=87=8A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../appclient/core/impls/ManageAppServiceImp.java | 11 ++++++++--- .../appclient/core/impls/RetailAppServiceImp.java | 10 ++++++---- .../core/impls/SimpleClientApplyServiceImpl.java | 9 +++++---- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 1ea51bcdb..77ff80cd6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.62 + 1.2.63 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index dcdd976b7..f810a4146 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -38,6 +38,8 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.ibatis.annotations.Param; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; @@ -52,6 +54,7 @@ import java.util.stream.Collectors; @Service public class ManageAppServiceImp implements ManageAppService { + private Logger logger = LoggerFactory.getLogger(getClass()); @Resource private ManageDeviceSupport manageDeviceSupport; @@ -470,6 +473,7 @@ public class ManageAppServiceImp implements ManageAppService { throw new BadRequestException("Captcha has been sent.Please check your email or try again in 5 minutes."); } String codeKeyValue = RandomStringUtils.random(6, false, true); + logger.debug("send sms code : {} ", codeKeyValue); Context ctx = new Context(); JSONObject manager = managerMapper.findById(device.getString("manager_id")); ctx.setVariable("account",manager); @@ -480,7 +484,7 @@ public class ManageAppServiceImp implements ManageAppService { mailService.sendEmail("Your account is in the process of binding a mailbox", email.getString("contact_email"), "", content); } catch (Exception e) { - throw new EmailException("Email Sending Failed", e); +// throw new EmailException("Email Sending Failed", e); } }); stringRedisTemplate.boundValueOps(getUpdateManageEmailKey(codeKey)).set(codeKeyValue+"&"+email.getString("contact_email"), 5, TimeUnit.MINUTES); @@ -512,6 +516,7 @@ public class ManageAppServiceImp implements ManageAppService { throw new BadRequestException("Captcha has been sent.Please check your phone or try again in 5 minutes."); } String codeKeyValue = RandomStringUtils.random(6, false, true); + logger.debug("send sms code : {} ", codeKeyValue); String nationCode = phone.getString("nation_code"); String phoneNumber = phone.getString("contact_phone"); ArrayList param = new ArrayList<>(); @@ -522,8 +527,8 @@ public class ManageAppServiceImp implements ManageAppService { try { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, BIND_PHONE_TEMPLID, param, "RoyalPay", "", ""); } catch (Exception e) { - e.printStackTrace(); - throw new ServerErrorException("Phone number is wrong.Please try again."); +// e.printStackTrace(); +// throw new ServerErrorException("Phone number is wrong.Please try again."); } stringRedisTemplate.boundValueOps(getUpdateManagePhoneKey(codeKey)).set(codeKeyValue+"&"+nationCode+"&"+phoneNumber, Long.parseLong(expireMin), TimeUnit.MINUTES); } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index bd7a62c6f..162802f49 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2098,6 +2098,7 @@ public class RetailAppServiceImp implements RetailAppService { throw new BadRequestException("Captcha has been sent.Please check your email or try again in 5 minutes."); } String codeKeyValue = RandomStringUtils.random(6, false, true); + logger.debug("send sms code : {} ", codeKeyValue); Context ctx = new Context(); JSONObject account = clientAccountMapper.findById(device.getString("account_id")); ctx.setVariable("account", account); @@ -2140,6 +2141,7 @@ public class RetailAppServiceImp implements RetailAppService { throw new BadRequestException("Captcha has been sent.Please check your phone or try again in 1 minutes."); } String codeKeyValue = RandomStringUtils.random(6, false, true); + logger.debug("send sms code : {} ", codeKeyValue); String nationCode = phone.getString("nation_code").contains("+")?phone.getString("nation_code").substring(1):phone.getString("nation_code"); String phoneNumber = phone.getString("contact_phone"); ArrayList param = new ArrayList<>(); @@ -2150,8 +2152,8 @@ public class RetailAppServiceImp implements RetailAppService { try { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, BIND_PHONE_TEMPLID, param, "RoyalPay", "", ""); } catch (Exception e) { - logger.error(e.getMessage(), e); - throw new BadRequestException("Phone number is wrong.Please try again."); +// logger.error(e.getMessage(), e); +// throw new BadRequestException("Phone number is wrong.Please try again."); } stringRedisTemplate.boundValueOps(getUpdateAccountPhoneKey(codeKey)).set(codeKeyValue + "&" + nationCode + "&" + phoneNumber, Long.parseLong(expireMin), TimeUnit.MINUTES); } @@ -2174,8 +2176,8 @@ public class RetailAppServiceImp implements RetailAppService { try { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, BIND_PHONE_TEMPLID, param, "RoyalPay", "", ""); } catch (Exception e) { - logger.error(e.getMessage(), e); - throw new BadRequestException("Phone number is wrong.Please try again."); +// logger.error(e.getMessage(), e); +// throw new BadRequestException("Phone number is wrong.Please try again."); } stringRedisTemplate.boundValueOps(getUpdateAccountPhoneKey(codeKey)).set(codeKeyValue + "&" + nationCode + "&" + phoneNumber, Long.parseLong(expireMin), TimeUnit.MINUTES); } 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 53c1eb8f5..0184d8e8c 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 @@ -170,6 +170,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { param.add(registerClientCode); String expireMin = "3"; param.add(expireMin); + logger.debug("send sms code : {} ", registerClientCode); try { if(request.getLocales().nextElement().equals(Locale.CHINESE)|| request.getLocales().nextElement().equals(Locale.SIMPLIFIED_CHINESE)){ smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, REGISTER_CLIENT_TEMPLID, param, "RoyalPay", "", ""); @@ -177,8 +178,8 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, REGISTER_CLIENT_TEMPLID_ENGLISH, param, "RoyalPay", "", ""); } } catch (Exception e) { - e.printStackTrace(); - throw new ServerErrorException("Phone number is wrong Please try again"); +// e.printStackTrace(); +// throw new ServerErrorException("Phone number is wrong Please try again"); } stringRedisTemplate.boundValueOps(getRegisterClientRedisKey(phoneNumber)).set(registerClientCode, Long.parseLong(expireMin), TimeUnit.MINUTES); return registerClientCode; @@ -880,8 +881,8 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, REGISTER_CLIENT_TEMPLID_ENGLISH, param, "RoyalPay", "", ""); } } catch (Exception e) { - e.printStackTrace(); - throw new ServerErrorException("Phone number is wrong Please try again"); +// e.printStackTrace(); +// throw new ServerErrorException("Phone number is wrong Please try again"); } stringRedisTemplate.boundValueOps(getLoginClientRedisKey(phoneNumber)).set(registerClientCode, Long.parseLong(expireMin), TimeUnit.MINUTES); } From acca378070f27a27b69a10720d07cc572f97a15d Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 5 Nov 2019 17:42:52 +0800 Subject: [PATCH 08/17] =?UTF-8?q?add=20phone=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E3=80=81=E6=B3=A8=E9=87=8A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../application/core/impls/SimpleClientApplyServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77ff80cd6..99631ceca 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.63 + 1.2.64 UTF-8 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 0184d8e8c..9029853ef 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 @@ -873,6 +873,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { param.add("RoyalPay"); param.add(registerClientCode); String expireMin = "1"; + logger.debug("{} phone sms send code :{}",phoneNumber,registerClientCode); param.add(expireMin); try { if(request.getLocales().nextElement().equals(Locale.CHINESE)|| request.getLocales().nextElement().equals(Locale.SIMPLIFIED_CHINESE)){ From 5a03d736acff792a714577b6d5baa68f53011320 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 5 Nov 2019 18:02:20 +0800 Subject: [PATCH 09/17] =?UTF-8?q?fix=20=E8=87=AA=E5=8A=A9=E8=BF=9B?= =?UTF-8?q?=E4=BB=B6=E6=94=AF=E4=BB=98=E5=AE=9D=E5=85=B3=E9=97=AD=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8A=A5=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../application/core/impls/SimpleClientApplyServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 99631ceca..af36dc24e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.64 + 1.2.65 UTF-8 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 9029853ef..8923b461f 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 @@ -770,7 +770,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { Runnable task2 = () -> { try { if (signInfo != null) { - clientManager.registerClientApplyGMS(clientMoniker, sysAccount.getString("account_id")); +// clientManager.registerClientApplyGMS(clientMoniker, sysAccount.getString("account_id")); }else { clientManager.getNewAggregateAgreeFile(clientMoniker, null, true); } From c2cd43de4f633c7573acbf4e4a53016a9e514364 Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 5 Nov 2019 18:43:05 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=88=AA=E9=99=A4ip=E9=99=90=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 - .../web/RetailValidationController.java | 8 +++---- .../signin/core/SignInStatusManager.java | 10 ++++---- .../core/impls/SignInStatusManagerImpl.java | 24 +++++++++---------- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index af36dc24e..04514bbe3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,6 @@ manage 1.2.65 - UTF-8 1.6.1 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java index cc7f761f5..fb2dbc8c3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java @@ -208,7 +208,7 @@ public class RetailValidationController implements ApplicationEventPublisherAwar HttpUtils.handleValidErrors(errors); JSONObject result = new JSONObject(); simpleClientApplyService.verifyLoginSMSCode(params.getString("verify_code"), contactPhone); - String signKey = signInStatusManager.getClientInfoByPhoneStatusKey(contactPhone, nationCode,RequestEnvironment.getClientIp()); + String signKey = signInStatusManager.getClientInfoByPhoneStatusKey(contactPhone, nationCode); if(signKey!=null){ JSONObject account = signInStatusManager.getCurrentClient(signKey); account = JSON.parseObject(account.toJSONString()); @@ -247,7 +247,7 @@ public class RetailValidationController implements ApplicationEventPublisherAwar loginInfo.setLoginId(params.getString("loginId")); loginInfo.setPassword(params.getString("password")); String signKey = signInStatusManager.verifyClientAccountLogin(loginInfo,"phone"); - signInStatusManager.verifyClientLoginPhoneBindCode(contactPhone,nationCode,RequestEnvironment.getClientIp()); + signInStatusManager.verifyClientLoginPhoneBindCode(contactPhone,nationCode); JSONObject account = signInStatusManager.getCurrentClient(signKey); retailAppService.updateLoginClientAccountPhone(account, contactPhone,nationCode); account.put("sign_key", signKey); @@ -271,7 +271,7 @@ public class RetailValidationController implements ApplicationEventPublisherAwar public JSONObject clientAppWechatSignIn(@RequestBody JSONObject params, Errors errors) { HttpUtils.handleValidErrors(errors); - JSONObject account = signInStatusManager.clientAppWechatSignIn(params.getString("code"),RequestEnvironment.getClientIp()); + JSONObject account = signInStatusManager.clientAppWechatSignIn(params.getString("code")); if(!account.getBoolean("bind_status")){ deviceSupport.validDeviceWithClient(account, params.getString("app_openid")); return account; @@ -287,7 +287,7 @@ public class RetailValidationController implements ApplicationEventPublisherAwar */ @PostMapping("/login/wechat_bind") public JSONObject wechatLoginBind(@RequestBody JSONObject params){ - JSONObject wechatInfo = signInStatusManager.verifyClientLoginWechatBindCode(params.getString("wechat_openid"),RequestEnvironment.getClientIp()); + JSONObject wechatInfo = signInStatusManager.verifyClientLoginWechatBindCode(params.getString("wechat_openid")); LoginInfo loginInfo = new LoginInfo(); loginInfo.setLoginId(params.getString("loginId")); loginInfo.setPassword(params.getString("password")); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInStatusManager.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInStatusManager.java index cbdb88d7c..2dc07fbd0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInStatusManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInStatusManager.java @@ -73,7 +73,7 @@ public interface SignInStatusManager { * @param code * @return */ - JSONObject clientAppWechatSignIn(String code,String ip); + JSONObject clientAppWechatSignIn(String code); /** * 手机号登录 @@ -81,7 +81,7 @@ public interface SignInStatusManager { * @param nationCode * @return */ - String getClientInfoByPhoneStatusKey(String phone,String nationCode,String ip); + String getClientInfoByPhoneStatusKey(String phone,String nationCode); /** * 登录绑定校验用户名密码 @@ -93,17 +93,15 @@ public interface SignInStatusManager { /** * 微信openId是否有申请绑定 * @param codeId - * @param ip * @return */ - JSONObject verifyClientLoginWechatBindCode (String codeId,String ip); + JSONObject verifyClientLoginWechatBindCode (String codeId); /** * 微信手机号是否有申请绑定 * @param phone * @param nationCode - * @param ip * @return */ - void verifyClientLoginPhoneBindCode (String phone,String nationCode,String ip); + void verifyClientLoginPhoneBindCode (String phone,String nationCode); } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java index 6a28b02f5..98b0bdb4d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java @@ -82,12 +82,12 @@ public class SignInStatusManagerImpl implements SignInStatusManager { } @Override - public String getClientInfoByPhoneStatusKey(String phone, String nationCode,String ip) { + public String getClientInfoByPhoneStatusKey(String phone, String nationCode) { String statusKey = newStatusKey(); JSONObject account = clientAccountMapper.findOneByPhoneAndCreateTimeDesc(phone, "+" + nationCode); if (account == null) { String expireMin = "5"; - stringRedisTemplate.boundValueOps(getClientLoginPhoneBindRedisKey(phone,nationCode,ip)).set(phone, Long.parseLong(expireMin), TimeUnit.MINUTES); + stringRedisTemplate.boundValueOps(getClientLoginPhoneBindRedisKey(phone,nationCode)).set(phone, Long.parseLong(expireMin), TimeUnit.MINUTES); return null; } stringRedisTemplate.boundValueOps(partnerLoginRedisKey(statusKey)).set(account.getString("account_id") + "", 30, TimeUnit.MINUTES); @@ -380,7 +380,7 @@ public class SignInStatusManagerImpl implements SignInStatusManager { } @Override - public JSONObject clientAppWechatSignIn(String code,String ip) { + public JSONObject clientAppWechatSignIn(String code) { JSONObject user = mpClientAppWechatApiProvider.getApi("merchant-app").appLoginUser(code); if(user==null){ throw new BadRequestException("WeChat users do not exist"); @@ -396,7 +396,7 @@ public class SignInStatusManagerImpl implements SignInStatusManager { res.put("app_openid", openId); res.put("status", "success"); String expireMin = "5"; - stringRedisTemplate.boundValueOps(getClientLoginWechatBindRedisKey(openId,ip)).set(openId+"&"+nickName+"&"+unionId, Long.parseLong(expireMin), TimeUnit.MINUTES); + stringRedisTemplate.boundValueOps(getClientLoginWechatBindRedisKey(openId)).set(openId+"&"+nickName+"&"+unionId, Long.parseLong(expireMin), TimeUnit.MINUTES); return res; } String statusKey = newStatusKey(); @@ -411,14 +411,14 @@ public class SignInStatusManagerImpl implements SignInStatusManager { return result; } - private String getClientLoginWechatBindRedisKey(String openId,String ip){ - return "login:"+":"+CLIENT_LOGIN_WECHAT_BIND_PREFIX + "&"+openId+"&"+ip; + private String getClientLoginWechatBindRedisKey(String openId){ + return "login:"+":"+CLIENT_LOGIN_WECHAT_BIND_PREFIX + "&"+openId; } @Override - public JSONObject verifyClientLoginWechatBindCode(String openId,String ip){ - String rediskey = getClientLoginWechatBindRedisKey(openId,ip); + public JSONObject verifyClientLoginWechatBindCode(String openId){ + String rediskey = getClientLoginWechatBindRedisKey(openId); String codeValue = stringRedisTemplate.boundValueOps(rediskey).get(); if (codeValue == null || !codeValue.split("&")[0].equals(openId)) { throw new BadRequestException("The WeChat ID does not apply for binding"); @@ -432,12 +432,12 @@ public class SignInStatusManagerImpl implements SignInStatusManager { }}; } - private String getClientLoginPhoneBindRedisKey(String phone,String nationCode,String ip){ - return "login:"+CLIENT_LOGIN_PHONE_BIND_PREFIX + "&"+nationCode+"&"+phone+"&"+ip; + private String getClientLoginPhoneBindRedisKey(String phone,String nationCode){ + return "login:"+CLIENT_LOGIN_PHONE_BIND_PREFIX + "&"+nationCode+"&"+phone; } - public void verifyClientLoginPhoneBindCode(String phone,String nationCode,String ip){ - String rediskey = getClientLoginPhoneBindRedisKey(phone,nationCode,ip); + public void verifyClientLoginPhoneBindCode(String phone,String nationCode){ + String rediskey = getClientLoginPhoneBindRedisKey(phone,nationCode); String codeValue = stringRedisTemplate.boundValueOps(rediskey).get(); if (codeValue == null || !codeValue.equals(phone)) { throw new BadRequestException("The phone number is for application binding"); From d27d67ab61cb98483394bd8cfee38cb4524e3d8a Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 5 Nov 2019 18:47:25 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=8D=87=E7=B4=9A=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 04514bbe3..1ca0eda62 100644 --- a/pom.xml +++ b/pom.xml @@ -8,9 +8,8 @@ 1.1.5 4.0.0 - manage - 1.2.65 + 1.2.66 UTF-8 1.6.1 From 0bf127aa81a5bdd05db6fdda350dc3f4b33578ce Mon Sep 17 00:00:00 2001 From: duLingLing Date: Tue, 5 Nov 2019 19:31:34 +0800 Subject: [PATCH 12/17] =?UTF-8?q?UPD:=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E7=BB=91=E5=AE=9A=EF=BC=8C=E4=BC=98=E5=85=88?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=94=A8=E6=88=B7=E5=90=8D=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/web/RetailValidationController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1ca0eda62..849501692 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.66 + 1.2.67 UTF-8 1.6.1 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java index fb2dbc8c3..5e9b27285 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailValidationController.java @@ -287,11 +287,11 @@ public class RetailValidationController implements ApplicationEventPublisherAwar */ @PostMapping("/login/wechat_bind") public JSONObject wechatLoginBind(@RequestBody JSONObject params){ - JSONObject wechatInfo = signInStatusManager.verifyClientLoginWechatBindCode(params.getString("wechat_openid")); LoginInfo loginInfo = new LoginInfo(); loginInfo.setLoginId(params.getString("loginId")); loginInfo.setPassword(params.getString("password")); String signKey = signInStatusManager.verifyClientAccountLogin(loginInfo,"wechat"); + JSONObject wechatInfo = signInStatusManager.verifyClientLoginWechatBindCode(params.getString("wechat_openid")); JSONObject account = signInStatusManager.getCurrentClient(signKey); params.put("nick_name",wechatInfo.getString("nick_name")); params.put("union_id",wechatInfo.getString("union_id")); From 74e5e483ccd229196aeeb39ac9e922b49a1c3452 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 5 Nov 2019 19:51:35 +0800 Subject: [PATCH 13/17] =?UTF-8?q?fix=20=E6=81=A2=E5=A4=8D=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/ManageAppServiceImp.java | 6 +++--- .../manage/appclient/core/impls/RetailAppServiceImp.java | 4 ++-- .../core/impls/SimpleClientApplyServiceImpl.java | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 849501692..716a25a99 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.67 + 1.2.68 UTF-8 1.6.1 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index f810a4146..367d85e39 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -484,7 +484,7 @@ public class ManageAppServiceImp implements ManageAppService { mailService.sendEmail("Your account is in the process of binding a mailbox", email.getString("contact_email"), "", content); } catch (Exception e) { -// throw new EmailException("Email Sending Failed", e); + throw new EmailException("Email Sending Failed", e); } }); stringRedisTemplate.boundValueOps(getUpdateManageEmailKey(codeKey)).set(codeKeyValue+"&"+email.getString("contact_email"), 5, TimeUnit.MINUTES); @@ -527,8 +527,8 @@ public class ManageAppServiceImp implements ManageAppService { try { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, BIND_PHONE_TEMPLID, param, "RoyalPay", "", ""); } catch (Exception e) { -// e.printStackTrace(); -// throw new ServerErrorException("Phone number is wrong.Please try again."); + e.printStackTrace(); + throw new ServerErrorException("Phone number is wrong.Please try again."); } stringRedisTemplate.boundValueOps(getUpdateManagePhoneKey(codeKey)).set(codeKeyValue+"&"+nationCode+"&"+phoneNumber, Long.parseLong(expireMin), TimeUnit.MINUTES); } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 162802f49..43be5a6bf 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2152,8 +2152,8 @@ public class RetailAppServiceImp implements RetailAppService { try { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, BIND_PHONE_TEMPLID, param, "RoyalPay", "", ""); } catch (Exception e) { -// logger.error(e.getMessage(), e); -// throw new BadRequestException("Phone number is wrong.Please try again."); + logger.error(e.getMessage(), e); + throw new BadRequestException("Phone number is wrong.Please try again."); } stringRedisTemplate.boundValueOps(getUpdateAccountPhoneKey(codeKey)).set(codeKeyValue + "&" + nationCode + "&" + phoneNumber, Long.parseLong(expireMin), TimeUnit.MINUTES); } 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 8923b461f..48f52bd43 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 @@ -178,8 +178,8 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, REGISTER_CLIENT_TEMPLID_ENGLISH, param, "RoyalPay", "", ""); } } catch (Exception e) { -// e.printStackTrace(); -// throw new ServerErrorException("Phone number is wrong Please try again"); + e.printStackTrace(); + throw new ServerErrorException("Phone number is wrong Please try again"); } stringRedisTemplate.boundValueOps(getRegisterClientRedisKey(phoneNumber)).set(registerClientCode, Long.parseLong(expireMin), TimeUnit.MINUTES); return registerClientCode; @@ -882,8 +882,8 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, REGISTER_CLIENT_TEMPLID_ENGLISH, param, "RoyalPay", "", ""); } } catch (Exception e) { -// e.printStackTrace(); -// throw new ServerErrorException("Phone number is wrong Please try again"); + e.printStackTrace(); + throw new ServerErrorException("Phone number is wrong Please try again"); } stringRedisTemplate.boundValueOps(getLoginClientRedisKey(phoneNumber)).set(registerClientCode, Long.parseLong(expireMin), TimeUnit.MINUTES); } From 6006720adaf6f3bf40cf4326fe7ad7454f4a40b7 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 5 Nov 2019 20:07:44 +0800 Subject: [PATCH 14/17] =?UTF-8?q?fix=20=E6=81=A2=E5=A4=8D=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 716a25a99..2b27c7e85 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.68 + 1.2.69 UTF-8 1.6.1 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 43be5a6bf..8d9bf838c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2176,8 +2176,8 @@ public class RetailAppServiceImp implements RetailAppService { try { smsSender.getSender().sendWithParam(nationCode.trim(), phoneNumber, BIND_PHONE_TEMPLID, param, "RoyalPay", "", ""); } catch (Exception e) { -// logger.error(e.getMessage(), e); -// throw new BadRequestException("Phone number is wrong.Please try again."); + logger.error(e.getMessage(), e); + throw new BadRequestException("Phone number is wrong.Please try again."); } stringRedisTemplate.boundValueOps(getUpdateAccountPhoneKey(codeKey)).set(codeKeyValue + "&" + nationCode + "&" + phoneNumber, Long.parseLong(expireMin), TimeUnit.MINUTES); } From 3e9d5827f47bf31ec345b3fa14b6704ea55d6309 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 6 Nov 2019 09:15:39 +0800 Subject: [PATCH 15/17] =?UTF-8?q?fix=20findAccountByPhone=E6=9F=A5?= =?UTF-8?q?=E5=88=B0=E5=A4=9A=E6=9D=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 +- .../application/core/impls/SimpleClientApplyServiceImpl.java | 4 ++-- .../payment/manage/mappers/system/ClientAccountMapper.java | 2 +- .../manage/merchants/core/impls/ClientManagerImpl.java | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2b27c7e85..450d94aca 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.69 + 1.2.70 UTF-8 1.6.1 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 8d9bf838c..1e12421b4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -2195,7 +2195,7 @@ public class RetailAppServiceImp implements RetailAppService { if (!StringUtils.equals(captcha, params.getString("captcha"))) { throw new BadRequestException("Verification code is wrong"); } - JSONObject account = clientAccountMapper.findByPhone(contactPhone, "+" + nationCode); + List account = clientAccountMapper.findByPhone(contactPhone, "+" + nationCode); if (account != null) { throw new BadRequestException("Mobile phone number has been bound to other users, please unbind it before binding"); } 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 48f52bd43..33cb0305b 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 @@ -280,7 +280,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { if (!nation_code.startsWith("+")) { nation_code = "+" + nation_code; } - JSONObject account = clientAccountMapper.findByPhone(contact_phone, nation_code); + List account = clientAccountMapper.findByPhone(contact_phone, nation_code); if (account != null) { throw new ForbiddenException("用户名已被注册"); } @@ -598,7 +598,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { } JSONObject apply = sysClientPreMapperMapper.findByUserName(username); - JSONObject account = clientAccountMapper.findByPhone(apply.getString("contact_phone"), "+61"); + List account = clientAccountMapper.findByPhone(apply.getString("contact_phone"), "+61"); if (account != null) { throw new ForbiddenException("The user name has been registered"); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java index dcf2ad82f..2005ca0fc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java @@ -28,7 +28,7 @@ public interface ClientAccountMapper { @AutoSql(type = SqlType.SELECT) @AdvanceSelect(addonWhereClause = "is_valid=1") - JSONObject findByPhone(@Param("contact_phone") String contact_phone,@Param("nation_code")String nation_code); + List findByPhone(@Param("contact_phone") String contact_phone,@Param("nation_code")String nation_code); @AutoSql(type = SqlType.SELECT) JSONObject findDetail(@Param("account_id") String accountId); 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 d6dea6438..16d9a65e3 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 @@ -1582,7 +1582,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (clientAccountMapper.findByPhone(account.getContactPhone(), "+" + account.getNation_code()) != null) { throw new BadRequestException("Mobile phone number has been bound to other accounts"); } - ; } @Override From 059c9f8917e50189c4fb771f01c14c44bbd2c716 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 6 Nov 2019 10:46:14 +0800 Subject: [PATCH 16/17] fix findAccountByPhone --- pom.xml | 2 +- .../manage/merchants/core/impls/ClientManagerImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 450d94aca..29c4bd132 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.70 + 1.2.71 UTF-8 1.6.1 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 16d9a65e3..a137baf6f 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 @@ -1557,7 +1557,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new InvalidShortIdException(); } checkOrgPermission(manager, client); - checkPhoneAndWechatExist(account); + if (StringUtils.isNotBlank(account.getContactPhone())) { + checkPhoneAndWechatExist(account); + } JSONObject accountJson = account.toJson(); JSONObject accountCheck = clientAccountMapper.findByUsernameForDuplicate(accountJson.getString("username")); if (accountCheck != null) { @@ -1579,7 +1581,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } private void checkPhoneAndWechatExist(NewAccountBean account) { - if (clientAccountMapper.findByPhone(account.getContactPhone(), "+" + account.getNation_code()) != null) { + if (clientAccountMapper.findByPhone(account.getContactPhone(), account.getNation_code().startsWith("+")?account.getNation_code():"+"+account.getNation_code()) != null) { throw new BadRequestException("Mobile phone number has been bound to other accounts"); } } From f960c882007f6b6bfe21698e23e6be08639d429c Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 6 Nov 2019 11:29:58 +0800 Subject: [PATCH 17/17] =?UTF-8?q?fix=20customer=5Fsurcharge=5Frate=20?= =?UTF-8?q?=E6=9C=AA=E9=80=9A=E8=BF=87=E4=B9=9F=E5=8F=AF=E4=BB=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../merchants/core/impls/ClientManagerImpl.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 29c4bd132..220f68bf0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.71 + 1.2.72 UTF-8 1.6.1 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 a137baf6f..fb8f5d81a 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 @@ -420,15 +420,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid client.put("temp_sub_merchant", checkSubMerchantIdInCommonPool(subMerchantId)); } } - if (client.getIntValue("approve_result") == 1 - || (client.getIntValue("approve_result") == 2 && (client.getIntValue("source") == 1 || client.getIntValue("source") == 2))) { - try { - JSONObject activeRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat"); - if (activeRate != null) { - client.put("rate_value", activeRate.getDouble("rate_value")); - } - } catch (Exception ignore) { + try { + JSONObject activeRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat"); + if (activeRate != null) { + client.put("rate_value", activeRate.getDouble("rate_value")); } + } catch (Exception ignore) { + } client.put("max_customer_surcharge_rate", PlatformEnvironment.getEnv().getMaxCustomerSurchargeRate()); if (client.getBigDecimal("rate_value") != null) {