From 3aec2319104216be1c6a50e77f793b9932800ed9 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 26 Sep 2019 09:52:22 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                         |  2 +-
 config/session.php                 |  1 -
 config/template.php                | 11 +++++++----
 public/static/theme/css/login.css  |  2 +-
 public/static/theme/css/login.less |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58017a7f4..68f83c3b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 /runtime
 /safefile
 /nbproject
+/config/cert
 /composer.lock
 /public/upload
 /public/static/theme/css/console.custom.css
@@ -14,4 +15,3 @@
 /public/static/theme/css/console.layout.css.map
 /public/static/theme/css/console.layui.css
 /public/static/theme/css/console.layui.css.map
-/config/cert
diff --git a/config/session.php b/config/session.php
index c1b12676f..1f187504c 100644
--- a/config/session.php
+++ b/config/session.php
@@ -23,5 +23,4 @@ return [
     'prefix' => 'fw',
     'path'   => $_path_,
     'name'   => $_name_,
-    // 'var_session_id' => $_name_,
 ];
diff --git a/config/template.php b/config/template.php
index 9f94f0429..52dfd7454 100644
--- a/config/template.php
+++ b/config/template.php
@@ -13,15 +13,18 @@
 // | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
 // +----------------------------------------------------------------------
 
+use think\facade\Config;
+use think\facade\Request;
+
 return [
     // 去除HTML空格换行
     'strip_space'        => true,
     // 开启模板编译缓存
-    'tpl_cache'          => !config('app_debug'),
+    'tpl_cache'          => !Config::get('app_debug'),
     // 定义模板替换字符串
     'tpl_replace_string' => [
-        '__APP__'    => rtrim(url('@'), '\\/'),
-        '__ROOT__'   => rtrim(dirname(request()->basefile()), '\\/'),
-        '__PUBLIC__' => rtrim(dirname(request()->basefile(true)), '\\/'),
+        '__APP__'  => rtrim(url('@'), '\\/'),
+        '__ROOT__' => rtrim(dirname(Request::basefile()), '\\/'),
+        '__FULL__' => rtrim(dirname(Request::basefile(true)), '\\/'),
     ],
 ];
diff --git a/public/static/theme/css/login.css b/public/static/theme/css/login.css
index d02817adc..22fd66027 100644
--- a/public/static/theme/css/login.css
+++ b/public/static/theme/css/login.css
@@ -83,7 +83,7 @@ body {
   color: #fff;
   font-size: 18px;
   position: absolute;
-  padding: 12px 15px 13px 20px;
+  padding: 14px 15px 13px 20px;
 }
 .login-container form ul li input {
   color: #fff;
diff --git a/public/static/theme/css/login.less b/public/static/theme/css/login.less
index 84b9b225a..c8d52b1b4 100644
--- a/public/static/theme/css/login.less
+++ b/public/static/theme/css/login.less
@@ -109,7 +109,7 @@ body {
         color: #fff;
         font-size: 18px;
         position: absolute;
-        padding: 12px 15px 13px 20px;
+        padding: 14px 15px 13px 20px;
       }
 
       input {