msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
master
wangning 7 years ago
parent f24084254c
commit 57b3a77fbd
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File

1
src/db/modify.sql
Unescape View File

@ -497,6 +497,7 @@ ALTER TABLE `act_red_packets_customer` ADD COLUMN `rule_max_num_limit` tinyint(1
CREATE TABLE `sys_mail_send` ( CREATE TABLE `sys_mail_send` (
`id` int(11) NOT NULL, `id` int(11) NOT NULL,
`mail_address` varchar(100) NOT NULL COMMENT '邮箱地址', `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', `message_id` varchar(60) NOT NULL COMMENT 'Mailgun Message id',
`status` int(9) NOT NULL DEFAULT 0, `status` int(9) NOT NULL DEFAULT 0,
`create_time` datetime not null DEFAULT now(), `create_time` datetime not null DEFAULT now(),

4
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -823,7 +823,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
SendMail sendMail = new SendMail(); SendMail sendMail = new SendMail();
Set<String> to = new HashSet<>(); Set<String> to = new HashSet<>();
to.add(mailTo); to.add(mailTo);
sendMail.setFrom("postmaster@mail.royalpay.com.au"); sendMail.setFrom("info@mail.royalpay.com.au");
sendMail.setMailTos(to); sendMail.setMailTos(to);
sendMail.setMailCcs(emails); sendMail.setMailCcs(emails);
sendMail.setTitle("Your RoyalPay Cross-border Payment has been set up"); sendMail.setTitle("Your RoyalPay Cross-border Payment has been set up");
@ -879,7 +879,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
Set<String> to = new HashSet<>(); Set<String> to = new HashSet<>();
to.add(mailTo); to.add(mailTo);
sendMail.setMailTos(to); sendMail.setMailTos(to);
sendMail.setFrom("postmaster@mail.royalpay.com.au"); sendMail.setFrom("info@mail.royalpay.com.au");
sendMail.setMailCcs(emails); sendMail.setMailCcs(emails);
sendMail.setTitle("Your Partner Account Has Been Authenticated Successfully"); sendMail.setTitle("Your Partner Account Has Been Authenticated Successfully");
sendMail.setContent(content); sendMail.setContent(content);

2
src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
Unescape View File

@ -314,7 +314,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
Set<String> to = new HashSet<>(); Set<String> to = new HashSet<>();
to.add(contact_email); to.add(contact_email);
sendMail.setMailTos(to); sendMail.setMailTos(to);
sendMail.setFrom("postmaster@mail.royalpay.com.au"); sendMail.setFrom("info@mail.royalpay.com.au");
sendMail.setTitle("Reset Password"); sendMail.setTitle("Reset Password");
sendMail.setContent(content); sendMail.setContent(content);
sendMail.setTags(tags); sendMail.setTags(tags);

2
src/main/java/au/com/royalpay/payment/manage/system/core/impl/MailGunServiceImpl.java
Unescape View File

@ -144,7 +144,7 @@ public class MailGunServiceImpl implements MailGunService {
} }
SendMail sendMail = new SendMail(); SendMail sendMail = new SendMail();
sendMail.setFrom("postmaster@mail.royalpay.com.au"); sendMail.setFrom("info@mail.royalpay.com.au");
sendMail.setTitle(title); sendMail.setTitle(title);
sendMail.setContent(doc.outerHtml()); sendMail.setContent(doc.outerHtml());
sendMail.setNotice_id(notice_id); sendMail.setNotice_id(notice_id);

4
src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java
Unescape View File

@ -154,13 +154,13 @@ public class CustomerImpressionImplTest {
@Test @Test
public void sendSimpleMessages() throws Exception { public void sendSimpleMessages() throws Exception {
SendMail sendMail = new SendMail(); SendMail sendMail = new SendMail();
sendMail.setFrom("postmaster@mail.royalpay.com.au"); sendMail.setFrom("info@mail.royalpay.com.au");
sendMail.setContent("<html><p>Hi kira</p ></html>"); sendMail.setContent("<html><p>Hi kira</p ></html>");
Set<String> mailCCs = new HashSet<>(); Set<String> mailCCs = new HashSet<>();
mailCCs.add("asd1159111@163.com"); mailCCs.add("asd1159111@163.com");
sendMail.setMailCcs(mailCCs); sendMail.setMailCcs(mailCCs);
Set<String> mailtos = new HashSet<>(); Set<String> mailtos = new HashSet<>();
mailtos.add("1029811920@qq.com"); mailtos.add("eason.qian@royalpay.com.au");
mailtos.add("164851225@qq.com"); mailtos.add("164851225@qq.com");
sendMail.setMailTos(mailtos); sendMail.setMailTos(mailtos);
sendMail.setTitle("Final Test"); sendMail.setTitle("Final Test");

Write Preview
Loading…
Cancel
Save