Merge remote-tracking branch 'origin/4.7.2'

Conflicts:
	pom.xml
	src/main/java/net/mingsoft/config/WebConfig.java

src/main/webapp/static/skin/manager/4.5.7/js/ms.manager.min.js

-ms.manager={initMenu:function(e){$("#ms-menu-parent-tmpl").tmpl(e).appendTo(".ms-menu"),$(".ms-menu-parent").each(function(s){var n=new Array;for(i=0;i<e.length;i++)e[i].modelModelId==$(this).data("model-id")&&n.push(e[i]);$("#ms-menu-child-tmpl").tmpl(n).appendTo($(this).find("ul:first"))}),$('[data-toggle="tooltip"]').tooltip(),$("body").delegate(".ms-menu-parent > div","click",function(){$(this).siblings(".ms-menu-child").hasClass("openMenuChild")?($(this).removeClass("nav-title"),$(this).addClass("ms-menu-parent-header"),$(this).siblings(".ms-menu-child").slideUp(),$(this).siblings(".ms-menu-child").removeClass("openMenuChild")):($(".ms-menu-parent").children("div").removeClass("nav-title"),$(".ms-menu-parent").children("div").addClass("ms-menu-parent-header"),$(".ms-menu-child").slideUp(),$(".ms-menu-child").removeClass("openMenuChild"),$(this).addClass("nav-title"),$(this).removeClass("ms-menu-parent-header"),$(this).siblings(".ms-menu-child").slideDown(),$(this).siblings(".ms-menu-child").addClass("openMenuChild"),$(this).siblings(".ms-menu-child > li").click(function(){$(this).siblings(".ms-menu-child").show(),$(".ms-menu-parent").siblings(".ms-menu-child > li >a").css("color","#e4e4e4"),$(this).siblings(".ms-menu-child > li > a").css("color","#1CAF9A")}))})}},$(function(){$("body").delegate(".ms-menu-parent","mouseover",function(){$(this).children("div").addClass("nav-title"),$(this).children("div").removeClass("ms-menu-parent-header")}),$("body").delegate(".ms-menu-parent","mouseout",function(){$(this).children(".ms-menu-child").hasClass("openMenuChild")?($(this).children("div").addClass("nav-title"),$(this).children("div").removeClass("ms-menu-parent-header")):($(this).children("div").removeClass("nav-title"),$(this).children("div").addClass("ms-menu-parent-header"))}),$('[data-toggle="tooltip"]').tooltip()});
\ No newline at end of file

src/main/webapp/static/skin/manager/4.6.0/css/login.css

-body {
-  padding-top: 40px;
-  padding-bottom: 40px;
-  background-color: #eee;
-}
-
-.form-signin {
-  max-width: 330px;
-  padding: 15px;
-  margin: 0 auto;
-}
-.form-signin .form-signin-heading,
-.form-signin .checkbox {
-  margin-bottom: 10px;
-}
-.form-signin .checkbox {
-  font-weight: normal;
-}
-.form-signin .form-control {
-  position: relative;
-  height: auto;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  padding: 10px;
-  font-size: 16px;
-}
-.form-signin .form-control:focus {
-  z-index: 2;
-}
-.form-signin input[type="email"] {
-  margin-bottom: -1px;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.form-signin input[type="password"] {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.form-signin input[name="verify"] {
-  margin-bottom:10px;
-  width:60%;
-  float:left;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-.form-signin .checkimage {
-width: 70px;
-height:33px;
-float: left;
-margin: 5px 25px;
-}

src/main/webapp/static/skin/manager/4.6.0/css/ms.mstore.min.css

-.ms-upgrader-number,.topDiv{display:none}.ms-text2-hide,.ms-text3-hide,.ms-text8-hide{-webkit-box-orient:vertical}.ms-text-hide,.ms-text2-hide,.ms-text3-hide,.ms-text8-hide{text-overflow:ellipsis}.email-login,.weixin-login{position:absolute;top:15%;left:32%}html{height:100%}::-webkit-scrollbar{width:7px;height:7px}::-webkit-scrollbar-thumb{background-color:rgba(50,50,50,.3)}::-webkit-scrollbar-thumb:hover{background-color:rgba(50,50,50,.6)}::-webkit-scrollbar-track{background-color:rgba(50,50,50,.1)}::-webkit-scrollbar-track:hover{background-color:rgba(50,50,50,.2)}.topDiv{height:125px;width:100%}.ms-text-hide{word-break:keep-all;white-space:nowrap;overflow:hidden}.ms-text2-hide{display:-webkit-box;-webkit-line-clamp:2}.ms-text3-hide{display:-webkit-box;-webkit-line-clamp:3}.ms-text8-hide{display:-webkit-box;-webkit-line-clamp:8}.email-login{width:472px;border:1px solid #eaeaea;padding-top:20px;background:#fff;box-shadow:0 0 15px -5px #888}.email-login form{width:300px;margin:0 auto}.email-login .title{font-size:20px;text-align:center;margin-bottom:15px}.email-login .email-login-tit{margin-right:-15px;margin-left:-15px}.fixed-filter,.fixed-top{background:#fff;position:fixed}#login_container{margin:0 auto;width:472px;background:url(http://static.ming-soft.net/images/scorback.jpg)no-repeat #fcfcfc;text-align:center;padding-top:51px}.small-font{font-size:12px}.padding-clear{padding:0}.pageNav{text-align:right;margin-bottom:30px;padding-right:8px;overflow:hidden}.fixed-top{top:-10px;z-index:1000;left:0;margin-left:-15px;padding-left:15px}.fixed-filter{top:42px;z-index:1000;width:100%;left:0;box-shadow:0 5px 10px #d3d3d3}.mstore-content{overflow:auto;padding:15px;min-width:1100px}.mstore-content .free-font{color:#1E8BDD;font-weight:700}.mstore-content .price-font{color:#FB803C;font-weight:700}.mstore-content .glyphicon-star,.mstore-content .glyphicon-star-empty{color:#fb803c}.mstore-content .glyphicon-heart{color:#d9534f}.mstore-content .carousel{height:240px}.mstore-content .item img{margin:0 auto;max-width:100%}.mstore-content .group-button-active{background-color:#e6e6e6}.mstore-content .mswidth{width:100%}.mstore-content .content-new{margin-top:15px;border:1px solid #ddd;overflow:hidden;border-bottom:0}.mstore-content .content-new .new-upload{width:78%;float:left}.mstore-content .content-new .new-upload .table-title{padding:10px;height:40px;border-bottom:1px solid #ddd;border-right:1px #ddd solid;clear:both;font-weight:700;font-size:18px}.mstore-content .content-new .new-upload ul li{height:260px;border-radius:0;margin:0;border-left:none;border-top:none;float:left;cursor:pointer}.mstore-content .content-new .new-upload ul li .pic{display:block;height:74%;overflow:hidden;margin-bottom:5px}.mstore-content .content-new .new-upload ul li .share-info{min-width:220px;width:80%;float:left}.mstore-content .content-new .new-upload ul li .share-info .share-title{margin:5px 0}.mstore-content .content-new .new-upload ul li .share-user{width:40px;float:right;height:62px;overflow:hidden}.mstore-content .content-new .new-upload ul li .share-user img{width:100%}.mstore-content .content-new .new-upload ul li .share-user p{font-size:12px;line-height:25px}.mstore-content .content-new .order-user-list{width:22%;float:left;overflow:hidden;height:520px}.mstore-content .content-new .order-user-list .list-title{border-bottom:1px solid #ddd;margin:10px;padding-bottom:10px;font-weight:700}.mstore-content .order-user{width:33%;max-width:90px;float:left;height:95px;overflow:hidden;line-height:38px}.mstore-content .order-user p{font-size:12px}.mstore-content .content-people{border:1px solid #ddd;overflow:hidden;border-top:0}.mstore-content .content-people .solve-user-list{width:78%;float:left}.mstore-content .content-people .solve-user-list .table-title{padding:10px;height:40px;border-bottom:1px solid #ddd;border-right:1px #ddd solid;clear:both;font-weight:700;font-size:18px}.mstore-content .content-people .solve-user-list .solve-user-detail{border-radius:0;margin:0;border-left:none;height:295px;border-top:none;border-bottom:none}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-user-head{width:50px;float:left;padding-right:5px}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-user-info{float:left}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-user-info .solve-heart{margin-top:5px}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-descrip{height:60%;overflow:hidden;width:100%;padding:5px;line-height:23px}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-bottom{position:absolute;bottom:10px;right:10px}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-bottom .solve-btn{padding:0 10px}.mstore-content .content-people .download-top{width:22%;float:left}.mstore-content .content-people .download-top .list-title{border-bottom:1px solid #ddd;margin:10px;padding-bottom:10px;font-weight:700}.mstore-content .content-people .download-top .download-info{width:100%;margin-bottom:9px;float:left}.mstore-content .content-people .download-top .download-info .download-head{width:40px;float:left;margin:0 10px}.mstore-content .content-people .download-top .download-info strong{cursor:pointer}.mstore-content .model-all{margin:10px 0}.mstore-content .model-filter{margin-bottom:10px;padding:10px 15px}.mstore-content .nav-pills li{cursor:pointer}.mstore-content .nav-pills li a{padding:1px 20px}.mstore-content .share-detail{padding:0 5px}.mstore-content .share-detail .thumbnail{height:260px;cursor:pointer;margin-bottom:10px}.mstore-content .share-detail .pic{display:block;height:74%;overflow:hidden;margin-bottom:5px}.mstore-content .share-detail .pic .tit{position:absolute;padding:5px;top:5px;right:10px;text-align:center;color:#fff;background:#868686}.mstore-content .share-detail .pic .describe{color:#666;line-height:25px;margin-top:4px;font-size:12px;text-decoration:none}.mstore-content .share-detail .pic .describe:hover,.mstore-content .share-detail .pic:hover{text-decoration:none}.mstore-content .share-detail .share-info{width:70%;float:left}.mstore-content .share-detail .share-info .share-title{margin:5px 0}.mstore-content .share-detail .share-user{width:40px;float:right;height:62px;overflow:hidden}.mstore-content .share-detail .share-user img{width:100%}.mstore-content .share-detail .share-user p{font-size:12px;line-height:25px}.mstore-content .share-detail-user{margin-bottom:10px;overflow:hidden}.mstore-content .share-detail-user img{width:50px;height:50px;margin-right:10px}.mstore-content .read-more{margin-left:20px;color:#fff}.mstore-content .comment-info{border-bottom:1px dotted #ddd;padding-bottom:15px}.mstore-content .comment-info .comment-name{color:#337ab7;font-size:14px;font-weight:700}.mstore-content #detail-comment{max-height:500px;overflow-y:auto}
\ No newline at end of file

src/main/webapp/static/skin/manager/4.6.0/css/reset.css

-
-/* ------- This is the CSS Reset ------- */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, 
-abbr, acronym, address, big, cite, code, del,
-dfn, em, img, ins, kbd, q, s, samp, small,
-strike, strong, sub, sup, tt, var, u, i, center,
-dl, dt, dd, ol, ul, li, fieldset, form, label,
-legend, table, caption, tbody, tfoot, thead, tr,
-th, td, article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup, menu,
-nav, output, ruby, section, summary, time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
-}
-
-/* ------- HTML5 display-role reset for older browsers ------- */
-
-article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after, q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-

src/main/webapp/static/skin/manager/4.6.0/css/supersized.css

-/*
-
-	Supersized - Fullscreen Slideshow jQuery Plugin
-	Version : 3.2.7
-	Site	: www.buildinternet.com/project/supersized
-	
-	Author	: Sam Dunn
-	Company : One Mighty Roar (www.onemightyroar.com)
-	License : MIT License / GPL License
-	
-*/
-
-* { margin:0; padding:0; }
-body { background:#111; height:100%; }
-	img { border:none; }
-	
-	#supersized-loader { position:absolute; top:50%; left:50%; z-index:0; width:60px; height:60px; margin:-30px 0 0 -30px; text-indent:-999em; background:url(../images/progress.gif) no-repeat center center;}
-	
-	#supersized {  display:block; position:fixed; left:0; top:0; overflow:hidden; z-index:-999; height:100%; width:100%; }
-		#supersized img { width:auto; height:auto; position:relative; display:none; outline:none; border:none; }
-			#supersized.speed img { -ms-interpolation-mode:nearest-neighbor; image-rendering: -moz-crisp-edges; }	/*Speed*/
-			#supersized.quality img { -ms-interpolation-mode:bicubic; image-rendering: optimizeQuality; }			/*Quality*/
-		
-		#supersized li { display:block; list-style:none; z-index:-30; position:fixed; overflow:hidden; top:0; left:0; width:100%; height:100%; background:#111; }
-		#supersized a { width:100%; height:100%; display:block; }
-			#supersized li.prevslide { z-index:-20; }
-			#supersized li.activeslide { z-index:-10; }
-			#supersized li.image-loading { background:#111 url(../images/progress.gif) no-repeat center center; width:100%; height:100%; }
-				#supersized li.image-loading img{ visibility:hidden; }
-			#supersized li.prevslide img, #supersized li.activeslide img{ display:inline; }
-
-
-#supersized img { max-width: none !important }
-

src/main/webapp/static/skin/manager/4.6.0/js/ms.manager.min.js

-function showMstore(){$(".ms-top-mstore").find(".animated").addClass("rubberBand")}function hiddenMstore(){$(".ms-top-mstore").find(".animated").removeClass("rubberBand")}$(document).bind("click",function(e){var t=$(e.target);0==t.closest(".menu-default").length&&manager.topMenu.initTop()}),$(window).resize(function(){$(".categoryTree").height($(document).height()),$("#listFrame").height($(document).height()),$(".easyui-tabs").tabs("resize",{width:$(".easyui-tabs").parent().width(),fit:!0,scrollDuration:1e3})}),$(function(){$(".slideMenu").click(function(){var e=$(this);"block"==$(".ms-menu").css("display")?(e.children(".icon-open").show(),e.children(".icon-close").hide(),$(".ms-menu,.ms-menu-div").hide(),$(".easyui-tabs").tabs("resize",{width:$(".easyui-tabs").parent().width()})):(e.children(".icon-open").hide(),e.children(".icon-close").show(),$(".ms-menu,.ms-menu-div").show(),$(".easyui-tabs").tabs("resize",{width:$(".easyui-tabs").parent().width(),fit:!0,scrollDuration:1e3}))}),$(".ms-menu").delegate(".ms-menu-child a","click",function(){$(".easyui-tabs").show(),$(".wellcome").hide(),$(".ms-menu-child a").removeClass("active"),$(this).addClass("active");var e=$(this).data("title"),t=$(this).data("url");$(".easyui-tabs").tabs("exists",e)?$(".easyui-tabs").tabs("select",e):$(".easyui-tabs").tabs("add",{title:e,content:"<iframe src="+t+' frameborder="0" height="100%" width="100%" id="mainFrame" name="mainFrame"></iframe>',closable:!0})}),"block"==$(".easyui-tabs").css("display")&&$(".easyui-tabs").tabs({onSelect:function(e){var t=$(".easyui-tabs").tabs("getSelected"),i=t.panel("options").tab;$(".ms-menu").find("li").each(function(){var e=$(this);e.text()==i.text()&&($(".ms-menu-child a").removeClass("active"),e.parent().parent().slideDown(),e.parent().slideDown(),e.find("a").addClass("active"),$(".ms-menu-list").find("li").removeClass("active").each(function(){e.parent().parent().data("model-id")==$(this).data("model-id")&&$(this).addClass("active")}))})}}),$(".easyui-tabs").tabs({onClose:function(){0==$(".easyui-tabs").tabs("tabs").length&&($(".wellcome").show(),$(".easyui-tabs").hide(),$(".ms-menu-child a").removeClass("active"),$(".ms-menu-list").find("li").removeClass("active"))}})}),window.setInterval(showMstore,1e3),window.setInterval(hiddenMstore,1500);var manager={topMenu:{initEvent:function(){$("*[data-ms-*]").each()},initMenu:function(e){$("#ms-menu-list-tmpl").tmpl(e).appendTo(".ms-menu-list"),$(".ms-menu-list").children().length>5&&$(".openMenu").show(),$("#ms-menu-tmpl").tmpl(e).appendTo(".ms-menu"),$(".ms-menu-parent").each(function(t){var s=new Array;for(i=0;i<e.length;i++)e[i].modelModelId==$(this).data("model-id")&&s.push(e[i]);$("#ms-menu-child-tmpl").tmpl(s).appendTo($(this).find("ul:first"))})},topMenuOpen:function(e,t){var i=$(".ms-menu-list").height();e.parent().hasClass(t)?this.initTop():(e.parent().addClass(t),$("."+t).height(i))},initTop:function(){$(".menu-default").height("50px"),$(".menu-default").removeClass("menu-show")},showChildMenu:function(e,t){({modelTitle:e.text(),modelIcon:e.data("model-icon"),modelId:e.data("model-id")}),new Array;$(".ms-menu-list").find("li").removeClass("active"),e.addClass("active"),"none"==$(".ms-menu").css("display")&&($(".slideMenu").children(".icon-open").hide(),$(".slideMenu").children(".icon-close").show(),$(".ms-menu,.ms-menu-div").show(),$(".easyui-tabs").tabs("resize",{width:$(".easyui-tabs").parent().width(),fit:!0,scrollDuration:1e3})),$(".ms-menu-parent").each(function(){if(e.data("model-id")==$(this).data("model-id")){$(this).show(),$(".ms-menu-none").hide(),$(".ms-menu-parent").find("ul").slideUp(),$(this).find("ul").slideDown(),$(".easyui-tabs").show(),$(".wellcome").hide();var t=$(this).find("ul li:eq(0) a").data("title"),i=$(this).find("ul li:eq(0) a").data("url");$(".easyui-tabs").tabs("exists",t)?$(".easyui-tabs").tabs("select",t):$(".easyui-tabs").tabs("add",{title:t,content:"<iframe src="+i+' frameborder="0" height="100%" width="100%" id="mainFrame" name="mainFrame"></iframe>',closable:!0})}}),this.initTop()}},leftMenu:{leftMenuOpen:function(e,t){t.slideToggle()}}};$(function(){$(".openMenu").click(function(){manager.topMenu.topMenuOpen($(this),"menu-show")}),$(".ms-menu").delegate(".ms-menu-parent-title","click",function(){var e=$(this).parent().siblings(".ms-menu-child");manager.leftMenu.leftMenuOpen($(this),e)}),$(".ms-menu").delegate(".ms-menu-parent","mouseover",function(){$(".closeMenu").hide(),$(this).find(".closeMenu").show()}),$(document).bind("mouseover",function(e){var t=$(e.target);0==t.closest(".ms-menu-parent").length&&$(".closeMenu").hide()}),$(".ms-menu").delegate(".closeMenu","click",function(){$(this).parent().parent().hide();var e=$(this).parent().siblings(".ms-menu-child");manager.leftMenu.leftMenuOpen($(this),e);var t=0;$(".ms-menu-parent").each(function(){var e=$(this);$(".ms-menu-list li").each(function(){e.data("model-id")==$(this).data("model-id")&&$(this).removeClass("active")}),"none"==$(this).css("display")&&(t++,t==$(".ms-menu-parent").length&&($(".ms-menu-list li").removeClass("active"),$(".ms-menu-none").show()))})})});
\ No newline at end of file