Browse Source

Merge branch 'develop'

xielin 5 years ago
parent
commit
4c5156cb23

+ 7 - 0
app/Http/Controllers/V1/PostController.php

@@ -89,6 +89,7 @@ class PostController extends Controller
         Log::debug('内容搜索' . json_encode($request));
         Log::debug('内容搜索' . json_encode($request));
         $userInfo = $this->getUserInfo();
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
         if (empty($userInfo)) {
+            Log::debug('获取用户信息失败index'.json_encode($request));
             return jsonError('获取用户信息失败');
             return jsonError('获取用户信息失败');
         }
         }
         $list = $this->postRepositories->lists($request->all());
         $list = $this->postRepositories->lists($request->all());
@@ -107,6 +108,7 @@ class PostController extends Controller
     {
     {
         $userInfo = $this->getUserInfo();
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
         if (empty($userInfo)) {
+            Log::debug('获取用户信息失败video'.json_encode($request));
             return jsonError('获取用户信息失败');
             return jsonError('获取用户信息失败');
         }
         }
         $list = $this->postRepositories->video($request->all());
         $list = $this->postRepositories->video($request->all());
@@ -132,6 +134,7 @@ class PostController extends Controller
 
 
         $userInfo = $this->getUserInfo();
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
         if (empty($userInfo)) {
+            Log::debug('获取用户信息失败myPost'.json_encode($request));
             return jsonError('获取用户信息失败');
             return jsonError('获取用户信息失败');
         }
         }
         $param = $request->all();
         $param = $request->all();
@@ -157,6 +160,7 @@ class PostController extends Controller
     {
     {
         $userInfo = $this->getUserInfo();
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
         if (empty($userInfo)) {
+            Log::debug('获取用户信息失败suggestPost'.json_encode($request));
             return jsonError('获取用户信息失败');
             return jsonError('获取用户信息失败');
         }
         }
 
 
@@ -248,6 +252,7 @@ class PostController extends Controller
         }
         }
         $userInfo = $this->getUserInfo();
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
         if (empty($userInfo)) {
+            Log::debug('获取用户信息失败detail'.json_encode($request));
             return jsonError('获取用户信息失败');
             return jsonError('获取用户信息失败');
         }
         }
         $detail = $this->postRepositories->detail($request['id']);
         $detail = $this->postRepositories->detail($request['id']);
@@ -335,6 +340,7 @@ class PostController extends Controller
         }
         }
         $userInfo = $this->getUserInfo();
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
         if (empty($userInfo)) {
+            Log::debug('获取用户信息失败topicDetail'.json_encode($request));
             return jsonError('获取用户信息失败');
             return jsonError('获取用户信息失败');
         }
         }
         $detail = $this->postRepositories->topicDetail($request['id']);
         $detail = $this->postRepositories->topicDetail($request['id']);
@@ -355,6 +361,7 @@ class PostController extends Controller
     {
     {
         $userInfo = $this->getUserInfo();
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
         if (empty($userInfo)) {
+            Log::debug('获取用户信息失败topicPost'.json_encode($request));
             return jsonError('获取用户信息失败');
             return jsonError('获取用户信息失败');
         }
         }
         $list = $this->postRepositories->topicPost($request->all());
         $list = $this->postRepositories->topicPost($request->all());

+ 7 - 7
app/Http/Middleware/JwtAuthMiddleware.php

@@ -39,13 +39,13 @@ class JwtAuthMiddleware
                 ];
                 ];
                 return response()->json($error)->setStatusCode(401);
                 return response()->json($error)->setStatusCode(401);
             }
             }
-//            if ($data->sign !== md5($data->uid . config('customer.jwt_secret'))) {
-//                $error = [
-//                    'message' => 'request is not allow',
-//                    'code' => 401,
-//                ];
-//                return response()->json($error);
-//            }
+            if ($data->sign !== md5($data->uid . config('customer.jwt_secret'))) {
+                $error = [
+                    'message' => 'request is not allow',
+                    'code' => 401,
+                ];
+                return response()->json($error);
+            }
         } catch (TokenExpiredException $e) {
         } catch (TokenExpiredException $e) {
             $error = [
             $error = [
                 'message' => 'Token is Expired',
                 'message' => 'Token is Expired',