Merge remote-tracking branch 'origin/master'

app/common/controller/Frontend.php

@@ -49,10 +49,12 @@ class Frontend
         // 初始化会员鉴权实例
         $this->auth = Auth::instance();
         $token      = request()->header('token');
-        if ($token && $needLogin) {
+        if ($token) {
+            if(request()->controller != 'app\czg\app\controller\LoginController' && request()->action != 'index'){} {
                 if(!$this->auth->init($token)) {
                     $this->error('Token expiration', [], 401);
                 }
+            }
         }else {
             if ($needLogin) {
                 $this->error('请登录', [