From 57b3a77fbd986cc42e61e1b3e569ed7d438c0258 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 22 May 2018 18:50:18 +0800 Subject: [PATCH] update --- src/db/modify.sql | 1 + .../manage/merchants/core/impls/ClientManagerImpl.java | 4 ++-- .../manage/signin/core/impls/SignInAccountServiceImpl.java | 2 +- .../payment/manage/system/core/impl/MailGunServiceImpl.java | 2 +- .../manage/apps/core/impls/CustomerImpressionImplTest.java | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/db/modify.sql b/src/db/modify.sql index e87a6e3cf..12073aaad 100644 --- a/src/db/modify.sql +++ b/src/db/modify.sql @@ -497,6 +497,7 @@ ALTER TABLE `act_red_packets_customer` ADD COLUMN `rule_max_num_limit` tinyint(1 CREATE TABLE `sys_mail_send` ( `id` int(11) NOT NULL, `mail_address` varchar(100) NOT NULL COMMENT '邮箱地址', + `cc_mail_address` varchar(100) NOT NULL COMMENT '邮箱地址', `message_id` varchar(60) NOT NULL COMMENT 'Mailgun Message id', `status` int(9) NOT NULL DEFAULT 0, `create_time` datetime not null DEFAULT now(), 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 c50d0d099..e49727080 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 @@ -823,7 +823,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid SendMail sendMail = new SendMail(); Set to = new HashSet<>(); to.add(mailTo); - sendMail.setFrom("postmaster@mail.royalpay.com.au"); + sendMail.setFrom("info@mail.royalpay.com.au"); sendMail.setMailTos(to); sendMail.setMailCcs(emails); sendMail.setTitle("Your RoyalPay Cross-border Payment has been set up"); @@ -879,7 +879,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid Set to = new HashSet<>(); to.add(mailTo); sendMail.setMailTos(to); - sendMail.setFrom("postmaster@mail.royalpay.com.au"); + sendMail.setFrom("info@mail.royalpay.com.au"); sendMail.setMailCcs(emails); sendMail.setTitle("Your Partner Account Has Been Authenticated Successfully"); sendMail.setContent(content); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index d43cd90a9..e7cc6501e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -314,7 +314,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati Set to = new HashSet<>(); to.add(contact_email); sendMail.setMailTos(to); - sendMail.setFrom("postmaster@mail.royalpay.com.au"); + sendMail.setFrom("info@mail.royalpay.com.au"); sendMail.setTitle("Reset Password"); sendMail.setContent(content); sendMail.setTags(tags); diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java index 4276cbdc2..ce60f0703 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java @@ -144,7 +144,7 @@ public class MailGunServiceImpl implements MailGunService { } SendMail sendMail = new SendMail(); - sendMail.setFrom("postmaster@mail.royalpay.com.au"); + sendMail.setFrom("info@mail.royalpay.com.au"); sendMail.setTitle(title); sendMail.setContent(doc.outerHtml()); sendMail.setNotice_id(notice_id); diff --git a/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java b/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java index 9de6610e1..4c9146935 100644 --- a/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java +++ b/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java @@ -154,13 +154,13 @@ public class CustomerImpressionImplTest { @Test public void sendSimpleMessages() throws Exception { SendMail sendMail = new SendMail(); - sendMail.setFrom("postmaster@mail.royalpay.com.au"); + sendMail.setFrom("info@mail.royalpay.com.au"); sendMail.setContent("

Hi kira

"); Set mailCCs = new HashSet<>(); mailCCs.add("asd1159111@163.com"); sendMail.setMailCcs(mailCCs); Set mailtos = new HashSet<>(); - mailtos.add("1029811920@qq.com"); + mailtos.add("eason.qian@royalpay.com.au"); mailtos.add("164851225@qq.com"); sendMail.setMailTos(mailtos); sendMail.setTitle("Final Test");