hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复API一键生成时ApiReturn的错误 

修改默认Token驱动为Mysql
修复在系统配置中使用富文本编辑器的BUG
pull/56/head
Karson 2018-04-02 22:26:05 +08:00
parent f129e8af7d
commit 064e129342
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/admin/command/Api/library/Extractor.php
View File

@ -2,6 +2,8 @@
namespace app\admin\command\Api\library;
use Exception;
/**
* Class imported from https://github.com/eriknyk/Annotations
* @author Erik Amaru Ortiz https://github.com/eriknyk‎
@ -329,11 +331,16 @@ class Extractor
{
$argsParts = trim($matches['args'][$i]);
$name = $matches['name'][$i];
$argsParts = preg_replace("/\{(\w+)\}/", '#$1#', $argsParts);
$value = self::parseArgs($argsParts);
if(is_string($value))
if($name == 'ApiReturn')
{
$value = preg_replace("/\#(\w+)\#/", '{$1}', $argsParts);
$value = $argsParts;
} else {
$argsParts = preg_replace("/\{(\w+)\}/", '#$1#', $argsParts);
$value = self::parseArgs($argsParts);
if(is_string($value))
{
$value = preg_replace("/\#(\w+)\#/", '{$1}', $argsParts);
}
}
}
else

6
application/admin/view/general/config/index.html
View File

@ -51,7 +51,7 @@
<textarea name="row[{$item.name}]" class="form-control" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}" {$item.extend}>{$item.value}</textarea>
{/case}
{case editor}
<textarea name="row[{$item.name}]" class="form-control editor" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}" {$item.extend}>{$item.value}</textarea>
<textarea name="row[{$item.name}]" id="editor-{$item.name}" class="form-control editor" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}" {$item.extend}>{$item.value}</textarea>
{/case}
{case array}
<dl class="fieldlist" data-name="row[{$item.name}]">
@ -176,8 +176,8 @@
<div class="form-group hide" id="add-content-container">
<label for="content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
<div class="col-xs-12 col-sm-4">
<textarea name="row[content]" id="content" cols="30" rows="5" class="form-control" data-rule="required">key1|value1
key2|value2</textarea>
<textarea name="row[content]" id="content" cols="30" rows="5" class="form-control" data-rule="required">value1|title1
value2|title2</textarea>
</div>
</div>
<div class="form-group">

2
application/config.php
View File

@ -247,7 +247,7 @@ return [
// +----------------------------------------------------------------------
'token' => [
// 驱动方式
'type' => 'Redis',
'type' => 'Mysql',
// 缓存前缀
'key' => 'i3d6o32wo8fvs1fvdpwens',
// 加密方式