From 81ad02acac3c3780bb979645500d44e6068b7e33 Mon Sep 17 00:00:00 2001 From: Todking Date: Wed, 24 Mar 2021 10:50:23 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=92=88=E5=AF=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E9=85=8D=E7=BD=AE=E7=9A=84=E5=95=86=E6=88=B7=E4=B8=8D?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=BC=80=E9=80=9A=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../merchants/core/impls/ClientManagerImpl.java | 9 +++++++++ src/main/resources/application-dev.yml | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) 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 3ad05d758..bd519bf5c 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 @@ -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 bds = clientBDMapper.listClientBDInfoAvailable(client.getIntValue("client_id"), new Date()); Context ctx = new Context(); ctx.setVariable("bds", bds); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8be115e3d..35d4a6129 100644 --- a/src/main/resources/application-dev.yml +++ b/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