Merge

app/Http/Controllers/QuickApp/BaseController.php

@@ -11,18 +11,24 @@ class BaseController extends Controller
     
     public function __get($name)
     {
+//        if (!isset($this->field[$name])) {
+//            $qapp_user = QappUserService::getGolableUserStatic();
+//            if ($name == '_user_info') {
+//                $this->field[$name] = $qapp_user->user;
+//            }
+//            if ($name == 'uid') {
+//                $this->field[$name] = $qapp_user->uid;
+//            }
+//            if ($name == 'distribution_channel_id') {
+//                $this->field[$name] = $qapp_user->user->distribution_channel_id;
+//            }
+//        }
         if (!isset($this->field[$name])) {
-             QappUserService::setGolableUserStatic(162261523);
-            $qapp_user = QappUserService::getGolableUserStatic();
-            if ($name == 'user_info') {
-                $this->field[$name] = $qapp_user->user;
-            }
-            if ($name == 'uid') {
-                $this->field[$name] = $qapp_user->uid;
-            }
-            if ($name == 'distribution_channel_id') {
-                $this->field[$name] = $qapp_user->user->distribution_channel_id;
-            }
+
+            $this->field['_user_info'] = '';
+            $this->field['uid'] = 1;
+            $this->field['distribution_channel_id'] = 5;
+
         }
         return  $this->field[$name];
     }