Merge remote-tracking branch 'origin/master'

Modules/Admin/Http/Controllers/Api/TokenController.php

@@ -102,9 +102,9 @@ class TokenController extends Controller
         $formattedDateString = "$year-$month-$day $hour:$minute:$second";
         $timestamp = strtotime($formattedDateString);
 
-//        if(time() - $timestamp > 5){
-//            return $this->error(1003, '已超时');
-//        }
+        if(time() - $timestamp > 10){
+            return $this->error(1003, '已超时');
+        }
 
         $md5 = md5($loginid.'|'.$ts.'|'.$salt);
         if($md5 != $token){