diff --git a/pom.xml b/pom.xml index 4485124b6..4a0476ba6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 2.2.16 + 2.2.17 4.0.0 manage - 2.3.68 + 2.3.69 UTF-8 2.4.0 @@ -362,4 +362,10 @@ + + + royalpay + http://nexus.royalpay.com.au/content/groups/public + + 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 7779db0b1..d247aee02 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 @@ -1174,7 +1174,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid gatewayMerchantApply.notifyOrgMerchantStatus(client); } else if (checkGreenChannel && client.getIntValue("open_status") == 5) { // 绿色通道通过后不发邮件 - logger.info("PASS 绿色通道:" + clientMoniker); + logger.info("PASS 绿色通道:{}", clientMoniker); saveClientAuditProcess(client.getIntValue("client_id"), open_status, 5, "合规通过", manager, 1); } else { initAdminUserAndSendEmail(manager, clientMoniker, client, false); @@ -1319,12 +1319,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid public void sendInitEmail(final JSONObject client, String username, String pwd, boolean isUpayAuditPass) { logger.debug("sending email after comply"); - JSONObject model = new JSONObject(); - model.put("username", username); - model.put("password", pwd); - model.put("client_moniker", client.getString("client_moniker")); - model.put("contact_person", client.getString("contact_person")); - model.put("credential_code", client.getString("credential_code")); List bds = clientBDMapper.listClientBDInfoAvailable(client.getIntValue("client_id"), new Date()); Context ctx = new Context(); ctx.setVariable("bds", bds); diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/MailServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/MailServiceImp.java index aa5b98bb2..5b3ff5ed9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/MailServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/MailServiceImp.java @@ -68,25 +68,6 @@ public class MailServiceImp implements MailService { @Value("${app.risk.control.aes-key}") private String riskControlAESKey; -/* @Override - public void sendEmail(NoticeBean noticeBean) { - String url = host + "/mail?" + generateSign(appid, credentialCode, "/mail"); - try { - HttpRequestResult result = new HttpRequestGenerator(url, RequestMethod.POST).setJSONEntity(noticeBean).execute(); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - - } - - private String generateSign(String appid, String credentialCode, String url) { - long time = System.currentTimeMillis(); - String nonceStr = RandomStringUtils.random(15, true, true); - String validStr = time + "&" + nonceStr + "&" + credentialCode + "&" + url; - String sign = DigestUtils.sha256Hex(validStr).toLowerCase(); - return "appid=" + appid + "&time=" + time + "&nonce_str=" + nonceStr + "&sign=" + sign; - }*/ - @Override public String sendEmailNotice(String notice_id, String title, List mailTo, String content) throws URISyntaxException, IOException { @@ -179,7 +160,7 @@ public class MailServiceImp implements MailService { noticeBean.setPassword(mailPwd); String postUrl = mailHost + "/mail/single?" + generateMailSignParam(); HttpRequestResult result = null; - logger.info("===sendEmail===noticeBean:" + JSON.toJSON(noticeBean)); + logger.info("===sendEmail===noticeBean:{}", JSON.toJSON(noticeBean)); result = new HttpRequestGenerator(postUrl, RequestMethod.POST).setJSONEntity(noticeBean).setTimeout(60_000).execute(); if (result.isSuccess()) { String mail_id = result.getResponseContentJSONObj().getString("mail_id"); diff --git a/src/test/java/au/com/royalpay/payment/manage/process/aes/AESTest.java b/src/test/java/au/com/royalpay/payment/manage/process/aes/AESTest.java index 83c1400ef..847c57666 100644 --- a/src/test/java/au/com/royalpay/payment/manage/process/aes/AESTest.java +++ b/src/test/java/au/com/royalpay/payment/manage/process/aes/AESTest.java @@ -18,8 +18,8 @@ public class AESTest { @Test public void testEncrypt() { - String keyStr = "EPrfsM2JE69ZPR7BhXn34g=="; - String source = "P8k2rA7N:GcE/{Rn"; + String keyStr = "Aa+MtthC4Ztq4Kfa9aL+UA=="; + String source = "2020@Zxcvb1026"; Key key = AESCrypt.fromKeyString(Base64.decodeBase64(keyStr)); byte[] encrypted = AESCrypt.encrypt(source.getBytes(StandardCharsets.UTF_8), key); System.out.println("encrypted: " + Base64.encodeBase64String(encrypted));