Merge branch 'master' into 3.1

Author: moshowgame

generator-web/src/main/resources/templates/header.html

@@ -3,6 +3,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <title>${(value.title)!!}</title>
 <meta name="keywords" content="${(value.keywords)!!}">
+
 <script>
     /*统计代码，便于统计流量，请勿移除，谢谢！*/
     var _hmt = _hmt || [];
@@ -18,4 +19,5 @@
     <#include "/header-local.html">
 <#else>
     <#include "/header-CDN.html">
-</#if>
+</#if>
+