yunqi test 4

app/Http/Middleware/ReadOauth.php

@@ -759,11 +759,11 @@ class ReadOauth
         if(empty($from_type)){
             return '';
         }
-        Log::info('1111111111111111111111111111111');
+        //Log::info('1111111111111111111111111111111');
         $param = $request->except('_url');
         if (isset($param['bid']))  unset($param['bid']);
         if(isset($param['bid']))  unset($param['bid']);
-        unset($param['param']);
+        unset($param['from_type']);
         $other_str = 't=1';
         if($param){
             $other_str = http_build_query($param);
@@ -777,9 +777,9 @@ class ReadOauth
         } catch (\Exception $e) {
             return '';
         }
-        Log::info('222222222222222222222222222222');
+        //Log::info('222222222222222222222222222222');
         if (!$bid) return '';
-        Log::info('333333333333333333333333333333');
+        //Log::info('333333333333333333333333333333');
         //用户是否在样本中
         $yq_book_user = BookUserService::selectUser($uid);
         if (!$yq_book_user) {
@@ -789,7 +789,7 @@ class ReadOauth
         if(empty($flag)){
             return '';
         }
-        Log::info('44444444444444444444444444444');
+        //Log::info('44444444444444444444444444444');
         //如果是group_1 不错操作
         if($flag == 'group_1'){
             if ($yq_book_user->type == 'INIT'){
@@ -797,11 +797,11 @@ class ReadOauth
             }
             return '';
         }
-        Log::info('5555555555555555555555555555');
+        //Log::info('5555555555555555555555555555');
         if($flag != 'group_2'){
             return '';
         }
-        Log::info('66666666666666666666666666666');
+        //Log::info('66666666666666666666666666666');
         //用户的类型是初始类型  区域还没获取
         if ($yq_book_user->type == 'INIT') {
             $area = $this->getIpArea(get_client_ip());
@@ -816,7 +816,7 @@ class ReadOauth
                     BookUserService::updateUser($uid, $data);
                     return '';
                 }
-                Log::info('7777777777777777777777777');
+                //Log::info('7777777777777777777777777');
                 //书不在在测试列表中
                 //获取随机获取一本书,获取不到则返回
                 $redirect_bids = YqZsyTestService::getRandomBooks($uid,1);
@@ -828,7 +828,7 @@ class ReadOauth
                     BookUserService::updateUser($uid, $data);
                     return '';
                 };
-                Log::info('88888888888888888888888888');
+                //Log::info('88888888888888888888888888');
                 $redirect_book_info = BookConfigService::getBookById($redirect_bid);
                 if ($redirect_book_info) {
                     $redirect = $this->getBookReaderUrl($redirect_bid,$channel_id);
@@ -838,7 +838,7 @@ class ReadOauth
                     BookUserService::updateUser($uid, $data);
                     return $redirect.'&'.$other_str;
                 }
-                Log::info('9999999999999999999999999');
+                //Log::info('9999999999999999999999999');
                 return '';
 
             }
@@ -848,18 +848,18 @@ class ReadOauth
                 BookUserService::popUser($uid);
                 return '';
             }
-            Log::info('aaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+            //Log::info('aaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
         }
         if($yq_book_user->type == 'DISABLED'){
             return '';
         }
-        Log::info('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+        //Log::info('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
         $yq_zsy_test = YqZsyTestService::getByBid($bid);
         //如果书在测试样本中 不跳转
         if ($yq_zsy_test) {
             return '';
         }
-        Log::info('ccccccccccccccccccccccccccccc');
+        //Log::info('ccccccccccccccccccccccccccccc');
         // 用户符合条件 且看的书不样本中
         if($yq_book_user->bid){
             //已经有对应关系
@@ -868,7 +868,7 @@ class ReadOauth
             if($record_url) return $record_url;
             //没有阅读记录
             $book_url = $this->getBookReaderUrl($yq_book_user->bid,$channel_id);
-            Log::info('dddddddddddddddddddddddddd');
+            //Log::info('dddddddddddddddddddddddddd');
             return $book_url.'&'.$other_str;
         }else{
             //没有对应关系
@@ -881,16 +881,16 @@ class ReadOauth
             if (!$redirect_bid) {
                 return '';
             };
-            Log::info('eeeeeeeeeeeeeeeeeeeeeeeeeeeee');
+            //Log::info('eeeeeeeeeeeeeeeeeeeeeeeeeeeee');
             $redirect = $this->getBookReaderUrl($redirect_bid,$channel_id);
             if($redirect){
                 $data['bid'] = $redirect_bid;
                 //更新对应关系
                 BookUserService::updateUser($uid, $data);
-                Log::info('ffffffffffffffffffffffff');
+                //Log::info('ffffffffffffffffffffffff');
                 return $redirect.'&'.$other_str;
             }
-            Log::info('gggggggggggggggggggggggggggggggg');
+            //Log::info('gggggggggggggggggggggggggggggggg');
             return '';
         }
     }
@@ -935,7 +935,7 @@ class ReadOauth
     }
     private function isLimit($area)
     {
-        $limit_area = ['上海', '北京'];
+        $limit_area = ['上海', '北京','杭州'];
         foreach ($limit_area as $area) {
             if (strpos($area, $area) === true) {
                 return 'DISABLED';