修复开发模式下未显示错误信息的BUG

修复API部分注释无效的BUG
修复API文档无法替换参数的BUG

application/admin/command/Api/library/Extractor.php

@@ -322,7 +322,6 @@ class Extractor
         if (preg_match_all('/@(?<name>[A-Za-z_-]+)[\s\t]*\((?<args>(?:(?!\)).)*)\)\r?/s', $docblock, $matches))
         {
             $numMatches = count($matches[0]);
-
             for ($i = 0; $i < $numMatches; ++$i)
             {
                 // annotations has arguments
@@ -330,7 +329,12 @@ 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))
+                    {
+                        $value = preg_replace("/\#(\w+)\#/", '{$1}', $argsParts);
+                    }
                 }
                 else
                 {

application/admin/command/Api/template/index.html

@@ -382,27 +382,31 @@
                     //instead of the initial attribute
                     var url = $(form).attr('action');
 
-                    var serializedData = new FormData();
+                    var formData = new FormData();
 
                     $(form).find('input').each(function (i, input) {
                         if ($(input).attr('type') == 'file') {
-                            serializedData.append($(input).attr('name'), $(input)[0].files[0]);
+                            formData.append($(input).attr('name'), $(input)[0].files[0]);
                         } else {
-                            serializedData.append($(input).attr('name'), $(input).val())
+                            formData.append($(input).attr('name'), $(input).val())
                         }
                     });
 
                     var index, key, value;
 
                     if (matchedParamsInRoute) {
+                        var params = {};
+                        formData.forEach(function(value, key){
+                            params[key] = value;
+                        });
                         for (index = 0; index < matchedParamsInRoute.length; ++index) {
                             try {
                                 key = matchedParamsInRoute[index];
-                                value = serializedData[key];
+                                value = params[key];
                                 if (typeof value == "undefined")
                                     value = "";
-                                url = url.replace("{" + key + "}", value);
-                                delete serializedData[key];
+                                url = url.replace("\{" + key + "\}", value);
+                                formData.delete(key);
                             } catch (err) {
                                 console.log(err);
                             }
@@ -425,7 +429,7 @@
 
                     $.ajax({
                         url: $('#apiUrl').val() + url,
-                        data: $(form).attr('method') == 'get' ? $(form).serialize() : serializedData,
+                        data: $(form).attr('method') == 'get' ? $(form).serialize() : formData,
                         type: $(form).attr('method') + '',
                         dataType: 'json',
                         contentType: false,

application/common/view/tpl/think_exception.tpl

@@ -1,6 +1,7 @@
 <?php
 $cdnurl = function_exists('config') ? config('view_replace_str.__CDN__') : '';
 $publicurl = function_exists('config') ? config('view_replace_str.__PUBLIC__') : '/';
+$debug = function_exists('config') ? config('app_debug') : false;
 
 $lang = [
     'An error occurred' => '发生错误',
@@ -17,83 +18,84 @@ if (isset($_GET['lang'])) {
 } elseif (isset($_COOKIE['think_var'])) {
     $langSet = strtolower($_COOKIE['think_var']);
 } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-    preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
+preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
     $langSet     = strtolower($matches[1]);
 }
 $langSet = $langSet && in_array($langSet, ['zh-cn', 'en']) ? $langSet : 'zh-cn';
 $langSet == 'en' && $lang = array_combine(array_keys($lang), array_keys($lang));
+
 ?>
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-        <title><?=$lang['An error occurred']?></title>
-        <meta name="robots" content="noindex,nofollow" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-        <link rel="shortcut icon" href="<?php echo $cdnurl;?>/assets/img/favicon.ico" />
-        <style>
-            * {-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;}
-            html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,abbr,address,cite,code,del,dfn,em,img,ins,kbd,q,samp,small,strong,sub,sup,var,b,i,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,article,aside,canvas,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary,time,mark,audio,video {margin:0;padding:0;border:0;outline:0;vertical-align:baseline;background:transparent;}
-            article,aside,details,figcaption,figure,footer,header,hgroup,nav,section {display:block;}
-            html {font-size:16px;line-height:24px;width:100%;height:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;overflow-y:scroll;overflow-x:hidden;}
-            img {vertical-align:middle;max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;}
-            body {min-height:100%;background:#edf1f4;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei",微软雅黑,Arial,sans-serif;}
-            .clearfix {clear:both;zoom:1;}
-            .clearfix:before,.clearfix:after {content:"\0020";display:block;height:0;visibility:hidden;}
-            .clearfix:after {clear:both;}
-            body.error-page-wrapper,.error-page-wrapper.preview {background-position:center center;background-repeat:no-repeat;background-size:cover;position:relative;}
-            .error-page-wrapper .content-container {border-radius:2px;text-align:center;box-shadow:1px 1px 1px rgba(99,99,99,0.1);padding:50px;background-color:#fff;width:100%;max-width:560px;position:absolute;left:50%;top:50%;margin-top:-220px;margin-left:-280px;}
-            .error-page-wrapper .content-container.in {left:0px;opacity:1;}
-            .error-page-wrapper .head-line {transition:color .2s linear;font-size:40px;line-height:60px;letter-spacing:-1px;margin-bottom:20px;color:#777;}
-            .error-page-wrapper .subheader {transition:color .2s linear;font-size:32px;line-height:46px;color:#494949;}
-            .error-page-wrapper .hr {height:1px;background-color:#eee;width:80%;max-width:350px;margin:25px auto;}
-            .error-page-wrapper .context {transition:color .2s linear;font-size:16px;line-height:27px;color:#aaa;}
-            .error-page-wrapper .context p {margin:0;}
-            .error-page-wrapper .context p:nth-child(n+2) {margin-top:16px;}
-            .error-page-wrapper .buttons-container {margin-top:35px;overflow:hidden;}
-            .error-page-wrapper .buttons-container a {transition:text-indent .2s ease-out,color .2s linear,background-color .2s linear;text-indent:0px;font-size:14px;text-transform:uppercase;text-decoration:none;color:#fff;background-color:#2ecc71;border-radius:99px;padding:8px 0 8px;text-align:center;display:inline-block;overflow:hidden;position:relative;width:45%;}
-            .error-page-wrapper .buttons-container a:hover {text-indent:15px;}
-            .error-page-wrapper .buttons-container a:nth-child(1) {float:left;}
-            .error-page-wrapper .buttons-container a:nth-child(2) {float:right;}
-            @media screen and (max-width:580px) {
-                .error-page-wrapper {padding:30px 5%;}
-                .error-page-wrapper .content-container {padding:37px;position:static;left:0;margin-top:0;margin-left:0;}
-                .error-page-wrapper .head-line {font-size:36px;}
-                .error-page-wrapper .subheader {font-size:27px;line-height:37px;}
-                .error-page-wrapper .hr {margin:30px auto;width:215px;}
-            }
-            @media screen and (max-width:450px) {
-                .error-page-wrapper {padding:30px;}
-                .error-page-wrapper .head-line {font-size:32px;}
-                .error-page-wrapper .hr {margin:25px auto;width:180px;}
-                .error-page-wrapper .context {font-size:15px;line-height:22px;}
-                .error-page-wrapper .context p:nth-child(n+2) {margin-top:10px;}
-                .error-page-wrapper .buttons-container {margin-top:29px;}
-                .error-page-wrapper .buttons-container a {float:none !important;width:65%;margin:0 auto;font-size:13px;padding:9px 0;}
-                .error-page-wrapper .buttons-container a:nth-child(2) {margin-top:12px;}
-            }
-        </style>
-    </head>
-    <body class="error-page-wrapper">
-        <div class="content-container">
-            <div class="head-line">
-                <img src="<?=$cdnurl?>/assets/img/error.svg" alt="" width="120"/>
-            </div>
-            <div class="subheader">
-                <?=$lang['The page you are looking for is temporarily unavailable']?>
-            </div>
-            <div class="hr"></div>
-            <div class="context">
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <title><?=$lang['An error occurred']?></title>
+    <meta name="robots" content="noindex,nofollow" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <link rel="shortcut icon" href="<?php echo $cdnurl;?>/assets/img/favicon.ico" />
+    <style>
+        * {-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;}
+        html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,abbr,address,cite,code,del,dfn,em,img,ins,kbd,q,samp,small,strong,sub,sup,var,b,i,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,article,aside,canvas,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary,time,mark,audio,video {margin:0;padding:0;border:0;outline:0;vertical-align:baseline;background:transparent;}
+        article,aside,details,figcaption,figure,footer,header,hgroup,nav,section {display:block;}
+        html {font-size:16px;line-height:24px;width:100%;height:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;overflow-y:scroll;overflow-x:hidden;}
+        img {vertical-align:middle;max-width:100%;height:auto;border:0;-ms-interpolation-mode:bicubic;}
+        body {min-height:100%;background:#edf1f4;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei",微软雅黑,Arial,sans-serif;}
+        .clearfix {clear:both;zoom:1;}
+        .clearfix:before,.clearfix:after {content:"\0020";display:block;height:0;visibility:hidden;}
+        .clearfix:after {clear:both;}
+        body.error-page-wrapper,.error-page-wrapper.preview {background-position:center center;background-repeat:no-repeat;background-size:cover;position:relative;}
+        .error-page-wrapper .content-container {border-radius:2px;text-align:center;box-shadow:1px 1px 1px rgba(99,99,99,0.1);padding:50px;background-color:#fff;width:100%;max-width:560px;position:absolute;left:50%;top:50%;margin-top:-220px;margin-left:-280px;}
+        .error-page-wrapper .content-container.in {left:0px;opacity:1;}
+        .error-page-wrapper .head-line {transition:color .2s linear;font-size:40px;line-height:60px;letter-spacing:-1px;margin-bottom:20px;color:#777;}
+        .error-page-wrapper .subheader {transition:color .2s linear;font-size:32px;line-height:46px;color:#494949;}
+        .error-page-wrapper .hr {height:1px;background-color:#eee;width:80%;max-width:350px;margin:25px auto;}
+        .error-page-wrapper .context {transition:color .2s linear;font-size:16px;line-height:27px;color:#aaa;}
+        .error-page-wrapper .context p {margin:0;}
+        .error-page-wrapper .context p:nth-child(n+2) {margin-top:16px;}
+        .error-page-wrapper .buttons-container {margin-top:35px;overflow:hidden;}
+        .error-page-wrapper .buttons-container a {transition:text-indent .2s ease-out,color .2s linear,background-color .2s linear;text-indent:0px;font-size:14px;text-transform:uppercase;text-decoration:none;color:#fff;background-color:#2ecc71;border-radius:99px;padding:8px 0 8px;text-align:center;display:inline-block;overflow:hidden;position:relative;width:45%;}
+        .error-page-wrapper .buttons-container a:hover {text-indent:15px;}
+        .error-page-wrapper .buttons-container a:nth-child(1) {float:left;}
+        .error-page-wrapper .buttons-container a:nth-child(2) {float:right;}
+        @media screen and (max-width:580px) {
+            .error-page-wrapper {padding:30px 5%;}
+            .error-page-wrapper .content-container {padding:37px;position:static;left:0;margin-top:0;margin-left:0;}
+            .error-page-wrapper .head-line {font-size:36px;}
+            .error-page-wrapper .subheader {font-size:27px;line-height:37px;}
+            .error-page-wrapper .hr {margin:30px auto;width:215px;}
+        }
+        @media screen and (max-width:450px) {
+            .error-page-wrapper {padding:30px;}
+            .error-page-wrapper .head-line {font-size:32px;}
+            .error-page-wrapper .hr {margin:25px auto;width:180px;}
+            .error-page-wrapper .context {font-size:15px;line-height:22px;}
+            .error-page-wrapper .context p:nth-child(n+2) {margin-top:10px;}
+            .error-page-wrapper .buttons-container {margin-top:29px;}
+            .error-page-wrapper .buttons-container a {float:none !important;width:65%;margin:0 auto;font-size:13px;padding:9px 0;}
+            .error-page-wrapper .buttons-container a:nth-child(2) {margin-top:12px;}
+        }
+    </style>
+</head>
+<body class="error-page-wrapper">
+<div class="content-container">
+    <div class="head-line">
+        <img src="<?=$cdnurl?>/assets/img/error.svg" alt="" width="120"/>
+    </div>
+    <div class="subheader">
+        <?=$debug?$message:$lang['The page you are looking for is temporarily unavailable']?>
+    </div>
+    <div class="hr"></div>
+    <div class="context">
 
-                <p>
-                    <?=$lang['You can return to the previous page and try again']?>
-                </p>
+        <p>
+            <?=$lang['You can return to the previous page and try again']?>
+        </p>
 
-            </div>
-            <div class="buttons-container">
-                <a href="<?=$publicurl?>"><?=$lang['Home']?></a>
-                <a href="<?=$publicurl?>"><?=$lang['Feedback']?></a>
-            </div>
-        </div>
-    </body>
+    </div>
+    <div class="buttons-container">
+        <a href="<?=$publicurl?>"><?=$lang['Home']?></a>
+        <a href="<?=$publicurl?>"><?=$lang['Feedback']?></a>
+    </div>
+</div>
+</body>
 </html>

extend/fast/Date.php

@@ -62,6 +62,7 @@ class Date
      * @param   string  $output formatting string
      * @return  string   when only a single output is requested
      * @return  array    associative list of all outputs requested
+     * @from https://github.com/kohana/ohanzee-helpers/blob/master/src/Date.php
      */
     public static function span($remote, $local = NULL, $output = 'years,months,weeks,days,hours,minutes,seconds')
     {

extend/fast/Form.php

@@ -5,6 +5,7 @@ namespace fast;
 use ArrayAccess;
 
 /**
+ * 表单元素生成
  * @class Form
  * @package fast
  * @method mixed token() static token
@@ -45,6 +46,12 @@ class Form
 
 }
 
+/**
+ *
+ * 表单元素生成
+ * @from https://github.com/illuminate/html
+ * @package fast
+ */
 class FormBuilder
 {
 

public/api.html

@@ -33,7 +33,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="http://www.fastadmin.net" target="_blank">FastAdmin</a>
+                    <a class="navbar-brand" href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
                 </div>
                 <div class="navbar-collapse collapse">
                     <form class="navbar-form navbar-right">
@@ -3351,9 +3351,9 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2018-03-16 14:43:16                </div>
+                    Generated on 2018-04-01 15:11:14                </div>
                 <div class="col-md-6" align="right">
-                    <a href="http://www.fastadmin.net" target="_blank">FastAdmin</a>
+                    <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
                 </div>
             </div>
 
@@ -3476,27 +3476,31 @@
                     //instead of the initial attribute
                     var url = $(form).attr('action');
 
-                    var serializedData = new FormData();
+                    var formData = new FormData();
 
                     $(form).find('input').each(function (i, input) {
                         if ($(input).attr('type') == 'file') {
-                            serializedData.append($(input).attr('name'), $(input)[0].files[0]);
+                            formData.append($(input).attr('name'), $(input)[0].files[0]);
                         } else {
-                            serializedData.append($(input).attr('name'), $(input).val())
+                            formData.append($(input).attr('name'), $(input).val())
                         }
                     });
 
                     var index, key, value;
 
                     if (matchedParamsInRoute) {
+                        var params = {};
+                        formData.forEach(function(value, key){
+                            params[key] = value;
+                        });
                         for (index = 0; index < matchedParamsInRoute.length; ++index) {
                             try {
                                 key = matchedParamsInRoute[index];
-                                value = serializedData[key];
+                                value = params[key];
                                 if (typeof value == "undefined")
                                     value = "";
-                                url = url.replace("{" + key + "}", value);
-                                delete serializedData[key];
+                                url = url.replace("\{" + key + "\}", value);
+                                formData.delete(key);
                             } catch (err) {
                                 console.log(err);
                             }
@@ -3519,7 +3523,7 @@
 
                     $.ajax({
                         url: $('#apiUrl').val() + url,
-                        data: $(form).attr('method') == 'get' ? $(form).serialize() : serializedData,
+                        data: $(form).attr('method') == 'get' ? $(form).serialize() : formData,
                         type: $(form).attr('method') + '',
                         dataType: 'json',
                         contentType: false,