From e6cd084499d25764e26ad160af2aac534331bb60 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 2 Jan 2019 02:24:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E7=89=88=E6=9C=AC=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9C=80=E4=BD=8E5.6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/install/controller/Index.php   | 2 +-
 application/install/view/index/create.html | 5 +++++
 public/install/install.lock-s              | 0
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 public/install/install.lock-s

diff --git a/application/install/controller/Index.php b/application/install/controller/Index.php
index de4f627e4..1aefb79a6 100644
--- a/application/install/controller/Index.php
+++ b/application/install/controller/Index.php
@@ -357,7 +357,7 @@ php;
             new \base\Behavior(['msg'=>'查询数据库版本失败']);
             return DataReturn('查询数据库版本失败', -1);
         } else {
-            if($data[0]['version'] < 5.0)
+            if($data[0]['version'] < 5.6)
             {
                 new \base\Behavior(['msg'=>'数据库版本过低', 'mysql_version'=>$data[0]['version']]);
                 return DataReturn('数据库版本过低', -1);
diff --git a/application/install/view/index/create.html b/application/install/view/index/create.html
index a35cb63b1..43b43e068 100644
--- a/application/install/view/index/create.html
+++ b/application/install/view/index/create.html
@@ -6,6 +6,11 @@
 <!-- conntent start  -->
 <div class="am-g inside create">
     <h2>数据库信息</h2>
+    <div class="am-alert am-alert-warning am-radius" data-am-alert>
+        <button type="button" class="am-close">&times;</button>
+        <p class="fs-12">MySQL需 5.6 及以上版本</p>
+        <p class="fs-12">编码格式为 utf8mb4 / utf8mb4_general_ci</p>
+    </div>
     <form class="am-form am-form-horizontal form-validation" method="post" action="{{:MyUrl('install/index/add')}}" request-type="ajax-url" request-value="{{:MyUrl('install/index/successful')}}" timeout="60000">
         <div class="am-form-group">
             <label class="am-u-sm-2 am-form-label">数据库类型</label>
diff --git a/public/install/install.lock-s b/public/install/install.lock-s
new file mode 100644
index 000000000..e69de29bb

From 6c7a0dabf7bdb30d19bea661bf38a91479ff10dc Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Wed, 2 Jan 2019 02:24:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E7=89=88=E6=9C=AC=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9C=80=E4=BD=8E5.6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/install/install.lock-s | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 public/install/install.lock-s

diff --git a/public/install/install.lock-s b/public/install/install.lock-s
deleted file mode 100644
index e69de29bb..000000000