Skip to content

Master api #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wecall wants to merge 10 commits into
base: master
Choose a base branch
from
+1 −1
Open

Master api #2

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
07659b0
Merge branch 'develop_api' into master_api
Jun 29, 2016
4b53981
Merge branch 'develop_api' into master_api
Jun 30, 2016
8b953a7
Merge branch 'develop_api' into master_api
Jul 1, 2016
3cad6ba
Merge branch 'develop_api' into master_api
Jul 4, 2016
53c7b1a
修改邮件
Jul 5, 2016
d12c813
Merge branch 'develop_api' into master_api
Jul 5, 2016
7b3cf65
Merge branch 'develop_api' into master_api
Jul 7, 2016
06759a8
Merge branch 'develop_api' into master_api
Jul 13, 2016
a8e3457
Merge branch 'develop_api' into master_api
Jul 14, 2016
186f7fc
Merge branch 'develop_api' into master_api
Jul 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/TestController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function index(){
// var_dump($mongodb->count());
// exit;

// // 邮件服务测试 ---------------------------- 显示成功但是没有收到邮件问题
// // 邮件服务测试 ---------------------------- 显示成功但是没有收到邮件问题 -- 已经处理完成
// $mail = new MailsService("qq.email");
// var_dump($mail->sendmail("416994628@163.com","测试邮件地址","<b>文本测试</b>"));
// exit;
Expand Down