接口对接

app/Http/Controllers/Api/JRFIDController.php

@@ -12,6 +12,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -22,6 +23,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -32,6 +34,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -42,6 +45,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -52,6 +56,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -62,6 +67,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -72,6 +78,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -82,6 +89,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -92,6 +100,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -102,6 +111,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -112,6 +122,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -122,6 +133,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -132,6 +144,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -142,6 +155,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -152,6 +166,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -162,6 +177,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -172,6 +188,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -182,6 +199,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }
@@ -192,6 +210,7 @@ class JRFIDController extends BaseController
         if($bool){
             return $this->json_return(200,'',$data);
         }else{
+            if($bool === 0) return $this->json_return(401,$data);
             return $this->json_return(201,$data);
         }
     }

app/Http/Middleware/CheckJRFIDLogin.php

@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Service\EmployeeService;
+use App\Service\JRFIDServerService;
 use Closure;
 
 class CheckJRFIDLogin
@@ -17,7 +18,7 @@ class CheckJRFIDLogin
     public function handle($request, Closure $next)
     {
         $token = $request->header('Authorization');
-        if (! isset($token)) return response()->json(['code'=>201,'msg'=>'缺少Authorization','data'=>null]);
+        if(empty($token)) return response()->json(['code'=>401,'msg'=>'缺少登录凭证','data'=>null]);
         if(strpos($token, "Bearer ") === false) $token = "Bearer " . $token;
         $data['token'] = $token;
         $data['header'] = ["Authorization: {$token}",'Content-Type:application/json'];

app/Service/JRFIDServerService.php

@@ -29,7 +29,7 @@ class JRFIDServerService extends Service
         ];
         $header = ['Content-Type:application/json'];
         list($status, $result) = $this->post_helper($url,$post, $header);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         //登录失败
         if(! empty($result['errorMessage'])) return [false, $result['errorMessage']];
@@ -40,7 +40,7 @@ class JRFIDServerService extends Service
     public function getSite($data){
         $url = config("j_rfid.site");
         list($status,$result) = $this->get_helper($url);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['errorMessage'])) return [false, $result['errorMessage']];
 
@@ -52,7 +52,7 @@ class JRFIDServerService extends Service
 
         $header = ["Authorization: {$param['token']}"];
         list($status,$result) = $this->get_helper($url,$header);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['errorMessage'])) return [false, $result['errorMessage']];
 
@@ -69,7 +69,7 @@ class JRFIDServerService extends Service
             'site' => $data['site'],
         ];
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
@@ -87,7 +87,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
@@ -130,7 +130,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post,['Content-Type:application/json']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['message']];
         if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
@@ -188,7 +188,7 @@ class JRFIDServerService extends Service
         $post['number'] = ($data['number'] ?? 1) - 1;
 
         list($status,$result) = $this->post_helper($url,$post,$header);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
         if(! isset($result['content'])) {
@@ -214,7 +214,7 @@ class JRFIDServerService extends Service
         $post['number'] = ($data['number'] ?? 1) - 1;
 
         list($status,$result) = $this->post_helper($url,$post,$header);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
         if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
@@ -242,7 +242,7 @@ class JRFIDServerService extends Service
         $post['number'] = ($data['number'] ?? 1) - 1;
 
         list($status,$result) = $this->post_helper($url,$post,$header);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
         if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
@@ -282,7 +282,7 @@ class JRFIDServerService extends Service
         $post['rules'] = $data['rules'] ?? [];
 
         list($status,$result) = $this->post_helper($url,$post,$header);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
         if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
@@ -338,7 +338,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post, $param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! isset($result['success'])) {
             $error = $result[0]['message'] ?? "操作失败，请刷新页面";
@@ -369,7 +369,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post, $param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! isset($result['success'])) {
             $error = $result[0]['message'] ?? "操作失败，请刷新页面";
@@ -405,7 +405,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post,['Content-Type:application/json']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['message']];
         if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
@@ -448,7 +448,7 @@ class JRFIDServerService extends Service
         $post['number'] = $data['number'] ?? 1;
 
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
@@ -478,7 +478,7 @@ class JRFIDServerService extends Service
         $post['number'] = $data['number'] ?? 1;
 
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
@@ -510,7 +510,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
@@ -542,7 +542,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
@@ -574,7 +574,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
@@ -601,7 +601,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['message']];
         if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
@@ -628,7 +628,7 @@ class JRFIDServerService extends Service
         ];
 
         list($status,$result) = $this->post_helper($url,$post,$param['header']);
-        if(! $status) return [false, $result];
+        if(! $status) return [$status, $result];
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['message']];
         if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
@@ -675,9 +675,12 @@ class JRFIDServerService extends Service
         }
         curl_close($ch);
 
-        Log::channel('apiLog')->info('工装云POST结果', ["message" => json_decode($r, true)]);
+        $return = json_decode($r, true);
+        Log::channel('apiLog')->info('工装云POST结果', ["message" => $return]);
 
-        return [true, json_decode($r, true)];
+        if(! empty($return['message']) && $return['message'] == 'error.unAuthorized') return [0, '登录凭证已失效或者不正常'];
+
+        return [true, $return];
     }
 
     public function get_helper($url,$header=[],$timeout = 20){
@@ -707,8 +710,12 @@ class JRFIDServerService extends Service
         }
 
         curl_close($ch);
-        Log::channel('apiLog')->info('工装云GET', ["message" => json_decode($r, true)]);
 
-        return [true, json_decode($r, true)];
+        $return = json_decode($r, true);
+        Log::channel('apiLog')->info('工装云GET', ["message" => $return]);
+
+        if(! empty($return['message']) && $return['message'] == 'error.unAuthorized') return [0, '登录凭证已失效或者不正常'];
+
+        return [true, $return];
     }
 }