Merge remote-tracking branch 'origin/develop' into develop

Author: netbuffer

src/main/resources/logback.xml

@@ -7,10 +7,9 @@
 	<property name="logbase" value="${catalina.base}/logs/ssmbootstrap_table/" />
 	<jmxConfigurator />
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder charset="utf-8">
-			<pattern>
-				%date [%thread] %-5level %logger{80} - %msg%n
-			</pattern>
+		<withJansi>true</withJansi>
+		<encoder>
+			<pattern>%highlight(%date{yyyy-MM-dd HH:mm:ss.SSS}) %cyan([%thread]) %yellow(%-5level)  %green(%logger{36}) - %blue(%msg%n)</pattern>
 		</encoder>
 	</appender>
 	<appender name="logfile"

src/main/webapp/WEB-INF/web.xml

@@ -123,6 +123,7 @@
 				/*/login/**
 				/*/register/**
 				/*/captcha/**
+				/*/static/**
 				/*/css/**
 				/*/js/**
 				/*/image/**

src/main/webapp/index.html

@@ -6,19 +6,17 @@
 <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
 <title>登陆系统</title>
 <link rel="icon" href="favicon.ico">
-<link
-	href="http://cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css"
-	rel="stylesheet">
-<link href="//cdn.bootcss.com/jQuery-Validation-Engine/2.6.4/validationEngine.jquery.min.css" rel="stylesheet">
+<link href="static/bootstrap/bootstrap.min.css" rel="stylesheet">
+<link href="static/validationEngine/validationEngine.jquery.min.css" rel="stylesheet">
 <link href="css/css.css" rel="stylesheet">
 <link href="css/font-awesome.css" rel="stylesheet">
 <link href="css/form-elements.css" rel="stylesheet">
 <link href="css/style.css" rel="stylesheet">
-<script src="http://cdn.bootcss.com/jquery/2.1.3/jquery.js"></script>
-<script src="//cdn.bootcss.com/jquery-url-parser/2.3.1/purl.min.js"></script>
-<script src="//cdn.bootcss.com/jquery-backstretch/2.0.4/jquery.backstretch.min.js"></script>
-<script src="//cdn.bootcss.com/jQuery-Validation-Engine/2.6.4/languages/jquery.validationEngine-zh_CN.min.js"></script>
-<script src="//cdn.bootcss.com/jQuery-Validation-Engine/2.6.4/jquery.validationEngine.min.js"></script>
+<script src="static/jquery.min.js"></script>
+<script src="static/purl.min.js"></script>
+<script src="static/jquery.backstretch.min.js"></script>
+<script src="static/validationEngine/jquery.validationEngine-zh_CN.min.js"></script>
+<script src="static/validationEngine/jquery.validationEngine.min.js"></script>
 <script type="text/javascript">
 	$(function(){
 		if($("#form-username").val()==""){