diff --git a/application/admin/command/Api/library/Extractor.php b/application/admin/command/Api/library/Extractor.php index 49bdf282..1dc62e34 100644 --- a/application/admin/command/Api/library/Extractor.php +++ b/application/admin/command/Api/library/Extractor.php @@ -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 diff --git a/application/admin/view/general/config/index.html b/application/admin/view/general/config/index.html index 9875aab4..44edef96 100644 --- a/application/admin/view/general/config/index.html +++ b/application/admin/view/general/config/index.html @@ -51,7 +51,7 @@ {/case} {case editor} - + {/case} {case array}
@@ -176,8 +176,8 @@
- +
diff --git a/application/config.php b/application/config.php index 3bfb1d6d..b7472467 100755 --- a/application/config.php +++ b/application/config.php @@ -247,7 +247,7 @@ return [ // +---------------------------------------------------------------------- 'token' => [ // 驱动方式 - 'type' => 'Redis', + 'type' => 'Mysql', // 缓存前缀 'key' => 'i3d6o32wo8fvs1fvdpwens', // 加密方式