Merge branch 'stabble'

app/Http/Middleware/ReadOauth.php

@@ -761,6 +761,9 @@ class ReadOauth
         if(empty($from_type)){
             return '';
         }
+        if($from_type == 'main'){
+            return '';
+        }
         if($request->has('r') ){
             return '';
         }
@@ -949,6 +952,9 @@ class ReadOauth
     }
     private function isLimit($area)
     {
+        if($area == 'unknown'){
+            return 'DISABLED';
+        }
         $limit_area = ['上海', '北京','杭州','南京','广州'];
         foreach ($limit_area as $a) {
             Log::info('$area: '.$area.',$a: '.$a.PHP_EOL);