Merge branch 'develop'

app/Http/Controllers/ConfigController.php

@@ -44,6 +44,8 @@ class ConfigController extends Controller
                 'add_data' => '增加数据',
                 'delete' => '删除内容',
                 'update_topic' => '编辑内容话题',
+                'suggest' => '推荐',
+                'cancel_suggest' => '取消推荐',
             ],
             //是否推荐
             'is_suggest' => [

app/Http/Middleware/JwtAuthMiddleware.php

@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use Closure;
+use Illuminate\Support\Facades\Log;
 use Tymon\JWTAuth\Exceptions\JWTException;
 use Tymon\JWTAuth\Exceptions\TokenExpiredException;
 use Tymon\JWTAuth\Exceptions\TokenInvalidException;
@@ -31,29 +32,34 @@ class JwtAuthMiddleware
                 return response()->json($error);
             }
             $data = JWTAuth::decode($token);
+            Log::debug('parse-token='.json_encode($data));
         } catch (TokenExpiredException $e) {
             $error = [
                 'message' => 'Token is Expired',
                 'code' => 401,
             ];
+            Log::debug('parse-token='.$e->getMessage());
             return response()->json($error);
         } catch (TokenInvalidException $e) {
             $error = [
                 'message' => $e->getMessage(),
                 'code' => 401,
             ];
+            Log::debug('parse-token='.$e->getMessage());
             return response()->json($error);
         } catch (JWTException $e) {
             $error = [
                 'message' => $e->getMessage(),
                 'code' => 401,
             ];
+            Log::debug('parse-token='.$e->getMessage());
             return response()->json($error);
         }catch (\Exception $e){
             $error = [
                 'message' => $e->getMessage(),
                 'code' => 401,
             ];
+            Log::debug('parse-token='.$e->getMessage());
             return response()->json($error);
         }
         return $next($request);

app/Repositories/Post/PostRepository.php

@@ -630,6 +630,14 @@ class PostRepository
      */
     public function suggest($request)
     {
+        $token = JWTAuth::decode(JWTAuth::getToken());
+        if ($token['type'] != 1) {
+            return Response::create([
+                'message' => '只有运营才能修改推荐',
+                'status_code' => 500
+            ]);
+        }
+
         $post = $this->post->where('id', $request['id'])->first();
         if (!$post) {
             return Response::create([
@@ -640,8 +648,24 @@ class PostRepository
 
         if ($post->is_suggest == 1) {
             $post->is_suggest = 0;
+            $logData = [
+                'uid' => $token['user']->id,
+                'operator_type' => 'admin',
+                'post_id' => $request['id'],
+                'username' => $token['user']->username,
+                'log_type' => 'cancel_suggest',
+                'content' => json_encode(['cancel_suggest' => $request['id']]),
+            ];
         } else {
             $post->is_suggest = 1;
+            $logData = [
+                'uid' => $token['user']->id,
+                'operator_type' => 'admin',
+                'post_id' => $request['id'],
+                'username' => $token['user']->username,
+                'log_type' => 'suggest',
+                'content' => json_encode(['suggest' => $request['id']]),
+            ];
         }
 
         $date = Carbon::now()->toDateTimeString();
@@ -649,6 +673,7 @@ class PostRepository
         DB::beginTransaction();
         try {
             $post->save();
+            $this->postLog->create($logData);
             DB::commit();
             //内容被设为推荐时，发送推送消息
             if($post->is_suggest==1){

app/Transformers/Post/LogTransformer.php

@@ -22,6 +22,8 @@ class LogTransformer extends TransformerAbstract
             'add_share_count' => '增加分享数：',
             'delete' => '删除内容：',
             'update_topic' => '编辑内容话题：',
+            'suggest' => '推荐内容：',
+            'cancel_suggest' => '取消推荐内容：',
         ];
         $data = json_decode($postLog['content']);
         $content = '';