From a95833c81f58e3eac03eddcfc60a51c4e55bdb48 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 23 Sep 2019 15:03:29 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Login.php | 6 +++---
 route/demo.php                         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index 8b4e996d0..fa24db16a 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -42,10 +42,10 @@ class Login extends Controller
             if (NodeService::islogin()) {
                 $this->redirect('@admin');
             } else {
-                $this->domain = Request::host(true);
-                $this->devmode = in_array($this->domain, ['127.0.0.1', 'localhost']) or stripos($this->domain, 'thinkadmin.top') !== false;
-                if (!($this->loginskey = session('loginskey'))) session('loginskey', $this->loginskey = uniqid());
                 $this->title = '系统登录';
+                $this->domain = Request::host(true);
+                if (!($this->loginskey = session('loginskey'))) session('loginskey', $this->loginskey = uniqid());
+                $this->devmode = in_array($this->domain, ['127.0.0.1', 'localhost']) || is_numeric(stripos($this->domain, 'thinkadmin.top'));
                 $this->fetch();
             }
         } else {
diff --git a/route/demo.php b/route/demo.php
index cb38b9e7d..f0aafab94 100644
--- a/route/demo.php
+++ b/route/demo.php
@@ -18,7 +18,7 @@ use think\facade\Route;
 
 /* 演示环境禁止操作路由绑定 */
 $domain = Request::host(true);
-if (in_array($domain, ['127.0.0.1', 'localhost']) or stripos($domain, 'thinkadmin.top') <> false) {
+if (in_array($domain, ['127.0.0.1', 'localhost']) || stripos($domain, 'thinkadmin.top') <> false) {
     Route::post('admin/user/pass', function () {
         return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']);
     });