Merge branch 'develop'

app/Http/Controllers/V1/PostController.php

@@ -492,4 +492,20 @@ class PostController extends Controller
         return jsonSuccess($data);
     }
 
+    /**
+     * 图片验证
+     */
+    public function checkImage(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'image' => 'required|url',
+        ]);
+        if ($validator->fails()) {
+            return jsonError($validator->errors()->first());
+        }
+        $res = $this->postRepositories->checkImage($request['image']);
+       
+        return jsonSuccess($res);
+    }
+
 }

app/Repositories/PostRepositories.php

@@ -820,4 +820,12 @@ class PostRepositories
         return $commentCount;
     }
 
+    /**
+     * 内容评论数
+     */
+    public function checkImage($img)
+    {
+        return $this->detectionService->checkImg($img);
+    }
+
 }

app/Service/DetectionService.php

@@ -91,11 +91,15 @@ class DetectionService
             //根据scene和suggetion做相关的处理
             $suggestion = $sceneResult->suggestion;
             $label = $sceneResult->label;
+            $rate = $sceneResult->rate;
             //如果为色情，辱骂，摄政，违禁 标签，并且建议为block 则不通过
             if(in_array($label,['porn','abuse','politics','contraband','others'])){
                 if ($suggestion == 'block') {
                     $flag = false;
                 }
+                if($suggestion == 'review' && $rate<=70){
+                    $flag = false;
+                }
             }
 
         }

app/Transformers/Post/CommentTransformer.php

@@ -23,6 +23,9 @@ class CommentTransformer extends TransformerAbstract
         $replyData = Redis::GET($replyKey);
         if($replyData){
             $reply = json_decode($replyData);
+            foreach($reply as &$item){
+                $item['created_at'] = Carbon::parse($item['created_at'])->diffForHumans();
+            }
         }else{
             $replies = PostComment::where('parent_id', $postComment['id'])->orderBy('id', 'desc')->limit(2)->get();
             foreach($replies as $val){

routes/api.php

@@ -63,6 +63,9 @@ $api->version('v1', [
     //获取话题
     $api->get('topic/group', 'PostController@getTopic');
 
+    //图片验证
+    $api->get('post/checkImage', 'PostController@checkImage');
+
     //登录+验签
     $api->group(['middleware' => ['chxq_jwt_auth','chxq_sign']], function ($api) {
         //发布内容