Merge branch 'hotfix' into develop

# Conflicts:
#	src/db/modify.sql

src/db/modify.sql

@@ -551,4 +551,10 @@ ADD COLUMN `gateway_alipay_online`  tinyint(1) NULL DEFAULT 1 COMMENT '支付宝
 ALTER TABLE `sys_clients`
 ADD COLUMN `gateway_alipay_online`  tinyint(1) NULL DEFAULT 1 COMMENT '支付宝线上网关使用线上渠道' AFTER `require_remark`;
 
-alter table pmt_refunds add column remark varchar(200);
+alter table pmt_refunds add column remark varchar(200);
+
+alter table pmt_refunds add column remark varchar(200);
+
+alter table sys_client_pre_apply add column `salt` varchar(30) NOT NULL COMMENT '每次修改密码时随机更改';
+alter table sys_client_pre_apply add column `password_hash` varchar(150) NOT NULL COMMENT '登录账户密码 base64(sha256(salt+password))';
+alter table sys_client_pre_apply add column  `password_aes` varchar(50) NOT NULL COMMENT '登录账户密码 AES加密';

src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

@@ -92,7 +92,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
     private ClientConfigMapper clientConfigMapper;
     private ThreadPoolExecutor pool = new ThreadPoolExecutor(1, 10, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
-
     @Resource
     private StringRedisTemplate stringRedisTemplate;
     private SmsSingleSender sender = null;
@@ -164,22 +163,23 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         Context ctx = new Context();
         ctx.setVariable("url", PlatformEnvironment.getEnv().concatUrl("/register/account/mail/" + address + "/verify/" + key + "/jump?username=" + username));
         final String content = thymeleaf.process("mail/register_application", ctx);
-//        SendMail sendMail = new SendMail();
-//        Set<String> 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);
+        // SendMail sendMail = new SendMail();
+        // Set<String> 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);
 
-        try {
-            String emailId = mailService.sendEmail("Your RoyalPay Cross-border Payment has been set up", address,
-                    "", content);
-        } catch (Exception e) {
-            throw new EmailException("Email Sending Failed", e);
-        }
+        Runnable task2 = () -> {
+            try {
+                String emailId = mailService.sendEmail("Your RoyalPay Cross-border Payment has been set up", address, "", content);
+            } catch (Exception ignore) {
+            }
+        };
+        pool.execute(task2);
 
     }
 
@@ -362,7 +362,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         clientConfig.put("common_sub_merchant_id", 1);
         clientConfigMapper.save(clientConfig);
 
-        apply.put("client_moniker",clientMoniker);
+        apply.put("client_moniker", clientMoniker);
         sysClientPreMapperMapper.update(apply);
 
         JSONObject sysRate = new JSONObject();
@@ -374,7 +374,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysRate.put("active_time", DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
         sysRate.put("expiry_time", DateFormatUtils.format(DateUtils.addYears(new Date(), 1), "yyyy-MM-dd"));
 
-
         JSONObject rateConfig = JSONObject.parseObject(sysConfig.getString("sys_apply_rates"));
         JSONObject chooseRate = new JSONObject();
         if (apply.getIntValue("clean_days") == 1) {
@@ -401,7 +400,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         };
         pool.execute(task2);
 
-
     }
 
     private String generateClientMoniker() {