From 0e7f5ac3ec855e2baa120423193d0bbf20a676e1 Mon Sep 17 00:00:00 2001
From: Zhao <756958008@qq.com>
Date: Sun, 14 Jul 2019 11:05:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Install.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/command/Install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/command/Install.php b/application/command/Install.php
index 7b6caf6..0b78a35 100644
--- a/application/command/Install.php
+++ b/application/command/Install.php
@@ -55,7 +55,7 @@ class Install extends Command {
 
         if ($input->hasOption('db')) {
             try {
-                $options = $options = $this->parseDsnConfig($input->getOption('db'));
+                $options = $this->parseDsnConfig($input->getOption('db'));
                 Connection::instance($options)->getTables($options['database']);
                 $confPath = Env::get('config_path');
 

From b9b87a2ca0028c732f04b2f7810a20d4f0e3514d Mon Sep 17 00:00:00 2001
From: zhaoxiang <zhaoxiang051405@gmail.com>
Date: Tue, 16 Jul 2019 17:14:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?modified=20=E5=AE=8C=E5=96=84=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wiki/view/index/detail.html | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/application/wiki/view/index/detail.html b/application/wiki/view/index/detail.html
index 83483f2..bda647c 100644
--- a/application/wiki/view/index/detail.html
+++ b/application/wiki/view/index/detail.html
@@ -81,14 +81,6 @@
                         <tr><th>参数名字</th><th>类型</th><th width="96">字段状态</th><th width="70">默认值</th><th width="30%">其他</th><th>说明</th></tr>
                         </thead>
                         <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>
                             <td>access-token</td>
                             <td>String</td>
@@ -183,7 +175,7 @@
                 imgExpanded: "/static/jsonFormater/Expanded.gif"
             };
             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));