Skip to content
This repository was archived by the owner on Apr 26, 2020. It is now read-only.

Commit 882f79b

Browse files
committed
Merge branch 'master' of github.com:kaopur/yii2-doc-online
2 parents 70f7544 + e84a0b6 commit 882f79b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/ApiDesc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function render() {
7676
$pos = stripos($comment, '@param');
7777
if ($pos !== FALSE) {
7878
$paramArr = explode(' ', trim(substr($comment, $pos + 7)), 3);
79-
$rules[$paramArr[0]] = $paramArr;
79+
$rules[] = $paramArr;
8080
continue;
8181
}
8282

tpl/api_desc_tpl.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757

5858
foreach ($rules as $key => $rule) {
5959
$name = isset($rule['1'])?ltrim($rule['1'], '$'):'';
60-
if (!isset($rule['type'])) {
60+
if (!isset($rule['0'])) {
6161
$rule['type'] = 'string';
6262
}
6363
$type = isset($typeMaps[$rule[0]]) ? $typeMaps[$rule[0]] : $rule[0];
6464
$content_require_desc_String = isset($rule[2])?trim($rule[2], '|'):'';
6565
$content_require_desc_Arr = explode('|', $content_require_desc_String);
6666
$content = isset($content_require_desc_Arr[0])?$content_require_desc_Arr[0]:'';
6767
$require = isset($content_require_desc_Arr[1]) && $content_require_desc_Arr[1]=='yes'?'<font color="red">必须</font>':'可选';
68-
$desc = isset($content_require_desc_Arr[2])?$content_require_desc_Arr[2]:'';
68+
$desc = isset($content_require_desc_Arr[2])?htmlentities($content_require_desc_Arr[2]):'';
6969

7070
echo "<tr><td>$name</td><td>$type</td><td>$require</td><td>$content</td><td>$desc</td></tr>\n";
7171
}
@@ -189,6 +189,7 @@
189189
/**
190190
* 底部
191191
*/
192+
$_csrf = \Yii::$app->request->getCsrfToken();
192193
echo <<<EOT
193194
<div class="ui blue message">
194195
<strong>温馨提示:</strong> 此接口参数列表根据后台代码自动生成,可将 ?r= 改成您需要查询的接口/服务
@@ -204,6 +205,9 @@ function getData() {
204205
data[e.name] = e.value;
205206
}
206207
});
208+
if ($("select").val() == 'POST') {
209+
data['_csrf'] = "$_csrf";
210+
}
207211
return data;
208212
}
209213

0 commit comments

Comments
 (0)