Merge branch 'v0.2' into develop

app/Http/Controllers/MessageRuleController.php

@@ -69,7 +69,7 @@ class MessageRuleController extends Controller
             'message_show_type' => ['required_if:message_type,star',Rule::in('only_show', 'user', 'post', 'activity', 'topic')],
             'activity_url' => 'required_if:message_show_type,user,post,activity,topic|string|max:64',
             'content' => 'required_if:message_type,system|string|max:200',
-            'cover' => 'required|url',
+            'cover' => 'required_if:message_type,star|url',
             'send_time' => 'nullable|date',
             'activity_time' => 'nullable|string|max:24',
         ]);
@@ -92,7 +92,7 @@ class MessageRuleController extends Controller
             'message_show_type' => ['required_if:message_type,star',Rule::in('only_show', 'user', 'post', 'activity', 'topic')],
             'activity_url' => 'required_if:message_show_type,user,post,activity,topic|string|max:64',
             'content' => 'required_if:message_type,system|string|max:200',
-            'cover' => 'required|url',
+            'cover' => 'required_if:message_type,star|url',
             'send_time' => 'nullable|date',
             'activity_time' => 'nullable|string|max:24',
         ]);

app/Repositories/MessageRuleRepository.php

@@ -66,12 +66,12 @@ class MessageRuleRepository
 
         $data = [
             'title' => $request['title'],
-            'content' => isset($request['content'])? $request['content']:'',
+            'content' => isset($request['content']) && $request['message_type'] == 'system'? $request['content']:'',
             'notice_groups' => $noticeGroups,
             'message_type' => $request['message_type'],
-            'message_show_type' => isset($request['message_show_type'])? $request['message_show_type']:'',
-            'activity_url' => isset($request['activity_url'])? $request['activity_url']:'',
-            'cover' => $request['cover'],
+            'message_show_type' => isset($request['message_show_type']) && $request['message_type'] == 'star'? $request['message_show_type']:'',
+            'activity_url' => isset($request['activity_url']) && $request['message_type'] == 'star'? $request['activity_url']:'',
+            'cover' => $request['message_type'] == 'star'? $request['cover']:'',
             'message_status' => 0,
             'send_time' => isset($request['send_time']) && $request['send_time']? $request['send_time']:null,
             'activity_time' => $request['activity_time']??'',
@@ -126,10 +126,13 @@ class MessageRuleRepository
         $message->title = $request['title'];
         $message->notice_groups = $noticeGroups;
         $message->message_type = $request['message_type'];
-        $message->cover = $request['cover'];
+
+        if(isset($request['cover'])){
+            $message->cover = $request['cover'];
+        }
 
         if(isset($request['activity_url'])){
-            $message->notice_groups = $request['activity_url'];
+            $message->activity_url = $request['activity_url'];
         }
         if(isset($request['message_show_type'])){
             $message->message_show_type = $request['message_show_type'];