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.6.0/js/scripts.js

-
-jQuery(document).ready(function() {
-
-    $('.page-container form').submit(function(){
-        var username = $(this).find('.username').val();
-        var password = $(this).find('.password').val();
-        if(username == '') {
-            $(this).find('.error').fadeOut('fast', function(){
-                $(this).css('top', '27px');
-            });
-            $(this).find('.error').fadeIn('fast', function(){
-                $(this).parent().find('.username').focus();
-            });
-            return false;
-        }
-        if(password == '') {
-            $(this).find('.error').fadeOut('fast', function(){
-                $(this).css('top', '96px');
-            });
-            $(this).find('.error').fadeIn('fast', function(){
-                $(this).parent().find('.password').focus();
-            });
-            return false;
-        }
-    });
-
-    $('.page-container form .username, .page-container form .password').keyup(function(){
-        $(this).parent().find('.error').fadeOut('fast');
-    });
-
-});

src/main/webapp/templets/1/default/css/about.css

+.ms-content-about{margin-top:20px;margin-bottom:40px}.ms-content-about a:link{color:#000;text-decoration:none}.ms-content-about a:visited{color:#000;text-decoration:none}.ms-content-about a:active{color:#000;text-decoration:none}.ms-content-about a:hover{color:#000;text-decoration:none}.ms-content-about .ms-content-main{width:1200px;overflow:hidden;margin:auto}.ms-content-about .ms-content-main .ms-content-left{width:230px;float:left;margin-right:20px}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-title{font-weight:bold;background-color:#009aff;color:#fff;height:40px;line-height:40px;width:190px;padding:0 20px}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul{background-color:#fff;margin-top:1px;width:230px}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul a:hover{color:#fff}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul a:hover li{background-color:#54bcfe}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul a{color:#999999}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul li{height:40px;line-height:40px;font-size:14px;cursor:pointer;padding:0 20px}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul li .ms-content-left-li-more{float:right}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul .ms-content-left-li-first{color:#fff}.ms-content-about .ms-content-main .ms-content-left .ms-content-left-ul .ms-content-left-li-first li{background-color:#54bcfe}.ms-content-about .ms-content-main .ms-content-right{overflow:hidden}.ms-content-about .ms-content-main .ms-content-right a:visited{color:#000000}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-position{font-size:14px}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-position a:hover{color:#0099ff}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-position span{padding:0 5px}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-main{width:952px;background-color:#ffffff;min-height:450px;padding-bottom:20px}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-main .ms-content-right-main-content{margin:0 20px}.ms-content-about .ms-content-main .ms-content-right .ms-content-right-main .ms-content-right-main-title{text-align:center;font-size:20px;padding-top:40px;padding-bottom:20px;border-bottom:1px solid #d0cfcf99 99;margin:20px}/*# sourceMappingURL=./about.css.map */
\ No newline at end of file

src/main/webapp/templets/1/default/css/advice.css

+.ms-content-advice{margin-top:20px;margin-bottom:40px}.ms-content-advice .ms-content-form-background{width:1200px;height:480px;background-color:#ffffff;margin:auto;display:flex}.ms-content-advice .ms-content-form-background .ms-content-form{width:330px;margin:auto}.ms-content-advice .ms-content-form-background .ms-content-form ::-webkit-input-placeholder{color:#999}.ms-content-advice .ms-content-form-background .ms-content-form input::-webkit-input-placeholder,.ms-content-advice .ms-content-form-background .ms-content-form textarea::-webkit-input-placeholder{font-family:Arial,Verdana,Sans-serif}.ms-content-advice .ms-content-form-background .ms-content-form .ms-content-form-name,.ms-content-advice .ms-content-form-background .ms-content-form .ms-content-form-phone,.ms-content-advice .ms-content-form-background .ms-content-form .ms-content-form-message{width:308px;height:12px;padding:10px;display:block;border:1px solid #eeeeee;border-radius:3px;color:#555555;margin-bottom:20px}.ms-content-advice .ms-content-form-background .ms-content-form .ms-content-form-message{height:142px}.ms-content-advice .ms-content-form-background .ms-content-form .ms-login-button{pointer-events:none;width:330px;height:34px;line-height:34px;font-size:14px;color:#ddd;text-align:center;background-color:#fafafa;cursor:pointer;border-radius:4px}/*# sourceMappingURL=./advice.css.map */
\ No newline at end of file

src/main/webapp/templets/1/default/css/base.css

+body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div,a{margin:0;padding:0;border:0;text-decoration:none !important}*{margin:0;padding:0}body{min-width:1200px;background-color:#fafafa}html,body,ul,li{margin:0;padding:0}a{text-decoration:none;color:#555}ul,li,ol{list-style:none}input:focus,textarea:focus{outline:none}.ms-banner{height:337px}.ms-banner img{width:100%;height:100%}.flexslider{margin:0 auto 20px;position:relative;width:100%;height:440px;overflow:hidden;zoom:1}.flexslider .slides li{width:100%;height:100%}.flexslider .slides a img{width:100%;height:337px;display:block}.flexslider .flex-direction-nav{width:100%;bottom:10px;text-align:center}.flexslider .flex-direction-nav a{width:70px;height:70px;line-height:99em;overflow:hidden;margin:-35px 0 0;display:block;background:url(../images/ad_ctr.png) no-repeat;position:absolute;top:50%;z-index:10;cursor:pointer;opacity:0;filter:alpha(opacity=0);-webkit-transition:all .3s ease;border-radius:35px}.flexslider .flex-direction-nav .flex-next{background-position:0 -70px;right:10px}.flexslider .flex-direction-nav .flex-prev{left:10px}.flexslider .flex-direction-nav li{margin:0 2px;display:inline-block;zoom:1;*display:inline}.flexslider:hover .flex-next{opacity:.8;filter:alpha(opacity=25)}.flexslider:hover .flex-prev{opacity:.8;filter:alpha(opacity=25)}.flexslider:hover .flex-next:hover,.flexslider:hover .flex-prev:hover{opacity:1;filter:alpha(opacity=50)}.ms-head{background-color:#2b3442}.ms-head a{color:#fff}.ms-head .head-menu-flex-center{display:flex;align-items:center}.ms-head .head-menu{width:1200px;height:60px;margin:auto;color:#ffffff;display:flex;justify-content:space-between}.ms-head .head-menu .head-menu-flex-center .head-menu-list{padding-left:30px;height:60px;line-height:60px;margin:0 !important}.ms-head .head-menu .head-menu-flex-center .head-menu-list .head-active{color:#ffb800;background-color:#2b3442}.ms-head .head-menu .head-menu-flex-center .head-menu-list .head-menu-list-li:hover{background-color:#202833;color:#ffb800}.ms-head .head-menu .head-menu-flex-center .head-menu-list .head-menu-list-li a:hover{background-color:#202833;color:#ffb800}.ms-head .head-menu .head-menu-flex-center .head-menu-list .head-menu-list-li{cursor:pointer;position:relative}.ms-head .head-menu .head-menu-flex-center .head-menu-list .head-menu-list-li .head-menu-son-list{background-color:#2b3442;position:absolute;width:100%;left:0;color:#fff;display:none;top:60px;z-index:9999999}.ms-head .head-menu .head-menu-flex-center .head-menu-list .head-menu-list-li .head-menu-son-list li{height:40px;line-height:40px;text-align:center}.ms-head .head-menu .head-menu-flex-center .head-menu-list .head-menu-list-li .head-menu-son-list li a:hover{color:#ffb800;background-color:#2b3442}.ms-head .head-menu img,.ms-head .head-menu .head-menu-list,.ms-head .head-menu div,.ms-head .head-menu .head-menu-list-li{float:left}.ms-head .head-menu img{width:60px;height:30px;padding-right:10px}.ms-head .head-menu li{padding:0 15px}.ms-head .head-menu .head-men-right .head-menu-right-content{min-width:100px}.ms-head .head-menu .head-men-right .head-menu-right-content span span{padding:0 5px;cursor:pointer}.ms-head .head-menu .head-men-right .head-menu-right-content span span a:hover{color:#ffb800}.ms-head .head-menu .head-men-right .head-menu-right-search{padding-right:12px;position:relative}.ms-head .head-menu .head-men-right .head-menu-right-search input:-webkit-autofill{-webkit-box-shadow:0 0 0 1000px #2b3442 inset !important;-webkit-text-fill-color:#fff !important}.ms-head .head-menu .head-men-right .head-menu-right-search .ms-search-click{background-image:url(../images/search.png);width:14px;height:14px;border:0;background-color:#2b3442;position:absolute;right:30px;top:8px;cursor:pointer}.ms-head .head-menu .head-men-right .head-menu-right-search .ms-search-input{height:28px;background-color:#2b3442;border:1px solid #fff;border-radius:15px;padding-left:30px;color:#fff;width:318px;font-size:14px}.ms-head .head-menu .head-men-right .head-menu-right-search input::-webkit-input-placeholder{color:#fff}.ms-head .head-menu .head-men-right .head-menu-right-search .iconfont{font-size:18px;cursor:pointer;position:absolute;right:28px}.ms-footer{height:140px;background-color:#2a3542}.ms-footer .ms-footer-content{padding:46px 0;width:1200px;margin:auto}.ms-footer .ms-footer-content .ms-footer-left{color:#999999;font-size:14px;float:left}.ms-footer .ms-footer-content .ms-footer-left .ms-footer-left-copyright{display:block;padding-top:20px;height:14px}.ms-footer .ms-footer-content .ms-footer-left .ms-footer-left-column{height:14px;cursor:pointer}.ms-footer .ms-footer-content .ms-footer-left .ms-footer-left-column a:link{color:#999;text-decoration:none}.ms-footer .ms-footer-content .ms-footer-left .ms-footer-left-column a:visited{color:#999;text-decoration:none}.ms-footer .ms-footer-content .ms-footer-left .ms-footer-left-column a:hover{color:#fff}.ms-footer .ms-footer-content .ms-footer-left .ms-footer-left-column .ms-footer-left-column-course,.ms-footer .ms-footer-content .ms-footer-left .ms-footer-left-column .ms-footer-left-column-contact{padding:0 10px}.ms-footer .ms-footer-content .ms-footer-left .ms-footer-left-column .ms-footer-left-column-about{padding-right:10px}.ms-footer .ms-footer-content .ms-footer-right{float:right}.ms-footer .ms-footer-content .ms-footer-right img{cursor:pointer}.ms-footer .ms-footer-content .ms-footer-right .ms-footer-right-baidu{padding:0 12px}.ms-footer .ms-footer-content .ms-footer-right .ms-footer-right-weixin{position:relative;display:none}.ms-footer .ms-footer-content .ms-footer-right .ms-footer-right-weixin img{top:-161px;left:-38px;width:103px;border:2px solid #ccc;position:absolute}.ms-footer .ms-footer-content .ms-footer-right .ms-footer-right-weixin p{font-size:0;line-height:0;display:block;width:0;height:0;left:8px;border-left:10px solid transparent;border-right:8px solid transparent;border-top:10px solid #fff;position:absolute;top:-58px;z-index:85}.ms-but-disabled2,.ms-but-disabled{opacity:.6 !important;cursor:no-drop !important}.ms-but-disabled:hover{background-color:#009aff !important}.ms-loading{text-align:center;height:700px;line-height:700px}.ms-loading img{width:60px}.topbar-info{display:flex;align-items:center;float:right;color:white;text-align:right}.topbar-info a{height:30px;line-height:30px}.topbar-info a .loginImg{width:30px !important;height:30px !important;vertical-align:super;border-radius:50%;padding:0;margin-right:12px;opacity:.9;cursor:pointer}.topbar-info a .loginImg:hover{opacity:1}.topbar-info a .userName{line-height:30px !important;margin-right:12px;color:#fff;cursor:pointer;font-weight:500}.topbar-info a .userName:hover{color:#ffb800}.topbar-info .quitLogin{color:#fff;height:30px;line-height:30px}.topbar-info .quitLogin:hover{color:#ffb800}.topbar-info .ms-userName{max-width:110px;white-space:nowrap;display:inline-block;overflow:hidden;text-overflow:ellipsis}/*# sourceMappingURL=./base.css.map */
\ No newline at end of file

src/main/webapp/templets/1/default/css/case-list.css

+.ms-content-case{background-color:#fff;overflow:hidden;padding-top:20px}.ms-content-case a:visited{color:#000000}.ms-content-case .ms-content-main{width:1200px;min-height:400px;margin:auto;overflow:hidden}.ms-content-case .ms-content-main .ms-content-main-case:nth-child(3n){margin-right:0}.ms-content-case .ms-content-main .ms-content-main-case{border:1px solid #f0f0f0;width:384px;height:332px;margin-right:20px;float:left;position:relative;overflow:hidden;color:#ffffff;margin-top:20px}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-img{width:387px;height:334px}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-img img{width:100%;height:100%}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-explain{display:none;width:100%;height:100%;background-color:#0099ff;opacity:.9;position:absolute;top:0;left:0}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-explain .ms-content-main-case-title{font-size:22px;text-align:center;margin:20px 0;padding:0 20px;height:22px;line-height:22px;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:1;-webkit-box-orient:vertical;display:-webkit-box}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-explain .ms-content-main-case-content{min-height:215px}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-explain .ms-content-main-case-content p{font-size:14px;padding:0 30px;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:4;-webkit-box-orient:vertical;display:-webkit-box}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-explain .ms-content-main-case-content p img{width:100px;text-align:center;margin:20px 0;height:100px}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-explain .ms-content-main-case-click{text-align:center}.ms-content-case .ms-content-main .ms-content-main-case .ms-content-main-case-explain .ms-content-main-case-click a{border:1px solid #ffffff;border-radius:17px;padding:5px 39px;color:#ffffff}.ms-content-case .ms-content-main .ms-content-main-case-left{margin-right:0}.ms-content-case #ms-case-page{margin-top:50px}.ms-content-case #ms-case-page a:hover{background-color:#eee}.ms-content-case .ms-content-main-page{text-align:center;margin-top:30px;margin-bottom:50px}.ms-content-case .ms-content-main-page a{color:#999;font-size:14px}.ms-content-case .ms-content-main-page .ms-content-main-page-first,.ms-content-case .ms-content-main-page .ms-content-main-page-last{border:1px solid #ddd;padding:10px 15px;margin-right:-5px}.ms-content-case .ms-content-main-page .ms-content-main-page-upper,.ms-content-case .ms-content-main-page .ms-content-main-page-next{border-top:1px solid #ddd;border-bottom:1px solid #ddd;padding:10px 15px;margin-right:-5px}.ms-content-case .ms-content-main-page .ms-content-main-page-upper{border-right:1px solid #ddd}.ms-content-case .ms-content-main-page .ms-content-main-page-first{border-top-left-radius:4px;border-bottom-left-radius:4px}.ms-content-case .ms-content-main-page .ms-content-main-page-last{border-top-right-radius:4px;border-bottom-right-radius:4px}/*# sourceMappingURL=./case-list.css.map */
\ No newline at end of file

src/main/webapp/templets/1/default/css/center.css

+.ms-content{font-family:arial,"Microsoft Yahei","Hiragino Sans GB",sans-serif;width:1200px;margin:auto}.ms-content .ms-content-main{margin:20px 0}.ms-content .ms-content-main .ms-content-left{width:230px;height:270px;background-color:#fff;text-align:center;margin-right:20px;float:left}.ms-content .ms-content-main .ms-content-left .ms-content-left-info img{width:100px;height:100px;border-radius:50%;margin:20px 0 10px 0}.ms-content .ms-content-main .ms-content-left .ms-content-left-info div{border-bottom:1px solid #f1f1f1;padding-bottom:10px;font-weight:bold;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color:#555555}.ms-content .ms-content-main .ms-content-left .ms-content-left-list .active{color:#0099ff}.ms-content .ms-content-main .ms-content-left .ms-content-left-list a:link{color:#999;text-decoration:none}.ms-content .ms-content-main .ms-content-left .ms-content-left-list a:hover{color:#0099ff}.ms-content .ms-content-main .ms-content-left .ms-content-left-list .ms-content-left-list-info{margin-top:20px;cursor:pointer;color:#999999}.ms-content .ms-content-main .ms-content-left .ms-content-left-list .ms-content-left-list-pass{margin:20px 0;color:#999999;cursor:pointer}.ms-content .ms-content-main .ms-content-right{background-color:#fff;width:950px;min-height:653px;overflow:hidden}.ms-content .ms-content-main .ms-content-right .ms-content-right-title{color:#555555;border-bottom:1px solid #eeeeee;padding:20px 0;margin:0 20px}.ms-content .ms-content-main .ms-content-right .ms-content-right-form input::-webkit-input-placeholder{color:#999}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-old-password,.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data{font-size:14px;color:#999999}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-old-password .span,.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .span{display:inline-block}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-old-password .ms-error-hide,.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-error-hide{opacity:0;color:#FF0000;transition:all .2s}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-old-password .ms-error-show,.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-error-show{opacity:1}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-old-password span,.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data span{min-width:70px;max-width:300px}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-old-password img,.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data img{vertical-align:middle}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-old-password input,.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data input{width:220px;height:20px;padding:5px 10px;border:1px solid #eeeeee;border-radius:4px;margin-top:20px;background-color:#fafafa}.ms-content .ms-content-main .ms-content-right .ms-content-right-form form{margin-left:67px}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-click{pointer-events:none;background-color:#fafafa;color:#ddd;width:120px;padding:6px 0;border-radius:4px;text-align:center;margin-left:141px;margin-top:20px;cursor:pointer;opacity:.9}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-click:hover{opacity:1}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-click-password{margin-left:141px}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-error-hide{opacity:0;color:#FF0000;transition:all .2s}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-error-show{opacity:1}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data input{background-color:#ffffff;height:20px;padding:5px 10px;margin-right:18px;transition:all .6s;color:#999}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data input:focus{color:#000;border-color:#0099ff}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-content-head-img{width:64px;height:64px;position:relative}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-content-head-img:hover #browse{display:block}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-content-head-img img{width:100%;height:100%;border-radius:50%;background:white}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-content-head-img .ms-content-head-upload{width:100%;height:100%;line-height:64px;position:absolute;top:0;left:0;font-size:12px;color:#fff;border-radius:50%;text-align:center}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data .ms-content-head-img .ms-content-head-upload span{margin:auto}.ms-content .ms-content-main .ms-content-right .ms-content-right-form .ms-content-data-head{text-align:left;display:flex;align-items:center;margin-top:20px;cursor:pointer}.ms-content-head-upload .display-img{width:64px;height:64px;display:block !important}.ms-content-head-upload span{display:none}.ms-content-head-upload:hover #browse{opacity:1}.ms-content-head-upload #browse{background:rgba(89,89,89,0.5);min-width:64px;width:64px;height:64px;transition:.3s;position:absolute;z-index:1;top:0;left:0;border-radius:50%;opacity:0}/*# sourceMappingURL=./center.css.map */
\ No newline at end of file