update 针对配置表配置的商户不发送开通邮件

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -1371,6 +1371,15 @@ 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 sysConfig = sysConfigManager.getSysConfig();
+        String[] orgs = sysConfig.getString("no_send_email_org").split(",");
+        for (String org : orgs) {
+            if (client.getString("org_id").equals(org)) {
+                logger.info("Merchant of organization does not send email.(org_id:" + org + ")");
+                return;
+            }
+        }
         List<JSONObject> bds = clientBDMapper.listClientBDInfoAvailable(client.getIntValue("client_id"), new Date());
         Context ctx = new Context();
         ctx.setVariable("bds", bds);

src/main/resources/application-dev.yml

@@ -7,11 +7,11 @@ spring:
       schema-name: royalpay_payment
       username: rpaydev
     slave:
-      host: 192.168.0.84:3306
+      host: 192.168.0.92:3306
       jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-      password: rpayplus123
-      schema-name: royalpay
-      username: root
+      password: SuTUUxyvzS0cLETi6Rzm
+      schema-name: royalpay_payment
+      username: rpaydev
     type: com.zaxxer.hikari.HikariDataSource
   redis:
     database: 1
@@ -23,10 +23,10 @@ spring:
 app:
   run-tasks: false
   host:
-    main: http://192.168.0.38:5000/
+    main: http://192.168.0.24:9008/
     regions:
-      au: http://192.168.0.38:5000/
-      cn: http://192.168.0.38:5000/
+      au: http://192.168.0.24:9008/
+      cn: http://192.168.0.24:9008/
   mail:
     appid: 1
     host: https://dev.mailsupport.hcqtech.com