Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -24,7 +24,7 @@ class FileController
     public $token = '';//token
 
     public $cache = '';//缓存数据
-    public $upload_location = 1;
+    public $upload_location = 0;
     public $file_type = [
         2 => 'other',//其他
         1 => 'video',//视频

@@ -184,6 +184,7 @@ class UserLoginLogic
         return $this->success($info);
     }
 
+
     /**
      * @remark :组装返回数据
      * @name   :getProjectInfo