version update

pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.2.16</version>
+        <version>2.2.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.68</version>
+    <version>2.3.69</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
@@ -362,4 +362,10 @@
             </build>
         </profile>
     </profiles>
+    <repositories>
+        <repository>
+            <id>royalpay</id>
+            <url>http://nexus.royalpay.com.au/content/groups/public</url>
+        </repository>
+    </repositories>
 </project>

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<JSONObject> bds = clientBDMapper.listClientBDInfoAvailable(client.getIntValue("client_id"), new Date());
         Context ctx = new Context();
         ctx.setVariable("bds", bds);

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<JSONObject> 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");

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 keyStr = "Aa+MtthC4Ztq4Kfa9aL+UA==";
-        String source = "P8k2rA7N:GcE/{Rn";
+        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));