From a5ba65d9c9b919984b6d8c8fdea196bbb178cf56 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 8 Apr 2019 18:03:11 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=90=8C=E6=AD=A5Framework?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Config.php | 11 +++++++----
 application/admin/controller/Login.php  |  4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php
index 5d1d9273b..e51e06cea 100644
--- a/application/admin/controller/Config.php
+++ b/application/admin/controller/Config.php
@@ -38,10 +38,13 @@ class Config extends Controller
     public function info()
     {
         $this->applyCsrfToken();
-        $this->title = '系统参数配置';
-        if ($this->request->isGet()) return $this->fetch();
-        foreach ($this->request->post() as $k => $v) sysconf($k, $v);
-        $this->success('系统参数配置成功！');
+        if ($this->request->isGet()) {
+            $this->title = '系统参数配置';
+            $this->fetch();
+        } else {
+            foreach ($this->request->post() as $k => $v) sysconf($k, $v);
+            $this->success('系统参数配置成功！');
+        }
     }
 
     /**
diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index d5befa2cd..1af362d27 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -16,6 +16,7 @@ namespace app\admin\controller;
 
 use library\Controller;
 use think\Db;
+use think\Session;
 
 /**
  * 用户登录管理
@@ -97,7 +98,8 @@ class Login extends Controller
      */
     public function out()
     {
-        [session_unset(), session_destroy()];
+        \think\facade\Session::clear();
+        \think\facade\Session::destroy();
         $this->success('退出登录成功！', url('@admin/login'));
     }