Merge branch 'master' of https://gitee.com/karson/fastadmin

@@ -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>
                                             <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}
                                             {case custom}
                                             {case custom}
-                                            {$item.extend}
+                                            {$item.extend_html}
                                             {/case}
                                             {/case}
                                             {/switch}
                                             {/switch}
                                         </div>
                                         </div>

@@ -108,7 +108,7 @@ class Token
      */
      */
     public static function get($token, $default = false)
     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
      * 清除Token
      * @access public
      * @access public
-     * @param  string $token Token标记
+     * @param  int user_id 用户编号
      * @return boolean
      * @return boolean
      */
      */
     public static function clear($user_id = null)
     public static function clear($user_id = null)

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