Merge branch 'develop' of http://47.118.43.255:3000/jjhc/train into develop

public/themes/simpleboot3/public/nav.html

@@ -1,7 +1,7 @@
 <div class="header">
 
     <div class="ma clearfix  hidden-sm hidden-xs">
-        <div class="fl logo"><a href="/"><img src="__TMPL__/public/assets/images/train/logo.png"></a>
+        <div class="fl logo"><a href="/"><img src="__TMPL__/public/assets/images/train/logo.png?v=1"></a>
         </div>
         <div class="fr menu">
             <ul>

vendor/thinkcmf/cmf/src/lib/Upload.php

@@ -259,7 +259,7 @@ class Upload
 
         //  $url=$first['url'];
         $storageSetting = cmf_get_cmf_settings('storage');
-        $qiniuSetting   = $storageSetting['Qiniu']['setting'];
+        $qiniuSetting   = empty($storageSetting['Qiniu']['setting']) ? [] : $storageSetting['Qiniu']['setting'];
         //$url=preg_replace('/^https/', $qiniu_setting['protocol'], $url);
         //$url=preg_replace('/^http/', $qiniu_setting['protocol'], $url);