//

application/index/extend/Basic.php

@@ -228,10 +228,9 @@ class Basic extends Controller
 
             if (empty($is_auth) && $this->userId != 1) {
                 if($this->request->isAjax()){
-                    //echo json_encode(array( "code" => "300", "msg" => "没有权限！", "data" => [], "type" => "json" ));exit;
+                    echo json_encode(array( "code" => "300", "msg" => "没有权限！", "data" => [], "type" => "json" ));exit;
                 } else {
-//                    $this->error('没有当前页面权限');exit;
-                    echo json_encode(array( "code" => "101", "msg" => "没有当前页面权限", "data" => [], "type" => "json" ));exit;
+                    $this->error('没有当前页面权限');exit;
                 }
             }
         }
@@ -245,23 +244,21 @@ class Basic extends Controller
     public function userVerify(){
         $this->lastLoginTime = Session::get("lastLoginTime");
         if(empty($this->userName) || empty($this->userId) || empty($this->lastLoginTime) ){
+            if ($this->request->isAjax()) {
                 echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
-//            if ($this->request->isAjax()) {
-//                echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
-//            } else {
-//                $this->redirect('/index/login');
-//            }
+            } else {
+                $this->redirect('/index/login');
+            }
         }
 
         $time = time();
         //登录有效期判断
         if (($time - $this->lastLoginTime) > 36000) {
+            if ($this->request->isAjax()) {
                 echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
-//            if ($this->request->isAjax()) {
-//                echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
-//            } else {
-//                $this->redirect('/index/login');die;
-//            }
+            } else {
+                $this->redirect('/index/login');die;
+            }
         } else {
             //更新时间
             Session::set("lastLoginTime", $time);