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

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
ff9987b9 · sgjj · 3daa94b1 · 18c092cd · 3daa94b1 · 3daa94b1
Commit ff9987b9 authored Jan 04, 2020 by sgjj
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/beep3.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/beep3.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling1.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling1.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling1.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling1.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling2.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling2.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling2.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling2.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling3.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling3.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling3.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling3.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling4.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling4.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling4.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling4.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling5.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling5.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling5.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/bling5.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/blop.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/blop.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/blop.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/blop.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop1.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop1.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop1.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop1.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop2.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop2.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop2.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop2.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop3.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop3.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop3.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop3.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/jBox.css
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/jBox.css