From 5e908498bdc7bfcfaf4b5c51e9718de505a7f968 Mon Sep 17 00:00:00 2001
From: twhmr <open@twhmr.cn>
Date: Fri, 31 Jul 2020 10:46:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?update=20application/common/model/Config.ph?=
 =?UTF-8?q?p.=20=E6=96=B0=E5=A2=9E=E9=A2=9D=E5=A4=96=E5=B1=9E=E6=80=A7=20e?=
 =?UTF-8?q?xtend=5Fhtml=EF=BC=8C=E7=94=A8=E6=9D=A5=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=9B=BF=E6=8D=A2extend=E7=9A=84=E9=A2=84?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AE=9A=E7=95=8C=E7=AC=A6=E8=A2=AB=E7=AF=A1?=
 =?UTF-8?q?=E6=94=B9=E5=B9=B6=E4=BF=9D=E5=AD=98=E8=BF=9B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/model/Config.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/common/model/Config.php b/application/common/model/Config.php
index e15dd83f..cccc5d35 100644
--- a/application/common/model/Config.php
+++ b/application/common/model/Config.php
@@ -19,6 +19,7 @@ class Config extends Model
     protected $updateTime = false;
     // 追加属性
     protected $append = [
+        'extend_html'
     ];
 
     /**
@@ -72,7 +73,7 @@ class Config extends Model
         return $regexList;
     }
 
-    public function getExtendAttr($value, $data)
+    public function getExtendHtmlAttr($value, $data)
     {
         $result = preg_replace_callback("/\{([a-zA-Z]+)\}/", function ($matches) use ($data) {
             if (isset($data[$matches[1]])) {

From b6aaaeaebeca809156af40b3fe3a9026dfed2014 Mon Sep 17 00:00:00 2001
From: twhmr <open@twhmr.cn>
Date: Fri, 31 Jul 2020 10:47:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update=20application/admin/view/general/con?=
 =?UTF-8?q?fig/index.html.=20=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8Dextend=E4=B8=BAextend=5Fhtml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/general/config/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/view/general/config/index.html b/application/admin/view/general/config/index.html
index 402db74f..db989c84 100644
--- a/application/admin/view/general/config/index.html
+++ b/application/admin/view/general/config/index.html
@@ -137,7 +137,7 @@
                                             <label for="row[{$item.name}]-no"><input id="row[{$item.name}]-no" name="row[{$item.name}]" type="radio" value="0" {$item.value?'':'checked'} data-tip="{$item.tip}" /> {:__('No')}</label>
                                             {/case}
                                             {case custom}
-                                            {$item.extend}
+                                            {$item.extend_html}
                                             {/case}
                                             {/switch}
                                         </div>

From ac7f3f26909dba73a6f019c00cb74089d9e7c971 Mon Sep 17 00:00:00 2001
From: twhmr <open@twhmr.cn>
Date: Mon, 3 Aug 2020 14:48:55 +0800
Subject: [PATCH 3/3] update application/common/library/Token.php.

---
 application/common/library/Token.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/common/library/Token.php b/application/common/library/Token.php
index e9cd5e35..f9e231a0 100644
--- a/application/common/library/Token.php
+++ b/application/common/library/Token.php
@@ -108,7 +108,7 @@ class Token
      */
     public static function get($token, $default = false)
     {
-        return self::init()->get($token, $default);
+        return self::init()->get($token) ?: $default;
     }
 
     /**
@@ -148,7 +148,7 @@ class Token
     /**
      * 清除Token
      * @access public
-     * @param  string $token Token标记
+     * @param  int user_id 用户编号
      * @return boolean
      */
     public static function clear($user_id = null)