Merge branch '5.0.0' of https://gitee.com/mingSoft/MCMS into 5.0.0

 Conflicts:
	src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
	src/main/resources/application.yml

src/main/webapp/static/plugins/TextInputEffects/img/search.svg

+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="612px" height="612px" viewBox="0 0 612 612" xml:space="preserve">
+	<path fill="#fff" d="M5.817,606.299c7.729,7.614,20.277,7.614,28.007,0L192.448,450.2c44.267,35.333,100.622,56.586,162.067,56.586c142.211,0,257.487-113.439,257.487-253.393C612.003,113.439,496.727,0,354.516,0S97.028,113.439,97.009,253.393c0,65.424,25.424,124.879,66.802,169.834L5.8,578.714C-1.929,586.328-1.929,598.686,5.817,606.299z"/>
+</svg>

src/main/webapp/static/plugins/TextInputEffects/js/classie.js

+/*!
+ * classie - class helper functions
+ * from bonzo https://github.com/ded/bonzo
+ * 
+ * classie.has( elem, 'my-class' ) -> true/false
+ * classie.add( elem, 'my-new-class' )
+ * classie.remove( elem, 'my-unwanted-class' )
+ * classie.toggle( elem, 'my-class' )
+ */
+
+/*jshint browser: true, strict: true, undef: true */
+/*global define: false */
+
+( function( window ) {
+
+'use strict';
+
+// class helper functions from bonzo https://github.com/ded/bonzo
+
+function classReg( className ) {
+  return new RegExp("(^|\\s+)" + className + "(\\s+|$)");
+}
+
+// classList support for class management
+// altho to be fair, the api sucks because it won't accept multiple classes at once
+var hasClass, addClass, removeClass;
+
+if ( 'classList' in document.documentElement ) {
+  hasClass = function( elem, c ) {
+    return elem.classList.contains( c );
+  };
+  addClass = function( elem, c ) {
+    elem.classList.add( c );
+  };
+  removeClass = function( elem, c ) {
+    elem.classList.remove( c );
+  };
+}
+else {
+  hasClass = function( elem, c ) {
+    return classReg( c ).test( elem.className );
+  };
+  addClass = function( elem, c ) {
+    if ( !hasClass( elem, c ) ) {
+      elem.className = elem.className + ' ' + c;
+    }
+  };
+  removeClass = function( elem, c ) {
+    elem.className = elem.className.replace( classReg( c ), ' ' );
+  };
+}
+
+function toggleClass( elem, c ) {
+  var fn = hasClass( elem, c ) ? removeClass : addClass;
+  fn( elem, c );
+}
+
+var classie = {
+  // full names
+  hasClass: hasClass,
+  addClass: addClass,
+  removeClass: removeClass,
+  toggleClass: toggleClass,
+  // short names
+  has: hasClass,
+  add: addClass,
+  remove: removeClass,
+  toggle: toggleClass
+};
+
+// transport
+if ( typeof define === 'function' && define.amd ) {
+  // AMD
+  define( classie );
+} else {
+  // browser global
+  window.classie = classie;
+}
+
+})( window );

src/main/webapp/static/plugins/amazeui/2.7.2/css/admin.css

-/**
- * admin.css
- */
-
-
-/*
- fixed-layout 固定头部和边栏布局
-*/
-
-html,
-body {
-  height: 100%;
-  overflow: hidden;
-}
-
-ul {
-  margin-top: 0;
-}
-
-.admin-icon-yellow {
-  color: #ffbe40;
-}
-
-.admin-header {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 1500;
-  font-size: 1.4rem;
-  margin-bottom: 0;
-}
-
-.admin-header-list a:hover :after {
-  content: none;
-}
-
-.admin-main {
-  position: relative;
-  height: 100%;
-  padding-top: 51px;
-  background: #f3f3f3;
-}
-
-.admin-menu {
-  position: fixed;
-  z-index: 10;
-  bottom: 30px;
-  right: 20px;
-}
-
-.admin-sidebar {
-  width: 260px;
-  min-height: 100%;
-  float: left;
-  border-right: 1px solid #cecece;
-}
-
-.admin-sidebar.am-active {
-  z-index: 1600;
-}
-
-.admin-sidebar-list {
-  margin-bottom: 0;
-}
-
-.admin-sidebar-list li a {
-  color: #5c5c5c;
-  padding-left: 24px;
-}
-
-.admin-sidebar-list li:first-child {
-  border-top: none;
-}
-
-.admin-sidebar-sub {
-  margin-top: 0;
-  margin-bottom: 0;
-  box-shadow: 0 16px 8px -15px #e2e2e2 inset;
-  background: #ececec;
-  padding-left: 24px;
-}
-
-.admin-sidebar-sub li:first-child {
-  border-top: 1px solid #dedede;
-}
-
-.admin-sidebar-panel {
-  margin: 10px;
-}
-
-.admin-content {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  background: #fff;
-}
-
-.admin-content,
-.admin-sidebar {
-  height: 100%;
-  overflow-x: hidden;
-  overflow-y: scroll;
-  -webkit-overflow-scrolling: touch;
-}
-
-.admin-content-body {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1 0 auto;
-  -ms-flex: 1 0 auto;
-  flex: 1 0 auto;
-}
-
-.admin-content-footer {
-  font-size: 85%;
-  color: #777;
-}
-
-.admin-content-list {
-  border: 1px solid #e9ecf1;
-  margin-top: 0;
-}
-
-.admin-content-list li {
-  border: 1px solid #e9ecf1;
-  border-width: 0 1px;
-  margin-left: -1px;
-}
-
-.admin-content-list li:first-child {
-  border-left: none;
-}
-
-.admin-content-list li:last-child {
-  border-right: none;
-}
-
-.admin-content-table a {
-  color: #535353;
-}
-.admin-content-file {
-  margin-bottom: 0;
-  color: #666;
-}
-
-.admin-content-file p {
-  margin: 0 0 5px 0;
-  font-size: 1.4rem;
-}
-
-.admin-content-file li {
-  padding: 10px 0;
-}
-
-.admin-content-file li:first-child {
-  border-top: none;
-}
-
-.admin-content-file li:last-child {
-  border-bottom: none;
-}
-
-.admin-content-file li .am-progress {
-  margin-bottom: 4px;
-}
-
-.admin-content-file li .am-progress-bar {
-  line-height: 14px;
-}
-
-.admin-content-task {
-  margin-bottom: 0;
-}
-
-.admin-content-task li {
-  padding: 5px 0;
-  border-color: #eee;
-}
-
-.admin-content-task li:first-child {
-  border-top: none;
-}
-
-.admin-content-task li:last-child {
-  border-bottom: none;
-}
-
-.admin-task-meta {
-  font-size: 1.2rem;
-  color: #999;
-}
-
-.admin-task-bd {
-  font-size: 1.4rem;
-  margin-bottom: 5px;
-}
-
-.admin-content-comment {
-  margin-bottom: 0;
-}
-
-.admin-content-comment .am-comment-bd {
-  font-size: 1.4rem;
-}
-
-.admin-content-pagination {
-  margin-bottom: 0;
-}
-.admin-content-pagination li a {
-  padding: 4px 8px;
-}
-
-@media only screen and (min-width: 641px) {
-  .admin-sidebar {
-    display: block;
-    position: static;
-    background: none;
-  }
-
-  .admin-offcanvas-bar {
-    position: static;
-    width: auto;
-    background: none;
-    -webkit-transform: translate3d(0, 0, 0);
-    -ms-transform: translate3d(0, 0, 0);
-    transform: translate3d(0, 0, 0);
-    overflow-y: visible;
-    min-height: 100%;
-  }
-  .admin-offcanvas-bar:after {
-    content: none;
-  }
-}
-
-@media only screen and (max-width: 640px) {
-  .admin-sidebar {
-    width: inherit;
-  }
-
-  .admin-offcanvas-bar {
-    background: #f3f3f3;
-  }
-
-  .admin-offcanvas-bar:after {
-    background: #BABABA;
-  }
-
-  .admin-sidebar-list a:hover, .admin-sidebar-list a:active{
-    -webkit-transition: background-color .3s ease;
-    -moz-transition: background-color .3s ease;
-    -ms-transition: background-color .3s ease;
-    -o-transition: background-color .3s ease;
-    transition: background-color .3s ease;
-    background: #E4E4E4;
-  }
-
-  .admin-content-list li {
-    padding: 10px;
-    border-width: 1px 0;
-    margin-top: -1px;
-  }
-
-  .admin-content-list li:first-child {
-    border-top: none;
-  }
-
-  .admin-content-list li:last-child {
-    border-bottom: none;
-  }
-
-  .admin-form-text {
-    text-align: left !important;
-  }
-
-}
-
-/*
-* user.html css
-*/
-.user-info {
-  margin-bottom: 15px;
-}
-
-.user-info .am-progress {
-  margin-bottom: 4px;
-}
-
-.user-info p {
-  margin: 5px;
-}
-
-.user-info-order {
-  font-size: 1.4rem;
-}
-
-/*
-* errorLog.html css
-*/
-
-.error-log .am-pre-scrollable {
-  max-height: 40rem;
-}
-
-/*
-* table.html css
-*/
-
-.table-main {
-  font-size: 1.4rem;
-  padding: .5rem;
-}
-
-.table-main button {
-  background: #fff;
-}
-
-.table-check {
-  width: 30px;
-}
-
-.table-id {
-  width: 50px;
-}
-
-@media only screen and (max-width: 640px) {
-  .table-select {
-    margin-top: 10px;
-    margin-left: 5px;
-  }
-}
-
-/*
-gallery.html css
-*/
-
-.gallery-list li {
-  padding: 10px;
-}
-
-.gallery-list a {
-  color: #666;
-}
-
-.gallery-list a:hover {
-  color: #3bb4f2;
-}
-
-.gallery-title {
-  margin-top: 6px;
-  font-size: 1.4rem;
-}
-
-.gallery-desc {
-  font-size: 1.2rem;
-  margin-top: 4px;
-}
-
-/*
- 404.html css
-*/
-
-.page-404 {
-  background: #fff;
-  border: none;
-  width: 200px;
-  margin: 0 auto;
-}

src/main/webapp/static/plugins/amazeui/2.7.2/css/app.css

-/* Write your styles */
\ No newline at end of file