diff --git a/.gitignore b/.gitignore
index d51ef34..e18fd6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,12 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+
+# idea file
+.idea
+.settings
+.project
+.classpath
+SSMBlogv2.iml
+target
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/classes/applicationContext.xml b/WebRoot/WEB-INF/classes/applicationContext.xml
index 5f57b08..c0385d6 100644
--- a/WebRoot/WEB-INF/classes/applicationContext.xml
+++ b/WebRoot/WEB-INF/classes/applicationContext.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" - xmlns:aop="http://www.springframework.org/schema/aop" xmlns:c="http://www.springframework.org/schema/c" - xmlns:con - xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:util="http://www.springframework.org/schema/util" - xmlns:tx="http://www.springframework.org/schema/tx" - xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:aop="http://www.springframework.org/schema/aop" + xmlns:con + xmlns:tx="http://www.springframework.org/schema/tx" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.3.xsd">
-	
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
+	<context:component-scan base-package="service"/>
 
 	
 	<bean id="dataSource">
-		<property name="url" value="jdbc:mysql://localhost:3306/jspblog"></property>
-		<property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
-		<property name="username" value="root"></property>
-		<property name="password" value="College86"></property>
+		<property name="url" value="jdbc:mysql://localhost:3306/jspblog"/>
+		<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+		<property name="username" value="admin"/>
+		<property name="password" value="password"/>
 	</bean>
 
 	<bean id="sqlSessionFactory">
-		<property name="dataSource" ref="dataSource"></property>
+		<property name="dataSource" ref="dataSource"/>
 		<property name="mapperLocations">
 			<array>
 				<value>classpath:mapping/*.xml</value>
@@ -59,8 +56,8 @@
 	</bean>
 
 	<bean>
-		<property name="basePackage" value="mapping"></property>
-		<property name="sqlSessionFactory" ref="sqlSessionFactory"></property>
+		<property name="basePackage" value="mapping"/>
+		<property name="sqlSessionFactory" ref="sqlSessionFactory"/>
 	</bean>
 
 	<aop:aspectj-autoproxy />
@@ -83,4 +80,4 @@
 		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/WebRoot/WEB-INF/jsp/admin/backadmin.jsp b/WebRoot/WEB-INF/jsp/admin/backadmin.jsp
index 929cd7d..deb4c97 100644
--- a/WebRoot/WEB-INF/jsp/admin/backadmin.jsp
+++ b/WebRoot/WEB-INF/jsp/admin/backadmin.jsp
@@ -15,22 +15,22 @@
 	src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 -->
-	 
-	 
+	 
+	 
 
 
 
- 
+ 
 	
-	<link href="js/editormd/css/editormd.min.css" rel="stylesheet" + <link href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH}/js/editormd/css/editormd.min.css" rel="stylesheet" type="text/css" />
-	
-	
+	
+	
 </head>
 <body><div class="naked_container">
 	<head>
<link rel="stylesheet" href="/common/speech.css" type="text/css" media="all" />
<meta name="robots" content="noindex,nofollow">
<meta name="robots" content="none">
<meta name="robots" content="noarchive">
<meta name="Googlebot" content="noarchive">

 		<ul>
-				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/validatellogin">文章管理</a> </li>
+				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/admin/">文章管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/commentback">评论管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/tagadmin">分类管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/logout">log out</a> </li>
@@ -53,11 +53,11 @@
 		<div>
 			
 		</div>
-		
+
 		
 		<div id="myModal" role="dialog">
 		 <div>
-		
+
 		 
 		 <div>
 		 <div>
@@ -72,7 +72,7 @@
 		 <button type="button" data-dismiss="modal">取消</button>
 		 </div>
 		 </div>
-		
+
 		 </div>
 		</div>
 	</div>
@@ -116,16 +116,16 @@
 				li.css("word-wrap","break-word").css("word-break","break-all")
 				.css("overflow","hidden");
 				var div = $("").addClass("btn-group").css("float","right");
-				
-				/* <button type="button" + + /* <button type="button" data-toggle="modal" data->Open Large Modal</button> */
-				
-				
+
+
 				var editBtn = $("").addClass("btn btn-primary").append("编辑")
 						.appendTo(div);
 					 editBtn.bind("click", function() {
 						edit(item.id);
-					 }); 
+					 });
 				var delBtn = $("").addClass("btn btn-danger").append("删除").attr("data-toggle", "modal")
 						.attr("data-target", "#myModal").appendTo(div);
 					delBtn.bind("click", function() {
@@ -212,17 +212,17 @@
 			var navEle = $("").append(ul);
 			navEle.appendTo("#page_nav_area");
 		}
-		
+
 		// 新建博客的控制器映射
 		function newblog() {
-			window.location='${APP_PATH }/islogin';	
+			window.location='${APP_PATH }/islogin';
 		}
-		
+
 		// 编辑博客发出的请求
 		function edit(id) {
 			window.location='${APP_PATH }/edit?id=' + id;
 		};
-		
+
 		// 删除函数
 		function del(id, pageNum) {
 			alert(id);
@@ -235,7 +235,7 @@
 						alert("删除成功!");
 						// 回到当前页
 						to_page(pageNum);
-					} 
+					}
 				});
 			});
 		}
diff --git a/WebRoot/WEB-INF/jsp/admin/commentadmin.jsp b/WebRoot/WEB-INF/jsp/admin/commentadmin.jsp
index a74de8e..e1da017 100644
--- a/WebRoot/WEB-INF/jsp/admin/commentadmin.jsp
+++ b/WebRoot/WEB-INF/jsp/admin/commentadmin.jsp
@@ -30,7 +30,7 @@
 <body>
 	<header>
 		<ul>
-				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/validatellogin">文章管理</a> </li>
+				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/admin/">文章管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/commentback">评论管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/tagadmin">分类管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/logout">log out</a> </li>
diff --git a/WebRoot/WEB-INF/jsp/admin/edit.jsp b/WebRoot/WEB-INF/jsp/admin/edit.jsp
index a87cb51..18db3bd 100644
--- a/WebRoot/WEB-INF/jsp/admin/edit.jsp
+++ b/WebRoot/WEB-INF/jsp/admin/edit.jsp
@@ -11,16 +11,16 @@
 <meta name="viewport" content=" initial-scale=1">
 	<title>王锐鹏博客</title>
 	 
- 
+ 
 
 
 
- 
-	<link href="js/editormd/css/editormd.min.css" rel="stylesheet" + + <link href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH}/js/editormd/css/editormd.min.css" rel="stylesheet" type="text/css" />
 	
-	
-	
+	
+	
 
 	<style>
 		h1{
@@ -32,47 +32,48 @@
 <body>
 	<h1>编辑保存文章</h1>
 	<br>
-	<form action="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/<%=path%>/updatearticle" method="post" style="text-align:center">
-		 <input type="hidden" name="id" value="${blogid }"/> 
-		 <div>
-		 <label for="title">title</label>
-		 <div>
-		 <input type="text" id="title" name="title" placeholder="title" - value="${blog.title }">
-		 </div>
-		 </div>
-		 <div>
-		 <label for="titleIntro">titleIntro</label>
-		 <div>
-		 <input type="text" id="titleIntro" name="titleIntro">
-		 </div>
-		 </div>
-		 <div>
-		 <label for="createdtime">createdtime</label>
-		 <div>
-		 <input type="date" id="createdtime" name="createdtime">
-		 </div>
-		 </div>
-		 
-		 <div>
-		 <label for="categoryName">categoryName</label>
-		 <div>
-		 <select id="categoryName" name="categoryName">
-		 </select>
-		 </div>
-		 <button type="submit">保存修改</button>
-		 </div>
+	<form>
+		<input type="hidden" name="id" value="${blogid }"/>
+		<div>
+			<label for="title">title</label>
+			<div>
+				<input type="text" id="title" name="title" placeholder="文章标题" + value="${blog.title }">
+			</div>
+		</div>
+		<div>
+			<label for="titleIntro">文章简介</label>
+			<div>
+				<input type="text" id="titleIntro" name="titleIntro" placeholder="文章简介">
+			</div>
+		</div>
+		<div>
+			<label for="createdTime">创建时间</label>
+			<div>
+				<input type="date" id="createdTime" name="createdTime">
+			</div>
+		</div>
+
+		<div>
+			<label for="categoryName">分类名字</label>
+			<div>
+				<select id="categoryName" name="categoryName">
+				</select>
+			</div>
+			<button type="button" id="updateArticle">保存修改</button>
+		</div>
 		
 		<div id="test-editormd">
-			<textarea id="editormd" name="test-editormd-markdown-doc" -></textarea>
+			<textarea id="editorMarkdown" name="editorMarkdown" +></textarea>
 			
 			
-			<textarea id="editorhtml" name="editorhtml"></textarea>
+			<textarea id="editorHtml" name="editorHtml"></textarea>
 		</div>
-			
+		
 	</form>
-	
+
+	
 	
 	
+
+
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/admin/login.jsp b/WebRoot/WEB-INF/jsp/admin/login.jsp
index 48786de..b00137e 100644
--- a/WebRoot/WEB-INF/jsp/admin/login.jsp
+++ b/WebRoot/WEB-INF/jsp/admin/login.jsp
@@ -1,44 +1,71 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%>
+ pageEncoding="UTF-8" %>
 <% - pageContext.setAttribute("APP_PATH", request.getContextPath()); + pageContext.setAttribute("APP_PATH", request.getContextPath()); %>
 <!doctype html>
 <html>
 <head>
-	<meta charset="utf-8">
+ <meta charset="utf-8">
 <meta name="viewport" content=" initial-scale=1">
-	<title>王锐鹏博客</title>
-	
-	
+ <title>王锐鹏博客</title>
+ 
+ 
 
 
 
 
 </head>
 <body>
-	<div>
-	 		 <div>
-	 <div>
-	 <h1>登陆界面</h1>
-	 <div>
-	 
-	 <form action="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/validatellogin" method="post">
-	 <input type="text" placeholder="username" name="username" required autofocus>
-	 <input type="password" placeholder="password" name="password" required>
-	 <button type="submit">
-	 Sign in</button>
-	 <label>
-	 <input type="checkbox" value="remember-me">
-	 Remember me
-	 </label>
-	 <a href="#">Need help? </a>
-	 </form>
-	 </div>
-	 <a href="#">Create an account </a>
-	 </div>
-	 </div>
-	</div>
+<div>
+ <div>
+ <div>
+ <h1>登陆界面</h1>
+ <div>
+ 
+ <form>
+ <input type="text" placeholder="username" name="username" required autofocus>
+ <input type="password" placeholder="password" name="password" required>
+ <button type="button" id="login">
+ Sign in
+ </button>
+ <label>
+ <input type="checkbox" value="remember-me">
+ Remember me
+ </label>
+ <a href="#">Need help? </a>
+ </form>
+ </div>
+ <a href="#">Create an account </a>
+ </div>
+ </div>
+</div>
 </div><div class="naked_ctrl">
<form action="/index.cgi/speech" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/1.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/1.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech" selected="selected">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>		
</body>
+
+
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/admin/newblog.jsp b/WebRoot/WEB-INF/jsp/admin/newblog.jsp
index c928d81..ce36f11 100644
--- a/WebRoot/WEB-INF/jsp/admin/newblog.jsp
+++ b/WebRoot/WEB-INF/jsp/admin/newblog.jsp
@@ -11,16 +11,16 @@
 <meta name="viewport" content=" initial-scale=1">
 	<title>王锐鹏博客</title>
 	 
- 
+ 
 
 
 
- 
-	<link href="js/editormd/css/editormd.min.css" rel="stylesheet" + + <link href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH}/js/editormd/css/editormd.min.css" rel="stylesheet" type="text/css" />
 	
-	
-	
+	
+	
 
 	<style>
 		h1{
@@ -30,46 +30,48 @@
 
 </head>
 <body>
-	<form action="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/<%=path%>/saveArticle" method="post" style="text-align:center">
-		 <h1>新建保存文章<button type="submit">发布</button></h1>
-		 <br>
-		 <div>
-		 <label for="title">title</label>
-		 <div>
-		 <input type="text" id="title" name="title" placeholder="title">
-		 </div>
-		 </div>
-		 <div>
-		 <label for="titleIntro">titleIntro</label>
-		 <div>
-		 <input type="text" id="titleIntro" name="titleIntro" placeholder="titleIntro">
-		 </div>
-		 </div>
-		 <div>
-		 <label for="createdtime">createdtime</label>
-		 <div>
-		 <input type="date" id="createdtime" name="createdtime" placeholder="createdtime">
-		 </div>
-		 </div>
-		 
-		 <div>
-		 <label for="categoryName">categoryName</label>
-		 <div>
-		 <select id="categoryName" name="categoryName">
-		 </select>
-		 </div>
-		 </div>
+	<form>
+		<h1>新建保存文章
+			<button type="button" id="createArticle">发布</button>
+		</h1>
+		<br>
+		<div>
+			<label for="title">标题</label>
+			<div>
+				<input type="text" id="title" name="title" placeholder="title">
+			</div>
+		</div>
+		<div>
+			<label for="titleIntro">文章简介</label>
+			<div>
+				<input type="text" id="titleIntro" name="titleIntro" placeholder="titleIntro">
+			</div>
+		</div>
+		<div>
+			<label for="createdTime">创建时间</label>
+			<div>
+				<input type="date" id="createdTime" name="createdTime" placeholder="createdTime">
+			</div>
+		</div>
+
+		<div>
+			<label for="categoryName">分类</label>
+			<div>
+				<select id="categoryName" name="categoryName">
+				</select>
+			</div>
+		</div>
 		
 		<div id="test-editormd">
-			<textarea id="editormd" name="test-editormd-markdown-doc" -></textarea>
+				<textarea id="editorMarkdown" name="editorMarkdown" +></textarea>
 			
 			
-			<textarea id="editorhtml" name="editorhtml"></textarea>
+			<textarea id="editorHtml" name="editorHtml"></textarea>
 		</div>
-			
+		
 	</form>
-	
+	
 	
 	
 -->
-	 
-	 
+	 
+	 
 
 
 
- 
+ 
 	
-	<link href="js/editormd/css/editormd.min.css" rel="stylesheet" + <link href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH}/js/editormd/css/editormd.min.css" rel="stylesheet" type="text/css" />
-	
-	
+	
+	
 </head>
 <body>
 	<header>
 		<ul>
-				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/validatellogin">文章管理</a> </li>
+				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/admin/">文章管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/commentback">评论管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/tagadmin">分类管理</a> </li>
 				<li><a href="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/logout">log out</a> </li>
@@ -57,7 +57,7 @@
 		 <h4>新建分类!</h4>
 		 </div>
 		 <div>
-		 <form action="/index.cgi/speech/https://patch-diff.githubusercontent.com/raw/oldbiwang/SSMBlogv2/pull/${APP_PATH }/newtag" method="post">
+		 <form>
 					 <div>
 					 <label for="name">name:</label>
 					 <div> 
@@ -71,7 +71,7 @@
 					 </div>
 					 </div>
 					 <div>
- 					<input type="submit" id="newBtn" value="确定"/>
+ 					<input type="submit" value="确定" />
 						<button type="button" data-dismiss="modal">关闭</button>
 					 </div>
 					</form>
@@ -103,11 +103,32 @@
 		
 		
 	</div>
-
+	
 	 type="text/javascript">
 		$(function() {
 			getTag();
 		});
+
+		$('#newBtn').click(function() {
+			$.ajax({
+				type: "POST",
+				url: "${APP_PATH}/newTag",
+				// 取出正则的结果,发送数据
+				data: $(".form-horizontal").serialize(),
+				success: function (data) {
+					if (data.code == 100) {
+						swal({
+							text: data.msg
+						})
+						setTimeout(function () {
+						}, 3000);
+						window.location.href = "${APP_PATH}/tagadmin";
+					}
+				}
+			})
+		});
+
+
 		// 获得标签 
 		function getTag() {
 			$.ajax({
diff --git a/src/applicationContext.xml b/src/applicationContext.xml
index 04cebef..c0385d6 100644
--- a/src/applicationContext.xml
+++ b/src/applicationContext.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" - xmlns:aop="http://www.springframework.org/schema/aop" xmlns:c="http://www.springframework.org/schema/c" - xmlns:con - xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:util="http://www.springframework.org/schema/util" - xmlns:tx="http://www.springframework.org/schema/tx" - xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:aop="http://www.springframework.org/schema/aop" + xmlns:con + xmlns:tx="http://www.springframework.org/schema/tx" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.3.xsd">
-	
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
+	<context:component-scan base-package="service"/>
 
 	
 	<bean id="dataSource">
-		<property name="url" value="jdbc:mysql://localhost:3306/jspblog"></property>
-		<property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
-		<property name="username" value="root"></property>
-		<property name="password" value="XXXXXXXX"></property>
+		<property name="url" value="jdbc:mysql://localhost:3306/jspblog"/>
+		<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+		<property name="username" value="admin"/>
+		<property name="password" value="password"/>
 	</bean>
 
 	<bean id="sqlSessionFactory">
-		<property name="dataSource" ref="dataSource"></property>
+		<property name="dataSource" ref="dataSource"/>
 		<property name="mapperLocations">
 			<array>
 				<value>classpath:mapping/*.xml</value>
@@ -59,8 +56,8 @@
 	</bean>
 
 	<bean>
-		<property name="basePackage" value="mapping"></property>
-		<property name="sqlSessionFactory" ref="sqlSessionFactory"></property>
+		<property name="basePackage" value="mapping"/>
+		<property name="sqlSessionFactory" ref="sqlSessionFactory"/>
 	</bean>
 
 	<aop:aspectj-autoproxy />
diff --git a/src/controller/AdminController.java b/src/controller/AdminController.java
new file mode 100644
index 0000000..a334e31
--- /dev/null
+++ b/src/controller/AdminController.java
@@ -0,0 +1,36 @@
+package controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpSession;
+
+@Controller
+@RequestMapping(value = "/admin")
+public class AdminController {
+ private final HttpSession session;
+
+ @Autowired
+ public AdminController(HttpSession session) {
+ this.session = session;
+ }
+
+ @RequestMapping(value = "/")
+ public String index() {
+ if (session.getAttribute("username") == null) {
+ return "admin/error";
+ }
+ return "admin/backadmin";
+ }
+
+ /**
+ * 重定向到/admin/
+ *
+ * @return
+ */
+ @RequestMapping(value = "")
+ public String toLogin() {
+ return "redirect:/admin/";
+ }
+}
diff --git a/src/controller/ArticleController.java b/src/controller/ArticleController.java
index 3d3698a..dc8e69e 100644
--- a/src/controller/ArticleController.java
+++ b/src/controller/ArticleController.java
@@ -9,7 +9,9 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
+import entity.ArticleVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -30,215 +32,184 @@
 
 @Controller
 public class ArticleController {
-	@Autowired
-	private ArticleService articleService;
-
-	// ���������б����� ��ҳ
-	@RequestMapping("/articles")
-	@ResponseBody
-	public Msg getArticlesList(
-			@RequestParam(value = "pn", defaultValue = "1") Integer pn) throws ParseException {
-		PageHelper.startPage(pn, 5);
-		List<blog> articles = articleService.getAll();
-
-		PageInfo<blog> pageInfo = new PageInfo<strong>(articles, 5);
-		return Msg.success().add("pageInfo", pageInfo);
-	}
-	
-	// ��ȡ������Ϣ
-	@RequestMapping(value="getCategoryName", method=RequestMethod.POST, produces="application/json")
-	@ResponseBody
-	public Msg getCategoryName() {
-		Msg msg = new Msg();
-		List<category> list = articleService.getCategoryName();
-		Map<string, Object> map = new HashMap<strong>();
-		map.put("category", list);
-		
-		msg.setCode(200);
-		msg.setMsg("���ط������֣�");
-		msg.setExtend(map);
-		return msg;		
-	}
-	
-	// ��̨�1⁄2���������,�ж��Ƿ���1⁄2������ ajax �����޷���תҳ�棬
-	// ʹ����window.location='${APP_PATH }/islogin'; ������ת
-	@RequestMapping(value="/islogin")
-	public String newarticle(HttpServletRequest request, HttpServletResponse response) throws IOException {
-		if(request.getSession().getAttribute("username") != null) {
-			System.out.println("username = " + request.getSession().getAttribute("username"));
-			return "redirect:/newarticle";
-		}
-		return "admin/error";
-	}
-	
-	// �1⁄2�����
-	@RequestMapping(value="/newarticle")
-	public String editarticle(HttpServletRequest request, HttpServletResponse response) 
-	{
-		//�õ� session ��ֵ���ж��Ƿ��Ѿ���1⁄2
-		if(request.getSession().getAttribute("username") != null) {
-			String username = request.getSession().getAttribute("username").toString();
-			if(username != null) {
-				return "admin/newblog";
-			}
-		}
-		return "admin/error";
-	}
-
-	// ���� md �� HTML �����ݿ�
-	@RequestMapping(value = "saveArticle", method = RequestMethod.POST)
-	public ModelAndView saveArticle(
-			HttpServletRequest request,
-			HttpServletResponse response,
-			@RequestParam(value = "test-editormd-markdown-doc", required = false) String edmdDoc,
-			@RequestParam(value = "editorhtml", required = false) String edmdHtml) {
-		ModelAndView view = new ModelAndView();
-		Map<string, Object> map = new HashMap<string, Object>();
-
-		// ��ȡ���¶�Ӧ�� ����Id
-		Integer categoryId = articleService.getCategoryId(request
-				.getParameter("categoryName"));
-
-		Blog blog = new Blog();
-		blog.setCategoryid(categoryId);
-		blog.setContent(edmdHtml);
-		blog.setMd(edmdDoc);
-		blog.setTitle(request.getParameter("title"));
-		blog.setTitleintro(request.getParameter("titleIntro"));
-		String dateStr = request.getParameter("createdtime").replace('/', '-');
-		Date date = DateUtil.fomatDate(dateStr);
-		blog.setCreatedtime(date);
-
-		articleService.save(blog);
-		// �������μı��⣬�������ܣ����ڣ���������Ϣ
-		map.put("message", "�1⁄2����3ɹ���");
-		view.setViewName("admin/newsuccess");
-		view.addObject("map", map);
-		return view;
-	}
-	
-	// �༭����
-	@RequestMapping("/edit")
-	public String edit(@RequestParam(value="id", required=true, defaultValue="1") int id, 
-			HttpServletRequest request, HttpServletResponse response, Model model) {
-		if(request.getSession().getAttribute("username") != null) {
-			model.addAttribute("blogid", id);
-			return "admin/edit";
-		}	
-		return "admin/error";
-	}
-	
-	// �����޸�����
-	@RequestMapping(value="/updatearticle", method=RequestMethod.POST)
-	public ModelAndView updatearticle(HttpServletRequest request, HttpServletResponse response,@RequestParam(value = "test-editormd-markdown-doc", required = false) String edmdDoc,
-			@RequestParam(value = "editorhtml", required = false) String edmdHtml) {
-		ModelAndView view = new ModelAndView();
-		String dateStr;
-		Map<string, Object> map = new HashMap<string, Object>();
-		
-		// ��ȡ���������μ� id
-		int id = Integer.parseInt(request.getParameter("id"));
-		// ��ȡ���¶�Ӧ�� ����Id
-		Integer categoryId = articleService.getCategoryId(request
-				.getParameter("categoryName"));
-
-		Blog blog = new Blog();
-		blog.setId(id);
-		blog.setCategoryid(categoryId);
-		blog.setContent(edmdHtml);
-		blog.setMd(edmdDoc);
-		blog.setTitle(request.getParameter("title"));
-		blog.setTitleintro(request.getParameter("titleIntro"));
-		if(request.getParameter("createdtime") != null)
-		{
-			dateStr = request.getParameter("createdtime").replace('/', '-');
-		} else {
-			dateStr = new String("1996-2-10");
-		}
-		Date date = DateUtil.fomatDate(dateStr);
-		blog.setCreatedtime(date);
-
-		articleService.update(blog);
-		// �������μı��⣬�������ܣ����ڣ���������Ϣ
-		map.put("message", "�޸����3ɹ���");
-		view.setViewName("admin/editsuccess");
-		view.addObject("map", map);
-		return view;
-	}
-	
-	
-	//ͨ�� id �������2�����
-	@RequestMapping("/getarticlebyid")
-	@ResponseBody
-	public Blog getarticlebyid(@RequestParam(value="id", defaultValue="1") int id) {
-		Blog blog = articleService.selectBlogById(id);
-		return blog;
-	}
-	
-	
-	// ��ʾ����
-	@RequestMapping(value="showarticle", method=RequestMethod.GET)
-	public String showarticle(@RequestParam(value="id", defaultValue="1")int id, Model model) {
-		String mdString = articleService.getArticleMdStr(id);
-		model.addAttribute("mdString", mdString);
-		model.addAttribute("id", id);
-		return "showarticle";
-	}
-	
-	// �������Ķ�ģʽ
-	@RequestMapping(value="/showarticlecustomcontanier", method=RequestMethod.GET)
-	public String showarticlecustomcontainer(HttpServletRequest request, HttpServletResponse response,
-			Model model, @RequestParam(value="id", defaultValue="1")int id) {
-		String customMd = articleService.getArticleMdStr(id);
-		model.addAttribute("customMd", customMd);
-		model.addAttribute("id", id);
-		return "showarticlecustomcontanier";
-	}
-	
-	// ɾ������
-	@RequestMapping(value="/delete", method=RequestMethod.GET) 
-	public void delete(@RequestParam(value="id", required=true)int id,HttpServletRequest request,
-			HttpServletResponse response) throws IOException {
-		if(request.getSession().getAttribute("username") != null) {
-			articleService.deleteArticleById(id);
-		} else {
-			response.sendRedirect("deletenologin");
-		}
-	}
-	
-	// û�е�1⁄2��ɦ�򣬾Ͳ���ɾ������
-	@RequestMapping("/deletenologin")
-	public String deletenologin() {
-		return "admin/error";
-	}
-	
-	/*	
-	// ��������ģʽ
-	@RequestMapping(value="/backhtml", method=RequestMethod.POST)
-	public String backhtml(HttpServletRequest request, HttpServletResponse response,
-			Model model, @RequestParam(value="md", required=true)String md) {
-		System.out.println("backmd = " + md);
-		model.addAttribute("backmd", md);
-		return "showarticle";
-	}*/
-	
-	// ������������������ƪ����
-	@RequestMapping("/postarticle")
-	@ResponseBody
-	public Msg postarticle() {
-		List<blog> list = articleService.getAll();
-		List<blog> postList = articleService.postarticle(list);
-		System.out.println("size = " + postList.size());
-		return Msg.success().add("postList", postList);
-	}
-	
-	@RequestMapping("about")
-	public String about() {
-		return "about";
-	}
-	
-	@RequestMapping("/contact")
-	public String contact() {
-		return "contact";
-	}
+ private final ArticleService articleService;
+
+ private final HttpSession session;
+
+ @Autowired
+ public ArticleController(ArticleService articleService, HttpSession session) {
+ this.articleService = articleService;
+ this.session = session;
+ }
+
+ // 返回文章列表,进行 分页
+ @RequestMapping("/articles")
+ @ResponseBody
+ public Msg getArticlesList(@RequestParam(value = "pn", defaultValue = "1") Integer pn)
+ throws ParseException {
+ PageHelper.startPage(pn, 5);
+ List<blog> articles = articleService.getAll();
+
+ PageInfo<blog> pageInfo = new PageInfo<strong>(articles, 5);
+ return Msg.success().add("pageInfo", pageInfo);
+ }
+
+ // 获取分类信息
+ @RequestMapping(
+ value = "getCategoryName",
+ method = RequestMethod.POST,
+ produces = "application/json")
+ @ResponseBody
+ public Msg getCategoryName() {
+ Msg msg = new Msg();
+ List<category> list = articleService.getCategoryName();
+ Map<string, Object> map = new HashMap<strong>();
+ map.put("category", list);
+
+ msg.setCode(200);
+ msg.setMsg("返回分类名字!");
+ msg.setExtend(map);
+ return msg;
+ }
+
+ // 后台新建博客文章,判断是否登陆,我用 ajax 请求无法跳转页面,
+ // 使用了window.location='${APP_PATH }/islogin'; 请求跳转
+ @RequestMapping(value = "/islogin")
+ public String newarticle() throws IOException {
+ if (session.getAttribute("username") != null) {
+ return "redirect:/newarticle";
+ }
+ return "admin/error";
+ }
+
+ // 新建文章
+ @RequestMapping(value = "/newarticle")
+ public String editarticle() {
+ // 得到 session 的值,判断是否已经登陆
+ if (session.getAttribute("username") != null) {
+ return "admin/newblog";
+ }
+ return "admin/error";
+ }
+
+ // 保存 md 和 HTML 到数据库
+ @RequestMapping(value = "/saveArticle", method = RequestMethod.POST)
+ @ResponseBody
+ public Msg saveArticle(ArticleVO articleVO) {
+ Integer categoryId = articleService.getCategoryId(articleVO.getCategoryName());
+ Blog blog = new Blog();
+ blog.setCategoryid(categoryId);
+
+ blog.setContent(articleVO.getEditorHtml());
+ blog.setMd(articleVO.getEditorMarkdown());
+ blog.setTitle(articleVO.getTitle());
+ blog.setTitleintro(articleVO.getTitleIntro());
+ blog.setCreatedtime(articleVO.getCreatedTime());
+
+ articleService.save(blog);
+ return Msg.success("新建文章成功!");
+ }
+
+ // 编辑文章
+ @RequestMapping("/edit")
+ public String edit(
+ @RequestParam(value = "id", required = true, defaultValue = "1") int id, Model model) {
+ if (session.getAttribute("username") != null) {
+ model.addAttribute("blogid", id);
+ return "admin/edit";
+ }
+ return "admin/error";
+ }
+
+ @RequestMapping(value = "/updateArticle", method = RequestMethod.POST)
+ @ResponseBody
+ public Msg updateArticle(ArticleVO articleVO) {
+
+ // 获取文章对应的 分类Id
+ Integer categoryId = articleService.getCategoryId(articleVO.getCategoryName());
+
+ Blog blog = new Blog();
+ blog.setId(articleVO.getId());
+ blog.setCategoryid(categoryId);
+ blog.setContent(articleVO.getEditorHtml());
+ blog.setMd(articleVO.getEditorMarkdown());
+ blog.setTitle(articleVO.getTitle());
+ blog.setTitleintro(articleVO.getTitleIntro());
+ blog.setCreatedtime(articleVO.getCreatedTime());
+ return Msg.success("修改成功!");
+ }
+
+ // 通过 id 查找文章并返回
+ @RequestMapping("/getarticlebyid")
+ @ResponseBody
+ public Blog getarticlebyid(@RequestParam(value = "id", defaultValue = "1") int id) {
+ Blog blog = articleService.selectBlogById(id);
+ return blog;
+ }
+
+ // 显示文章
+ @RequestMapping(value = "showarticle", method = RequestMethod.GET)
+ public String showarticle(@RequestParam(value = "id", defaultValue = "1") int id, Model model) {
+ String mdString = articleService.getArticleMdStr(id);
+ model.addAttribute("mdString", mdString);
+ model.addAttribute("id", id);
+ return "showarticle";
+ }
+
+ // 侧边栏阅读模式
+ @RequestMapping(value = "/showarticlecustomcontanier", method = RequestMethod.GET)
+ public String showarticlecustomcontainer(
+ Model model, @RequestParam(value = "id", defaultValue = "1") int id) {
+ String customMd = articleService.getArticleMdStr(id);
+ model.addAttribute("customMd", customMd);
+ model.addAttribute("id", id);
+ return "showarticlecustomcontanier";
+ }
+
+ // 删除文章
+ @RequestMapping(value = "/delete", method = RequestMethod.GET)
+ public void delete(
+ @RequestParam(value = "id", required = true) int id, HttpServletResponse response)
+ throws IOException {
+ if (session.getAttribute("username") != null) {
+ articleService.deleteArticleById(id);
+ } else {
+ response.sendRedirect("deletenologin");
+ }
+ }
+
+ // 没有登陆的时候,就不能删除文章
+ @RequestMapping("/deletenologin")
+ public String deletenologin() {
+ return "admin/error";
+ }
+
+ /*
+ // 返回正常模式
+ @RequestMapping(value="/backhtml", method=RequestMethod.POST)
+ public String backhtml(HttpServletRequest request, HttpServletResponse response,
+ 		Model model, @RequestParam(value="md", required=true)String md) {
+ 	System.out.println("backmd = " + md);
+ 	model.addAttribute("backmd", md);
+ 	return "showarticle";
+ }*/
+
+ // 返回评论数最多的四篇文章
+ @RequestMapping("/postarticle")
+ @ResponseBody
+ public Msg postarticle() {
+ List<blog> list = articleService.getAll();
+ List<blog> postList = articleService.postarticle(list);
+ return Msg.success().add("postList", postList);
+ }
+
+ @RequestMapping("about")
+ public String about() {
+ return "about";
+ }
+
+ @RequestMapping("/contact")
+ public String contact() {
+ return "contact";
+ }
 }
diff --git a/src/controller/CategoryController.java b/src/controller/CategoryController.java
index 148cb81..e1ee5aa 100644
--- a/src/controller/CategoryController.java
+++ b/src/controller/CategoryController.java
@@ -1,11 +1,10 @@
 package controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import entity.Blog;
+import entity.Category;
+import entity.Msg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -13,83 +12,85 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-
 import service.CategoryService;
-import entity.Blog;
-import entity.Category;
-import entity.Msg;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
 
 @Controller
 public class CategoryController {
-	@Autowired
-	private CategoryService categoryService;
-	
-	// tags ���ر�ǩ���Ұ�������Ϊ���ࣩ
-	@RequestMapping(value="/getTags",method=RequestMethod.GET) 
-	@ResponseBody
-	public Msg getTags() {
-		List <category> tags = categoryService.getCategory();
-		return Msg.success().add("tags", tags);
-	}
-	
-	
-	// �����ĺ�̨����
-	@RequestMapping(value="/tagadmin") 
-	public String tagadmin(HttpServletRequest request, HttpServletResponse response) {
-		String username = null;
-		if(request.getSession().getAttribute("username") != null) {
-			username = request.getSession().getAttribute("username").toString();
-		}
-		
-		if(username == null) {
-			return "admin/error";
-		}
-		return "admin/tagadmin";
-	}
-	
-	// �1⁄2�����
-	@RequestMapping(value="/newtag", method=RequestMethod.POST)
-	public String newtag(@RequestParam(value="name", required=true) String name,
-			@RequestParam(value="level", required=true)String level,Model model) {
-		categoryService.newtag(name, level);
-		model.addAttribute("msg", "�1⁄2������ɹ���");
-		return "admin/newtagsuccess";
-	}
-	
-	// ɾ������
-	@RequestMapping(value="deletetag", method=RequestMethod.GET) 
-	@ResponseBody
-	public Msg deletetag(HttpServletRequest request, HttpServletResponse response,
-			@RequestParam(value="id", required=true)int id) {
-		String username = null;
-		if(request.getSession().getAttribute("username") != null) {
-			username = request.getSession().getAttribute("username").toString();
-		}
-		if(username == null) {
-			return Msg.fail().add("msg", "��û�е�1⁄2");
-		}
-		categoryService.deltag(id);
-		return Msg.success().add("msg", "ɾ�������ɹ���");
-	}
-	
-	@RequestMapping("tag")
-	public String tag(@RequestParam("id")int id, Model model) {
-		model.addAttribute("id", id);
-		return "tag";
-	}
-	
-	// ���ظ÷������е�����
-	@RequestMapping(value="/tagarticle", method=RequestMethod.GET)
-	@ResponseBody
-	public Msg tagarticle(@RequestParam("id") int id,
-			@RequestParam(value = "pn", defaultValue = "1") Integer pn,
-			Model model) {
-		PageHelper.startPage(pn, 5);
-		List<blog> list = categoryService.getTagArticles(id);
-		PageInfo<blog> pageInfo = new PageInfo<strong>(list, 5);
-		return Msg.success().add("pageInfo", pageInfo);
-	}
+ private final CategoryService categoryService;
+
+ private final HttpSession session;
+
+ @Autowired
+ public CategoryController(CategoryService categoryService, HttpSession session) {
+ this.categoryService = categoryService;
+ this.session = session;
+ }
+
+ // tags 返回标签(我把它理解为分类)
+ @RequestMapping(value = "/getTags", method = RequestMethod.GET)
+ @ResponseBody
+ public Msg getTags() {
+ List<category> tags = categoryService.getCategory();
+ return Msg.success().add("tags", tags);
+ }
+
+ // 分类的后台管理
+ @RequestMapping(value = "/tagadmin")
+ public String tagadmin() {
+ String username = null;
+ if (session.getAttribute("username") != null) {
+ username = session.getAttribute("username").toString();
+ }
+
+ if (username == null) {
+ return "admin/error";
+ }
+ return "admin/tagadmin";
+ }
+
+ // 新建分类
+ @RequestMapping(value = "/newTag", method = RequestMethod.POST)
+ @ResponseBody
+ public Msg newtag(
+ @RequestParam(value = "name") String name, @RequestParam(value = "level") String level) {
+ categoryService.newtag(name, level);
+ return Msg.success("新建分类成功!");
+ }
+
+ // 删除分类
+ @RequestMapping(value = "deletetag", method = RequestMethod.GET)
+ @ResponseBody
+ public Msg deletetag(@RequestParam(value = "id", required = true) int id) {
+ String username = null;
+ if (session.getAttribute("username") != null) {
+ username = session.getAttribute("username").toString();
+ }
+ if (username == null) {
+ return Msg.fail().add("msg", "你没有登陆");
+ }
+ categoryService.deltag(id);
+ return Msg.success().add("msg", "删除分类成功!");
+ }
+
+ @RequestMapping("tag")
+ public String tag(@RequestParam("id") int id, Model model) {
+ model.addAttribute("id", id);
+ return "tag";
+ }
+
+ // 返回该分类所有的文章
+ @RequestMapping(value = "/tagarticle", method = RequestMethod.GET)
+ @ResponseBody
+ public Msg tagarticle(
+ @RequestParam("id") int id,
+ @RequestParam(value = "pn", defaultValue = "1") Integer pn,
+ Model model) {
+ PageHelper.startPage(pn, 5);
+ List<blog> list = categoryService.getTagArticles(id);
+ PageInfo<blog> pageInfo = new PageInfo<strong>(list, 5);
+ return Msg.success().add("pageInfo", pageInfo);
+ }
 }
diff --git a/src/controller/CommentController.java b/src/controller/CommentController.java
index b87462c..c5be2fb 100644
--- a/src/controller/CommentController.java
+++ b/src/controller/CommentController.java
@@ -5,6 +5,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -19,71 +20,82 @@
 
 @Controller
 public class CommentController {
-	@Autowired
-	private CommentService commentService;
-	
-	// �ύ����
-	@RequestMapping(value="/sendcomment", method=RequestMethod.POST)
-	@ResponseBody
-	public Msg sendcomment(@RequestParam(value="id", required=true)int id, 
-			@RequestParam("name") String name, @RequestParam("comment") String comment) throws ParseException {
-		System.out.println("name = " + name + " \ncomment = " + comment);
-		commentService.sendcomment(id, name, comment);
-		Msg msg = Msg.success();
-		msg.setMsg("�ύ���۳ɹ���");
-		return msg;
-	}
-	
-	// ��������
-	@RequestMapping(value="/getComments", method=RequestMethod.GET)
-	@ResponseBody
-	public Msg getComments(@RequestParam("id")int id) {
-		// ��ȡ�������е�����
-		List<comment> list = commentService.getComments(id);
-		return Msg.success().add("commentsList", list);
-	}
-	
-	// ������������
-	@RequestMapping(value="/getallcomments", method=RequestMethod.GET)
-	@ResponseBody
-	public Msg getallcomments() {
-		List<comment> list = commentService.selectAll();
-		return Msg.success().add("commentList", list);
-	}
-	
-	// ���ۺ�̨����
-	@RequestMapping("/commentback")
-	public String commentback(HttpServletRequest request,HttpServletResponse response) {
-		//�õ� session ��ֵ���ж��Ƿ��Ѿ���1⁄2
-		if(request.getSession().getAttribute("username") != null) {
-			String username = request.getSession().getAttribute("username").toString();
-			if(username != null) {
-				return "admin/commentadmin";
-			}
-		}
-		return "admin/error";
-	}
-	
-	// ɾ��һ������
-	@RequestMapping(value="/deleteacomment",method=RequestMethod.GET)
-	@ResponseBody
-	public Msg deleteacomment(@RequestParam("id") int id) {
-		commentService.deletea(id);
-		Msg msg = Msg.success();
-		msg.setMsg("����������ɾ����");
-		return msg;
-	}
-	
-	// �ύ����
-	@RequestMapping(value="/sendheartword", method=RequestMethod.POST)
-	@ResponseBody
-	public Msg sendheartword(@RequestParam(value="id", required=true)int id, 
-			@RequestParam("name") String name, @RequestParam("comment") String comment) throws ParseException {
-		System.out.println("name = " + name + " \ncomment = " + comment);
-		commentService.sendcomment(id, name, comment);
-		Msg msg = Msg.success();
-		msg.setMsg("���յ����������x�");
-		return msg;
-	}
+ private final CommentService commentService;
 
+ private final HttpSession session;
+
+ @Autowired
+ public CommentController(CommentService commentService, HttpSession session) {
+ this.commentService = commentService;
+ this.session = session;
+ }
+
+ // 提交评论
+ @RequestMapping(value = "/sendcomment", method = RequestMethod.POST)
+ @ResponseBody
+ public Msg sendcomment(
+ @RequestParam(value = "id", required = true) int id,
+ @RequestParam("name") String name,
+ @RequestParam("comment") String comment)
+ throws ParseException {
+ commentService.sendcomment(id, name, comment);
+ Msg msg = Msg.success();
+ msg.setMsg("提交评论成功!");
+ return msg;
+ }
+
+ // 获得评论
+ @RequestMapping(value = "/getComments", method = RequestMethod.GET)
+ @ResponseBody
+ public Msg getComments(@RequestParam("id") int id) {
+ // 获取文章所有的评论
+ List<comment> list = commentService.getComments(id);
+ return Msg.success().add("commentsList", list);
+ }
+
+ // 获得所有评论
+ @RequestMapping(value = "/getallcomments", method = RequestMethod.GET)
+ @ResponseBody
+ public Msg getallcomments() {
+ List<comment> list = commentService.selectAll();
+ return Msg.success().add("commentList", list);
+ }
+
+ // 评论后台管理
+ @RequestMapping("/commentback")
+ public String commentback() {
+ // 得到 session 的值,判断是否已经登陆
+ if (session.getAttribute("username") != null) {
+ String username = session.getAttribute("username").toString();
+ if (username != null) {
+ return "admin/commentadmin";
+ }
+ }
+ return "admin/error";
+ }
+
+ // 删除一条评论
+ @RequestMapping(value = "/deleteacomment", method = RequestMethod.GET)
+ @ResponseBody
+ public Msg deleteacomment(@RequestParam("id") int id) {
+ commentService.deletea(id);
+ Msg msg = Msg.success();
+ msg.setMsg("此条评论已删除!");
+ return msg;
+ }
+
+ // 提交评论
+ @RequestMapping(value = "/sendheartword", method = RequestMethod.POST)
+ @ResponseBody
+ public Msg sendheartword(
+ @RequestParam(value = "id", required = true) int id,
+ @RequestParam("name") String name,
+ @RequestParam("comment") String comment)
+ throws ParseException {
+ System.out.println("name = " + name + " \ncomment = " + comment);
+ commentService.sendcomment(id, name, comment);
+ Msg msg = Msg.success();
+ msg.setMsg("我收到你的心声了!");
+ return msg;
+ }
 }
diff --git a/src/controller/LoginController.java b/src/controller/LoginController.java
index 43e514c..5b6ee36 100644
--- a/src/controller/LoginController.java
+++ b/src/controller/LoginController.java
@@ -5,43 +5,50 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import entity.Msg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import service.LoginService;
 
-
 @Controller
 public class LoginController {
-	@Autowired
-	private LoginService service;
-	
-	@RequestMapping("/login")
-	public String login() {
-		return "admin/login";
-	}
-	
-	@RequestMapping(value="/validatellogin")
-	public String validatelogin(@RequestParam(value="username", required=false)String username,
-			@RequestParam(value="password",required=false)String password, HttpServletRequest request,
-			HttpServletResponse response) throws SaslException {
-			if(request.getSession().getAttribute("username") != null) {
-				return "admin/backadmin";
-			}
-			if(service.validate(username, password)) {
-				HttpSession session = request.getSession();
-				session.setAttribute("username", username);
-				return "admin/backadmin";
-			}
-			return "admin/loginfail";
-	}
-	
-	// �˳���1⁄2
-	@RequestMapping("logout")
-	public String logout(HttpServletRequest request, HttpServletResponse response) {
-		request.getSession().removeAttribute("username");
-		return "redirect:/login";
-	}
+ private final LoginService service;
+
+ @Autowired
+ public LoginController(LoginService service) {
+ this.service = service;
+ }
+
+ @RequestMapping("/login")
+ public String login() {
+ return "admin/login";
+ }
+
+ @RequestMapping(value = "/doLogin", method = RequestMethod.POST)
+ @ResponseBody
+ public Msg doLogin(
+ @RequestParam(value = "username", required = false) String username,
+ @RequestParam(value = "password", required = false) String password,
+ HttpServletRequest request)
+ throws SaslException {
+
+ if (service.validate(username, password)) {
+ HttpSession session = request.getSession();
+ session.setAttribute("username", username);
+ return Msg.success("登录成功!,正在进入后台");
+ }
+ return Msg.fail("登录失败!");
+ }
+
+ // 退出登陆
+ @RequestMapping("logout")
+ public String logout(HttpServletRequest request, HttpServletResponse response) {
+ request.getSession().removeAttribute("username");
+ return "redirect:/login";
+ }
 }
diff --git a/src/controller/UploadfileController.java b/src/controller/UploadfileController.java
index 9d2741c..4645c40 100644
--- a/src/controller/UploadfileController.java
+++ b/src/controller/UploadfileController.java
@@ -18,32 +18,33 @@
 
 @Controller
 public class UploadfileController {
-	Logger log = Logger.getLogger(this.getClass());
-	
-	@RequestMapping(value = "uploadImg", method = RequestMethod.POST)
-	public void uploadImg(
-			HttpServletRequest request,
-			HttpServletResponse response,
-			@RequestParam(value = "editormd-image-file", required = false) MultipartFile file) {
-			log.info("upload img");
-		try {
-			request.setCharacterEncoding("utf-8");
-			response.setHeader("Content-Type", "text/html");
-			String suffix = file.getOriginalFilename().substring(
-	 file.getOriginalFilename().lastIndexOf("."));
-			String filePath = "/upload/" + DateUtil.getDays() + "/" + Myutil.random(5) + suffix;
-			String resultPath = UploadUtil.uploadImg(filePath, file.getInputStream());
-			System.out.println("path="+resultPath);
-			response.getWriter().write( "{\"success\": 1, \"message\":\"�Θ��ɹ�\",\"url\":\"" + filePath + "\"}" );
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.error("upload failed ", e);
-			try {
-				response.getWriter().write( "{\"success\": 0, \"message\":\"�Θ�ʧ��\",\"url\":\""+ "\"}" );
-			} catch (IOException e1) {
-				e1.printStackTrace();
-			}
-		}
-	}
-	
+ Logger log = Logger.getLogger(this.getClass());
+
+ @RequestMapping(value = "uploadImg", method = RequestMethod.POST)
+ public void uploadImg(
+ HttpServletRequest request,
+ HttpServletResponse response,
+ @RequestParam(value = "editormd-image-file", required = false) MultipartFile file) {
+ log.info("upload img");
+ try {
+ request.setCharacterEncoding("utf-8");
+ response.setHeader("Content-Type", "text/html");
+ String suffix =
+ file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+ String filePath = "/upload/" + DateUtil.getDays() + "/" + Myutil.random(5) + suffix;
+ String resultPath = UploadUtil.uploadImg(filePath, file.getInputStream());
+ System.out.println("path=" + resultPath);
+ response
+ .getWriter()
+ .write("{\"success\": 1, \"message\":\"上传成功\",\"url\":\"" + filePath + "\"}");
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("upload failed ", e);
+ try {
+ response.getWriter().write("{\"success\": 0, \"message\":\"上传失败\",\"url\":\"" + "\"}");
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
 }
diff --git a/src/entity/ArticleVO.java b/src/entity/ArticleVO.java
new file mode 100644
index 0000000..6ffc2f9
--- /dev/null
+++ b/src/entity/ArticleVO.java
@@ -0,0 +1,105 @@
+package entity;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class ArticleVO {
+
+ private Integer id;
+
+ private String title;
+
+ private String titleIntro;
+
+ /** 格式化从前端接收到的时间数据 */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date createdTime;
+
+ private String categoryName;
+
+ private String editorMarkdown;
+
+ private String editorHtml;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getTitleIntro() {
+ return titleIntro;
+ }
+
+ public void setTitleIntro(String titleIntro) {
+ this.titleIntro = titleIntro;
+ }
+
+ public Date getCreatedTime() {
+ return createdTime;
+ }
+
+ public void setCreatedTime(Date createdTime) {
+ this.createdTime = createdTime;
+ }
+
+ public String getCategoryName() {
+ return categoryName;
+ }
+
+ public void setCategoryName(String categoryName) {
+ this.categoryName = categoryName;
+ }
+
+ public String getEditorMarkdown() {
+ return editorMarkdown;
+ }
+
+ public void setEditorMarkdown(String editorMarkdown) {
+ this.editorMarkdown = editorMarkdown;
+ }
+
+ public String getEditorHtml() {
+ return editorHtml;
+ }
+
+ public void setEditorHtml(String editorHtml) {
+ this.editorHtml = editorHtml;
+ }
+
+ @Override
+ public String toString() {
+ return "ArticleVO{"
+ + "id="
+ + id
+ + ", title='"
+ + title
+ + '\''
+ + ", titleIntro='"
+ + titleIntro
+ + '\''
+ + ", createdTime="
+ + createdTime
+ + ", categoryName='"
+ + categoryName
+ + '\''
+ + ", editorMarkdown='"
+ + editorMarkdown
+ + '\''
+ + ", editorHtml='"
+ + editorHtml
+ + '\''
+ + '}';
+ }
+}
diff --git a/src/entity/Msg.java b/src/entity/Msg.java
index c8ed08c..2c7c2d0 100644
--- a/src/entity/Msg.java
+++ b/src/entity/Msg.java
@@ -3,25 +3,39 @@
 import java.util.Map;
 
 public class Msg {
-	//״̬�� 100-�ɹ� 200-ʧ��
+	//状态码 100-成功 200-失败
 	private int code;
-	//��ʾ��Ϣ
+	//提示信息
 	private String msg;
 	
-	//�û�Ҫ���ظ�������������
+	//用户要返回给浏览器的数据
 	private Map<string, Object> extend = new HashMap<string, Object>();
 
-	public static Msg success(){
+	public static Msg success() {
 		Msg result = new Msg();
 		result.setCode(100);
-		result.setMsg("�����ɹ���");
+		result.setMsg("处理成功!");
 		return result;
 	}
-	
-	public static Msg fail(){
+
+	public static Msg success(String message) {
+		Msg result = new Msg();
+		result.setCode(100);
+		result.setMsg(message);
+		return result;
+	}
+
+	public static Msg fail() {
+		Msg result = new Msg();
+		result.setCode(200);
+		result.setMsg("处理失败!");
+		return result;
+	}
+
+	public static Msg fail(String message) {
 		Msg result = new Msg();
 		result.setCode(200);
-		result.setMsg("����ʧ�ܣ�");
+		result.setMsg(message);
 		return result;
 	}
 	
diff --git a/src/mapping/BlogMapper.java b/src/mapping/BlogMapper.java
index 246bd15..06cf00c 100644
--- a/src/mapping/BlogMapper.java
+++ b/src/mapping/BlogMapper.java
@@ -92,7 +92,7 @@ public interface BlogMapper {
 
 List<blog> selectAll();
 
- // �����ӵķ���
+ // 新添加的方法
 List<blog> selectByExampleWithCategory(BlogExample example);
 
 Blog selectByPrimaryKeyWithCategory(Integer id);
diff --git a/src/service/ArticleService.java b/src/service/ArticleService.java
index 7664bd3..4d3d4e1 100644
--- a/src/service/ArticleService.java
+++ b/src/service/ArticleService.java
@@ -23,27 +23,27 @@ public class ArticleService {
 	@Autowired
 	private CommentMapper commentMapper;
 	
-	// �������е�������Ϣ����������Ϣ
+	// 获得所有的文章信息不带分类信息
 	public List<blog> getAllArticle() {
 		return blogMapper.selectAll();
 	}
 
-	//ͨ��������ȡ������� ́�������Ϣ
+	//通过主键获取博客文章带分类信息
 public Blog selectByPrimaryKeyWithCategory(Integer id) {
 	return blogMapper.selectByPrimaryKeyWithCategory(id);
 }
 
- //��ȡ���е���� ́�������Ϣ
+ //获取所有的文章带分类信息
 	public List<blog> getAll() {
 		return blogMapper.selectByExampleWithCategory(null);
 	}
 
-	// ��ȡ���еķ�����Ϣ
+	// 获取所有的分类信息
 	public List<category> getCategoryName() {
 		return categoryMapper.selectByExample(null);
 	}
 
-	// �õ�����������Ӧ�� ID ֵ
+	// 得到分类名所对应的 ID 值
 	public Integer getCategoryId(String categoryName) {
 		CategoryExample example = new CategoryExample();
 		example.createCriteria().andNameEqualTo(categoryName);
@@ -52,16 +52,16 @@ public Integer getCategoryId(String categoryName) {
 		return id;
 	}
 
-	// �洢һƪ����
+	// 存储一篇博客
 	public void save(Blog blog) {
 		blogMapper.insert(blog);
 	}
 
-	// ��ȡ id ����Ӧ������� ́��������ݿ��� md 
+	// 获取 id 所对应博客文章储存在数据库的 md 
 	public String getArticleMdStr(int id) {
 		Blog blog = blogMapper.selectByPrimaryKeyWithCategory(id);
 		String md = blog.getMd();
-		// md Ϊ null,���ؿ��ַ���
+		// md 为 null,返回空字符串
 		if(md == null)
 			return "";
 		return md;
@@ -87,7 +87,7 @@ public void update(Blog blog) {
 	public List<blog> postarticle(List<blog> list) {
 		List<blog> listRtnBlogs = new ArrayList<blog>();
 		if(list != null && list.size()> 4) {
-			// ����������������ƪ����ȡ����
+			// 把评论数最大的四篇文章取出来
 			for(int i = 0 ; i < 4; i++) {
 			
 				for(int j = i + 1; j < list.size(); j++) {
diff --git a/src/service/CommentService.java b/src/service/CommentService.java
index 7b33af8..9e95ab5 100644
--- a/src/service/CommentService.java
+++ b/src/service/CommentService.java
@@ -18,15 +18,15 @@ public class CommentService {
 	@Autowired
 	private CommentMapper commentMapper;
 
-	// ��������
+	// 保存评论
 	public void sendcomment(int id, String name, String comment) throws ParseException {
 		if(name.equals("")) {
-			name = new String("����");
+			name = new String("匿名");
 		} 
 		if(comment.equals("")) {
-			comment = new String("ɶ��û���£�");
+			comment = new String("啥都没留下!");
 		}
-		// ����ɦ��
+		// 评论时间
 		Date now = new Date();
 	 
 	 Comment comment2 = new Comment();
diff --git a/src/service/LoginService.java b/src/service/LoginService.java
index ffec214..e278d3d 100644
--- a/src/service/LoginService.java
+++ b/src/service/LoginService.java
@@ -24,18 +24,18 @@ public boolean validate(String username, String password) throws SaslException {
 		if(usersMapper.selectByExample(example) != null) {
 			user = usersMapper.selectByExample(example).get(0);
 		} else {
-			// �û������ڣ���1⁄2ʧ�ܣ�
+			// 用户不存在,登陆失败!
 			return false;
 		}
 	
-		// ��ȡ���ݿ�������
+		// 获取数据库的密码
 		String passwordDB = user.getPassword();
-		// password md5 ����
+		// password md5 加密
 		String passmd5 = MD5.getMD5(password);
 		System.out.println(passmd5);
 		if(passwordDB.equals(passmd5))
 			return true;
-		// ����������
+		// 密码错误!
 		return false;
 	}
 	
diff --git a/src/utils/MD5.java b/src/utils/MD5.java
index 030cf71..2b21d4c 100644
--- a/src/utils/MD5.java
+++ b/src/utils/MD5.java
@@ -7,7 +7,7 @@
 
 public class MD5 {
 	/**
-	 * ���ַ���md5����
+	 * 对字符串md5加密
 	 *
 	 * @param str
 	 * @return
@@ -15,15 +15,15 @@ public class MD5 {
 	 */
 	public static String getMD5(String str) throws SaslException {
 	 try {
-	 // ����һ��MD5���ܼ���ժҪ
+	 // 生成一个MD5加密计算摘要
 	 MessageDigest md = MessageDigest.getInstance("MD5");
-	 // ����md5����
+	 // 计算md5函数
 	 md.update(str.getBytes());
-	 // digest()����ȷ������md5 hashֵ������ֵΪ8Ϊ�ַ���Ϊmd5 hashֵ��16λ��hexֵ��ɻ���Ͼ���8λ���ַ�
-	 // BigInteger��������8λ���ַ���ת����32λhexֵ�����ַ�������ʾ���õ��ַ�����ʽ�� hash ֵ
+	 // digest()最后确定返回md5 hash值,返回值为8为字符串。因为md5 hash值是16位的hex值,实际上就是8位的字符
+	 // BigInteger函数则将8位的字符串转换成32位hex值,用字符串来表示;得到字符串形式的 hash 值
 	 return new BigInteger(1, md.digest()).toString(16);
 	 } catch (Exception e) {
-	 throw new SaslException("MD5���ܳ��ִ���");
+	 throw new SaslException("MD5加密出现错误");
 	 }
 	}
 }
diff --git a/src/utils/Myutil.java b/src/utils/Myutil.java
index 2ce9741..e4e67d7 100644
--- a/src/utils/Myutil.java
+++ b/src/utils/Myutil.java
@@ -5,10 +5,10 @@
 public class Myutil {
 
 	/**
-	 * ����������
+	 * 返回随机数
 	 * 
 	 * @param n
-	 * ����
+	 * 个数
 	 * @return
 	 */
 	public static String random(int n) {
diff --git a/src/utils/UploadUtil.java b/src/utils/UploadUtil.java
index b82c709..4b503cc 100644
--- a/src/utils/UploadUtil.java
+++ b/src/utils/UploadUtil.java
@@ -8,7 +8,7 @@
 
 public class UploadUtil {
 	public static String uploadImg(String filePath, InputStream in) throws IOException {
-		//��ȡtomcat �ĸ�L·1⁄4��webapps �μ�·������editormd.root ��web.xml ������
+		//获取tomcat 的根目录(webapps 下的路径),editormd.root 在web.xml 中配置
 		String tomcatRootPath = System.getProperty("editormd.root") + "..";
 		String resultPath = tomcatRootPath + filePath;
 		
@@ -19,7 +19,7 @@ public static String uploadImg(String filePath, InputStream in) throws IOExcepti
 	}
 
 	/*
-	 * �����ļ��� �����ļ��в����ڽ�������
+	 * 创建文件, 如果文件夹不存在将被创建
 	 * */
 	public static File createFile(String resultPath) {
 		File file = new File(resultPath);