完善 token 过期认证

Deepseath
1 parent b75885cd
Showing 2 changed files with 45 additions and 11 deletions
src/Api/User.php
src/Hris.php
@@ -43,7 +43,8 @@ class User
             'email' => ''
         ], $params);
-        return $this->service->apiRequest('get', 'employeeList', $params);
+        $result = $this->service->apiRequest('get', 'employeeList', $params);
+        return isset($result['employeeList']) ? $result['employeeList'] : (isset($result['data']) ? $result['data'] : []);
     }
     /**
@@ -101,6 +102,7 @@ class User
     private function _fieldCheck(array $params) : bool
     {
         // 必须提供的参数
+        /*
         $requires = [
             'nameZH', // *员工姓名(中文)
             'nameEN', // *员工姓名(英文)
@@ -131,6 +133,7 @@ class User
                 throw new \Exception('Add user lose params "'.$_key.'"', 91001);
             }
         }
+        */
         return true;
     }
@@ -114,7 +114,7 @@ class Hris
     public function getTokenInfo(bool $force = false) : array
     {
         $token = $this->_cache->getItem('token');
-        if ($token->isHit() || $force !== false) {
+        if ($token->isHit() && $force === false) {
             return $token->get();
         }
@@ -126,13 +126,17 @@ class Hris
             'token' => $this->_originToken
         ];
         // 请求接口
-        $this->_http->headers([
+        $headers = [
             'Authorization' => $this->_originToken,
             'Content-Type' => 'application/json;charset=utf-8'
-        ]);
+        ];
+        $this->_http->headers($headers);
+        $this->log($url, 'Get Token');
+        $this->log($params, 'Request');
+        $this->log($headers, 'Header');
         $response = $this->_http->post($url, $params, 'json');
         $newTokenInfo = $response->json(true);
-
+        $this->log($newTokenInfo, 'Result');
         if (empty($newTokenInfo) || !isset($newTokenInfo['code'])) {
             throw new \Exception('request hris token error' . var_export($newTokenInfo, true) . '|' . $url . var_export($params, true), 9001);
         }
@@ -148,7 +152,8 @@ class Hris
         } else {
             $expire = $this->_tokenExpire;
         }
-        $token->expiresAfter($expire - 60 * 5);
+        $token->expiresAfter($expire - 10);
+        $this->log($token->get(), 'Save Token');
         $this->_cache->save($token);
         return $newTokenInfo;
@@ -173,12 +178,18 @@ class Hris
         if ($tryCount > 3) {
             throw new \Exception('hris SDK Error: Get token error, retry maximum number.');
         }
-        $this->_http->headers([
+        $headers = [
             'Content-Type' => 'application/json;charset=utf-8',
             'Authorization' => $this->getTokenInfo($flushToken)['data']['token']
-        ]);
+        ];
+        $this->_http->headers($headers);
         $url = $this->_baseUrl . $path;
         $method = strtolower($method);
+
+        $this->log($url, 'Url');
+        $this->log($method, 'Method');
+        $this->log($headers, 'Header');
+        $this->log($data, 'Request');
         if ($method == 'post') {
             $dataString = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $response = $this->_http->post($url, $dataString, 'json');
@@ -186,14 +197,34 @@ class Hris
             $response = $this->_http->get($url, $data);
         }
         $result = $response->json(true);
-        if (!isset($result['code']) || $result['code'] != 0) {
-            if ($result['code'] == 3001) {
+        $this->log($result, 'Result');
+        if (!isset($result['code']) || $result['code'] != 200) {
+            if (isset($result['code']) && ($result['code'] == '3001' || $result['code'] == '30010')) {
                 // token 无效，尝试重新刷新 token
+                $this->log($tryCount, 'Try count');
                 return $this->apiRequest($method, $path, $data, true);
             }
-            throw new \Exception('hris SDK Error: ' . $result['msg'] . ':' . $result['code'], $result['code']);
+            if (isset($result['msg']) && isset($result['code'])) {
+                throw new \Exception('hris SDK Error: ' . $result['msg'] . ':' . $result['code'] . '='. print_r($result, true), $result['code']);
+            } else {
+                throw new \Exception('hris SDK Error: Result NULL.' .var_export($result, true), 9999);
+            }
         }
+
         return isset($result['data']) ? $result['data'] : [];
     }
+
+    /**
+     * 打印调试日志
+     * @param mixed $info
+     */
+    public function log($info, $title = '', $level = 'info')
+    {
+        if ($this->_debug) {
+            $info = is_scalar($info) ? $info : json_encode($info, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            $title = $title ? "[{$title}]" : '';
+            \think\facade\Log::write($title . $info, 'info');
+        }
+    }
 }