完善了提醒邮件

N1ghtJs · N1ghtJs · commit 13773bf47db3 · 2018-11-29T10:37:01.000+08:00
diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
@@ -26,11 +26,9 @@ public function store(Request $request)
         if ($request->parent_id) {
             $comment->parent_id = $request->parent_id;
             $comment->target_id = $request->target_id;
-            Mail::to(Comment::findOrFail($request->target_id)->email)->send(new CommentRemind);
         }else {
             $comment->parent_id = 0;
             $comment->target_id = 0;
-            Mail::to(User::findOrFail(1))->send(new CommentRemind);
         }
         $comment->article_id = $request->article_id;
         $comment->content = $request->content;
@@ -40,6 +38,22 @@ public function store(Request $request)
         $comment->ip = $request->ip();
         // $comment->city = $city['region'].' '.$city['city'];
         $comment->save();
+
+        //发送邮件
+        if ($request->parent_id) {
+            $commentTarget = Comment::findOrFail($request->target_id);
+            $url = url("/articles/{$comment->article->id}#comment{$comment->id}");
+            try {
+                Mail::to($commentTarget->email)
+                    ->send(new CommentRemind($commentTarget->content, $comment, $url));
+            }catch (\Exception $e) {}
+        }else {
+            $url = url("/articles/{$comment->article->id}#comment{$comment->id}");
+            try {
+                Mail::to(User::findOrFail(1))
+                    ->send(new CommentRemind($comment->article->title, $comment, $url));
+            }catch (\Exception $e) {}
+        }
         return back()->with('message', '留言成功！');
     }
 }
diff --git a/app/Mail/CommentRemind.php b/app/Mail/CommentRemind.php
@@ -16,9 +16,12 @@ class CommentRemind extends Mailable
      *
      * @return void
      */
-    public function __construct()
+    public function __construct($title, $comment, $url)
     {
-        //
+        $this->subject('Re:' . $title);
+        $this->title = $title;
+        $this->comment = $comment;
+        $this->url = $url;
     }
 
     /**
@@ -28,6 +31,11 @@ public function __construct()
      */
     public function build()
     {
-        return $this->view('emails.comments.remind');
+        return $this->view('emails.comments.remind')
+                    ->with([
+                        'title' => $this->title,
+                        'comment' => $this->comment,
+                        'url' => $this->url,
+                    ]);;
     }
 }
diff --git a/resources/views/emails/comments/remind.blade.php b/resources/views/emails/comments/remind.blade.php
@@ -8,6 +8,8 @@
     <title>TEST TITLE</title>
 </head>
 <body>
-    <h1>TEST</h1>
+    <h4>您发布的内容 “{{ $title }}” 收到了回复：</h4>
+    <p> {{ $comment->name }} ：{{ $comment->content }} </p>
+    <p><a href="{{ $url }}">点此查看</a></p>
 </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,12 @@ class CommentRemind extends Mailable`
`16`	`16`	`*`
`17`	`17`	`* @return void`
`18`	`18`	`*/`
`19`		`- public function __construct()`
	`19`	`+ public function __construct($title, $comment, $url)`
`20`	`20`	`{`
`21`		`- //`
	`21`	`+ $this->subject('Re:' . $title);`
	`22`	`+ $this->title = $title;`
	`23`	`+ $this->comment = $comment;`
	`24`	`+ $this->url = $url;`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`/**`
`@@ -28,6 +31,11 @@ public function __construct()`
`28`	`31`	`*/`
`29`	`32`	`public function build()`
`30`	`33`	`{`
`31`		`- return $this->view('emails.comments.remind');`
	`34`	`+ return $this->view('emails.comments.remind')`
	`35`	`+ ->with([`
	`36`	`+ 'title' => $this->title,`
	`37`	`+ 'comment' => $this->comment,`
	`38`	`+ 'url' => $this->url,`
	`39`	`+ ]);;`
`32`	`40`	`}`
`33`	`41`	`}`