blackteay/ApiAdmin
1
0
Fork 0
mirror of https://gitee.com/apiadmin/ApiAdmin.git synced 2025-04-05 19:41:43 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into online

Browse Source
This commit is contained in:
zhaoxiang 2019-07-16 17:14:53 +08:00
commit 1917fc6206
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/command/Install.php
View File

@ -55,7 +55,7 @@ class Install extends Command {
if ($input->hasOption('db')) { if ($input->hasOption('db')) {
try { try {
$options = $options = $this->parseDsnConfig($input->getOption('db')); $options = $this->parseDsnConfig($input->getOption('db'));
Connection::instance($options)->getTables($options['database']); Connection::instance($options)->getTables($options['database']);
$confPath = Env::get('config_path'); $confPath = Env::get('config_path');

10
application/wiki/view/index/detail.html
View File

@ -81,14 +81,6 @@
<tr><th>参数名字</th><th>类型</th><th width="96">字段状态</th><th width="70">默认值</th><th width="30%">其他</th><th>说明</th></tr> <tr><th>参数名字</th><th>类型</th><th width="96">字段状态</th><th width="70">默认值</th><th width="30%">其他</th><th>说明</th></tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<td>version</td>
<td>String</td>
<td><span class="ui green label">必填</span></td>
<td>{:config('apiadmin.APP_VERSION')}</td>
<td></td>
<td>API版本号【请在Header头里面传递】</td>
</tr>
<tr> <tr>
<td>access-token</td> <td>access-token</td>
<td>String</td> <td>String</td>
@ -183,7 +175,7 @@
imgExpanded: "/static/jsonFormater/Expanded.gif" imgExpanded: "/static/jsonFormater/Expanded.gif"
}; };
window.jf = new JsonFormater(options); window.jf = new JsonFormater(options);
jf.doFormat({$detail["return_str"]}); jf.doFormat({:htmlspecialchars_decode($detail["return_str"])});
}(); }();
}); });
$('.ui .vertical').css('max-height', $('#detail').outerHeight(true)); $('.ui .vertical').css('max-height', $('#detail').outerHeight(true));