Merge branch 'master' into develop

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);

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>