Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Model/PromoteModel.class.php

@@ -165,7 +165,8 @@ class PromoteModel extends Model{
     /**
      * 退出登录
      */
-    public function logout(){
+    public function logout()
+    {
         session('promote_auth', null);
         session('promote_auth_sign', null);
         session('game_divide_second_pwd', null);

Application/Home/Controller/IndexController.class.php

@@ -287,7 +287,8 @@ class IndexController extends HomeController
     /**
      * 退出登录
      */
-    public function logout(){
+    public function logout()
+    {
         $Promote = new PromoteApi();
         $Promote->logout();
         redirect(U('Index/index'));

Application/User/Api/PromoteApi.class.php

@@ -80,7 +80,8 @@ class PromoteApi extends Api{
     /**
      * 退出登录
      */
-    public function logout(){
+    public function logout()
+    {
         $this->model->logout();
     }