Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-manage into develop

app/Console/Commands/VirusAdd.php

@@ -134,6 +134,7 @@ class VirusAdd extends Command
                     'behavior_id' => $data['behavior_id'],
                     'behavior_flag' => $data['behavior_flag'],
                     'post_id' => $data['post_id'],
+                    'post_type' => $data['post_type'],
                     'post_desc' => $data['post_desc'],
                     'post_cover' => $data['post_cover'],
                     'target_id' => (string) $data['target_id'],
@@ -147,6 +148,7 @@ class VirusAdd extends Command
                     'behavior_id' => $data['behavior_id'],
                     'behavior_flag' => $data['behavior_flag'],
                     'post_id' => $data['post_id'],
+                    'post_type' => $data['post_type'],
                     'post_author_uid' => $data['post_author_uid'],
                     'post_desc' => $data['post_desc'],
                     'post_cover' => $data['post_cover'],
@@ -170,6 +172,7 @@ class VirusAdd extends Command
                     'behavior_flag' => $data['behavior_flag'],
                     'behavior_value' => $data['behavior_value'],
                     'post_id' => $data['post_id'],
+                    'post_type' => $data['post_type'],
                     'post_author_uid' => $data['post_author_uid'],
                     'post_desc' => $data['post_desc'],
                     'post_cover' => $data['post_cover'],

app/Http/Controllers/Behavior/BehaviorController.php

@@ -139,11 +139,8 @@ class BehaviorController extends Controller
                 'is_open',
                 'behavior_level',
                 'name',
-                'trigger_times',
-                'effective_trigger',
-                'absolute_progression',
-                'physical_strength',
-                'grant_rainbow_beans',
+                'sort',
+                'search'
             ],
             'columns' => [
                 'id',

app/Http/Controllers/Behavior/CommentRecordController.php

@@ -86,12 +86,7 @@ class CommentRecordController extends Controller
                 'name',
                 'relative_series',
                 'is_open',
-                'bahavior_created_at',
-                'all_trigger_times',
-                'all_effective_trigger',
-                'all_physical_exertion',
-                'all_generation_quantity',
-                'all_quantity_issued'
+                'bahavior_created_at'
             ]
         ];
         return $data;

app/Repositories/Behavior/BehaviorRepository.php

@@ -368,28 +368,38 @@ class BehaviorRepository
             $where[] = ['name', 'like', "%{$request['name']}%"];
         }
 
-        if(isset($request['trigger_times'])){//触发次数由多到少-由少到多筛选
-            $filed = 'trigger_times';
-            $sort = $request['trigger_times']   == 0 ? 'desc' : 'asc';
-        }elseif(isset($request['effective_trigger'])){//有效触发由多到少-由少到多筛选
-            $filed = 'effective_trigger';
-            $sort=$request['effective_trigger']  == 0 ? 'desc' : 'asc';
-        }elseif (isset($request['absolute_progression'])){////绝对级数由多到少-由少到多筛选
-            $filed = 'absolute_progression';
-            $sort=$request['absolute_progression']  == 0 ? 'desc' : 'asc';
-        }elseif (isset($request['physical_strength'])){//耗费体力值由多到少-由少到多筛选
-            $filed = 'physical_strength';
-            $sort=$request['physical_strength']  == 0 ? 'desc' : 'asc';
-        }elseif (isset($request['grant_rainbow_beans'])) {//发放彩虹豆由多到少-由少到多筛选
-            $filed = 'grant_rainbow_beans';
-            $sort = $request['grant_rainbow_beans'] == 0 ? 'desc' : 'asc';
-        }else{
-            $sort = 'desc';
-            $filed = 'id';
+        $sort = 'desc';
+        $filed = 'id';
+        if(isset($request['search']) && isset($request['sort'])){
+                $filed = $this->check_search($request['search']);
+                $sort = $request['sort']   == 0 ? 'desc' : 'asc';
         }
 
         return $this->behavior->where($where)->orderBy($filed,$sort)->paginate($perPage);
     }
 
+    private function check_search($search)
+    {
+        $result = "";
+        switch ($search) {
+            case 'trigger_times':
+                $result = $search;
+                break;
+            case 'effective_trigger':
+                $result = $search;
+                break;
+            case 'absolute_progression':
+                $result = $search;
+                break;
+            case 'physical_strength':
+                $result = $search;
+                break;
+            case 'grant_rainbow_beans':
+                $result = $search;
+                break;
+        }
+        return $result;
+    }
+
 }
 

app/Repositories/Post/PostRepository.php

@@ -87,12 +87,14 @@ class PostRepository
         $topicIds = implode(',', $topicIdsArray);
 
         //验证内容字数
-        $html = strip_tags($request['content']);
-        if (mb_strlen($html, 'UTF8') > 1000) {
-            return Response::create([
-                'message' => '所传内容不能超过1000字',
-                'status_code' => 500
-            ]);
+        if($request['type'] != 'html'){
+            $html = strip_tags($request['content']);
+            if (mb_strlen($html, 'UTF8') > 1000) {
+                return Response::create([
+                    'message' => '所传内容不能超过1000字',
+                    'status_code' => 500
+                ]);
+            }
         }
 
         $data = [
@@ -134,7 +136,7 @@ class PostRepository
                 'available_bean' => $this->availableBean(),
                 'will_collect_bean' => rand(100, 200),
                 'collect_bean' => 0,
-                'weight' => 0
+                'weight' => 999
             ]);
 
             if (!empty($request['imgs']) && $request['type'] == 'image') {
@@ -167,6 +169,7 @@ class PostRepository
                     'behavior_id' => $virus->virus_behavior_id,
                     'behavior_flag' => 'publish',
                     'post_id' => $post->id,
+                    'post_type' => $post->type,
                     'post_desc' => $desc,
                     'post_cover' => $post->img,
                     'target_id' => $post->uid,
@@ -277,6 +280,7 @@ class PostRepository
             $data = [
                 'behavior_value' => 1,
                 'post_id' => $post->id,
+                'post_type' => $post->type,
                 'post_author_uid' => $post->uid,
                 'post_desc' => $desc,
                 'post_cover' => $post->img,
@@ -410,6 +414,7 @@ class PostRepository
                     'behavior_id' => $virus->virus_behavior_id,
                     'behavior_flag' => 'comment',
                     'post_id' => $post->id,
+                    'post_type' => $post->type,
                     'post_author_uid' => $post->uid,
                     'post_desc' => $desc,
                     'post_cover' => $post->img,